From 591ebf185c77030506ede6620096cbd4e3e3847d Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 30 Dec 2025 13:45:07 +0800 Subject: [PATCH 01/14] =?UTF-8?q?feat:=E7=A6=85=E9=81=93266?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/good_check_gx.vue | 81 ++++++++++++++++++++------ 1 file changed, 62 insertions(+), 19 deletions(-) diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index 3395fb64..cceff688 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -441,47 +441,90 @@ export default { let that = this; that.params.page = 1; that.params.querys=[]; - let arr1 = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}], - arr2 = [{field:"data__has_key",compare:"",value:"外观检验_日期"}], - arr3 = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}]; + let arrays = {}; + if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){ + let arrs = that.query.batch.split(' '); + console.log('arrs',arrs); + arrs.forEach((item, index) => { + let obj = {}; + obj.value = item; + obj.field = "batch"; + obj.compare = "contains"; + let newArrayName1 = 'arr1' + index; + let newArrayName2 = 'arr2' + index; + let newArrayName3 = 'arr3' + index; + console.log('obj',obj); + arrays[newArrayName1] = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj]; + arrays[newArrayName2] = [{field:"data__has_key",compare:"",value:"外观检验_日期"},obj]; + arrays[newArrayName3] = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj]; + }); + }else{ + let obj = {}; + obj.value =that.query.batch; + obj.field = "batch"; + obj.compare = "contains"; + arrays.arr1=[{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj]; + arrays.arr2=[{field:"data__has_key",compare:"",value:"外观检验_日期"},obj]; + arrays.arr3=[{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj]; + } + console.log('arrays',arrays); for(let key in that.query){ - if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined){ + if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined&&key!='batch'){ let obj = {}; obj.value = that.query[key]; - if(key=='batch'){ - obj.field = "batch"; - obj.compare = "contains"; - }else if(key=='cc_data_start'){ + if(key=='cc_data_start'){ obj.compare = "gte"; obj.field = "data__尺寸检验_日期"; - }else if(key=='cc_data_end'){ + } + if(key=='cc_data_end'){ obj.compare = "lte"; obj.field = "data__尺寸检验_日期"; - }else if(key=='shiftcc'){ + } + if(key=='shiftcc'){ obj.compare = ""; obj.field = "data__尺寸检验_班次"; - }else if(key=='wg_data_start'){ + } + if(key=='wg_data_start'){ obj.compare = "gte"; obj.field = "data__外观检验_日期"; - }else if(key=='wg_data_end'){ + } + if(key=='wg_data_end'){ obj.compare = "lte"; obj.field = "data__外观检验_日期"; - }else if(key=='shiftwg'){ + } + if(key=='shiftwg'){ obj.compare = ""; obj.field = "data__外观检验_班次"; - }else if(key=='fx_data_start'){ + } + if(key=='fx_data_start'){ obj.compare = "gte"; obj.field = "data__外观检验_返修_日期"; - }else if(key=='fx_data_end'){ + } + if(key=='fx_data_end'){ obj.compare = "lte"; obj.field = "data__外观检验_返修_日期"; } - arr1.push(obj); - arr2.push(obj); - arr3.push(obj); + if(that.query.batch.indexOf(' ')){ + let arrs = that.query.batch.split(' '); + arrs.forEach((item,index)=>{ + let newArrayName1 = 'arr1' + index; + let newArrayName2 = 'arr2' + index; + let newArrayName3 = 'arr3' + index; + arrays[newArrayName1].push(obj); + arrays[newArrayName2].push(obj); + arrays[newArrayName3].push(obj); + + }); + }else{ + arrays.arr1.push(obj); + arrays.arr2.push(obj); + arrays.arr3.push(obj); + } } } - that.params.querys.push(arr1,arr2,arr3); + for(let key in arrays){ + that.params.querys.push(arrays[key]); + } this.getList(); }, getSummaries({ columns, data }) { From 3297fa5a9381da932a92241701450acc2442da44 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 30 Dec 2025 14:20:45 +0800 Subject: [PATCH 02/14] =?UTF-8?q?feat:=E7=A6=85=E9=81=93237?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitemlist.vue | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue index 2caab089..f3013649 100644 --- a/src/views/inm/mioitemlist.vue +++ b/src/views/inm/mioitemlist.vue @@ -29,6 +29,20 @@ > + + + Date: Tue, 30 Dec 2025 14:59:35 +0800 Subject: [PATCH 03/14] =?UTF-8?q?fix:=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E6=8C=89=E9=92=AE=E2=80=9C=E6=92=A4=E9=94=80=E2=80=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=92=A4=E5=9B=9E=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/good_mio.vue | 15 +++------------ src/views/inm/halfgood_mio.vue | 6 +++--- src/views/inm/mainso_mio.vue | 6 +++--- src/views/inm/mio.vue | 6 +++--- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue index d1043bda..8b682d74 100644 --- a/src/views/inm/good_mio.vue +++ b/src/views/inm/good_mio.vue @@ -123,16 +123,7 @@ v-auth="'mio.submit'" v-if="scope.row.state == 20" > - 撤销 - - - 撤销 + 撤回 {}); }, revert(row) { - this.$confirm(`确定撤销该操作吗？`, "提示", { + this.$confirm(`确定撤回该操作吗？`, "提示", { type: "warning", }) .then(() => { this.$API.inm.mio.revert .req(row.id) .then((res) => { - this.$message.success("撤销成功"); + this.$message.success("撤回成功"); this.$refs.table.refresh(); return res; }) diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue index 973ecc15..5fcf7f7f 100644 --- a/src/views/inm/halfgood_mio.vue +++ b/src/views/inm/halfgood_mio.vue @@ -145,7 +145,7 @@ v-auth="'mio.submit'" v-if="scope.row.state == 20" > - 撤销 + 撤回 @@ -259,14 +259,14 @@ export default { .catch(() => {}); }, revert(row) { - this.$confirm(`确定撤销该操作吗？`, "提示", { + this.$confirm(`确定撤回该操作吗？`, "提示", { type: "warning", }) .then(() => { this.$API.inm.mio.revert .req(row.id) .then((res) => { - this.$message.success("撤销成功"); + this.$message.success("撤回成功"); this.$refs.table.refresh(); return res; }) diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue index 63ad6549..243f4aa3 100644 --- a/src/views/inm/mainso_mio.vue +++ b/src/views/inm/mainso_mio.vue @@ -154,7 +154,7 @@ v-auth="'mio.submit'" v-if="scope.row.state == 20" > - 撤销 + 撤回 @@ -275,14 +275,14 @@ export default { .catch(() => {}); }, revert(row) { - this.$confirm(`确定撤销该操作吗？`, "提示", { + this.$confirm(`确定撤回该操作吗？`, "提示", { type: "warning", }) .then(() => { this.$API.inm.mio.revert .req(row.id) .then((res) => { - this.$message.success("撤销成功"); + this.$message.success("撤回成功"); this.$refs.table.refresh(); return res; }) diff --git a/src/views/inm/mio.vue b/src/views/inm/mio.vue index c5e67611..5edfb9ec 100644 --- a/src/views/inm/mio.vue +++ b/src/views/inm/mio.vue @@ -127,7 +127,7 @@ (scope.row.type == 'other_in' || scope.row.type == 'other_out')" > - 撤销 + 撤回 { this.$API.inm.mio.revert .req(row.id) .then((res) => { - this.$message.success("撤销成功"); + this.$message.success("撤回成功"); this.$refs.table.refresh(); return res; }) From 458c9a674dfcc2c6d7d6c22cac55bbb90858edea Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 30 Dec 2025 15:22:01 +0800 Subject: [PATCH 04/14] =?UTF-8?q?fix:mlogb=5Fcheck=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E4=BA=BA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/mlogb_check.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue index 155ce09a..eca59188 100644 --- a/src/views/wpm_gx/mlogb_check.vue +++ b/src/views/wpm_gx/mlogb_check.vue @@ -386,6 +386,8 @@ export default { that.visible = true; that.mlogbItem = data; that.form.batch = data.batch; + that.form.test_user = data.test_user; + that.form.test_user_name = data.test_user_name; that.form.count_real =Number(data.count_real); that.form.count_ok= Number(data.count_ok); that.form.count_ok_full= Number(data.count_ok_full); From d8899317a861539042912d28b15b64ddddfcecce Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 31 Dec 2025 09:30:23 +0800 Subject: [PATCH 05/14] fix: --- src/api/model/qm.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/api/model/qm.js b/src/api/model/qm.js index bcdacbe0..b15c4e2a 100644 --- a/src/api/model/qm.js +++ b/src/api/model/qm.js @@ -365,5 +365,11 @@ export default { return await http.post(`${config.API_URL}/qm/ftestwork/${id}/submit/`); }, }, + revert: { + name: "撤回检验工作", + req: async function (id) { + return await http.post(`${config.API_URL}/qm/ftestwork/${id}/revert/`); + }, + }, }, }; From b63013d9a728c4d45e2aca9ed2bec185d1e72ecc Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 31 Dec 2025 10:00:10 +0800 Subject: [PATCH 06/14] =?UTF-8?q?fix:=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8F=AF=E6=92=A4=E5=9B=9E=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/check_drawer.vue | 35 +++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/views/wpm_gx/check_drawer.vue b/src/views/wpm_gx/check_drawer.vue index e29a9233..1ff8ebe6 100644 --- a/src/views/wpm_gx/check_drawer.vue +++ b/src/views/wpm_gx/check_drawer.vue @@ -54,17 +54,24 @@ - + @@ -97,11 +104,21 @@ export default { this.apiObj = this.$API.qm.ftestwork.list; return this; }, - table_del(row){ - this.$API.qm.ftestwork.delete.req(row.id).then((res) => { - this.$refs.drawer_table.fetch(); + table_revert(row){ + this.$API.qm.ftestwork.revert.req(row.id).then((res) => { + this.$refs.drawer_table.refresh(); }); }, + table_delete(row){ + let that = this; + that.$confirm("确定删除该检验记录吗？", "提示", { + type: "warning", + }).then(() => { + that.$API.qm.ftestwork.delete.req(row.id).then((res) => { + that.$refs.drawer_table.refresh(); + }); + }).catch(() => {}); + }, }, }; From 60ca063efeeb8898291ebfa5418c288fb7c149ed Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 31 Dec 2025 12:49:17 +0800 Subject: [PATCH 07/14] =?UTF-8?q?feat:=E7=A6=85=E9=81=93258?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inm/mioitem_check.vue | 208 ++++++++++++++++++++++++-------- 1 file changed, 157 insertions(+), 51 deletions(-) diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue index 20fa0bde..b061c83d 100644 --- a/src/views/inm/mioitem_check.vue +++ b/src/views/inm/mioitem_check.vue @@ -7,7 +7,7 @@ @closed="$emit('closed')" > - + - + + + + {{ objitem.material_name }} + + + + + {{ objitem.batch }} + + + + + + + + + + + + + + + + + + + + + + + + + 异常项： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ objitem.material_name }} @@ -605,16 +737,6 @@ - - - - - + - - - - - - - - - - - - + { this.tableHeight = document.getElementById('mioitemwMain').clientHeight-20; },500) @@ -1011,7 +1108,14 @@ export default { that.form.material_name = that.objitem.material_name; that.form.batch = that.objitem.batch; that.form.count = that.objitem.count; + that.form.count_ok = that.objitem.count; that.form.count_bag = that.objitem.count_bag; + if(that.project_code=='gx'){ + that.form.count_n_zw = 0;//直径 + that.form.count_n_zz = 0;//亮面 + that.form.count_n_b = 0;//崩面 + that.form.count_n_dl = 0;//长度 + } } if ( (that.type == "do_in" && that.cate == "halfgood") || @@ -1096,8 +1200,12 @@ export default { } return this; }, + gxPurInCountChange(){ + this.form.count_ok = this.form.count - this.form.count_notok; + }, nqtChange(){ - this.form.count_notok = this.form.count_n_qt; + this.form.count_notok = this.form.count_n_zw+this.form.count_n_zz+this.form.count_n_b+this.form.count_n_dl; + this.form.count_ok = this.form.count - this.form.count_notok; }, getMaterialItem(){ let that = this; @@ -1373,14 +1481,12 @@ export default { that.$message.success("操作成功"); }); } else { - that.$API.inm.mioitem.test - .req(that.mioitemId, that.form) - .then((res) => { - that.isSaveing = false; - that.$emit("success"); - that.visible = false; - that.$message.success("操作成功"); - }); + that.$API.inm.mioitem.test.req(that.mioitemId, that.form).then((res) => { + that.isSaveing = false; + that.$emit("success"); + that.visible = false; + that.$message.success("操作成功"); + }); } } catch (err) { //可以处理校验错误 From 001d9d68f7d55b67ba2a4b85a78c0b6416a5fc63 Mon Sep 17 00:00:00 2001 From: shijing Date: Sun, 4 Jan 2026 09:00:47 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=A1=B5=E5=BF=98?= =?UTF-8?q?=E8=AE=B0=E5=AF=86=E7=A0=81=E5=88=86=E9=A1=B9=E7=9B=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/passwordForm.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 6943ee0d..fff7ff24 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -108,8 +108,10 @@ export default { }, }, mounted() { - this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code; - console.log('this.project_code',this.project_code); + this.$nextTick(()=>{ + this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code; + console.log('this.project_code',this.project_code); + }); }, methods: { async login() { From 3e0fd5f4478e059f485234a7fc92e81cce46dd69 Mon Sep 17 00:00:00 2001 From: shijing Date: Sun, 4 Jan 2026 10:44:04 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix:=E7=A6=85=E9=81=93287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/cpccjc.vue | 17 +++---- src/views/statistics/bxerp/cpwgfj1.vue | 17 +++---- src/views/statistics/bxerp/cpwgfj2.vue | 17 +++---- src/views/statistics/bxerp/cpwgnzcj.vue | 17 +++---- src/views/statistics/bxerp/cpwgnzfj.vue | 17 +++---- src/views/statistics/bxerp/cpxnjy.vue | 17 +++---- src/views/statistics/bxerp/cpzj.vue | 17 +++---- src/views/statistics/bxerp/fenjian.vue | 17 +++---- src/views/statistics/bxerp/gzcpjc.vue | 17 +++---- src/views/statistics/bxerp/maopi.vue | 56 ++++++++++++----------- src/views/statistics/bxerp/niuzhuan.vue | 16 +++---- src/views/statistics/bxerp/zhongjian1.vue | 16 +++---- src/views/statistics/bxerp/zhongjian2.vue | 16 +++---- 13 files changed, 128 insertions(+), 129 deletions(-) diff --git a/src/views/statistics/bxerp/cpccjc.vue b/src/views/statistics/bxerp/cpccjc.vue index ddae9801..cece0888 100644 --- a/src/views/statistics/bxerp/cpccjc.vue +++ b/src/views/statistics/bxerp/cpccjc.vue @@ -2,6 +2,11 @@
+ - 导出
@@ -31,6 +30,8 @@ stripe > + +