diff --git a/src/views/wpm_bx/check_form.vue b/src/views/wpm_bx/check_form.vue index 27426bf1..c3b4a005 100644 --- a/src/views/wpm_bx/check_form.vue +++ b/src/views/wpm_bx/check_form.vue @@ -4,7 +4,7 @@ v-model="visible" :size="1000" destroy-on-close - @closed="$emit('closed')" + @closed="close" > @@ -134,393 +134,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + { userList = res; - that.$API.system.user.list.req({ depts: that.deptID, page: 0 }) - .then((res2) => { - res2.forEach((item) => { - userList.push(item); - }); - that.userList = userList ; - }); + // that.$API.system.user.list.req({ depts: that.deptID, page: 0 }) + // .then((res2) => { + // res2.forEach((item) => { + // userList.push(item); + // }); + // that.userList = userList ; + // }); + }); + }, + //获取不合格项 + getdefects(){ + let that = this; + that.$API.qm.qct.list.req({ page: 0, qctmat__material: that.itemObj.material }).then((res) => { + if(res.length>0){ + that.$API.qm.qct.item.req(res[0].id).then((res) => { + that.qct_defects = res.qct_defects; + }) + } }); }, handleCountChange(type){ - this.form.count_notok = - this.count_notok_json.count_n_wj+ - this.count_notok_json.count_n_yd+ - this.count_notok_json.count_n_txd+ - this.count_notok_json.count_n_hd+ - this.count_notok_json.count_n_qp+ - this.count_notok_json.count_n_swen+ - this.count_notok_json.count_n_hs+ - this.count_notok_json.count_n_bb+ - this.count_notok_json.count_n_xbb+ - this.count_notok_json.count_n_md+ - this.count_notok_json.count_n_ps+ - this.count_notok_json.count_n_qt; + this.form.count_notok this.handleCountNotokChange(); }, handleCountNotokChange(){ @@ -664,11 +267,9 @@ export default { let obj = {page: 0, count__gte: 0, count_xtest__gte: 0}; //工段 obj.mgroupx = that.mgroup; - that.$API.wpm.wmaterial.list - .req(obj) - .then((res) => { - that.options = res; - }); + that.$API.wpm.wmaterial.list.req(obj).then((res) => { + that.options = res; + }); }, //提交 submit() { @@ -676,19 +277,7 @@ export default { this.$refs.dialogForm.validate(async (valid) => { if (valid) { that.isSaveing = true; - let count_notok = - this.count_notok_json.count_n_wj+ - this.count_notok_json.count_n_yd+ - this.count_notok_json.count_n_txd+ - this.count_notok_json.count_n_hd+ - this.count_notok_json.count_n_qp+ - this.count_notok_json.count_n_swen+ - this.count_notok_json.count_n_hs+ - this.count_notok_json.count_n_bb+ - this.count_notok_json.count_n_xbb+ - this.count_notok_json.count_n_md+ - this.count_notok_json.count_n_ps+ - this.count_notok_json.count_n_qt; + let count_notok; if(count_notok>that.form.count_notok){ that.$notify.error("不合格数量有问题"); that.isSaveing = false; @@ -699,43 +288,37 @@ export default { if(that.supplier!== null&&that.form.type2==10){ that.form.need_update_wm = false; } - // that.form.count_ok = that.form.count-that.form.count_notok; if(that.form.type2==10){//抽检 that.form.count_sampling_ok = that.form.count_sampling - that.form.count_notok; }else{//全检 that.form.count_ok = that.form.count - that.form.count_notok; } - that.form.count_notok_json = that.count_notok_json; - console.log('that.form',that.form) - that.$API.qm.ftestwork.create.req(that.form) + that.$API.qm.ftestwork.create.req(that.form).then((res) => { + that.$API.qm.ftestwork.submit.req(res.id) .then((res) => { - that.$API.qm.ftestwork.submit.req(res.id) - .then((res) => { - that.isSaveing = false; - that.visible = false; - that.$emit("success"); - that.$message.success("操作成功"); - }) - }).catch( err=>{ - //可以处理校验错误 that.isSaveing = false; - }) + that.visible = false; + that.$emit("success"); + that.$message.success("操作成功"); + }) + }).catch( err=>{ + //可以处理校验错误 + that.isSaveing = false; + }) } - } }); }, + close(){ + this.visible = false; + this.$emit('closed') + }, //表单注入数据 setData(data) { Object.assign(this.form, data); this.formCount = this.form.count; // this.form.test_group = this.form.split(","); }, - //设置过滤项 - setFilters(filters) { - this.selectionFilters = filters; - this.setFiltersVisible = true; - }, }, }; diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 2a383176..3abb797a 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -287,9 +287,6 @@ export default { trigger: "blur", }, ], - }, - listParams:{ - }, totalCount: 0, deptID:'', @@ -367,37 +364,13 @@ export default { let that = this; var req = { page: 0, - notok_sign__isnull : 1, - count_xtest__isnull:1 + state:10, + mgroupx:that.mgroupId }; that.materialOptions = []; - if(that.mgroupName=="size"){ - that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => { - if(res.length>0){ - req.belong_dept=res[0].id; - that.listParams = req; - this.$API.wpm.wmaterial.list.req(req).then((res) => { - that.materialOptions = res; - }); - } - }) - }else if(that.mgroupName=="facade"){ - that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => { - if(res.length>0){ - req.belong_dept=res[0].id; - that.listParams = req; - this.$API.wpm.wmaterial.list.req(req).then((res) => { - that.materialOptions = res; - }); - } - }) - }else{ - req.mgroupx = that.mgroupId; - that.listParams = req; - this.$API.wpm.wmaterial.list.req(req).then((res) => { - that.materialOptions = res; - }); - } + this.$API.wpm.wmaterial.list.req(req).then((res) => { + that.materialOptions = res; + }); }, //获取车间不合格物料 getMaterialNotok() { @@ -406,10 +379,8 @@ export default { var req = { mgroupx: that.mgroupId, page: 0, - notok_sign__isnull : 0, - count_xtest__isnull:1 + state:20, }; - that.listParams = req; this.$API.wpm.wmaterial.list.req(req).then((res) => { that.materialOptions = res; }); diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue index 58a8ba7f..eccf78f7 100644 --- a/src/views/wpm_bx/inm.vue +++ b/src/views/wpm_bx/inm.vue @@ -84,7 +84,11 @@ label="数量" prop="count" min-width="80" - > + > + + @@ -119,16 +131,16 @@ @choseChange="choseChange" > - + + + + + + diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue index 36e675ef..459d2f1e 100644 --- a/src/views/wpm_bx/mlogb_form.vue +++ b/src/views/wpm_bx/mlogb_form.vue @@ -57,7 +57,7 @@ - + 提交 取消 @@ -188,9 +188,9 @@ export default { that.form.batch = wm_in; that.form.wm_in = arr[0].id; that.form.count_use = arr[0].count; - if(that.tracking==10){}else{ - that.submit();//提交 - } + // if(that.tracking==10){}else{ + // that.submit();//提交 + // } }else{ that.wm_in = ''; that.$message.error("批次号不存在");