From 43e39f810da453c959d9e8745d84df1e46f12304 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 7 Apr 2023 14:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index1.vue | 10 ++++++++--
 .../views/parameter/managementdetails/index.vue    | 14 +++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 681a4a461..6a2fecb21 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -587,7 +587,10 @@
                 this.content = []
                 let checkedList = []
                 jsonHead.forEach((res, index) => {
-                  checkedList.push(res.dataIndex)
+                  if(res.headFieldCn == '操作'){
+                    res.field = 'operation'
+                  }
+                  checkedList.push(res.field)
                   // 配置列
                   if (res.type) {
                     this.columns.push({
@@ -674,7 +677,10 @@
                     this.content = []
                     let checkedList = []
                     jsonHead.forEach((res, index) => {
-                      checkedList.push(res.dataIndex)
+                      if(res.headFieldCn == '操作'){
+                        res.field = 'operation'
+                      }
+                      checkedList.push(res.field)
                       // 配置列
                       if (res.type) {
                         this.columns.push({
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 51cfa32a9..62b36481b 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -389,15 +389,14 @@
       getcustomizeList(item){
         let params = {
           paramsManifestId: this.$route.query.id,
-          projectName:this.$route.query.projectName,
-          flag: '7'
+          flag: '8'
         }
-        getAction('params/collectManifest/getHeader', params).then((res) => {
+        getAction('report/detail/getHeader', params).then((res) => {
           if (res.success) {
             let List = []
             let sList = []
             res.result.forEach((item,index) => {
-              if(!item.isLock){
+              if(!item.type){
                 if(item.headFieldCn == '操作'){
                   item.field = 'operation'
                   item.disabled = true
@@ -406,7 +405,7 @@
                 }
                 List.push(item)
               }
-              if(item.isLock) {
+              if(item.type) {
                 sList.push(item)
               }
             })
@@ -929,4 +928,9 @@ popconfirmmize {
 ::v-deep .ant-popover-buttons {
   display: none !important;
 }
+</style>
+<style lang='less'>
+.popconfirm .ant-popover-message-title {
+  margin-bottom: 50px;
+}
 </style>
\ No newline at end of file