From 49d3214d594dc1ef1592e919b5f93bebee594319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Tue, 8 Oct 2024 15:12:19 +0800 Subject: [PATCH 1/6] =?UTF-8?q?2024-10-08=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20-=20=E7=82=B9=E6=A3=80=20=E5=B7=A1=E6=A3=80=20?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=8A=A5=E8=A1=A8=20=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/inspectionWork/index.vue | 8 ++++++++ src/views/device/maintenanceWork/index.vue | 3 +++ src/views/device/spotInspectionWork/index.vue | 3 +++ 3 files changed, 14 insertions(+) diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 5b3dbdd..fbf8c74 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -473,6 +473,12 @@ align="center" prop="equipmentName" /> + + + @@ -689,6 +690,7 @@ export default { loopStartArray: [], orderStartArray: [], orderEndArray: [], + complianceRate: null, }, // 表单参数 form: {}, @@ -781,6 +783,7 @@ export default { loopStartArray: [], orderStartArray: [], orderEndArray: [], + complianceRate: null, }; this.resetForm("form"); }, From 3db9ec02bdba81a5ce1866505fa997afb462c577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Tue, 8 Oct 2024 15:25:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?2024-10-08=20=E6=8A=A5=E4=BF=AE=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=20=E6=8C=89=E9=92=AE=E7=A7=BB=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E5=90=8E=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/faultReport/index.vue | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue index cac3d4d..17c571b 100644 --- a/src/views/device/faultReport/index.vue +++ b/src/views/device/faultReport/index.vue @@ -223,20 +223,11 @@ label="报修单号" align="center" prop="orderCode" - width="220" + width="250" :show-overflow-tooltip="true" fixed > - - From 6fe2d51784670f3aee32e9bc885deac89e03e838 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 8 Oct 2024 17:52:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E9=97=AE=E9=A2=98?= =?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/checkType/index.vue | 11 +++++++-- src/views/quality/produceReport/index.vue | 5 +++++ src/views/quality/qcTableDL/index.vue | 2 -- src/views/quality/qcTableXJ/index.vue | 27 +++++++++++++++++++---- src/views/wms/product/index.vue | 18 +++++++++++++-- 5 files changed, 53 insertions(+), 10 deletions(-) diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue index 415a646..eb36a0f 100644 --- a/src/views/quality/checkType/index.vue +++ b/src/views/quality/checkType/index.vue @@ -89,12 +89,19 @@ @click="handleDelete(scope.row)" v-hasPermi="['quality:checkType:remove']" >删除 - 分配检检员 + >分配检验员 + diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue index 2ce8a72..91f64cc 100644 --- a/src/views/quality/produceReport/index.vue +++ b/src/views/quality/produceReport/index.vue @@ -606,6 +606,11 @@ + + + + + diff --git a/src/views/quality/qcTableDL/index.vue b/src/views/quality/qcTableDL/index.vue index 2b223fd..4486601 100644 --- a/src/views/quality/qcTableDL/index.vue +++ b/src/views/quality/qcTableDL/index.vue @@ -37,7 +37,6 @@ @@ -52,7 +51,6 @@ diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue index b5175bc..4f30660 100644 --- a/src/views/quality/qcTableXJ/index.vue +++ b/src/views/quality/qcTableXJ/index.vue @@ -17,6 +17,7 @@ @keyup.enter.native="handleQuery" /> + + + + + + 搜索 重置 @@ -155,6 +168,7 @@ export default { open: false, // 查询参数 queryParams: { + incomeTimeArray: [], pageNum: 1, pageSize: 10, checkNo: null, @@ -212,7 +226,9 @@ export default { /**获取默认查询时间段**/ getDate() { let start = this.Fungetdate (0) - this.queryParams.incomeTime =start + let end = this.Fungetdate (1) + this.queryParams.incomeTimeArray.push(start,end) + //this.queryParams.checkTimeArray.push(start,end) }, Fungetdate (num) { var dd = new Date(); @@ -231,9 +247,12 @@ export default { this.loading = true; - if(this.queryParams.incomeTime != null){ - this.queryParams.incomeTimeStr = moment(this.queryParams.incomeTime).format('YYYY-MM-DD'); - + if(this.queryParams.incomeTimeArray != null &&this.queryParams.incomeTimeArray.length>0){ + this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); + this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); + }else{ + this.queryParams.incomeTimeStart = null; + this.queryParams.incomeTimeEnd = null; } getXJCheckTableList(this.queryParams).then(response => { diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index d23c529..9bb99f2 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -24,6 +24,14 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ + workVO.order.planCode + }} + {{ + workVO.order.planName + }} + {{ workVO.order.planLoop }}{{ workVO.order.planLoopType }} + + {{ + workVO.order.orderCode + }} + {{ + workVO.order.planWorkshop + }} + {{ + workVO.order.planLoopStart + }} + {{ + workVO.order.planLoopEnd + }} + {{ + workVO.order.orderStart + }} + {{ + workVO.order.orderEnd + }} + {{ + workVO.order.planPerson + }} + {{ + workVO.order.planPersonName + }} + {{ + workVO.order.repairCode + }} + + + + + {{ + workVO.equ.equipmentCode + }} + {{ + workVO.equ.equipmentName + }} + {{ + workVO.equ.equipmentLocation + }} + {{ + workVO.equ.equipmentTypeCode + }} + {{ + workVO.equ.equipmentTypeName + }} + {{ + workVO.equ.workshopCode + }} + {{ + workVO.equ.workshopName + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + 关 闭 + + + + + +
+ 确 定 + 取 消 +
+ + + + + + From 69295658a15ebd947b04935ac391497524f23a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Wed, 9 Oct 2024 11:07:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?2024-10-09=20=E8=AE=BE=E5=A4=87-=E5=AE=89?= =?UTF-8?q?=E7=8E=AF=E7=82=B9=E6=A3=80=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anHuanSpotInspectionReport/index.vue | 879 ++++++++++++++++++ 1 file changed, 879 insertions(+) create mode 100644 src/views/device/anHuanSpotInspectionReport/index.vue diff --git a/src/views/device/anHuanSpotInspectionReport/index.vue b/src/views/device/anHuanSpotInspectionReport/index.vue new file mode 100644 index 0000000..d5a1f00 --- /dev/null +++ b/src/views/device/anHuanSpotInspectionReport/index.vue @@ -0,0 +1,879 @@ + + + + From e6d97a059aac46fdae26632ba6ec4d405665369e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Wed, 9 Oct 2024 12:01:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?2024-10-09=20=E8=AE=BE=E5=A4=87-=E5=AE=89?= =?UTF-8?q?=E7=8E=AF-=E4=BF=9D=E5=85=BB=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/anHuanMaintenanceReport/index.vue | 1239 +++++++++++++++++ 1 file changed, 1239 insertions(+) create mode 100644 src/views/device/anHuanMaintenanceReport/index.vue diff --git a/src/views/device/anHuanMaintenanceReport/index.vue b/src/views/device/anHuanMaintenanceReport/index.vue new file mode 100644 index 0000000..399b366 --- /dev/null +++ b/src/views/device/anHuanMaintenanceReport/index.vue @@ -0,0 +1,1239 @@ + + + +