diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 9d071e1..27e149d 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -502,7 +502,7 @@ - + @@ -541,7 +541,7 @@ @@ -572,12 +572,15 @@ -
- {{ detail.itemName }} + + + width="80"> -
@@ -656,6 +658,7 @@ export default { dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], data() { return { + standardListVo:[], // 初始化VO workVO: { order: { @@ -787,6 +790,12 @@ export default { const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index f7198fc..eedfc40 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -417,7 +417,7 @@ @@ -448,12 +448,15 @@ -
- {{ detail.itemName }} + + + width="80"> -
@@ -540,6 +542,7 @@ export default { dicts: ['device_order_status', 'device_loop_type'], data() { return { + standardListVo:[], workCenterList: [], test: false, // 日期范围选择快捷 @@ -667,12 +670,18 @@ export default { this.workCenterList = response.data; }) }, - // 测试 + // 展示 showWork(row) { this.reset(); const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index 5956e90..485ff5f 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -450,7 +450,7 @@ @@ -527,12 +527,15 @@ -
- {{ detail.itemName }} + + + width="80"> -
@@ -614,6 +616,7 @@ export default { dicts: ['device_order_status', 'device_loop_type','device_upkeep_type','device_inspect_status'], data() { return { + standardListVo:[], workCenterList:[], // 日期范围选择快捷 pickerOptions: { @@ -760,6 +763,12 @@ export default { }else { this.workVO.order.shutDown = '停机保养'; } + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); @@ -896,7 +905,7 @@ export default { margin-top: 10px; } .demo-image__lazy{ - height: 400px; + height: 350px; overflow-y: auto; } diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 2c3b304..e00f778 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -493,7 +493,7 @@
- + @@ -532,7 +532,7 @@ @@ -563,12 +563,15 @@ -
- {{ detail.itemName }} + + + width="80"> -
@@ -643,6 +645,7 @@ export default { dicts: ['device_order_status', 'device_loop_type','device_reach_standard'], data() { return { + standardListVo: [], workDetail:false, // 初始化VO workVO: { @@ -785,6 +788,12 @@ export default { const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index 0fff947..1c4a291 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -406,7 +406,7 @@ @@ -437,12 +437,15 @@ -
- {{ detail.itemName }} + + -
@@ -523,6 +525,7 @@ export default { dicts: ['device_order_status', 'device_loop_type'], data() { return { + standardListVo:[], // 日期范围选择快捷 pickerOptions: { shortcuts: [{ @@ -656,6 +659,12 @@ export default { const orderId = row.orderId || this.ids getInspectionWork(orderId).then(response => { this.workVO = response.data; + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 196ade5..875dcde 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -1027,7 +1027,7 @@ @@ -1104,12 +1104,15 @@ -
- {{ detail.itemName }} + + + width="80"> -
@@ -1190,6 +1192,7 @@ export default { dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'], data() { return { + standardListVo:[], workDetail:false, // 初始化VO workVO: { @@ -1424,6 +1427,12 @@ export default { }else { this.workVO.order.shutDown = '停机保养'; } + for (let i = 0; i < this.workVO.detailList.length; i++) { + for (let j = 0; j < this.workVO.detailList[i].standardList.length; j++) { + this.workVO.detailList[i].standardList[j].itemName = this.workVO.detailList[i].itemName; + this.standardListVo.push(this.workVO.detailList[i].standardList[j]); + } + } this.workDetail = true; }); @@ -1842,7 +1851,7 @@ export default { width: 250px; } .demo-image__lazy{ - height: 400px; + height: 350px; overflow-y: auto; }