From 1e4842b47edfd879ffd2be1cfd5da973a87a1900 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 21 Feb 2025 17:27:52 +0800 Subject: [PATCH 01/44] =?UTF-8?q?fix:=E5=85=89=E5=AD=90=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E4=B8=AD=E6=A3=80=E6=8F=90=E4=BA=A4=E5=90=8E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog_dept6.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue index cdcf1076..e3e7a92a 100644 --- a/src/views/wpm/mlog_dept6.vue +++ b/src/views/wpm/mlog_dept6.vue @@ -320,7 +320,7 @@ @@ -334,6 +334,7 @@ Date: Fri, 21 Feb 2025 17:32:04 +0800 Subject: [PATCH 02/44] =?UTF-8?q?fix:system=E6=8E=A5=E5=8F=A3=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/api/model/system.js b/src/api/model/system.js index 150c8f64..8e1acd83 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -212,6 +212,12 @@ export default { return await http.get(this.url, params); } }, + item: { + name: "获取详情", + req: async function(id){ + return await http.get(`${config.API_URL}/system/user/${id}/`); + } + }, read: { name: "用户详情", req: async function(id){ From 9a370048ce5b2b823efebbb3d1ec46493aaac6c9 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 21 Feb 2025 17:33:47 +0800 Subject: [PATCH 03/44] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 1 + src/views/wpm_bx/mlogbw_check.vue | 691 +++++++++++++++++++------ src/views/wpm_bx/mlogbw_check_form.vue | 193 +++++++ 3 files changed, 734 insertions(+), 151 deletions(-) create mode 100644 src/views/wpm_bx/mlogbw_check_form.vue diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index 75fa6c89..acc8cb74 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -356,6 +356,7 @@ ref="checkDialogSingle" :mlogb="mlogb" :wm = "wm" + :mgroup="mgroup" :isSubmit="isSubmit" :batchNumber="batchNumber" :handle_user="handle_user" diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index 1e8d1ba4..fa21bbf9 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -7,160 +7,342 @@ @closed="$emit('closed')" > + +
+
检验人:{{setForm.test_user_name}}
+
检验设备:{{setForm.equipment_name}}
+
缺陷项: + {{ item1.defect_name }} + 、 + +
+
检测项: + {{ item2.testitem_name }} + 、 + +
+
+ + 检验 + 批量操作 - - + + + + + + + + + + + - + + + + + + + + + + + + + + + {{item.name}} + {{item.number}} + + + + + + + + + + + + + + + + + + + + + + + + 确定 + 取消 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.value }} + + + {{ item2.value }} + + + + + + + + 保存 + 取消 + + + + + diff --git a/src/views/wpm_bx/mlogbw_check_form.vue b/src/views/wpm_bx/mlogbw_check_form.vue new file mode 100644 index 00000000..a6f553f0 --- /dev/null +++ b/src/views/wpm_bx/mlogbw_check_form.vue @@ -0,0 +1,193 @@ + + + + From e8cf10b2d40187f90c6b03a718fed048be7ee6b6 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 21 Feb 2025 17:34:31 +0800 Subject: [PATCH 04/44] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A5=E8=89=BA=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E5=B1=95=E7=A4=BA=E6=8A=BD=E5=B1=89=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route_show.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route_show.vue b/src/views/mtm/route_show.vue index 7bab028f..3e6d55f0 100644 --- a/src/views/mtm/route_show.vue +++ b/src/views/mtm/route_show.vue @@ -2,7 +2,7 @@ Date: Fri, 21 Feb 2025 17:35:51 +0800 Subject: [PATCH 05/44] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=92=8C=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_check.vue | 563 ++++++++++++++++++++++++-------- src/views/inm/mioitem_form.vue | 275 +++++++++------- 2 files changed, 593 insertions(+), 245 deletions(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index c8705c0d..3c12bfdd 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -750,57 +750,165 @@ @closed="$emit('closed')" > - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - + - + + + + - - - diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index c4f18d6e..c5cc612b 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -12,119 +12,144 @@ :rules="rules" label-width="120px" > - - - - {{ item.full_name }} - 隐 + + + - - - - - - - - {{ item.batch }} - {{ item.count }} + {{ item.full_name }} + 隐 + + + + + + + + - - - - - - - {{ item.batch }} - {{ item.count }} -- {{ item.warehouse_name }} + {{ item.batch }} + {{ item.count }} + + + + + + + - - - - - - - - - - - - - - + + {{ item.batch }} + {{ item.count }} -- {{ item.warehouse_name }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
this.mioitems.length){ + let count = this.form.count-this.mioitems.length; + for(let i=0;i { @@ -439,8 +482,18 @@ export default { }); } } + let mioitemw = []; + if(this.mioitems.length>1){ + this.mioitems.forEach((item)=>{ + let obj = {}; + obj.number= item; + mioitemw.push(obj); + }) + this.form.mioitemw = mioitemw; + } try { var res; + console.log(this.form); if (this.mode == "add") { res = await this.$API.inm.mioitem.create.req( this.form From 527f44c443670000b1bcf86b2513ddaafadbef2f Mon Sep 17 00:00:00 2001 From: shijing Date: Mon, 24 Feb 2025 13:42:13 +0800 Subject: [PATCH 06/44] =?UTF-8?q?fix:=E6=8E=92=E6=9D=BF=E5=B7=A5=E6=AE=B5b?= =?UTF-8?q?w=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=A6=81=E9=BB=98=E8=AE=A4number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlog_detail.vue | 2 ++ src/views/wpm_bx/mlogbw_check.vue | 42 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue index acc8cb74..734b656e 100644 --- a/src/views/wpm_bx/mlog_detail.vue +++ b/src/views/wpm_bx/mlog_detail.vue @@ -357,6 +357,7 @@ :mlogb="mlogb" :wm = "wm" :mgroup="mgroup" + :mgroupName= "mlogItem.mgroup_name" :isSubmit="isSubmit" :batchNumber="batchNumber" :handle_user="handle_user" @@ -604,6 +605,7 @@ export default { that.batchNumber = row.batch; that.handle_date=that.mlogItem.handle_date; that.handle_user = that.mlogItem.handle_user; + console.log('that.mlogItem',that.mlogItem); that.dialog.check_single = true; if(row.qct==null){ that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{ diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index fa21bbf9..68c6114d 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -24,8 +24,8 @@
- 检验 - 批量操作 + 检验 + 批量操作 - - + From 58ae8af50d140622314e7d643e3c43d374ef6244 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 25 Feb 2025 17:40:28 +0800 Subject: [PATCH 23/44] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check.vue | 94 ++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 33 deletions(-) diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index 21f85b36..fa1ec1ec 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -4,6 +4,7 @@ v-model="visible" :size="'90%'" destroy-on-close + :close-on-click-modal="false" @closed="$emit('closed')" > @@ -24,8 +25,9 @@ - 检验 + 检验 批量操作 + 批量操作 @@ -275,7 +278,7 @@ @@ -288,14 +291,15 @@ label-width="150px" > - + + - + + @@ -309,9 +313,9 @@ - + {{ item2.value }} @@ -391,6 +395,7 @@ export default { qct:"", values:"", wprNumber:"", + wprInputText:"", params: {mlogb:'',page:0}, hideAdd: true, visible: false, @@ -403,6 +408,7 @@ export default { qct_testitems:[], mlogbwlist:[], equipmentOptions:[], + process_type:"", addTemplate:{ mlogb: "", number: "", @@ -437,20 +443,25 @@ export default { } that.params.mlogb = that.addTemplate.mlogb = that.mlogb; that.currentDate = this.$TOOL.dateFormat2(new Date()); - console.log(that.currentDate); + // console.log(that.currentDate); }, methods: { open(mode = "ins",qct = '') { let that = this; this.mode = mode; this.qct = qct; - that.getOptions(); - that.getdefects(); + if(that.mode == 'ins'){//输入 + that.getOptions(); + } + that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => { + that.process_type=res.process_type; + // console.log('res',res); + that.getdefects(); + }) this.visible = true; - // setTimeout(() => { - // this.tableHeight = document.getElementById('mlogbwMain').clientHeight-20; - // },500) - + setTimeout(() => { + this.tableHeight = document.getElementById('mlogbwMain').clientHeight-20; + },500) }, getEquipments(){ let that = this; @@ -465,12 +476,16 @@ export default { that.qct_defects = []; res.qct_defects.forEach((item) => { that.addTemplate[item.defect_name] = false; + let obj = Object.assign({}, item); + obj.canEdit = that.process_type=='20'?false:true; + that.qct_defects.push(obj); }) - that.qct_defects = res.qct_defects; that.qct_testitems = []; res.qct_testitems.forEach((item2) => { let obj2 = Object.assign({}, item2); obj2.value = ''; + obj2.canEdit = that.process_type=='20'?false:true; + obj2.addto_wpr = item2.addto_wpr; if(item2.testitem_field_type=='input-number'||item2.testitem_field_type=='input-int'){ obj2.value = 0; @@ -492,17 +507,15 @@ export default { }, getOptions(){ let that = this; - if(that.mode == 'ins'){//输入 - that.$API.wpm.wpr.list.req({wm:that.wm,page:0}).then((res) => { - that.options = res; - }) - } + that.$API.wpm.wpr.list.req({wm:that.wm,page:0}).then((res) => { + that.options = res; + }) }, optionChange(row){ let that = this; that.options.forEach((item) => { if(item.id == row.wpr){ - console.log('item',item); + // console.log('item',item); let index = that.mlogbwlist.indexOf(row); that.mlogbwlist[index].number = item.number; } @@ -517,7 +530,6 @@ export default { let obj = {}; obj = Object.assign({},item); obj.isEdit = false; - obj.canEdit = false; if(that.qct!=null&&that.qct!=''&&item.ftest!=null){ if(item.ftest.ftestdefects!==undefined&&item.ftest.ftestdefects!==''&&item.ftest.ftestdefects!==null&&item.ftest.ftestdefects.length>0){ item.ftest.ftestdefects.forEach((item1) => { @@ -566,7 +578,7 @@ export default { row.ftest.ftestitems.forEach((item1) => { item1.test_val_json = row[item1.testitem_name]; }) - console.log('obj',obj); + // console.log('obj',obj); }else{//检验表未填过 console.log('未填过'); obj.ftest = {}; @@ -621,7 +633,7 @@ export default { formTableEdit(row) { this.mlogbwlist.forEach((item, index) => { if (item.id == row.id) { - console.log('row',row); + // console.log('row',row); this.mlogbwlist[index].isEdit = true; } }); @@ -666,7 +678,7 @@ export default { let that = this; let index = that.mlogbwlist.indexOf(row); that.qct_defects.forEach(item => { - console.log('item.rule_expression',item.rule_expression); + // console.log('item.rule_expression',item.rule_expression); 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') @@ -806,6 +818,11 @@ export default { that.checkVisible = false; this.multipleSet = true; that.descriptionVisible = true; + that.qct_defects = []; + that.qct_defects = that.defectlists; + that.qct_testitems = []; + that.qct_testitems = that.testitemlists; + that.tableHeight = document.getElementById('mlogbwMain').clientHeight-80; that.getList(); }).catch((err) => { return err; @@ -824,11 +841,25 @@ export default { check_set(){ this.setVisible=true; }, + //扫描物料将这一行放到第一行并编辑这一行 + wprinputChange(){ + let that = this; + that.mlogbwlist.forEach((item,index) => { + if(item.number == that.wprInputText){ + let obj = Object.assign({},item); + obj.isEdit = true; + that.mlogbwlist.splice(index,1); + that.mlogbwlist.unshift(obj); + that.wprInputText = ""; + } + }) + }, wprChange(wprNumber){ let that = this; that.mlogbwlist.forEach(item => { if(item.number == wprNumber){ that.selectWpr.push(item); + that.wprNumber = ""; } }); }, @@ -854,17 +885,14 @@ export default { item.ftest.ftestitems.forEach(testitem => { let testitemindex = that.setForm.testitemids.indexOf(testitem.testitem); if( testitemindex > -1){ - console.log('that.testitemlists[testitemindex].value',that.testitemlists[testitemindex].value) testitem.test_val_json = that.testitemlists[testitemindex].value; } }) }); - console.log('that.selectWpr',that.selectWpr); that.$API.wpm.mlogbw.update.req("bulk",that.selectWpr).then((res) => { - console.log('blukres',res); that.setVisible = false; - that.descriptionVisible = false; - that.setForm = {}; + // that.descriptionVisible = false; + // that.setForm = {}; that.getList(); }).catch((err) => { return err; From 2f645882d5c01fc91621b3506209070175498022 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 25 Feb 2025 17:46:25 +0800 Subject: [PATCH 24/44] =?UTF-8?q?fix:wpm.mlog.list=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6with=5Fmlogb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog_dept10.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue index 9a1885e6..7c8b9c98 100644 --- a/src/views/wpm/mlog_dept10.vue +++ b/src/views/wpm/mlog_dept10.vue @@ -787,8 +787,7 @@ export default { }).catch((e) => {}); }, getMlogs() { - this.$API.wpm.mlog.list - .req({ mtask: this.currentMtask.id, page: 0 }) + this.$API.wpm.mlog.list.req({ mtask: this.currentMtask.id,with_mlogb:true,page: 0 }) .then((res) => { this.mlogs = res; }); From a3f2e2c0b771daad6b1171d81baa177b991c34fc Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 26 Feb 2025 10:29:32 +0800 Subject: [PATCH 25/44] =?UTF-8?q?fix=EF=BC=9A=E6=A3=80=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=94=B9=E6=88=90=E9=9D=9E=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=EF=BC=9B=E6=90=9C=E7=B4=A2=E6=A1=86=E5=B7=A6=E7=A7=BB=EF=BC=9B?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=97=B6=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=BC=BA=E9=99=B7=E9=A1=B9=E4=B8=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/mlogbw_check.vue | 34 ++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue index fa1ec1ec..6a06696c 100644 --- a/src/views/wpm_bx/mlogbw_check.vue +++ b/src/views/wpm_bx/mlogbw_check.vue @@ -25,9 +25,9 @@ - 检验 + 检验 批量操作 - 批量操作 + 批量操作 -