From 8f1eeddc7908f4e0ae77f0261791acf5e31bf6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 23 Mar 2023 15:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=82=AC=E5=8A=9E=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue          | 21 +++++++++++++------
 .../components/codeNumber.vue                 | 11 ++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index f8ba6e3d6..da81f8583 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1527,10 +1527,19 @@
           if (formInlineQuestion.expeditingType && formInlineQuestion.expeditingType.length > 0) {
             formInlineQuestion.expeditingType = formInlineQuestion.expeditingType.join(',')
           }
+          let operateType = ''
+          if (this.roleSwitchingCode == '0') {
+            operateType = 'lawsInventoryStudioExpediting'
+          } else if (this.roleSwitchingCode == '1') {
+            operateType = 'lawsInventoryRegulationOwnerExpediting'
+          } else if (this.roleSwitchingCode == '30') {
+            operateType = 'lawsInventoryEngineeringInterfacePersonExpediting'
+          }
           let query = {
             ids: this.questionIdList.join(','),
             projectLibraryId: this.$route.query.id,
-            expeditingType: formInlineQuestion.expeditingType
+            expeditingType: formInlineQuestion.expeditingType,
+            operateType: operateType
           }
           this.confirmLoadingQuestion = true
           postAction('project/projectLawsInventoryEO/expediting', query).then((res) => {
@@ -1616,11 +1625,11 @@
                 this.dataSource[i].verifyFlowStatus == 'NA'
               ) &&
               (this.dataSource[i].designFlowStatus == 'Results to be submitted' ||
-              this.dataSource[i].designFlowStatus == 'Results to be reviewed' ||
-              this.dataSource[i].designFlowStatus == 'Compliance' ||
-              this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
-              this.dataSource[i].designFlowStatus == 'To be tracked' ||
-              this.dataSource[i].designFlowStatus == 'NA'
+                this.dataSource[i].designFlowStatus == 'Results to be reviewed' ||
+                this.dataSource[i].designFlowStatus == 'Compliance' ||
+                this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
+                this.dataSource[i].designFlowStatus == 'To be tracked' ||
+                this.dataSource[i].designFlowStatus == 'NA'
               )) {
               isTrue = true
             } else {
diff --git a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
index 814f1c77c..4a1c20c10 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/codeNumber.vue
@@ -47,6 +47,17 @@
                                      :triggerChange="false" :dictCode="'state'"/>
                 </div>
               </a-col>
+              <a-col :md="12" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('zoneOfApplication')">
+                    <span>{{$t('zoneOfApplication')}}</span>
+                  </div>
+                  <j-multi-select-tag class="box-input" v-model="queryParam.region"
+                                      :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')" :type="'select'"
+                                      :triggerChange="false" :dictCode="'region'"/>
+                </div>
+              </a-col>
+
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">