From d56d6d22e1683c59de783519c46865220a18b1cb Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 14:18:28 +0800 Subject: [PATCH 01/76] fix:coding#446 --- src/views/mtm/materials_form_gx.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue index 4620327f..88a370da 100644 --- a/src/views/mtm/materials_form_gx.vue +++ b/src/views/mtm/materials_form_gx.vue @@ -66,8 +66,15 @@ /> - + + + + + Date: Tue, 27 Aug 2024 14:45:20 +0800 Subject: [PATCH 02/76] fix:coding#445 --- src/views/wpm_gx/mlog_form.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 8490c42b..49c0d453 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -301,6 +301,7 @@ export default { this.getUser(); this.getSupplier(); this.getEquipment(); + }, methods: { disabledDateFn(time) { @@ -340,6 +341,8 @@ export default { open(mode = "add") { this.mode = mode; this.visible = true; + this.$refs.dialogForm.resetFields(); + this.$refs.dialogForm.clearValidate(); return this; }, //表单注入数据 From ce51133d4c6c517c216ce5c7ef2228fbd1c49c95 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 15:03:21 +0800 Subject: [PATCH 03/76] =?UTF-8?q?fix:=E9=BB=91=E5=8C=96=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=9C=8B=E6=9D=BF=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/route.js b/src/config/route.js index 6d75f24a..e65b8251 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -3025,7 +3025,7 @@ const routes = [ meta: { title: "黑化车间", icon: "el-icon-trend-charts", - perms: ["bigScreenP_dept10"], + perms: ["bigScreenP_dept_hh"], fullpage: true, }, component: "bigScreen/index_heihuadept.vue", From 880c655e63e9aa5ae4e1d6b7416edebcfa52b16d Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 27 Aug 2024 16:09:04 +0800 Subject: [PATCH 04/76] fix:coding#4511 --- src/views/mtm/route_form.vue | 21 ++++++++++++--------- src/views/wpm_gx/mlog_form.vue | 9 +++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index f52b004a..bed5e2ec 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -66,10 +66,10 @@ --> - + - + --> - + @@ -171,9 +171,12 @@ const defaultForm = { process: null, sort: 1, out_rate: 100, + material_in:'', + material_out:'', + hour_work:0, batch_bind: true, - is_autotask: true, - is_count_utask: false, + // is_autotask: true, + // is_count_utask: false, }; export default { props: { @@ -185,7 +188,7 @@ export default { loading: false, mode: "add", //表单数据 - form: defaultForm, + form: Object.assign({}, defaultForm), //验证规则 rules: { process: [ diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 49c0d453..d1e04184 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -211,11 +211,14 @@ \ No newline at end of file diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue new file mode 100644 index 00000000..c3d8a9f8 --- /dev/null +++ b/src/views/fac_cal/mpointstat.vue @@ -0,0 +1,221 @@ + + + + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue new file mode 100644 index 00000000..e02bee2c --- /dev/null +++ b/src/views/fac_cal/taskresult.vue @@ -0,0 +1,60 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/xscript.vue b/src/views/fac_cal/xscript.vue new file mode 100644 index 00000000..80fc545e --- /dev/null +++ b/src/views/fac_cal/xscript.vue @@ -0,0 +1,224 @@ + + From 86dc38f847c2a8a36f55528a0d497f10c1db5e25 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 11:47:32 +0800 Subject: [PATCH 14/76] =?UTF-8?q?fix:=20routeForm=20is=5Fautotask=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BAtrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index bed5e2ec..1a80117d 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -175,7 +175,7 @@ const defaultForm = { material_out:'', hour_work:0, batch_bind: true, - // is_autotask: true, + is_autotask: true, // is_count_utask: false, }; export default { From dbc65739ce9f7d15bb914511c0e3029eb87ae50f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 12:51:20 +0800 Subject: [PATCH 15/76] =?UTF-8?q?feat:=20=E8=AE=A1=E7=AE=97=E5=85=AC?= =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5=E5=8A=A0=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/em/mpoint_form.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 2a999594..ea3b5f15 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -161,6 +161,8 @@ From 06bbc7c77687bbfe2c921c319e5854dbbbcd3e1c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 29 Aug 2024 12:52:06 +0800 Subject: [PATCH 16/76] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/fac_cal/mpointstat.vue | 7 ++++--- src/views/fac_cal/taskresult.vue | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue index c3d8a9f8..6f658343 100644 --- a/src/views/fac_cal/mpointstat.vue +++ b/src/views/fac_cal/mpointstat.vue @@ -56,11 +56,12 @@ - + + - + - + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue index e02bee2c..d63d2f62 100644 --- a/src/views/fac_cal/taskresult.vue +++ b/src/views/fac_cal/taskresult.vue @@ -11,7 +11,7 @@ - + @@ -22,6 +22,15 @@ + + + {{ current_tr.date_created }} + {{ current_tr.date_created }} + {{ current_tr.status }} + {{ current_tr.result }} + {{ current_tr.traceback }} + + diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue new file mode 100644 index 00000000..a3ea4d43 --- /dev/null +++ b/src/views/wpm_gx/fmlog_detail.vue @@ -0,0 +1,352 @@ + + + + diff --git a/src/views/wpm_gx/fmlog_form.vue b/src/views/wpm_gx/fmlog_form.vue new file mode 100644 index 00000000..fa9d1006 --- /dev/null +++ b/src/views/wpm_gx/fmlog_form.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/views/wpm_gx/fmlogs.vue b/src/views/wpm_gx/fmlogs.vue new file mode 100644 index 00000000..1c1904bc --- /dev/null +++ b/src/views/wpm_gx/fmlogs.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index 4c2e6882..67bb6416 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -37,7 +37,7 @@
放行审批 @@ -69,7 +69,7 @@
新增 编辑 @@ -251,7 +251,7 @@ 检验 diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue index 3951f11f..1988896a 100644 --- a/src/views/wpm_gx/mtask.vue +++ b/src/views/wpm_gx/mtask.vue @@ -8,23 +8,10 @@ row-key="id" :params="params" > - - + + - + @@ -33,31 +20,50 @@ - + - + + + + + diff --git a/src/views/wpm_gx/saobian.vue b/src/views/wpm_gx/saobian.vue index cd946423..b6304bf0 100644 --- a/src/views/wpm_gx/saobian.vue +++ b/src/views/wpm_gx/saobian.vue @@ -32,7 +32,7 @@ - + From eac434c0ea756bd4a3f436a31c18997509f07b13 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 Sep 2024 14:40:49 +0800 Subject: [PATCH 43/76] fix: --- src/views/wpm_gx/check_form.vue | 2 +- src/views/wpm_gx/mlog_detail.vue | 6 ++++++ src/views/wpm_gx/mlog_form.vue | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue index 4cdbf452..8c8c25f5 100644 --- a/src/views/wpm_gx/check_form.vue +++ b/src/views/wpm_gx/check_form.vue @@ -400,7 +400,7 @@ export default { if(this.form.type2==10){//抽检 this.form.count_sampling_ok = this.form.count_sampling - this.form.count_notok; this.count_ok_rate = ((this.form.count_sampling_ok/this.form.count_sampling)*100).toFixed(2); - }else{//全检 + }else if(this.form.type2==20){//全检 this.form.count_ok = this.form.count - this.form.count_notok; this.count_ok_rate = ((this.form.count_ok/this.form.count)*100).toFixed(2); } diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index a2aca7d7..e819dd94 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -10,6 +10,12 @@ {{ + mlogItem.routepack_name + }} + {{ + mlogItem.material_in_name + }} + {{ mlogItem.material_out_name }} {{ diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue index 1d0bc810..af70a6ed 100644 --- a/src/views/wpm_gx/mlog_form.vue +++ b/src/views/wpm_gx/mlog_form.vue @@ -312,6 +312,7 @@ export default { }); }, getEquipment() { + let that = this; this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => { this.options = res; }); From a57b58c29c0d583f10a9a9cde28564df15f952c5 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 Sep 2024 14:51:25 +0800 Subject: [PATCH 44/76] =?UTF-8?q?fix:=E5=A4=96=E5=8D=8F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pum/supplier.vue | 8 +++----- src/views/pum/supplier_form.vue | 8 ++++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/pum/supplier.vue b/src/views/pum/supplier.vue index 29f6984d..87f6bed2 100644 --- a/src/views/pum/supplier.vue +++ b/src/views/pum/supplier.vue @@ -43,11 +43,9 @@ - + + + - + + From 5487e1f74d204947bcf897eeccb5b298c7ded641 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 18 Sep 2024 13:31:33 +0800 Subject: [PATCH 74/76] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=AF=B7=E6=B1=82=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/task_rate_gx.vue | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/statistics/task_rate_gx.vue b/src/views/statistics/task_rate_gx.vue index ee355c27..2169d1ae 100644 --- a/src/views/statistics/task_rate_gx.vue +++ b/src/views/statistics/task_rate_gx.vue @@ -637,13 +637,18 @@ export default { that.query.start_date = that.query.querys[0][0].value = first.toISOString().split('T')[0]; that.query.end_date = that.query.querys[1][0].value = last.toISOString().split('T')[0]; that.options.forEach((item,index)=>{ - that.getData(item.id,item.name,index); + console.log('item',item); + setTimeout(()=>{ + that.getData(item.id,item.name,index); + },500) + }) - }, getMgroup(){ let that = this; + that.options = []; that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { + // that.options = res.slice(21); that.options = res; let nowDate = new Date(); that.getWeekDate(nowDate); @@ -669,18 +674,19 @@ export default { getData(mgroup_id,mgroup_name,mgroup_index) { let that = this; that.tableData1 = []; + that.query.querys[0][1].value = null; + that.query.querys[1][1].value = null; let option = deepCopy(that.basicOption); option.title.text = mgroup_name+"任务进度"; option.series.data[0].value = 0; option.series.data[1].value = 0; - that.query.querys[0][1].value = mgroup_id; that.query.querys[1][1].value = mgroup_id; that.$API.pm.mtask.cquery.req(that.query).then((res) => { let names = 'tableData'+mgroup_index; that[names] = res; - console.log('names',names); - console.log('that[names]',that[names]); + // console.log('names',names); + // console.log('that[names]',that[names]); let count_jh = 0,count_ok = 0,count_diff = 0; if (res.length > 0) { res.forEach((item) => { @@ -696,7 +702,6 @@ export default { let chartId = 'linechart'+mgroup_index; that.setChart(chartId, option); } - }); }, handleQuery(){ @@ -715,7 +720,9 @@ export default { that.query.querys[1][0].value = that.end_date; } that.options.forEach((item,index)=>{ - that.getData(item.id,item.name,index); + setTimeout(()=>{ + that.getData(item.id,item.name,index); + },500) }) }, handleExport(val) { From 747c22fc02459b6a9e9da4817232e7915ed7da62 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 18 Sep 2024 13:40:33 +0800 Subject: [PATCH 75/76] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/route.js | 142 ++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/src/config/route.js b/src/config/route.js index 01cfcdcb..d75d8817 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -1705,68 +1705,6 @@ const routes = [ }, component: "inm/warehouse", }, - { - name: "good", - path: "/inm/good", - meta: { - title: "成品库", - // icon: "el-icon-cellphone", - perms: ["good"], - }, - children: [ - { - name: "good", - path: "/inm/good", - meta: { - title: "成品库", - // icon: "el-icon-cellphone", - perms: ["good"], - }, - component: "inm/good", - }, - { - name: "good_mio", - path: "/inm/good_mio", - meta: { - title: "出入库记录", - // icon: "el-icon-cellphone", - perms: ["good_mio"], - }, - component: "inm/good_mio", - }, - ], - }, - { - name: "halfgood", - path: "/inm/halfgood", - meta: { - title: "半成品库", - // icon: "el-icon-cellphone", - perms: ["halfgood"], - }, - children: [ - { - name: "halfgood", - path: "/inm/halfgood", - meta: { - title: "半成品库", - // icon: "el-icon-cellphone", - perms: ["halfgood"], - }, - component: "inm/halfgood", - }, - { - name: "halfgood_mio", - path: "/inm/halfgood_mio", - meta: { - title: "出入库记录", - // icon: "el-icon-cellphone", - perms: ["halfgood_mio"], - }, - component: "inm/halfgood_mio", - }, - ], - }, { name: "mainso", path: "/inm/mainso", @@ -1829,6 +1767,77 @@ const routes = [ }, ], }, + { + name: "halfgood", + path: "/inm/halfgood", + meta: { + title: "半成品库", + // icon: "el-icon-cellphone", + perms: ["halfgood"], + }, + children: [ + { + name: "halfgood", + path: "/inm/halfgood", + meta: { + title: "半成品库", + // icon: "el-icon-cellphone", + perms: ["halfgood"], + }, + component: "inm/halfgood", + }, + { + name: "halfgood_mio", + path: "/inm/halfgood_mio", + meta: { + title: "出入库记录", + // icon: "el-icon-cellphone", + perms: ["halfgood_mio"], + }, + component: "inm/halfgood_mio", + }, + ], + }, + { + name: "good", + path: "/inm/good", + meta: { + title: "成品库", + // icon: "el-icon-cellphone", + perms: ["good"], + }, + children: [ + { + name: "good", + path: "/inm/good", + meta: { + title: "成品库", + // icon: "el-icon-cellphone", + perms: ["good"], + }, + component: "inm/good", + }, + { + name: "good_mio", + path: "/inm/good_mio", + meta: { + title: "出入库记录", + // icon: "el-icon-cellphone", + perms: ["good_mio"], + }, + component: "inm/good_mio", + }, + ], + }, + { + name: "inmScrap", + path: "/inm/inmScrap", + meta: { + title: "废品库", + perms: ["inmScrap"], + }, + component: "inm/inmScrap", + }, // { // "name": "materialbatch", // "path": "/inm/materialbatch", @@ -1878,15 +1887,6 @@ const routes = [ }, component: "inm/workshop_mio", }, - { - name: "inmScrap", - path: "/inm/inmScrap", - meta: { - title: "废品库", - perms: ["inmScrap"], - }, - component: "inm/inmScrap", - }, ], }, //采购 pum From 17c50f7b2747a23a5fd49b74d5cb66dfbeeac099 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 18 Sep 2024 14:50:28 +0800 Subject: [PATCH 76/76] =?UTF-8?q?fix:=E8=BD=A6=E9=97=B4=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=97=B6=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BAcount=5Fcando?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_gx/check_form.vue | 5 ++--- src/views/wpm_gx/mlog_detail.vue | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue index 8c8c25f5..fc3a507d 100644 --- a/src/views/wpm_gx/check_form.vue +++ b/src/views/wpm_gx/check_form.vue @@ -347,10 +347,10 @@ export default { }; }, mounted() { - this.batchCount = this.itemObj.count; + this.batchCount = this.itemObj.count_cando; this.form.batch = this.itemObj.batch; this.form.wm = this.itemObj.id; - this.form.count = this.itemObj.count; + this.form.count = this.itemObj.count_cando; this.form.supplier = this.itemObj.supplier; this.deptID = this.$TOOL.data.get('gx_deptID'); this.getUsers(); @@ -361,7 +361,6 @@ export default { this.mode = mode; this.modeTitle = mode+'抽检'; this.visible = true; - return this; }, getUsers(){ diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue index b8739c55..6181d17a 100644 --- a/src/views/wpm_gx/mlog_detail.vue +++ b/src/views/wpm_gx/mlog_detail.vue @@ -72,10 +72,10 @@ >放行审批
- +
@@ -141,7 +141,7 @@ - + - - + +