From d9a34e63b00162452c5439b5c409aee53b76bb25 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 18 十月 2023 15:45:23 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
index 6e6cd73..5916e5b 100644
--- a/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
+++ b/src/views/eam/modules/equipmentReturn/EquipmentUnloadingReturnDetailModal.vue
@@ -14,17 +14,17 @@
         <a-row :span='24'>
           <a-col :span='12'>
             <a-form-model-item label='鍗曟嵁鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
-              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
+              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿' :disabled="disableSubmit"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span='12'>
             <a-form-model-item label='涓氬姟绫诲瀷' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='businessType'>
               <j-dict-select-tag
                 allow-clear
-                :disabled='disableSubmit'
                 v-model='model.businessType'
                 :placeholder="disableSubmit?'':'璇烽�夋嫨绫诲瀷'"
                 :triggerChange='true'
+                :disabled="disableSubmit"
                 dictCode='business_type'
               />
             </a-form-model-item>
@@ -36,6 +36,7 @@
               <a-select
                 placeholder='璇烽�夋嫨'
                 v-model='model.useDepartId'
+                :disabled="disableSubmit"
                 :options='this.departVoList'
                 style='width: 100%'
               />
@@ -44,7 +45,7 @@
 
           <a-col :span='12'>
             <a-form-model-item label='澶囨敞' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='remark'>
-              <a-textarea v-model='model.remark'  placeholder='璇疯緭鍏ュ娉�'></a-textarea>
+              <a-textarea v-model='model.remark'  placeholder='璇疯緭鍏ュ娉�' :disabled="disableSubmit"></a-textarea>
             </a-form-model-item>
           </a-col>
 
@@ -55,6 +56,7 @@
       type='primary'
       :style="{ marginRight: '8px',marginBottom:'8px' }"
       :loading='confirmLoading'
+      :disabled="disableSubmit"
       @click='selectInspectionProjects()'
     >璁惧淇℃伅
     </a-button>
@@ -76,6 +78,7 @@
 
           <a-date-picker
             :value='text'
+            :disabled="disableSubmit"
             v-if="col.dataIndex == 'actualReturnDate'"
             format='YYYY-MM-DD HH:mm:ss'
             @change='(e)=>handleChange(e, record.key, col, index)'
@@ -89,6 +92,7 @@
       >
         <a-popconfirm
           title='纭畾鍒犻櫎鍚�?'
+          :disabled="disableSubmit"
           @confirm='() => handleDelete(text,record, index)'
         >
           <a>鍒犻櫎</a>
@@ -106,6 +110,7 @@
       <a-button
         @click='handleOk()'
         type='primary'
+        :disabled="disableSubmit"
         :loading='confirmLoading'
       >纭畾
       </a-button>
@@ -200,14 +205,14 @@
         {
           title: '璐ｄ换鐝粍',
           align: 'center',
-          dataIndex: 'responsibilityTeamId'
+          dataIndex: 'responsibilityTeamName'
 
         },
         {
           title: '璐ｄ换浜�',
           align: 'center',
 
-          dataIndex: 'responsibilityUserId'
+          dataIndex: 'responsibilityUserName'
         },
         {
           title: '鎿嶄綔',
@@ -292,7 +297,9 @@
           technicalStatus: data[i].technologyStatus_dictText,
           responsibilityTeamId: data[i].teamId,
           responsibilityUserId: data[i].functionary,
-          actualBorrowDate:data[i].updateTime
+          actualBorrowDate:data[i].updateTime,
+          responsibilityUserName:data[i].functionary_dictText,
+          responsibilityTeamName:data[i].teamId_dictText,
         })
       }
 

--
Gitblit v1.9.3