From 25370a08573dcdc90d9db4c0ef379a3af13e5dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 13 Feb 2023 10:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/mixins/header.js                 |  2 +-
 .../components/listOfRegulations.vue          | 58 ++++++++++---------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js
index 4f5bec969..af767cd05 100644
--- a/jero-web/src/mixins/header.js
+++ b/jero-web/src/mixins/header.js
@@ -145,7 +145,7 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
         )
       }
     }
-    console.log(restProps)
+    console.log(restProps,11)
     let className = ''
     if ((restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan == 1) || (restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan > 0)){
       className = ' second'
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 8644f5a55..8babe45ca 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -97,6 +97,34 @@
     <div class="table-operator"
          v-if="(isRoleSwitching && !isDisplay) ||  (!isDisplay && roleSwitchingList.length > 1) || isDisplay"
          style="overflow:hidden;margin-bottom: 20px">
+      <div style="float: right;margin-top: 1px; margin-left: 20px">
+        <a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" >
+          <template slot="title" id="popconfirmmize">
+            <div style="height:320px;overflow:scroll;overflow-x: auto;">
+              <a-checkbox
+                style='margin-bottom: 22px;'
+                v-if="customizeList && customizeList.length"
+                v-model="checkAll"
+                :indeterminate="indeterminate"
+                @change="onCheckAllChange"
+              >{{$t('selectAll')}}
+              </a-checkbox>
+              <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
+                <a-checkbox class="customize-text-title" :disabled='item.disabled' v-for="(item, key) in customizeList" :key="key" :value="item.field">{{ item.name }}
+                </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" @click='getcustomize'>
+            <a-icon type="setting"/>
+            {{ $t('customize') }}
+          </div>
+        </a-popconfirm>
+      </div>
       <div style="float: left;margin-bottom: 0px;margin-left: 20px" v-if="isDisplay">
         <div class="operator-text" @click="initiateListConfirmationcClick('清单')">
           <a-icon type="solution"/>
@@ -107,7 +135,7 @@
           {{ $t('initiateTaskConfirmation') }}
         </div>
       </div>
-      <div style="float: right;margin-top: 1px;" v-if="isDisplay">
+      <div style="float: right;margin-top: 1px;;margin-right: 20px" v-if="isDisplay">
         <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
           <template slot="title" id="popconfirm">
             <div style="height:320px;overflow:scroll;overflow-x: auto;">
@@ -161,32 +189,6 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
-        <a-popconfirm :visible="customizevisible" overlayClassName='popconfirmmize' placement="bottomRight" >
-          <template slot="title" id="popconfirmmize">
-            <div style="height:320px;overflow:scroll;overflow-x: auto;">
-              <a-checkbox
-                style='margin-bottom: 22px;'
-                v-if="customizeList && customizeList.length"
-                v-model="checkAll"
-                :indeterminate="indeterminate"
-                @change="onCheckAllChange"
-              >{{$t('selectAll')}}
-              </a-checkbox>
-              <a-checkbox-group @change="onChange" v-model="checkedList" class="customize-text">
-                <a-checkbox class="customize-text-title" :disabled='item.disabled' v-for="(item, key) in customizeList" :key="key" :value="item.field">{{ item.name }}
-                </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" @click='getcustomize'>
-            <a-icon type="setting"/>
-            {{ $t('customize') }}
-          </div>
-        </a-popconfirm>
 <!--        <div class="operator-text" @click="customizeClick">-->
 <!--          <a-icon type="setting"/>-->
 <!--          {{ $t('customize') }}-->
@@ -210,7 +212,7 @@
           {{ $t('roleSwitching') }}
         </div>
       </div>
-      <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
+      <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px;margin-right: 20px">
         <div @click="handleExport" v-has="'projectLawsInventory:exportData'"
              v-if="isRoleSwitching || formInlineRoleSwitching.roleSwitchingCode == '12'"
              class="operator-text">