From 7e606d48f55edc85d0ae68a5f36da8989097b8f6 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 1 Feb 2023 16:12:21 +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   | 57 ++++++++++++++-----
 .../src/components/tableCollection/index.vue  |  1 +
 .../ParameterItemCollectionList.vue           |  4 +-
 3 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 761d5a4e7..289fbc3d9 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -98,14 +98,16 @@
               </div>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      默认值-->
@@ -134,14 +136,16 @@
               </div>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      纯下拉单选-->
@@ -162,14 +166,16 @@
               </a-select>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      纯下拉多选-->
@@ -192,14 +198,16 @@
               </a-select>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      纯附件-->
@@ -216,14 +224,16 @@
               </a-button>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      文本+下拉单选-->
@@ -335,14 +345,16 @@
               </div>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      文本+下拉多选-->
@@ -456,14 +468,16 @@
               </div>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      文本+附件-->
@@ -570,14 +584,16 @@
               </a-button>
             </div>
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      下拉单选+附件-->
@@ -607,14 +623,16 @@
             </div>
             <!--            </div>-->
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      下拉多选+附件-->
@@ -646,14 +664,16 @@
             </div>
             <!--            </div>-->
           </div>
+          <span v-if="currentPersonRole == 'dre'">
           <div @click="addconfig" class='addicon'
                v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
         </div>
       </div>
       <!--      文本+下拉单选+附件-->
@@ -774,14 +794,17 @@
               </a-button>
             </div>
           </div>
-          <div @click="addconfig" class='addicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
+          <span v-if="currentPersonRole == 'dre'">
+            <div @click="addconfig" class='addicon'
+                 v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
-               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index > 0">
+               v-if="Object.keys(detailDate.paramsConfigData).length > 1">
             <a-icon type="minus"/>
           </div>
+          </span>
+
         </div>
       </div>
 
@@ -816,6 +839,10 @@
         type: Array,
         default: [],
         require: true
+      },
+      currentPersonRole: {
+        type: String,
+        default: ''
       }
     },
     data() {
@@ -839,6 +866,7 @@
       this.paramsConfigData = this.detailDate.paramsConfigData
       let name = []
       console.log(this.detailDate)
+      console.log(this.currentPersonRole)
       // this.columName.forEach(item => {
       //   if (item.db_field_name && item.db_field_name != '') {
       //     name.push(item.db_field_name)
@@ -1091,12 +1119,13 @@
     display: inline-block;
     //margin-left: -34px;
     margin-top: 8px;
+    margin-right: 5px;
     cursor: pointer;
   }
 
   .delicon {
     display: inline-block;
-    margin-left: 5px;
+    /*margin-left: 5px;*/
     margin-top: 8px;
     cursor: pointer;
   }
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 3a162c3e3..b26dfdece 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -75,6 +75,7 @@
 
         <span slot="detailClick" slot-scope="text,record">
           <collection-type :detailDate='text' :recordList = 'record' :columName='content'
+                           :currentPersonRole="currentPersonRole"
                            @consolidateData="consolidateData"
                            @collectionForm='collectionForm'/>
         </span>
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 6bd1aaa9f..99fd6d070 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1408,10 +1408,10 @@
       },
       Updateparametercolumn() {
         let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
-        console.log(data)
         let referencesCol = []
         let postDate = []
         let colunmnFlag = ''
+        this.colunmnFlag = false
         data.forEach((item, index) => {
           if (!item.referencesCol) {
             this.colunmnFlag = true
@@ -1433,7 +1433,7 @@
               if (referencesCol[i][itemIn[j]] instanceof Object && !(referencesCol[i][itemIn[j]] instanceof Array)) {
                 postDateobj[itemIn[j]] = referencesCol[i][itemIn[j]]
                 for (let k = 0; k < referencesCol[i][itemIn[j]].list.length; k++) {
-                  if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more') {
+                  if (referencesCol[i][itemIn[j]].list[k].type == 'pull_more' && referencesCol[i][itemIn[j]].list[k].dataValue instanceof Array) {
                     referencesCol[i][itemIn[j]].list[k].dataValue = referencesCol[i][itemIn[j]].list[k].dataValue.join(',')
                   }
                   if (referencesCol[i][itemIn[j]].list[k].type == 'text' && referencesCol[i][itemIn[j]].list[k].dataValue !== null) {