From 6048657f07f9b3c2155e6fd372a7fe413c29b4c9 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 26 Dec 2023 17:49:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/qcProCheck.js | 9 ++ src/views/quality/qcProCheck/index.vue | 188 +++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 src/api/quality/qcProCheck.js create mode 100644 src/views/quality/qcProCheck/index.vue diff --git a/src/api/quality/qcProCheck.js b/src/api/quality/qcProCheck.js new file mode 100644 index 00000000..5b5556cb --- /dev/null +++ b/src/api/quality/qcProCheck.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function listCheck(query) { + return request({ + url: '/quality/qcProCheck/list', + method: 'get', + params: query + }); +} diff --git a/src/views/quality/qcProCheck/index.vue b/src/views/quality/qcProCheck/index.vue new file mode 100644 index 00000000..d68a7244 --- /dev/null +++ b/src/views/quality/qcProCheck/index.vue @@ -0,0 +1,188 @@ + + + From c54cc8ee515fa1d6b4d742a701ee8be622cb5d6b Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 27 Dec 2023 09:40:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/quality/incomeReport/index.vue | 48 +++++++++++++++------ src/views/quality/produceReport/index.vue | 2 +- src/views/quality/productReport/index.vue | 52 ++++++++++++++++------- 3 files changed, 71 insertions(+), 31 deletions(-) diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue index e5964507..f32b9161 100644 --- a/src/views/quality/incomeReport/index.vue +++ b/src/views/quality/incomeReport/index.vue @@ -83,7 +83,7 @@ - + @@ -119,7 +119,7 @@ @pagination="getList" /> - + @@ -143,18 +143,18 @@ - + - + - + @@ -171,14 +171,14 @@ - + - + @@ -201,6 +201,25 @@ + + + + + + + + + + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + @@ -209,11 +228,11 @@ - + @@ -225,14 +244,15 @@ - - - + + + + - - + + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 91180bef..2cba9c88 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -83,7 +83,7 @@ - + diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue index 2b0b0db6..bdea3a61 100644 --- a/src/views/quality/productReport/index.vue +++ b/src/views/quality/productReport/index.vue @@ -83,7 +83,7 @@ - + @@ -119,7 +119,7 @@ @pagination="getList" /> - + @@ -147,19 +147,19 @@ - - + + - + - + @@ -178,7 +178,7 @@ - + @@ -203,10 +203,13 @@ - - - {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - + + + + + + + @@ -214,6 +217,22 @@ + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + + + + + {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + + + @@ -225,14 +244,15 @@ - - - + + + + - - + + From e971230ee19e52d426674edfb47c573d8d56fd45 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 10:48:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/income.js | 8 ++++++++ src/views/mes/reportWork/index.vue | 14 +++++++++----- src/views/plan/order/index.vue | 2 +- src/views/plan/whiteOrder/index.vue | 4 ++-- src/views/plan/workorder/index.vue | 18 +++++++++--------- src/views/quality/qcWarehousing/index.vue | 2 +- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 05278004..50a717ae 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -162,3 +162,11 @@ export function getWorkOrder(query) { params: query }); } +// 查询入库订单列表 +export function getProductWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getProductWorkOrder', + method: 'get', + params: query + }); + } \ No newline at end of file diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index a3965470..9dfa09cb 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -643,7 +643,8 @@ export default { attr3: null, attr4: null, workorderCode: null, - parentOrder:null + parentOrder:null, + uploadStatus:"0" }, // 表单参数 form: { @@ -940,15 +941,16 @@ export default { }, /** 报工详情按钮操作 */ handleReportHz(row) { + this.reset(); - let sr = this.selectRow[0]; + let sr = row; if(sr.uploadStatus =='sap报工成功'){ this.optType = 'view' }else{ this.optType = '' } - + this.queryParams.workorderCode = sr.workorderCode; //查询母工单报工记录列表 this.queryParams.parentOrder = '0'; @@ -964,7 +966,7 @@ export default { this.sOrderTableList = response; this.openReport = true; this.titleReport = "工单报工详情"; - + this.queryParams.workorderCode = ''; }); }, handleEdit(index, row) { @@ -993,7 +995,7 @@ export default { /** 报工损耗按钮操作 */ handleConsumeHz(row) { this.reset(); - let sr = this.selectRow[0]; + let sr = row; if(sr.uploadStatus =='sap报工成功'){ this.optType = 'view' @@ -1016,6 +1018,8 @@ export default { this.sConsumeTableList = response; this.openConsume = true; this.titleConsume = "工单报工物料损耗详情"; + + this.queryParams.workorderCode = ''; }); }, // 多选框选中数据 diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 0912b3fa..1f8051c9 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -130,7 +130,7 @@ > - diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue index 26966c0c..e93b670d 100644 --- a/src/views/plan/whiteOrder/index.vue +++ b/src/views/plan/whiteOrder/index.vue @@ -121,8 +121,8 @@ > - - + + diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index c03407c7..8a270dab 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -181,18 +181,18 @@ - + + + + - - + + - - - - - + - + diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index 933c5735..a6b9cc8f 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -397,7 +397,7 @@ import { listWarehousing, getWarehousing, delWarehousing, addWarehousing, updateWarehousing } from "@/api/quality/warehousing"; import { getBatchList} from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce"; -import ItemSelectWorkOrder from "./selectWorkOrder.vue"; +import ItemSelectWorkOrder from "./selectProductWorkOrder.vue"; import ItemSelectMaterial from "../qcIncome/selectMaterial.vue"; import ItemSelectLoc from "./selectLoc.vue"; import ItemSelectUser from "../qcIncome/selectUser.vue"; From 2e4b125df10434c310080f8cefb62400296b8129 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 10:50:24 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/qcWarehousing/selectWorkOrder.vue | 140 ------------------ 1 file changed, 140 deletions(-) delete mode 100644 src/views/quality/qcWarehousing/selectWorkOrder.vue diff --git a/src/views/quality/qcWarehousing/selectWorkOrder.vue b/src/views/quality/qcWarehousing/selectWorkOrder.vue deleted file mode 100644 index aa571a41..00000000 --- a/src/views/quality/qcWarehousing/selectWorkOrder.vue +++ /dev/null @@ -1,140 +0,0 @@ - - From c3a18829cc483079b11c5617688aadd7bc8e2045 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 10:50:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcWarehousing/selectProductWorkOrder.vue | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 src/views/quality/qcWarehousing/selectProductWorkOrder.vue diff --git a/src/views/quality/qcWarehousing/selectProductWorkOrder.vue b/src/views/quality/qcWarehousing/selectProductWorkOrder.vue new file mode 100644 index 00000000..1a24a246 --- /dev/null +++ b/src/views/quality/qcWarehousing/selectProductWorkOrder.vue @@ -0,0 +1,140 @@ + + From a6827375ef7c1f18f408aaf932e2ce58ddc3f25c Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 11:12:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/workorder/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 8a270dab..42873a6d 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -32,10 +32,10 @@ @keyup.enter.native="handleQuery" /> - + From 49bcf8142aaa92bf2f08a8771570b5b2724f2ab7 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Dec 2023 11:13:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/workorder/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 42873a6d..36392d15 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -35,7 +35,7 @@