From 03644065daca0f6e14155e17eb9e94a5535c4d93 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 1 Feb 2023 16:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 6d9bbbb10..3def79693 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -161,7 +161,7 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
-        <a-popconfirm overlayClassName='popconfirmmize' placement="bottomRight" >
+        <a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" >
           <template slot="title" id="popconfirmmize">
             <div style="height:320px;overflow:scroll;overflow-x: auto;">
               <a-checkbox
@@ -177,11 +177,12 @@
                 </a-checkbox>
               </a-checkbox-group>
               <div class="drawer-bootom-button">
+                <a-button @click="cancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
                 <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
               </div>
             </div>
           </template>
-          <div class="operator-text" style="position: relative">
+          <div class="operator-text" style="position: relative" @click='getcustomize'>
             <a-icon type="setting"/>
             {{ $t('customize') }}
           </div>
@@ -868,6 +869,7 @@
         isDisplay: true,
         selectedRowKeys: [],
         visible: false,
+        customizevisible: false,
         formInline: {},
         rules: {
           inventoryAffirmDueDate: [
@@ -1976,9 +1978,16 @@
                 })
               }
             })
-            this.columnsAll.forEach(item => {
-              this.checkedList.push(item.dataIndex)
+            this.columnsAll.forEach((item) => {
+              if(item.children){
+                item.children.forEach((val) => {
+                  this.checkedList.push(item.dataIndex,val.dataIndex)
+                })
+              }else {
+                this.checkedList.push(item.dataIndex)
+              }
             })
+            console.log(this.checkedList)
             this.loading = false
             this.JLoading = false
           } else {
@@ -2061,6 +2070,13 @@
         console.log(this.selectedValue,'console.log(this.selectedValue)')
         this.selectedValue = this.checkedList
       },
+      getcustomize(){
+        console.log(11111)
+        this.customizevisible = true
+      },
+      cancel(){
+        this.customizevisible = false
+      },
       handleSubmit(){
         let list = []
         let uniqueArray = this.selectedValue.filter((item, index, array) => {
@@ -2083,10 +2099,12 @@
           if (res.success) {
             this.confirmLoading = false
             this.$message.success(this.$t('OperationSuccessful'))
+            this.customizevisible = false
             this.getHeader()
           } else {
             this.$message.warning(this.$t('operationFailed'))
             this.confirmLoading = false
+            this.customizevisible = false
           }
         })
       },
@@ -2948,6 +2966,7 @@
     align-items: flex-start;
   }
   .customize-text-title{
+    margin-left: 0;
     font-size: 14px;
     font-weight: 400;
     color: #040B29;