From 9b87e28eb6bbf0905f9a1f04ee7179f1e049c753 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 22 Dec 2025 10:23:16 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=BC=80=E5=87=B9?= =?UTF-8?q?=E9=9D=A2=E5=88=86=E6=89=B9=E6=97=B6=E7=B1=BB=E4=BC=BC=E5=96=B7?= =?UTF-8?q?=E7=A0=81=E5=8F=AF=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 | 19 +++++++++-------- src/views/wpm_bx/handover_form2.vue | 33 +++++++++++++++++++++++++++-- src/views/wpm_bx/inmIn.vue | 2 +- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index 1df7de81..86181b02 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -160,7 +160,7 @@ - + - + { + console.log('that.type',that.type,'that.mtype',that.mtype) + if(that.type==20||that.type==50||(that.type==10&&that.mtype==30)||(that.mtype==30&&that.new_wm!=='')){ + that.form.recive_mgroup = that.mgroupId; + } + }) // type=10 正常交接 物料都可交接，接收工段有限制 // type=20 返工交接 不合格品交接，接收工段为该工艺流程中的工段 // type=30 物料检验 合格品交接，检验部接收 @@ -755,9 +759,6 @@ export default { let that = this; that.$refs.dialogForm.validate(async (valid) => { if (valid) { - if(that.mtype==30){ - that.form.recive_mgroup = that.form.send_mgroup; - } that.form.mtype=that.mtype; if(that.route_code=='shangpaipingmo'){ that.form.handoverb.forEach(item=>{ @@ -771,7 +772,7 @@ export default { }) } //合批、分批、报废，这三个交接操作直接创建并提交 - if(that.mtype==20||that.mtype==30||that.type==40){ + if(that.mtype==20||(that.mtype==30&&that.type==50&&that.new_wm!=='')||(that.mtype==30&&that.type==10)||that.type==40){ that.$API.wpm.handover.createsubmit.req(that.form).then((res) => { that.isSaveing = false; that.$emit("success"); diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index ca2cd6cf..2082c0a3 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -30,14 +30,16 @@ - 选择物料: + 选择物料: 数量：{{ listItem.count }} - +
{{ item2.number }} @@ -63,6 +65,11 @@ {{ item3 }}
+ + + + + @@ -141,6 +148,7 @@ export default { trigger: "blur", }, }, + route_code:"", batchOrign:{}, wprOptions: [], materialOptions: [], @@ -152,6 +160,9 @@ export default { }, mounted() { let that = this; + let paths = that.$route.path; + let arr = paths.split("/"); + that.route_code = arr[2]; that.form.type = that.type; that.form.handle_date = that.form.send_date = that.$TOOL.dateFormat2(new Date()); that.form.send_mgroup = that.form.recive_mgroup = that.mgroupId; @@ -162,6 +173,9 @@ export default { getWpr(id){ let that = this; that.$API.wpm.wpr.list.req({page:0,wm:id}).then((res) => { + res.forEach(item=>{ + item.checked = false; + }) that.wprOptions = res; }); }, @@ -295,6 +309,21 @@ export default { } that.form.handoverb.splice(index,1); }, + handleChange(index){ + let that = this; + that.form.handoverb[index].handoverbw = []; + let trueCount = this.wprOptions.filter(item => item.checked === true).length; + that.form.handoverb[index].count =trueCount; + this.wprOptions.forEach(item=>{ + if(item.checked){ + let obj = {}; + obj.number = item.number; + obj.wpr = item.id; + item.disabled = true; + that.form.handoverb[index].handoverbw.push(obj); + } + }) + }, //提交 submit() { let that = this; diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index b6e305be..6687a209 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -93,7 +93,7 @@ min-width="150" > From a2e849640f9bc34143f8b39e62ca2c03207dcbc5 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 22 Dec 2025 13:11:48 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=E5=88=86=E6=89=B9=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=9C=AC=E6=89=B9=E6=AC=A1=E7=9A=84=E6=9D=BF=E6=AE=B5?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form2.vue | 36 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index 2082c0a3..c294bd57 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -57,13 +57,18 @@ -
- {{ item2.number }} - +
+
+ {{ item2.number }} + +
+
+ {{ item2.number }} +
-
+ @@ -232,25 +237,27 @@ export default { if(arrs.length>1){ that.form.handoverb[index].wpr = ''; arrs.forEach(arr=>{ - that.wprOptions.forEach(item=>{ + let obj = {}; + obj.number = arr; + let options = that.wprOptions.filter(item=>{return item.number.indexOf(arr) > -1&&!item.disabled}); + if(options.length>0){ + obj.wpr = options[0].id; + barchArrs.push(arr); + } + that.form.handoverb[index].handoverbw.push(obj); + that.wprOptions.forEach(item=>{ if(item.number.indexOf(arr) > -1&&!item.disabled){ item.disabled = true; - let obj = {}; - obj.number = item.number; - obj.wpr = item.id; - barchArrs.push(arr); - that.form.handoverb[index].handoverbw.push(obj); - that.form.handoverb[index].count = that.form.handoverb[index].handoverbw.length; } }) + }) + that.form.handoverb[index].count = barchArrs.length; //如果arrs里有不是这个批次的wpr,提示错误 let diff = arrs.filter(item => !barchArrs.includes(item)); that.diff = diff; - console.log('diff',diff) if(diff.length>0){ that.$message.warning("物料"+diff.join(",")+"不在该批次中"); - // that.$confirm("物料"+diff.join(",")+"不在该批次中", "提示", {type: "warning",}).then(() => {}); } }else{ //放入对应的行中的handoverb中，并且在列表中disabled @@ -332,6 +339,7 @@ export default { let total = 0; if(this.form.handoverb.length>0){ this.form.handoverb.forEach(item=>{ + item.handoverbw = item.handoverbw.filter(item=>{ return item.wpr&&item.wpr!==''&&item.wpr!==null&&item.wpr!==undefined}) total += item.count; }) } From 11ebb98897a7473444f4ff9e26a9ce96d6cf9204 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 23 Dec 2025 10:53:37 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix:paoaomian=E4=B9=9F=E5=92=8Ckaiaomian?= =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=8A=A0=E5=85=A5=E5=88=86=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover_form2.vue | 6 +++--- src/views/wpm_bx/inmIn.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index c294bd57..3f25fe2e 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -32,7 +32,6 @@ 选择物料: {{ item3 }}
--> - + @@ -262,11 +261,12 @@ export default { }else{ //放入对应的行中的handoverb中，并且在列表中disabled that.wprOptions.forEach(item=>{ - if(item.number.indexOf(arr) > -1){ + if(item.number.indexOf(number) > -1){ if(item.disabled){ that.$message.error("该物料已被分配"); that.form.handoverb[index].wpr = ''; }else{ + item.checked = true; item.disabled = true; let obj = {}; obj.number = item.number; diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue index 6687a209..43ec2af5 100644 --- a/src/views/wpm_bx/inmIn.vue +++ b/src/views/wpm_bx/inmIn.vue @@ -93,7 +93,7 @@ min-width="150" > From bb25cc1c43f491214f41e928b7372c2e0da86572 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 23 Dec 2025 13:56:49 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix=EF=BC=9A=E5=BF=AB=E6=8D=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2->=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E7=9A=84?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/mioitemw.vue | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/views/statistics/bxerp/mioitemw.vue b/src/views/statistics/bxerp/mioitemw.vue index 7573aded..3af23bd5 100644 --- a/src/views/statistics/bxerp/mioitemw.vue +++ b/src/views/statistics/bxerp/mioitemw.vue @@ -16,7 +16,16 @@
- + + @@ -39,13 +48,13 @@ @@ -69,7 +78,9 @@ export default { mioitem__material__type:30, ftest__isnull:0, mioitem__mio__state:20, - } + }, + dataTotal:0, + apiObj:this.$API.inm.mioitemw.list, }; }, From a17961951914bd95e1ac2e82cc44711f3f21f07c Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 23 Dec 2025 17:14:52 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 77a6a6a4..c7c515b7 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -558,7 +558,7 @@ export default { } else { this.getBatchOptions(); } - if(that.type == 'pur_in'){ + if(that.form.type == 'pur_in'||that.form.type == 'other_in'){ that.batchcount = 99999999999; if(that.project_code=='gx'){ that.form.batch = '无' From ced6d4cb58b07041bfb26ca363ad1afe6a19dd2b Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 24 Dec 2025 13:22:34 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=90=88=E6=89=B9?= =?UTF-8?q?=E6=97=B6=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=8F=AF=E7=94=A8=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=BF=87=E7=9A=84=E6=89=B9=E6=AC=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/handover.vue | 9 +--- src/views/wpm_gx/handover_form.vue | 79 +++++++++++++++++++++++++++++- src/views/wpm_gx/inm.vue | 2 + src/views/wpm_gx/inmOut.vue | 2 + 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue index 1a3c059f..b5211ce5 100644 --- a/src/views/wpm_gx/handover.vue +++ b/src/views/wpm_gx/handover.vue @@ -101,20 +101,15 @@ - + - + -