From fb6785654e379d5c1339b48fb4d4594c4167fe00 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 16 Dec 2025 14:02:05 +0800 Subject: [PATCH 01/15] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_check.vue | 52 ++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index a082fb55..22cc38d9 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -605,12 +605,21 @@ - + + + + + @@ -618,7 +627,14 @@ - + + + + - + + + + + { @@ -1325,13 +1355,15 @@ export default { if (valid) { that.isSaveing = true; try { - if (that.type == "pur_in") { + if (that.type == "pur_in"&&that.project_code!="gx") { console.log(that.form); let arr = []; - that.weight_kgs.forEach((item) => { - arr.push(item.value); - }); - that.form.weight_kgs = arr; + if(that.weight_kgs.length>0){ + that.weight_kgs.forEach((item) => { + arr.push(item.value); + }); + that.form.weight_kgs = arr; + } console.log('that.form',that.form); that.$API.inm.mioitem.testpurin .req(that.mioitemId, that.form) From 882c6fa6a81d71f6d981666ddaccb47bd0173503 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 16 Dec 2025 14:46:38 +0800 Subject: [PATCH 02/15] fix: --- src/views/inm/mioitem_check.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 22cc38d9..38db64f5 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -619,7 +619,6 @@ From d2162924f8024d7c43d228acad8dd241eac12492 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 16 Dec 2025 16:15:21 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix:=E7=A6=85=E9=81=93223?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/workerTimes.vue | 113 +++++++++++++++------ 1 file changed, 83 insertions(+), 30 deletions(-) diff --git a/src/views/statistics/bxerp/workerTimes.vue b/src/views/statistics/bxerp/workerTimes.vue index 22fbc71e..c2eab7e7 100644 --- a/src/views/statistics/bxerp/workerTimes.vue +++ b/src/views/statistics/bxerp/workerTimes.vue @@ -51,11 +51,26 @@ + + + + + + + + + @@ -87,45 +102,83 @@ export default { methods: { getData(){ let that = this; + that.lists = []; that.mgruops = []; that.tableData = []; + that.titleList = []; + that.coefficient = []; let params = {}; params.query = that.query; that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => { - let data = res.data2.ds0; - that.lists = []; - let coefficient = []; - data.forEach(item=>{ - let obj = item.工序物料生产数?JSON.parse(item.工序物料生产数):{}; - for(let key in obj){ - if(coefficient.indexOf(key)<0){ - coefficient.push(key); - } - let mgroup = key.split('_')[0]; - let pname = key.split('_')[1]; - if(that.mgruops.indexOf(mgroup)<0){ - that.mgruops.push(mgroup); - that.lists.push({text:mgroup,value:[pname]}); - }else{ - var index = that.mgruops.indexOf(mgroup); - if(that.lists[index].value.indexOf(pname)<0){ - that.lists[index].value.push(pname); + let data = res.data2.ds0; + let coefficient = []; + if(data.length>0){ + data.forEach(item=>{ + let obj = item.工序物料生产数?JSON.parse(item.工序物料生产数):{}; + for(let key in obj){ + if(coefficient.indexOf(key)<0){ + coefficient.push(key); } + let mgroup = key.split('_')[0]; + let pname = key.split('_')[1]; + if(that.mgruops.indexOf(mgroup)<0){ + that.mgruops.push(mgroup); + that.lists.push({text:mgroup,value:[pname]}); + }else{ + var index = that.mgruops.indexOf(mgroup); + if(that.lists[index].value.indexOf(pname)<0){ + that.lists[index].value.push(pname); + } + } + item[key]= obj[key]; + item[pname]= obj[key]; } - item[key]= obj[key]; - item[pname]= obj[key]; - } - }) - let item0 = {日期:'系数',操作人:'',indexs:0}; - coefficient.forEach(cof=>{ - item0[cof]= 1; - }) - if(data.length>0){ + }) + that.coefficient = coefficient; + let item0 = {日期:'系数',操作人:'',indexs:0}; + coefficient.forEach(cof=>{ + item0[cof]= 1; + }) data.unshift(item0); - } - that.tableData = data; + data.forEach(item1 => { + item1.time_other=0; + let all = 0; + coefficient.forEach(item2 => { + if(item1[item2]){ + all = all+ Number(item1[item2]) + } + }) + item1.time_all = all; + }) + } + that.tableData = data; }); }, + xishuChange(){ + let that = this; + that.tableData.forEach((item1,index1) => { + if(index1>0){ + let all = 0; + that.coefficient.forEach(item2 => { + if(item1[item2]){ + all = all+ Number(item1[item2])*Number(that.tableData[0][item2]) + } + }) + item1.time_all = all+Number(item1.time_other); + } + }) + }, + otherChange(index){ + let that = this; + let all = 0; + console.log('index',index) + that.coefficient.forEach(item2 => { + if(that.tableData[index][item2]){ + all = all+ Number(that.tableData[index][item2])*Number(that.tableData[0][item2]) + } + that.tableData[index].time_all = all+Number(that.tableData[index].time_other); + }) + }, deptChange(){ this.getData(); }, From 0f90a845d0089763a18f057ee30d4b0cf97d0983 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Dec 2025 08:42:32 +0800 Subject: [PATCH 04/15] fix: --- src/views/wpm_gx/handover_form.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue index d8b83af2..2f8a4a99 100644 --- a/src/views/wpm_gx/handover_form.vue +++ b/src/views/wpm_gx/handover_form.vue @@ -535,8 +535,10 @@ export default { this.form.handoverb = []; data.forEach(item=>{ let obj = {}; - obj.wm = item.id; + obj.wm = item.wm; + obj.label = item.label; obj.batch = item.batch; + obj.count_cando = item.count_canhandover; obj.count = item.count_canhandover; this.form.handoverb.push(obj); this.totalCount += Number(item.count_canhandover); From e0fa44f976811b883d9d5e6be441605364def88b Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Dec 2025 09:39:49 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix:=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9C=89=E6=A3=80=E9=AA=8C=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=8F=90=E4=BA=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index be7124e5..0b19cc46 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -141,7 +141,13 @@ - + + + + @@ -158,8 +164,7 @@ link type="primary" @click="table_check(scope.row)" - v-if="project_code=='bxerp'&&mioObj.state == 10 && - (type == 'pur_in' ||type == 'do_in' ||type == 'other_in')" + v-if="project_code=='bxerp'&&mioObj.state == 10 &&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')" v-auth="'mioitem.test'" >检验 Date: Wed, 17 Dec 2025 13:34:30 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix:=E5=A4=9A=E9=80=89=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E5=A2=9E=E5=8A=A0id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 1 + src/views/wpm_bx/inmOut.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 7df7f0d0..454b1132 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -496,6 +496,7 @@ export default { if(this.selection.length>0){ this.selection.forEach(item=>{ let obj = {}; + obj.id = item.id; obj.wm = item.id; obj.batch = item.batch; obj.process = item.material_.process_name; diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue index 1da2472c..ffcbbe3a 100644 --- a/src/views/wpm_bx/inmOut.vue +++ b/src/views/wpm_bx/inmOut.vue @@ -519,6 +519,7 @@ export default { if(this.selection.length>0){ this.selection.forEach(item=>{ let obj = {}; + obj.id = item.id; obj.wm = item.id; obj.batch = item.batch; obj.process = item.material_.process_name; From 0252ee2361d12b77240ece264ea3705734551429 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Dec 2025 13:35:10 +0800 Subject: [PATCH 07/15] =?UTF-8?q?fix:=E4=B8=8A=E7=9B=98=E5=B9=B3=E7=A3=A8h?= =?UTF-8?q?andoverbw=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 28038b6f..98c3d579 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -117,6 +117,7 @@ @@ -234,7 +231,6 @@ > From 163f46929eba935728db2669db314f376fd6b9b3 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Dec 2025 14:32:12 +0800 Subject: [PATCH 09/15] =?UTF-8?q?fix:=E5=90=88=E5=B9=B6=E5=88=B0=E6=9C=AC?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=90=8E=E4=BC=A0=E5=85=A5new=5Fwm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 454b1132..8a5583e8 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -245,6 +245,7 @@ ref="scrapDialog" :type="type" :tag="tag" + :new_wm="new_wm" :wmItem="wmItem" :mgroupName="mgroup_name" :mgroupId="mgroupId" @@ -702,6 +703,7 @@ export default { handleAddWpr(row){ this.dialog.scrap = true; this.type = 50; + this.new_wm = row.id; let obj = {}; obj.wm = row.id; obj.batch = row.batch; From 87fab76188caa5da296c99638ef3edc023255bac Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Dec 2025 15:45:46 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fix:=E6=80=A7=E8=83=BD=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=9E=90=E6=99=B6=E9=BB=98=E8=AE=A4=E4=B8=8D=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/behavior_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue index e7b36cfe..244b1fde 100644 --- a/src/views/qm/behavior_form.vue +++ b/src/views/qm/behavior_form.vue @@ -246,7 +246,7 @@ export default { return { loading: false, form: { - val_xj: "S", + val_xj: "", }, rules: { belong_dept: [ From b1e46f1bf338dda901748998a6f236292746a5c1 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 09:07:06 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fix:=E6=B7=B7=E6=89=B9=E5=8A=A0=E6=96=99?= =?UTF-8?q?=E6=97=B6=E4=BC=A0=E5=85=A5mtype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/inmIn.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 8a5583e8..b6e305be 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -713,7 +713,7 @@ export default { obj.material_name = row.material_name; this.wmItem = obj; this.$nextTick(() => { - this.$refs.scrapDialog.open("add"); + this.$refs.scrapDialog.open("add",'',30); }); }, handleWprSuccess(row){}, From ae2e7172b63dc95b2f269a2397f6ff2aac7cb7c5 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 09:10:31 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fix:=E6=B7=B7=E6=89=B9=E5=8A=A0=E6=96=99?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 98c3d579..b5664a6b 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -198,12 +198,12 @@ - + - + - + 请手动录入新批次号，不要用已有批次！ @@ -266,6 +266,10 @@ export default { type: Object, default: () => ({}), }, + new_wm:{ + type: String, + default: "", + }, }, components: { scanDialog @@ -385,7 +389,7 @@ export default { let that = this; that.form.type = that.type; if(that.type==50){ - that.form.mtype=30; + that.mtype=30; that.change_batch = true; } let arr = that.$route.path.split("/"); @@ -394,6 +398,10 @@ export default { that.materialObj = materialObj; that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date()); that.form.send_mgroup = that.mgroupId; + if(that.new_wm!==''){ + that.mtype==30; + that.form.new_wm = that.new_wm; + } if(that.wmItem.wm){ that.form.new_batch = that.wmItem.batch; that.form.material_changed = that.wmItem.material; @@ -615,7 +623,9 @@ export default { open(mode = "add",data,mtype) { let that = this; that.mode = mode; - that.mtype = mtype; + if(mtype!==undefined&&mtype!==null){ + that.mtype = mtype; + } that.checkedStatus=[]; that.selectItems=[]; if(mtype==30){ @@ -631,9 +641,7 @@ export default { that.totalCount += Number(item.count); that.getWprList(item.wm,index); }) - console.log('that.isFeiPinku',that.isFeiPinku); if(that.isFeiPinku){ - console.log('data[0].material',data[0].material); that.form.new_batch = data[0].batch; that.form.material_changed = data[0].material; that.form.material_changed_fname = data[0].material_name; From 90713c1dfffbbae2fc7b87f3ded1ff64e192929c Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 09:39:44 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fix:=E6=B7=B7=E6=89=B9=E5=8A=A0=E6=96=99?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=B7=BB=E5=8A=A0=E8=BD=A6=E9=97=B4=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BB=BB=E6=84=8F=E5=B7=A5=E6=AE=B5=E7=9A=84=E6=9D=BF?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form.vue | 65 ++++++++++++++++++------------ 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index b5664a6b..1df7de81 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -986,31 +986,46 @@ export default { that.form.handoverb[indexs].handoverbw.push(obj1); } }else{//handoverb里没有有这个物料批次 - that.materialOptions.forEach((item) => { - if(item.id == res[0].wm){ - if(that.type==50){ - that.form.new_batch = item.batch+'-G'; - } - let params = {material: item.material,type: that.type}; - that.$API.wpm.handover.mgroups.req(params).then((res1) => { - that.mgroupOptions = res1; - }) - let obj2 = {}; - obj2.wm = item.id; - obj2.batch = item.batch; - if(item.material_.process_name){ - obj2.process = item.material_.process_name; - } - obj2.count_cando = item.count_canhandover; - obj2.handoverbw = []; - obj2.count = 1; - let obj3 = {}; - obj3.wpr = res[0].id; - obj3.number = res[0].number; - obj2.handoverbw.push(obj3); - that.form.handoverb.push(obj2); - } - }) + if(that.new_wm==''){ + that.materialOptions.forEach((item) => { + if(item.id == res[0].wm){ + if(that.type==50){ + that.form.new_batch = item.batch+'-G'; + } + let params = {material: item.material,type: that.type}; + that.$API.wpm.handover.mgroups.req(params).then((res1) => { + that.mgroupOptions = res1; + }) + let obj2 = {}; + obj2.wm = item.id; + obj2.batch = item.batch; + if(item.material_.process_name){ + obj2.process = item.material_.process_name; + } + obj2.count_cando = item.count_canhandover; + obj2.handoverbw = []; + obj2.count = 1; + let obj3 = {}; + obj3.wpr = res[0].id; + obj3.number = res[0].number; + obj2.handoverbw.push(obj3); + that.form.handoverb.push(obj2); + } + }) + }else{ + console.log('res[0]',res[0]) + let obj2 = {}; + obj2.wm = res[0].wm; + obj2.batch = res[0].wm_batch; + obj2.process = res[0].process_name; + obj2.handoverbw = []; + obj2.count = 1; + let obj3 = {}; + obj3.wpr = res[0].id; + obj3.number = res[0].number; + obj2.handoverbw.push(obj3); + that.form.handoverb.push(obj2); + } } }else{ that.$message.error("该批次不存在") From fb428464c2d1092057f6a73977d4062dfe815510 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 18 Dec 2025 10:01:36 +0800 Subject: [PATCH 14/15] =?UTF-8?q?fix:=E6=9E=90=E6=99=B6=E4=B8=BAnull?= =?UTF-8?q?=E6=88=96=E8=BF=99=E7=A9=BA=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BAel-tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/behavior.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue index a0f26bfd..106cf8f8 100644 --- a/src/views/qm/behavior.vue +++ b/src/views/qm/behavior.vue @@ -119,7 +119,7 @@ prop="val_xj" > Date: Thu, 18 Dec 2025 11:12:36 +0800 Subject: [PATCH 15/15] =?UTF-8?q?fix:=E7=A6=85=E9=81=93166?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog6_form.vue | 41 ++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue index 5b93a337..99f7d990 100644 --- a/src/views/wpm/mlog6_form.vue +++ b/src/views/wpm/mlog6_form.vue @@ -86,9 +86,11 @@ controls-position="right" :min="0" :step="1" + :max="count_cando" :step-strictly="true" style="width: 100%" placeholder="请输入领用数量" + @change="countUseChange" > @@ -100,6 +102,7 @@ controls-position="right" :min="0" :step="1" + :max="form.count_use" :step-strictly="true" style="width: 100%" placeholder="请输入加工数量" @@ -114,6 +117,7 @@ controls-position="right" :min="0" :step="1" + disabled="true" :step-strictly="true" style="width: 100%" placeholder="请输入合格数" @@ -586,6 +590,7 @@ export default { handle_user: "", }, + count_cando:0, mlogb: [], userList: [], batchOptions: [], @@ -663,9 +668,31 @@ export default { }, batchChange(){ let that = this; - that.form.count_use = that.selectBatch.count_cando; - that.form.count_real = that.selectBatch.count_cando; - that.form.count_ok = that.selectBatch.count_cando; + this.form.count_notok = + this.form.count_n_hs = + this.form.count_n_cs = + this.form.count_n_zz = + this.form.count_n_tw = + this.form.count_n_zdd = + this.form.count_n_d = + this.form.count_n_dl = + this.form.count_n_qp = + this.form.count_n_bl = + this.form.count_n_hw = + this.form.count_n_yp = + this.form.count_n_bp = + this.form.count_n_sc = + this.form.count_n_zjd = + this.form.count_n_zjx = + this.form.count_n_qx = + this.form.count_n_js = + this.form.count_n_tydd = + this.form.count_n_sw = + this.form.count_n_bhpcd = + this.form.count_n_wq = + this.form.count_n_qt = + this.form.count_n_zw = 0; + that.count_cando = that.form.count_use = that.form.count_real = that.form.count_ok = that.selectBatch.count_cando; }, //获取车间物料批次号 getBatchs() { @@ -699,6 +726,12 @@ export default { this.visible = true; return this; }, + countUseChange(){ + if(this.form.count_real>this.form.count_use){ + this.form.count_real = this.form.count_use; + this.count_ok = this.form.count_real - this.form.count_notok; + } + }, countNotOkSun() { this.form.count_notok = Number(this.form.count_n_hs) + @@ -724,7 +757,7 @@ export default { Number(this.form.count_n_wq) + Number(this.form.count_n_qt) + Number(this.form.count_n_zw); - this.form.count_real = this.form.count_use-this.form.count_notok; + this.form.count_ok = this.form.count_real-this.form.count_notok; }, //提交 submit() {