From 56148970959b7016cfe1c54ffa39dbd9bb9921ff Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 11 七月 2025 21:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/maintenance/modules/EamInspectionOrderModal.vue |   56 +++++++++++++++++++++++++-------------------------------
 1 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 1ecc745..45fdba0 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -33,7 +33,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="淇濆吇鍛ㄦ湡">
-              <a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" v-model="model.maintenancePeriod" disabled/>
+              <a-input v-model="model.maintenancePeriod" disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
@@ -128,24 +128,21 @@
             {
               title: '搴忓彿',
               key: 'itemCode',
-              type: JVXETypes.inputNumber,
+              type: JVXETypes.normal,
               width: 100,
-              align: 'center',
-              disabled: true
+              align: 'center'
             },
             {
               title: '淇濆吇椤�',
               key: 'itemName',
-              type: JVXETypes.textarea,
-              align: 'center',
-              disabled: true
+              type: JVXETypes.normal,
+              align: 'center'
             },
             {
               title: '淇濆吇瑙勮寖鎴栬姹�',
               key: 'itemDemand',
-              type: JVXETypes.textarea,
-              align: 'center',
-              disabled: true
+              type: JVXETypes.normal,
+              align: 'center'
             }
           ],
           weekInspectionColumns: [],
@@ -155,43 +152,41 @@
               key: 'itemCode',
               type: JVXETypes.normal,
               width: 60,
-              align: 'center',
-              fixed: 'left'
+              align: 'center'
             },
             {
               title: '淇濆吇椤�',
               key: 'itemName',
-              type: JVXETypes.textarea,
-              align: 'center',
-              fixed: 'left'
+              type: JVXETypes.normal,
+              align: 'center'
             },
             {
               title: '淇濆吇瑕佹眰',
               key: 'itemDemand',
-              type: JVXETypes.textarea,
-              align: 'center',
-              fixed: 'left'
+              type: JVXETypes.normal,
+              align: 'center'
             },
             {
               title: '鐐规缁撴灉',
               key: 'inspectionResult',
-              type: JVXETypes.slot,
-              slotName: 'inspectionResult',
-              align: 'center'
+              type: JVXETypes.select,
+              dictCode: 'inspection_project_result',
+              align: 'center',
+              disabled: true
             },
             {
               title: '寮傚父鎻忚堪',
               key: 'exceptionDescription',
-              type: JVXETypes.slot,
-              slotName: 'exceptionDescription',
+              type: JVXETypes.normal,
               align: 'center'
             },
             {
               title: '寮傚父鏄惁鎶ヤ慨',
               key: 'reportFlag',
-              type: JVXETypes.slot,
-              slotName: 'reportFlag',
-              align: 'center'
+              type: JVXETypes.select,
+              ditCode: 'yn',
+              align: 'center',
+              disabled: true
             }
           ]
         }
@@ -199,7 +194,7 @@
     },
     methods: {
       add() {
-        this.model = {}
+        this.model = { maintenancePeriod: 1 }
         this.visible = true
         this.editable = true
         this.detail.dayInspectionList = []
@@ -207,7 +202,7 @@
       },
 
       edit(record) {
-        this.model = Object.assign({}, record)
+        this.model = Object.assign({ maintenancePeriod: 1 }, record)
         this.editable = false
         this.visible = true
         this.spinning = true
@@ -254,7 +249,6 @@
 
       autocompleteForm(selectObj) {
         this.model.standardName = selectObj.standardName
-        this.model.maintenancePeriod = selectObj.maintenancePeriod
         this.model.standardCode = selectObj.standardCode
         this.standardId = selectObj.id
         this.detail.dayInspectionList = []
@@ -302,8 +296,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