From e9cf1db5345b7d35165879d34fb113c29c13a36e Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Oct 2025 15:03:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E9=92=88=E5=AF=B9=E5=89=AA=E5=88=87?= =?UTF-8?q?=E5=80=BC18mm=E7=9A=84=E5=88=A4=E5=AE=9A=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index b894869c..03cfa21a 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -636,6 +636,11 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1') + if(str.indexOf('row.剪切值18mm')>-1){ + if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ + str = str.split('||')[0]; + } + } let judge = eval(str); row[item.defect_name] = judge; } @@ -745,7 +750,13 @@ export default { that.qct_defects.forEach(item => { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); - str = str.replace(/\${(.*?)}/g, 'row.\$1') + str = str.replace(/\${(.*?)}/g, 'row.\$1'); + if(str.indexOf('row.剪切值18mm')>-1){ + if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ + str = str.split('||')[0]; + } + } + //`${剪切18mm}>31||${剪切值18mm}.indexOf("满")!=-1` let judge = eval(str); that.mlogbwlist[index][item.defect_name] = judge; }else{ From f7ab449054cb66bfb6773d9be9f986c551634e4a Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Oct 2025 16:13:31 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99=E6=8C=89-create=5Ftime?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route_form.vue | 2 +- src/views/wpm_bx/mlogbw_check_table.vue | 30 ++++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index a572433b..155ac56a 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -401,7 +401,7 @@ export default { getMaterialIn() { let that = this; that.$API.mtm.material.list - .req({ page: 0, type__in: "10,20,30" }) + .req({ page: 0, type__in: "10,20,30",ordering: "-create_time"}) .then((res) => { that.materialsIn = res; }); diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index 03cfa21a..e3a4b48e 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -636,13 +636,13 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1') - if(str.indexOf('row.剪切值18mm')>-1){ - if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ - str = str.split('||')[0]; - } + let judge = false; + try { + judge = eval(str); + row[index][item.defect_name] = judge; + }catch (error) { + console.error('error',error); } - let judge = eval(str); - row[item.defect_name] = judge; } }); obj.ftest = {}; @@ -751,14 +751,18 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1'); - if(str.indexOf('row.剪切值18mm')>-1){ - if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ - str = str.split('||')[0]; - } + // if(str.indexOf('row.剪切值18mm')>-1){ + // if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ + // str = str.split('||')[0]; + // } + // } + let judge = false; + try { + judge = eval(str); + that.mlogbwlist[index][item.defect_name] = judge; + }catch (error) { + console.error(error); } - //`${剪切18mm}>31||${剪切值18mm}.indexOf("满")!=-1` - let judge = eval(str); - that.mlogbwlist[index][item.defect_name] = judge; }else{ that.mlogbwlist[index][item.defect_name] = false; } From f968b951f4d64afb0b8c27d2c4d23e9a79648c58 Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 13 Oct 2025 16:19:39 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check_table.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index e3a4b48e..f5b9712a 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -503,8 +503,10 @@ export default { }, getEquipments(){ let that = this; + let eqId = localStorage.getItem("bxerpChenckEquipmentId"); that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => { that.equipmentOptions = res; + that.form.equipment = eqId; }) }, getdefects(){ @@ -751,11 +753,6 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1'); - // if(str.indexOf('row.剪切值18mm')>-1){ - // if(row.剪切值18mm==null||row.剪切值18mm==''||row.剪切值18mm==undefined){ - // str = str.split('||')[0]; - // } - // } let judge = false; try { judge = eval(str); @@ -809,6 +806,7 @@ export default { }, equipmentChange(){ let that = this; + localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment); that.equipmentOptions.forEach(item => { if(item.id == that.form.equipment){ that.form.equipment_name = item.name; From ed6501057bdcf55f8f80a0b3ad07cf7523934ef0 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Oct 2025 10:31:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix=EF=BC=9A=E5=AE=A1=E6=89=B9=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ofm/booking_form.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue index 2efb8464..0dd96a6c 100644 --- a/src/views/ofm/booking_form.vue +++ b/src/views/ofm/booking_form.vue @@ -210,16 +210,13 @@ export default { getTid (){ var that = this; if (that.t_id) { - that.$API.wpm.handover.item.req(that.t_id).then(res=>{ - that.setData(res); + that.$API.ofm.mroombooking.item.req(that.t_id).then(res=>{ + that.form = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.type = "edit"; }else{ that.type = "show"; } - that.$nextTick(()=>{ - that.$refs.ticketd_b_start.init(); - }) }) } }, From 233c1784803694df2edea8fb561e1f348e3eb7cc Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Oct 2025 10:45:23 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=BE=85=E6=96=99=E5=B1=95=E7=A4=BA=E6=98=AF=E5=90=A6=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/materials.vue | 6 ++++++ src/views/mtm/materials_gx.vue | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/views/inm/materials.vue b/src/views/inm/materials.vue index c2787e1c..179885cf 100644 --- a/src/views/inm/materials.vue +++ b/src/views/inm/materials.vue @@ -70,6 +70,12 @@ >隐 + + + diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue index 2118dbad..bcfdbfb2 100644 --- a/src/views/mtm/materials_gx.vue +++ b/src/views/mtm/materials_gx.vue @@ -115,6 +115,12 @@ > + + + Date: Tue, 14 Oct 2025 11:11:23 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E8=BE=85=E6=96=99?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E5=B9=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitemlist.vue | 39 ++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue index f8765435..b7117d49 100644 --- a/src/views/inm/mioitemlist.vue +++ b/src/views/inm/mioitemlist.vue @@ -43,7 +43,12 @@ show-summary > - + + + + {{ scope.row.material_.model }} - @@ -125,6 +130,20 @@ + + + @@ -199,6 +218,7 @@ export default { getList(val){ let that = this; that.params.page = val?val:1; + that.params.with_mio = 'yes'; that.params.search = that.query.search; that.params.mio__inout_date__gte = that.query.mio__inout_date__gte; that.params.mio__inout_date__lte = that.query.mio__inout_date__lte; @@ -339,7 +359,7 @@ export default { sums[index] = "合计"; return; } - if (index == 8|| index == 10) { + if (index == 9|| index == 11) { const values = data.map((item) => Number(item[column.property]) ); @@ -387,6 +407,19 @@ export default { filterName9(value, row) { return row. 入库凭证号 === value; }, + revertAndDel(row){ + let that = this; + that.$confirm('此操作将撤回并删除该记录, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(res=>{ + that.$API.inm.mioitem.revertDel.req(row.id).then(res=>{ + that.$message.success("撤回并删除成功"); + that.getList(1); + }) + }) + }, }, }; From 79cec10102bbbbe83fa1b27727c936af277df7f3 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Oct 2025 11:20:32 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=BE=85?= =?UTF-8?q?=E6=96=99=E6=97=B6=E4=BC=A0=E5=8F=82type=EF=BC=9A40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/materials.vue | 1 + src/views/mtm/materials_form_gx.vue | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/views/inm/materials.vue b/src/views/inm/materials.vue index 179885cf..33d7add8 100644 --- a/src/views/inm/materials.vue +++ b/src/views/inm/materials.vue @@ -130,6 +130,7 @@ diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue index 1cdd75d4..4b5b1463 100644 --- a/src/views/mtm/materials_form_gx.vue +++ b/src/views/mtm/materials_form_gx.vue @@ -183,6 +183,12 @@ import { mCateEnum } from "@/utils/enum.js"; export default { emits: ["success", "closed"], + props: { + type: { + type: Number, + default: 10, + } + }, data() { return { mCateEnum, @@ -260,6 +266,7 @@ export default { if(this.project_code !== 'bxerp'){ this.options.push({ name: "辅助材料", id: 40 }); } + this.form.type = this.type; this.getProcessOptions(); }, methods: { From 7fd149693e8e456395604ace2c3ac425af20fbe7 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Oct 2025 13:45:51 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=E7=A6=85=E9=81=93125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitemlist.vue | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue index b7117d49..64d96ec5 100644 --- a/src/views/inm/mioitemlist.vue +++ b/src/views/inm/mioitemlist.vue @@ -18,6 +18,17 @@ placeholder="结束日期" style="width: 150px;" /> + + + { if (res.count > 0) { that.tableData = res.results; @@ -316,7 +338,10 @@ export default { resetQuery() { this.query = {}; }, - + selectMaterialChange() { + var that = this; + that.query.material = that.selectObj.id; + }, //打印物料标签 printMaterial(row,type){ let that = this; From ed4c915125b4da6df1232670f82b21781c99f0f4 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 14 Oct 2025 14:21:38 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E7=A6=85=E9=81=93124?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/helpso_mio.vue | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index a261b14b..37e3a6b7 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -49,12 +49,34 @@ @change="handleQuery" > + + + + +
- +