diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue
index 0723c8e..d40f1b2 100644
--- a/src/views/device/deviceOrder/index.vue
+++ b/src/views/device/deviceOrder/index.vue
@@ -538,10 +538,10 @@
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue
index 4bdd019..4fc82c6 100644
--- a/src/views/device/inspectionWork/index.vue
+++ b/src/views/device/inspectionWork/index.vue
@@ -428,10 +428,10 @@
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue
index 5a614d7..99831cb 100644
--- a/src/views/device/maintenanceWork/index.vue
+++ b/src/views/device/maintenanceWork/index.vue
@@ -342,7 +342,7 @@
-
+
-
+
-
+
@@ -446,6 +446,7 @@
@pagination="getList"
/>
+
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
+ {{ workVO.order.upkeep }}
+ {{ workVO.order.shutDown }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
@@ -565,7 +568,7 @@ import {getWorkCenter} from "@/api/device/plan";
export default {
name: "InspectionWork",
- dicts: ['device_order_status', 'device_loop_type'],
+ dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'],
data() {
return {
// 日期范围选择快捷
@@ -696,12 +699,22 @@ export default {
this.workCenterList = response.data;
})
},
- // 测试
+ // 展示
showWork(row) {
this.reset();
const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => {
this.workVO = response.data;
+ if (this.workVO.order.upkeep == 0) {
+ this.workVO.order.upkeep = '内部';
+ }else {
+ this.workVO.order.upkeep = '委外';
+ }
+ if (this.workVO.order.shutDown == 0) {
+ this.workVO.order.shutDown = '开机保养';
+ }else {
+ this.workVO.order.shutDown = '停机保养';
+ }
this.workDetail = true;
});
diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue
index 906b20d..9188460 100644
--- a/src/views/device/spotInspectionOrder/index.vue
+++ b/src/views/device/spotInspectionOrder/index.vue
@@ -529,10 +529,10 @@
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
@@ -846,6 +846,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
+ this.recordList = [];
const orderCode = row.orderCode || this.ids
getDeviceOrder(orderCode).then(response => {
this.form = response.data;
diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 2d12861..31bb3e0 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -417,10 +417,10 @@
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 82cf593..ec3d02d 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -413,7 +413,7 @@
-
+
@@ -1006,10 +1006,12 @@
{{ workVO.order.orderCode }}
{{ workVO.order.planWorkshop }}
- {{ workVO.order.planLoopStart }}
- {{ workVO.order.planLoopEnd }}
- {{ workVO.order.orderStart }}
- {{ workVO.order.orderEnd }}
+ {{ workVO.order.planLoopStart }}
+ {{ workVO.order.planLoopEnd }}
+ {{ workVO.order.orderStart }}
+ {{ workVO.order.orderEnd }}
+ {{ workVO.order.upkeep }}
+ {{ workVO.order.shutDown }}
{{ workVO.order.planPerson }}
{{ workVO.order.repairCode }}
@@ -1314,6 +1316,16 @@ export default {
const orderId = row.orderId || this.ids
getInspectionWork(orderId).then(response => {
this.workVO = response.data;
+ if (this.workVO.order.upkeep == 0) {
+ this.workVO.order.upkeep = '内部';
+ }else {
+ this.workVO.order.upkeep = '委外';
+ }
+ if (this.workVO.order.shutDown == 0) {
+ this.workVO.order.shutDown = '开机保养';
+ }else {
+ this.workVO.order.shutDown = '停机保养';
+ }
this.workDetail = true;
});
@@ -1634,6 +1646,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
+ this.recordList = [];
const orderCode = row.orderCode || this.ids
getDeviceOrder(orderCode).then(response => {
this.form = response.data;
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index 40bc2d9..d27b146 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -477,8 +477,8 @@
- 停机保养
- 开机保养
+ 停机保养
+ 开机保养