From 75b875f7538bf7700684c2eb2582c2d8f0aa8675 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 七月 2025 10:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/modules/EamInspectionOrderModal.vue | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 84c5ec1..8361c6c 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -131,21 +131,18 @@
type: JVXETypes.normal,
width: 100,
align: 'center',
- disabled: true
},
{
title: '淇濆吇椤�',
key: 'itemName',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
align: 'center',
- disabled: true
},
{
title: '淇濆吇瑙勮寖鎴栬姹�',
key: 'itemDemand',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
align: 'center',
- disabled: true
}
],
weekInspectionColumns: [],
@@ -156,40 +153,38 @@
type: JVXETypes.normal,
width: 60,
align: 'center',
- disabled: true
},
{
title: '淇濆吇椤�',
key: 'itemName',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
align: 'center',
- disabled: true
},
{
title: '淇濆吇瑕佹眰',
key: 'itemDemand',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
align: 'center',
- disabled: true
},
{
title: '鐐规缁撴灉',
key: 'inspectionResult',
- type: JVXETypes.textarea,
+ type: JVXETypes.select,
+ dictCode: 'inspection_project_result',
align: 'center',
disabled: true
},
{
title: '寮傚父鎻忚堪',
key: 'exceptionDescription',
- type: JVXETypes.textarea,
+ type: JVXETypes.normal,
align: 'center',
- disabled: true
},
{
title: '寮傚父鏄惁鎶ヤ慨',
key: 'reportFlag',
- type: JVXETypes.textarea,
+ type: JVXETypes.select,
+ ditCode: 'yn',
align: 'center',
disabled: true
}
@@ -302,8 +297,8 @@
})
.then(res => {
if (res.success) {
- if (res.result.length > 0) {
- this.detail.weekInspectionList = res.result
+ if (res.result.list.length > 0) {
+ this.detail.weekInspectionList = res.result.list
this.detail.weekInspectionColumns = this.detail.weekInspectionOrderColumns
}
}
--
Gitblit v1.9.3