Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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 {

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">