From 2f2036aa0e6e0629f6f2f3346609b9ea3a881128 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 26 Apr 2024 17:58:42 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=8F=90=E9=86=92=E7=9A=84=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=AE=BD=E5=BA=A6=E5=8A=A0=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 2b705fd..7b44fde 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -152,7 +152,7 @@ From 9f3c8d745d7c889d93fca554f8ae7925b425c92a Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sun, 28 Apr 2024 11:55:38 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=B7=A5+=E5=88=87?= =?UTF-8?q?=E7=BA=BF=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/reportWork.js | 10 ++++++---- src/views/mes/reportWork/index.vue | 10 +++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index a895802..dca7815 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -183,9 +183,10 @@ export function getMesListEquip(query) { }); } //报工按钮 -export function reportSap(workorderCode) { +export function reportSap(workorderCode,machineCode) { const data = { - workorderCode + workorderCode, + machineCode } return request({ url: '/mes/reportWork/reportSap', @@ -194,9 +195,10 @@ export function reportSap(workorderCode) { }); } //报工撤销按钮 -export function reportSapCancel(workorderCode) { +export function reportSapCancel(workorderCode,machineCode) { const data = { - workorderCode + workorderCode, + machineCode } return request({ url: '/mes/reportWork/reportSapCancel', diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index fa07943..29a54c7 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -1141,11 +1141,12 @@ export default { } const code = sr.workorderCode; + const machineCode = sr.machineCode; let _this = this; this.$modal - .confirm('是否确认工单"' + code + '"的数据项向sap报工？') + .confirm('是否确认线体'+machineCode+',工单' + code + '的数据项向sap报工？') .then(function () { - reportSap(code).then((response) => { + reportSap(code,machineCode).then((response) => { if (response != null && response.code == 200) { _this.$modal.msgSuccess("报工成功"); } @@ -1161,11 +1162,12 @@ export default { this.loading = true; let sr = this.selectRow[0]; const code = sr.workorderCode; + const machineCode = sr.machineCode; let _this = this; this.$modal .confirm('是否确认工单"' + code + '"的数据项撤销sap报工？') .then(function () { - reportSapCancel(code).then((response) => { + reportSapCancel(code,machineCode).then((response) => { if (response != null && response.code == 200) { _this.$modal.msgSuccess("报工撤销成功"); } @@ -1191,6 +1193,7 @@ export default { } this.queryParams.workorderCode = sr.workorderCode; + this.queryParams.machineCode = sr.machineCode; //查询工单报工记录列表 getAllLevelReportList(this.queryParams).then((response) => { @@ -1298,6 +1301,7 @@ export default { } this.queryParams.workorderCode = sr.workorderCode; + this.queryParams.machineCode = sr.machineCode; //查询母工单报工记录列表 getAllLevelConsumeList(this.queryParams).then((response) => { this.libConsumeTabs = response; From fec75ea82d52a56dce7272c094f45cd57655c4ce Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Sun, 28 Apr 2024 13:58:39 +0800 Subject: [PATCH 03/16] =?UTF-8?q?wms=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=9A=84sap=E6=94=B6=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BC=A0=E7=BA=BF=E4=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index fa07943..1172949 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -383,7 +383,7 @@

备注：

+ v-model="item.remark" placeholder="请输入内容(300个字内)" maxlength=300 >
@@ -1049,6 +1049,7 @@ export default { } this.queryParams.workorderCode = sr.workorderCode; + this.queryParams.machineCode = sr.machineCode; // this.SAPCD=sr.workorderCodeSap; //查询母工单报工记录列表 this.queryParams.parentOrder = "0"; From 475f24a93ecf47ccafa306da5e0399cfe447596b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sun, 28 Apr 2024 17:25:57 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=B7=A5+=E5=88=87?= =?UTF-8?q?=E7=BA=BF=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index ba3f779..1997e24 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -377,6 +377,7 @@ @change="handleEdit(scope.$index, scope.row)"> + @@ -434,6 +435,7 @@ + - + + - - - - - @@ -460,8 +468,7 @@ {{ workVO.order.planCode }} {{ workVO.order.planName }} - {{ workVO.order.planLoop }}{{ workVO.order.planLoopType }} - + {{ workVO.order.planLoop }}{{ workVO.order.planLoopType }} {{ workVO.order.orderCode }} {{ workVO.order.planWorkshop }} {{ workVO.order.planLoopStart }} @@ -708,6 +715,7 @@ export default { pageSize: 10, planId: null, planCode: null, + planName:null, planType: "maintenance", orderCode: null, planWorkshop: null, @@ -848,7 +856,10 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - this.queryParams.equipmentName = null; + this.queryParams.loopEndArray = null; + this.queryParams.loopStartArray = null; + this.queryParams.orderEndArray = null; + this.queryParams.orderStartArray = null; this.resetForm("queryForm"); this.handleQuery(); }, From 76b8686172874bb595cd12cd221de27685ad2829 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 29 Apr 2024 14:07:04 +0800 Subject: [PATCH 06/16] =?UTF-8?q?2024-4-29=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E6=8A=A5=E8=A1=A8-=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=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/device/spotInspectionWork/index.vue | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index 7d59fbf..a49d059 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -9,6 +9,14 @@ @keyup.enter.native="handleQuery" /> + + + - + @@ -43,16 +51,7 @@ @keyup.enter.native="handleQuery" /> - - - - - + - + + + + + + - + - - - @@ -624,6 +633,7 @@ export default { pageSize: 10, planId: null, planCode: null, + planName: null, planType: "spotInspection", orderCode: null, planWorkshop: null, From bb629448b55a305d0d84ab61ff2b35788a69b00c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 29 Apr 2024 14:57:30 +0800 Subject: [PATCH 07/16] =?UTF-8?q?2024-4-29=20=E8=AE=BE=E5=A4=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=B7=A1=E6=A3=80=E6=8A=A5=E8=A1=A8-=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=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/device/inspectionWork/index.vue | 748 ++++++++++++++-------- 1 file changed, 493 insertions(+), 255 deletions(-) diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index c2afe43..038ee01 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -1,6 +1,13 @@