From 1cacb861cbe64c2e3082d51dfda8dfaa2db47780 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 29 Apr 2024 11:34:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2024-4-29=20=E4=BF=9D=E5=85=BB=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=A1=86+?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/maintenanceWork/index.vue | 109 ++++++++++++--------- 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index cfe7805..dd8f6c1 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -9,6 +9,24 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + - + @@ -35,6 +53,22 @@ /> + + + + + + - + - - - - - - @@ -275,16 +293,6 @@ /> - - - - - 搜索 重置 @@ -342,9 +350,6 @@ - - - + + + + + + + + @@ -373,18 +388,16 @@ {{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }} - + + - - - - - @@ -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 2/3] =?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 3/3] =?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 @@