参数收集自定义表头合并配置列

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -864,6 +864,7 @@
         },
         loading: false,
         dataSource: [],
+        statuList:[],
         areaVisible: false, // 弹框的控制
         configureareaVisible: false, // 配置的彈框
         pageNo: 1,
@@ -1740,6 +1741,7 @@
         getAction('params/collectManifest/getHeader', params).then((res) => {
           if (res.success) {
             let List = []
+            let sList = []
             res.result.forEach((item,index) => {
               if(!item.isLock){
                 if(item.headFieldCn == '操作'){
@@ -1750,8 +1752,12 @@
                 }
                 List.push(item)
               }
+              if(item.isLock) {
+                sList.push(item)
+              }
             })
             this.customizeList = List
+            this.statuList = sList
           }
         })
         if(item){
@@ -1778,12 +1784,13 @@
             if (item == val.field) {
               // val.sort = index + 1
               val.dbFieldName = val.db_field_name
+              val.dbFieldTxt = val.db_field_txt
               list.push(val)
             }
           })
         })
         this.confirmLoading = true
-        let headCustomEOList = JSON.parse(JSON.stringify(list))
+        let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList)
         let query = {
           headCustomEOList: headCustomEOList
         }