From ec3127722d339136c0b724c9626bde521b75c6cd Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 31 Jan 2023 17:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 8b9e1a7ac..55598352a 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -205,7 +205,7 @@
                style="display: inline-block" class='valflex'>
             <div style='display: inline-block' v-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
-                        @click="clickButtonToUpload(itemval)">
+                        @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
                 itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
               </a-button>
@@ -554,7 +554,7 @@
             </div>
             <div style='display: inline-block' v-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
-                        @click="clickButtonToUpload(itemval)">
+                        @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
                 itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
               </a-button>
@@ -589,7 +589,7 @@
             </div>
             <div style='display: inline-block' v-else-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
-                        @click="clickButtonToUpload(itemval)">
+                        @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
                 itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
               </a-button>
@@ -625,7 +625,7 @@
             </div>
             <div style='display: inline-block' v-else-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
-                        @click="clickButtonToUpload(itemval)">
+                        @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
                 itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
               </a-button>
@@ -753,7 +753,7 @@
             </div>
             <div style='display: inline-block' v-if='itemval.type==="file"'>
               <a-button type="primary" class="button-text inputWid"
-                        @click="clickButtonToUpload(itemval)">
+                        @click="clickButtonToUpload(item,itemval,index1)">
                 {{ (itemval.dataValue === 'null' || itemval.dataValue === '' ||
                 itemval.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
               </a-button>
@@ -810,7 +810,10 @@
         visible: false,
         detailDatetransformation: [],
         detailDateList: [],
-        paramsConfigData: {}
+        paramsConfigData: {},
+        fileNameOne:'',
+        fileNameTwo:'',
+        fileIndex:'',
       }
     },
     components: {
@@ -884,14 +887,17 @@
           // console.log('form',this.formInline)
 
         }
-        this.detailDateList.forEach((item, index) => {
-          if (item.type === 'file') {
-            item.dataValue = attIdList.join(',')
-          }
-        })
+        this.detailDate.paramsConfigData[this.fileNameOne][this.fileIndex].dataValue = attIdList.join(',')
+        // this.detailDateList.forEach((item, index) => {
+        //   if (item.type === 'file') {
+        //     item.dataValue = attIdList.join(',')
+        //   }
+        // })
       },
-      clickButtonToUpload(item) {
-        if (item.isLock == '1') {
+      clickButtonToUpload(name,item,index) {
+        this.fileNameOne = name
+        this.fileIndex = index
+        if (item.isLock && item.isLock == '1') {
           this.$refs.uploadFile.disabled = true
         } else {
           this.$refs.uploadFile.disabled = false