From 69bdc91008a224685ae9bc56b9971ba9982e72f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 17 Mar 2023 10:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=BA=93?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue    |  10 +-
 .../components/listOfRegulations.vue          | 153 +++++++++---------
 2 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 7ad6c4dee..39ce27b8a 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -1297,13 +1297,13 @@
         this.visibleRoleSwitching = true
         this.$nextTick(() => {
           this.$refs.ruleFormRoleSwitching.clearValidate()
-          if (!this.formInlineRoleSwitching.roleSwitchingCode) {
-            this.formInlineRoleSwitching.roleSwitchingCode = '0'
+          if (!this.roleSwitchingCode) {
+            this.roleSwitchingCode = '0'
           }
-          if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
-            this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+          if (!(this.roleSwitchingList.some(val => val.roleCode == this.roleSwitchingCode))) {
+            this.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
           }
-          this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
+          this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingCode
           this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
         })
       },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index a71f49006..500838bc6 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -35,48 +35,48 @@
                                   :triggerChange="false" :dictCode="'duty_territory'" />
             </div>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('listConfirmationStatus')">
-                  <span>{{ $t('listConfirmationStatus') }}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('listConfirmationStatus')"
-                          class="box-input"
-                          allowClear
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="queryParam.inventoryAffirmStatus">
-                  <a-select-option v-for="(item, key) in listOptions"
-                                   :key="item.key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.label ">
-                           {{ item.label }}
-                     </span>
-                  </a-select-option>
-                </a-select>
-              </div>
-            </a-col>
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('taskAffirmStatus')">
-                  <span>{{ $t('taskAffirmStatus') }}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('taskAffirmStatus')"
-                          class="box-input"
-                          allowClear
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="queryParam.taskAffirmStatus">
-                  <a-select-option v-for="(item, key) in taskOptions"
-                                   :key="item.key"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.label ">
-                           {{ item.label }}
-                     </span>
-                  </a-select-option>
-                </a-select>
-              </div>
-            </a-col>
-          </template>
+<!--          <template v-if="toggleSearchStatus">-->
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text" :title="$t('listConfirmationStatus')">-->
+<!--                  <span>{{ $t('listConfirmationStatus') }}</span>-->
+<!--                </div>-->
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('listConfirmationStatus')"-->
+<!--                          class="box-input"-->
+<!--                          allowClear-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          v-model="queryParam.inventoryAffirmStatus">-->
+<!--                  <a-select-option v-for="(item, key) in listOptions"-->
+<!--                                   :key="item.key"-->
+<!--                                   :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+<!--                           {{ item.label }}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+<!--              </div>-->
+<!--            </a-col>-->
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text" :title="$t('taskAffirmStatus')">-->
+<!--                  <span>{{ $t('taskAffirmStatus') }}</span>-->
+<!--                </div>-->
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('taskAffirmStatus')"-->
+<!--                          class="box-input"-->
+<!--                          allowClear-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          v-model="queryParam.taskAffirmStatus">-->
+<!--                  <a-select-option v-for="(item, key) in taskOptions"-->
+<!--                                   :key="item.key"-->
+<!--                                   :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.label ">-->
+<!--                           {{ item.label }}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+<!--              </div>-->
+<!--            </a-col>-->
+<!--          </template>-->
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                    <globalAdvancedQuery ref="globalAdvancedQueryRef"
@@ -85,10 +85,10 @@
                   <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
                   <a-button class="box-button" style="margin-left: 8px"
                             @click="searchReset">{{ $t('reset') }}</a-button>
