zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
caoqianming 2023-12-21 13:25:30 +08:00
parent 01276e0a00 278e3c3648
commit a57b49316b
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/wpm/worktask_form.vue
View File

@ -1126,15 +1126,6 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log('brothersList')
console.log(this.brothersList)
this.getMaterial();
// this.getMgroupList();
this.getUserList();
this.getEquipment();
this.getShiftOptions();
this.getRouteOptions();
let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
let month = date.getMonth() + 1; let month = date.getMonth() + 1;
@ -1144,6 +1135,12 @@ export default {
this.form.mtask = this.mtask; this.form.mtask = this.mtask;
this.form.mgroup = this.mgroup; this.form.mgroup = this.mgroup;
this.form.handle_date = year + "-" + month + "-" + day; this.form.handle_date = year + "-" + month + "-" + day;
this.getMaterial();
// this.getMgroupList();
this.getUserList();
this.getEquipment();
this.getShiftOptions();
this.getRouteOptions();
this.getWorkShopMaterial(); this.getWorkShopMaterial();
if (this.activeType == "10车间") { if (this.activeType == "10车间") {
let mlogb = []; let mlogb = [];
@ -1265,13 +1262,6 @@ export default {
}); });
} }
}, },
//获取车间物料
// getMaterial(){
// let that = this;
// this.$API.wpm.wmaterial.list.req({belong_dept_name:'8车间',page:0}).then(res=>{
// that.materialOptions = res;
// });
// },
getWorkShopMaterial() { getWorkShopMaterial() {
let that = this; let that = this;
if(this.form.material_in){ if(this.form.material_in){
@ -1355,7 +1345,7 @@ export default {
}); });
this.form.count_ok = ok_number; this.form.count_ok = ok_number;
} else if (this.activeType == "退火") { } else if (this.activeType == "退火") {
this.form.mgroup = "3428194648706011136"; // this.form.mgroup = "3428194648706011136";
this.form.count_notok = this.form.count_notok =
this.form.count_n_wq + this.form.count_n_wq +
this.form.count_n_tw + this.form.count_n_tw +
@ -1463,18 +1453,6 @@ export default {
} }
} }
}, },
//选择
// wmaterialInChange(val) {
// console.log(this.form)
// console.log(this.wmaterialOptions);
// debugger;
// for(let i=0;i<this.wmaterialOptions.length;i++){
// if(this.wmaterialOptions[i].id==val){
// this.form.batch = data[0].batch;
// }
// }
// console.log(this.form)
// },
}, },
}; };
</script> </script>