zhangsiyu
/
erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ssff

master
huangli865118801 3 years ago
parent
a6f6c73d7a
commit
15097647e9
15 changed files with 105 additions and 70 deletions
Unified View
  1. 2
      config/config.js
  2. 6
      pages/assembleBadProdct/assembleBadProdct.vue
  3. 5
      pages/assembleRecordList/assembleRecordList.vue
  4. 7
      pages/badProduct/badProduct.vue
  5. 16
      pages/offLine/offLine.vue
  6. 8
      pages/rawMaterialList/rawMaterialList.vue
  7. 6
      pages/repairExeam/repairExeam.vue
  8. 2
      pages/repairRecordList/index.scss
  9. 8
      pages/sprayBadProdoct/sprayBadProdoct.vue
  10. 5
      pages/sprayRecordList/sprayRecordList.vue
  11. 6
      pages/stampingRecordList/stampingRecordList.vue
  12. 24
      pages/stopLine/stopLine.vue
  13. 14
      pages/user/user.vue
  14. 64
      unpackage/dist/build/app-plus/app-service.js
  15. 2
      unpackage/dist/build/app-plus/app-view.js

2
config/config.js
Unescape View File

@ -2,4 +2,4 @@
export const devDomain = "http://erp.ilechuan.com"; export const devDomain = "http://erp.ilechuan.com";
//export const devDomain = "http://xy.x-embers.com"; //export const devDomain = "http://xy.x-embers.com";
//线上环境域名 //线上环境域名
export const prdDomain = "http://erp.ilechuan.com"; export const prdDomain = "http://xy.x-embers.com";

6
pages/assembleBadProdct/assembleBadProdct.vue
Unescape View File