-                 <a @click="handleToggleSearch" style="margin-left: 8px">
-                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
-                 </a>
+<!--                 <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                            {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+<!--                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />-->
+<!--                 </a>-->
                </a-col>
             </span>
         </a-row>
@@ -99,22 +99,22 @@
          style="overflow:hidden;margin-bottom: 20px">
       <div style="float: left;margin-bottom: 0px;margin-left: 20px">
 <!--        调取-->
-        <div @click="transferClick" class="operator-text" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
+        <div @click="transferClick" class="operator-text" v-if="this.roleSwitchingCode == '0'">
           <a-icon type="profile" />
           {{ $t('Transfer') }}
         </div>
 <!--        带入相关人员-->
-        <div class="operator-text" @click="bringInRelevantPersonnelClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
+        <div class="operator-text" @click="bringInRelevantPersonnelClick" v-if="this.roleSwitchingCode == '0'">
           <a-icon type="user" />
           {{ $t('bringInRelevantPersonnel') }}
         </div>
 <!--        批量设置-->
-        <div class="operator-text" @click="batSettingClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
+        <div class="operator-text" @click="batSettingClick" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
           <a-icon type="setting" />
           {{ $t('BatchSetting') }}
         </div>
 <!--        列表设置-->
-        <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize" placement="bottomRight" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
+        <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize" placement="bottomRight" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1'">
           <template slot="title" id="popconfirmmize">
             <div style="height:320px;overflow:scroll;overflow-x: auto;">
               <a-checkbox
@@ -141,9 +141,9 @@
             <a-icon type="setting" />
             {{ $t('customize') }}
           </div>
-        </a-popconfirm v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1'">
+        </a-popconfirm>
 <!--        更多-->
-        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
+        <a-popconfirm overlayClassName="popconfirm" placement="bottomRight" v-if="this.roleSwitchingCode == '0'">
           <template slot="title" id="popconfirm">
             <div style="height:320px;overflow:scroll;overflow-x: auto;">
 <!--              添加-->
@@ -217,33 +217,33 @@
         <!--          {{ $t('customize') }}-->
         <!--        </div>-->
         <div @click="handleExport" v-has="'projectLawsInventory:exportData'"
-             v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1' || this.formInlineRoleSwitching.roleSwitchingCode == '2' || this.formInlineRoleSwitching.roleSwitchingCode == '30' || this.formInlineRoleSwitching.roleSwitchingCode == '31'"
+             v-if="this.roleSwitchingCode == '1' || this.roleSwitchingCode == '2' || this.roleSwitchingCode == '30' || this.roleSwitchingCode == '31'"
              class="operator-text">
           <a-icon type="export" :rotate="-90" />
           {{ $t('export') }}
         </div>
 <!--        发布-->
-        <div class="operator-text" @click="initiateListConfirmationcClick('清单')" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
+        <div class="operator-text" @click="initiateListConfirmationcClick('清单')" v-if="this.roleSwitchingCode == '0'">
           <a-icon type="solution" />
           {{ $t('release') }}
         </div>
 <!--        撤回-->
-        <div class="operator-text" @click="withdrawnClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0'">
+        <div class="operator-text" @click="withdrawnClick" v-if="this.roleSwitchingCode == '0'">
           <a-icon type="rollback" />
           {{ $t('withdraw') }}
         </div>
         <!--        发起任务-->
-        <div class="operator-text" @click="submitClick(0)" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1'">
+        <div class="operator-text" @click="submitClick(0)" v-if="this.roleSwitchingCode == '1'">
           <a-icon type="check-circle" />
           {{ $t('initiateTask') }}
         </div>
         <!--        退回-->
-        <div class="operator-text" @click="submitClick(1)" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '1'">
+        <div class="operator-text" @click="submitClick(1)" v-if="this.roleSwitchingCode == '1'">
           <a-icon type="close-circle" />
           {{ $t('sendBack') }}
         </div>
 <!--        催办-->
-        <div class="operator-text" @click="questionClick" v-if="this.formInlineRoleSwitching.roleSwitchingCode == '0' || this.formInlineRoleSwitching.roleSwitchingCode == '1' || this.formInlineRoleSwitching.roleSwitchingCode == '30'">
+        <div class="operator-text" @click="questionClick" v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '30'">
           <a-icon type="sound" />
           {{ $t('question') }}
         </div>
@@ -1410,6 +1410,7 @@ export default {
           }
         ]
       },
+      roleSwitchingCode:'',
       detailedSuccessList: [],
       detailedWarningList: [],
       rowKeysSuccessList: [],
@@ -1490,10 +1491,9 @@ export default {
       } else {
         roleCodeIndex = 4
       }
-      console.log(this.formInlineRoleSwitching.roleSwitchingCode)
-      if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+      if (this.roleSwitchingCode == '11' ||
+        this.roleSwitchingCode == '12' ||
+        this.roleSwitchingCode == '13') {
         roleCodeIndex = 0
       }
       row.roleCodeIndex = roleCodeIndex
@@ -1543,6 +1543,7 @@ export default {
               this.isRoleSwitching = false
             }
           }
+          this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
           this.$emit('getRoleSwitch',this.formInlineRoleSwitching.roleSwitchingCode)
           this.getList()
           // this.JLoading = false
@@ -1569,9 +1570,9 @@ export default {
       } else {
         roleCodeIndex = 4
       }
-      if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+      if (this.roleSwitchingCode == '11' ||
+        this.roleSwitchingCode == '12' ||
+        this.roleSwitchingCode == '13') {
         roleCodeIndex = 0
       }
       let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
@@ -1613,7 +1614,7 @@ export default {
       this.$refs.transferListRef.transferModel()
     },
     batSettingClick() {
-      let code = this.formInlineRoleSwitching.roleSwitchingCode
+      let code = this.roleSwitchingCode
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)),code)
       } else {
@@ -1844,6 +1845,7 @@ export default {
                   this.isRoleSwitching = false
                 }
               }
+              this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode
               this.$message.success(this.$t('OperationSuccessful'))
               this.visibleRoleSwitching = false
               this.confirmLoadingRoleSwitching = false
@@ -1864,12 +1866,13 @@ export default {
       this.visibleRoleSwitching = true
       this.$nextTick(() => {
         this.$refs.ruleFormRoleSwitching.clearValidate()
-        if (!this.formInlineRoleSwitching.roleSwitchingCode) {
-          this.formInlineRoleSwitching.roleSwitchingCode = '0'
+        if (!this.roleSwitchingCode) {
+          this.roleSwitchingCode = '0'
         }
-        if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
-          this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
+        if (!(this.roleSwitchingList.some(val => val.roleCode == this.roleSwitchingCode))) {
+          this.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : ''
         }
+        this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingCode
         this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching }
       })
     },
@@ -1922,9 +1925,9 @@ export default {
       } else {
         roleCodeIndex = 4
       }
-      if (this.formInlineRoleSwitching.roleSwitchingCode == '11' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '12' ||
-        this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+      if (this.roleSwitchingCode == '11' ||
+        this.roleSwitchingCode == '12' ||
+        this.roleSwitchingCode == '13') {
         roleCodeIndex = 0
       }
       item.roleCodeIndex = roleCodeIndex
@@ -2076,9 +2079,9 @@ export default {
       } else {
         roleCode = 4
       }
-      if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
+      if (this.roleSwitchingCode == '11' || this.roleSwitchingCode == '12') {
         roleCode = 0
-      } else if (this.formInlineRoleSwitching.roleSwitchingCode == '13') {
+      } else if (this.roleSwitchingCode == '13') {
         roleCode = 13
       }
       let queryParam = JSON.parse(JSON.stringify(this.queryParam))