From 4417b03641b35ac37d9cfe5eb88bbe64e3ecb66d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 6 Apr 2023 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E5=90=88=E5=B9=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 13030bab1..8cbe6a3bc 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/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
         }