@ -95,11 +95,11 @@
status: 1 status: 1
}).then(res => { }).then(res => {
this.reason = res; this.reason = res;
this.getInfo();
}); });
const index = this.reason.findIndex((role) => role.id === id) const index = this.reason.findIndex((role) => role.id === id)
console.log("是三手", this.reason[index]) console.log("是三手", this.reason[index])
this.getInfo();
this.power = this.userInfo.power; this.power = this.userInfo.power;
this.getArr(); this.getArr();
this.isMenu(); this.isMenu();
@ -107,7 +107,7 @@
}, },
data() { data() {
return { return {
methodList:["返修","报装"], methodList:["返修","报废"],
methodIds:0, methodIds:0,
type:0, type:0,
planInfo: {}, planInfo: {},

5
pages/assembleRecordList/assembleRecordList.vue
Unescape View File

@ -23,6 +23,11 @@
<view>物料编号:</view><text>{{item.product_number}}</text> <view>物料编号:</view><text>{{item.product_number}}</text>
</view> </view>
</view> </view>
<view class="card-up-list">
<view class="card-up-list-list">
<view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
</view>
</view>
<!-- <view class="card-up-list"> <!-- <view class="card-up-list">
<view class="card-up-list-list"> <view class="card-up-list-list">
<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text> <view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text>

7
pages/badProduct/badProduct.vue
Unescape View File

@ -95,11 +95,11 @@
status: 1 status: 1
}).then(res => { }).then(res => {
this.reason = res; this.reason = res;
this.getInfo();
}); });
const index = this.reason.findIndex((role) => role.id === id) const index = this.reason.findIndex((role) => role.id === id)
console.log("是三手", this.reason[index]) console.log("是三手", this.reason[index])
this.getInfo();
this.power = this.userInfo.power; this.power = this.userInfo.power;
this.getArr(); this.getArr();
this.isMenu(); this.isMenu();
@ -107,7 +107,7 @@
}, },
data() { data() {
return { return {
methodList:["返修","报装"], methodList:["返修","报废"],
methodIds:0, methodIds:0,
type:0, type:0,
planInfo: {}, planInfo: {},
@ -230,6 +230,7 @@
}) })
}, },
submit() { submit() {
console.log("是三手",this.froms);
let params = JSON.parse(JSON.stringify(this.froms)); let params = JSON.parse(JSON.stringify(this.froms));
params = params.map(item => { params = params.map(item => {
item.reason_no_id = this.reason[item.reasonIndex].id; item.reason_no_id = this.reason[item.reasonIndex].id;

16
pages/offLine/offLine.vue
Unescape View File

@ -23,7 +23,7 @@
<view class="list-list"> <view class="list-list">
<view class="list-title">班次</view> <view class="list-title">班次</view>
<view class="list-right"> <view class="list-right">
<text>{{CyInfo.line_title==0?'夜班':'白班'}}</text> <text>{{CyInfo.frequency==0?'夜班':'白班'}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -132,13 +132,13 @@
}, },
methods: { methods: {
getArr() { getArr() {
if (this.power.length > 0) { if (this.power.length > 0) {
let newArr = this.power.map(item => { let newArr = this.power.map(item => {
this.jurisdiction.push(item.id) this.jurisdiction.push(item.id)
}) })
} }
console.log("xinshuzu", this.jurisdiction) console.log("xinshuzu", this.jurisdiction)
}, },

8
pages/rawMaterialList/rawMaterialList.vue
Unescape View File

@ -31,8 +31,8 @@
<view class="lists" v-for="(item,index) in list" :key="index"> <view class="lists" v-for="(item,index) in list" :key="index">
<view class="list-left"> <view class="list-left">
<view class="list-left-up"> <view class="list-left-up">
<view class="list-left-up-left">巡检人:{{item.check_name}}</view> <view class="list-left-up-left">检验人员:{{item.check_name}}</view>
<view class="list-left-up-mid">巡检时间:{{item.create_time}}</view> <view class="list-left-up-mid">检验时间:{{item.create_time}}</view>
<view class="list-left-up-right-ok" v-if="item.result==1">OK</view> <view class="list-left-up-right-ok" v-if="item.result==1">OK</view>
<view class="list-left-up-right-no" v-if="item.result==2">NG</view> <view class="list-left-up-right-no" v-if="item.result==2">NG</view>
</view> </view>
@ -48,12 +48,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="list-right" v-if="list.length==1||index==0"> <!-- <view class="list-right" v-if="list.length==1||index==0">
首 首
</view> </view>
<view class="list-right" v-if="list.length>=2&&list.length-1==index"> <view class="list-right" v-if="list.length>=2&&list.length-1==index">
末 末
</view> </view> -->
</view> </view>
<view class="submit-btn"> <view class="submit-btn">
<button type="primary" v-if="isMenu(29)" @tap="addRecord(CyInfo)">新增检验记录</button> <button type="primary" v-if="isMenu(29)" @tap="addRecord(CyInfo)">新增检验记录</button>

6
pages/repairExeam/repairExeam.vue
Unescape View File

@ -33,6 +33,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content-box-card-ul-two">
<view class="content-box-card-list">
<view class="content-box-card-title">不良原因:</view>
<text>{{ cyInfo.no_reason }}</text>
</view>
</view>
</view> </view>
</view> </view>
<view> <view>

2
pages/repairRecordList/index.scss
Unescape View File

@ -21,7 +21,7 @@
.card-up-list-list{ .card-up-list-list{
@include flex(center,flex-start); @include flex(center,flex-start);
view{ view{
width:300upx; width:150upx;
@include fonts(26upx,#333,500); @include fonts(26upx,#333,500);
} }
text{ text{

8
pages/sprayBadProdoct/sprayBadProdoct.vue
Unescape View File

@ -92,14 +92,14 @@
this.planInfo = JSON.parse(decodeURIComponent(e.badProduct)); this.planInfo = JSON.parse(decodeURIComponent(e.badProduct));
this.froms[0].plan_id = this.planInfo.plan_id; this.froms[0].plan_id = this.planInfo.plan_id;
reasonNo({ reasonNo({
status: 1 status: 2
}).then(res => { }).then(res => {
this.reason = res; this.reason = res;
this.getInfo();
}); });
const index = this.reason.findIndex((role) => role.id === id) const index = this.reason.findIndex((role) => role.id === id)
console.log("是三手", this.reason[index]) console.log("是三手", this.reason[index])
this.getInfo();
this.power = this.userInfo.power; this.power = this.userInfo.power;
this.getArr(); this.getArr();
this.isMenu(); this.isMenu();
@ -107,7 +107,7 @@
}, },
data() { data() {
return { return {
methodList:["返修","报装"], methodList:["返修","报废"],
methodIds:0, methodIds:0,
type:0, type:0,
planInfo: {}, planInfo: {},

5
pages/sprayRecordList/sprayRecordList.vue
Unescape View File

@ -28,6 +28,11 @@
<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text> <view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text>
</view> </view>
</view> --> </view> -->
<view class="card-up-list">
<view class="card-up-list-list">
<view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
</view>
</view>
<view class="card-dow-list"> <view class="card-dow-list">
<view class="card-up-list-list"> <view class="card-up-list-list">
<view>班次:</view> <view>班次:</view>

6
pages/stampingRecordList/stampingRecordList.vue
Unescape View File

@ -23,11 +23,11 @@
<view>物料编号:</view><text>{{item.product_number}}</text> <view>物料编号:</view><text>{{item.product_number}}</text>
</view> </view>
</view> </view>
<!-- <view class="card-up-list"> <view class="card-up-list">
<view class="card-up-list-list"> <view class="card-up-list-list">
<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text> <view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
</view> </view>
</view> --> </view>
<view class="card-dow-list"> <view class="card-dow-list">
<view class="card-up-list-list"> <view class="card-up-list-list">
<view>班次:</view> <view>班次:</view>

24
pages/stopLine/stopLine.vue
Unescape View File

@ -376,16 +376,16 @@
}; };
}, },
onLoad(e) { onLoad(e) {
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
this.froms.plan_id = this.CyInfo.plan_id;
this.crrentReson = "设备维修"
this.getReson(); this.getReson();
this.getDevice(); this.getDevice();
this.getMode() this.getMode()
if (e.id) { if (e.id) {
this.stopId = e.id this.stopId = e.id
} }
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
this.froms.plan_id = this.CyInfo.plan_id;
this.crrentReson = "设备维修"
console.log('picker发送选择改变，携带值为', this.CyInfo)
this.getdeviceException(); //获取设备异常现象 this.getdeviceException(); //获取设备异常现象
this.getModeException(); //获取模具异常现象 this.getModeException(); //获取模具异常现象
this.getDecYyfx(); //获取设备异常原因分析 this.getDecYyfx(); //获取设备异常原因分析
@ -437,7 +437,14 @@
}) })
}, },
getStaff() { getStaff() {
staff().then(res => { let position=""
if(this.reasonIds=="1"){
position="钳工"
}
if(this.reasonIds=="0"){
position="开线员"
}
staff({position:position}).then(res => {
this.staffList = res; this.staffList = res;
this.modestaffList = res; this.modestaffList = res;
@ -445,9 +452,8 @@
}) })
}, },
getDevice() { getDevice() {
device().then(res => { device({line_id:this.CyInfo.line_id}).then(res => {
this.deviceNo = res this.deviceNo = res
console.log("设备编号11", this.deviceNo)
}) })
}, },
getDeviceRepairDescription() { getDeviceRepairDescription() {
@ -483,7 +489,7 @@
}) })
}, },
getMode() { getMode() {
mode().then(res => { mode({number:this.CyInfo.product_number}).then(res => {
this.mould = res this.mould = res
console.log("mode", this.mould) console.log("mode", this.mould)
}) })
@ -599,7 +605,7 @@
if(this.reasonIds=="0"){ if(this.reasonIds=="0"){
this.getDecYyfx() this.getDecYyfx()
} }
this.getStaff()
}, },
bindmouldIds(e, item) { bindmouldIds(e, item) {
if (item.length > 0) { if (item.length > 0) {

14
pages/user/user.vue
Unescape View File

@ -16,6 +16,14 @@
<image class="next-icon" src="../../static/next.png"></image> <image class="next-icon" src="../../static/next.png"></image>
</view> </view>
</view> </view>
<view>
<view class="list">
<view class="left">
<view>版本号</view>
</view>
<text>{{versionCode}}</text>
</view>
</view>
<button class="logout" type="primary" v-if="userInfo.name" @tap="logout">退出登录</button> <button class="logout" type="primary" v-if="userInfo.name" @tap="logout">退出登录</button>
</view> </view>
</template> </template>
@ -32,11 +40,14 @@
}, },
onLoad() { onLoad() {
}, },
data() { data() {
return { return {
status:0, status:0,
ifJump:0, ifJump:0,
versionNo:'',
versionCode:'1.0.1'
}; };
},methods:{ },methods:{
...mapMutations(['setToken', 'setUserInfo']), ...mapMutations(['setToken', 'setUserInfo']),
@ -56,6 +67,7 @@
complete: () => {} complete: () => {}
}); });
}, },
logout(){ logout(){
this.$functions.confirm("是否确认退出登录").then(()=>{ this.$functions.confirm("是否确认退出登录").then(()=>{
this.setToken(""); this.setToken("");
@ -64,7 +76,7 @@
url:"../login/login" url:"../login/login"
}) })
}) })
} },
} }
} }
</script> </script>

64
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save