From 19e08ee30065fff50e722023c44dccb8f0848c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Thu, 16 Nov 2023 18:11:20 +0800
Subject: [PATCH] =?UTF-8?q?2023-11-16=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
=?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/eam/eamWorkOrderForDefect.vue | 62 ++++++++-----------
.../reportWorkOrder/reportDefectOrder.vue | 39 +++++++++---
2 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 19b8e0a..d1d0df5 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -213,6 +213,11 @@
备件图片
+
+
+
+
+
@@ -418,42 +423,6 @@
departmentList:[],
// 展示列集
columnList: [
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101018,
- // serialNumber: '101018TableOrderNo',
- // tableId: "101018Table",
- // tableName: "common",
- // columnProp: 'urgency',
- // headerAlign: "center",
- // align: "center",
- // columnLabel: '紧急程度',
- // columnHidden: false,
- // columnImage: false,
- // columnSortable: true,
- // sortLv: 0,
- // status: true,
- // fixed: '',
- // columnWidth: 90,
- // },
- // {
- // userId: this.$store.state.user.name,
- // functionId: 101014,
- // serialNumber: '101014TableResult',
- // tableId: "101014Table",
- // tableName: "common",
- // columnProp: 'result',
- // headerAlign: "center",
- // align: "center",
- // columnLabel: '维修结论',
- // columnHidden: false,
- // columnImage: false,
- // columnSortable: true,
- // sortLv: 0,
- // status: true,
- // fixed: '',
- // columnWidth: 80,
- // },
{
userId: this.$store.state.user.name,
functionId: 101014,
@@ -508,6 +477,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101018,
+ serialNumber: '101018TablePlanID',
+ tableId: "101018Table",
+ tableName: "common",
+ columnProp: 'feedBackDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '反馈描述',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: true,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
{
userId: this.$store.state.user.name,
functionId: 101018,
@@ -1231,7 +1218,8 @@
disposalMeasures: row.disposalMeasures,
handlingMethod: row.handlingMethod,
functionType: row.functionType,
- resourceDesc: row.resourceDesc
+ resourceDesc: row.resourceDesc,
+ feedBackDesc: row.feedBackDesc
}
this.detailModelFlag = true
},
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index bfafbf1..03f86e9 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -148,13 +148,18 @@
备件图片
+
+
+
+
+
选择机修人员
-
+
@@ -461,6 +466,23 @@
status: true,
fixed: '',
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101020,
+ serialNumber: '101020TablePlanID',
+ tableId: "101020Table",
+ tableName: "common",
+ columnProp: 'feedBackDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '反馈描述',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ },
{
userId: this.$store.state.user.name,
functionId: 101020,
@@ -692,7 +714,8 @@
checkItemNo: '',
reachDate: '',
finishDate: '',
- handlingMethod: ''
+ handlingMethod: '',
+ feedBackDesc: ''
},
operatorData: {
site: this.$store.state.user.site,
@@ -1180,6 +1203,8 @@
// 选择到达人员
chooseReachOperator (row) {
+ this.saveData.operator = ''
+ this.saveData.operatorName = ''
this.reachData = row
this.chooseReachModelFlag = true
},
@@ -1194,11 +1219,6 @@
reachOperator: this.saveData.operator,
reachOperatorName: this.saveData.operatorName
}
- this.$confirm(`是否确认到达?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
reach(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -1215,8 +1235,6 @@
})
}
})
- }).catch(() => {
- })
},
// 执行
@@ -1241,7 +1259,8 @@
reachDate: row.reachDate,
operator: row.reachOperator,
operatorName: row.reachOperatorName,
- handlingMethod: row.handlingMethod
+ handlingMethod: row.handlingMethod,
+ feedBackDesc: row.feedBackDesc
}
this.queryHistoryRecord()
this.detailModelFlag = true