From 3d75e77f6c90d55c63edabb204cffae08a5a1ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 10 Aug 2023 18:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/search/index.vue      |  4 ++-
 .../components/virtualListDetails.vue         | 36 ++++++++++++++++++-
 .../components/certificationList/index.vue    |  2 +-
 .../components/listOfRelevantPersonnel.vue    | 13 +++++++
 .../certificationListMaintenance.vue          | 34 ++++++++++++++++++
 5 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 9b0e2148b..41811ade2 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -263,13 +263,15 @@
         getAction(this.url.seachList, params).then((res) => {
           if (res.success) {
             this.searchList = res.result
+            console.log(this.searchQueryList)
             if (this.searchQueryList && this.searchQueryList.length > 0) {
+              console.log(this.searchList)
               for (let i = 0; i < this.searchList.length; i++) {
                 if (this.searchList[i].db_field_name == 'issue_time') {
                   this.searchList.splice(i, 1)
                   i--
                 }
-                if (this.searchList[i].db_field_name == 'title') {
+                if (this.searchList[i].db_field_name == 'title' || this.searchList[i].db_field_name == 'title_en') {
                   let data = this.searchList[i + 1]
                   this.searchList[i + 1] = this.searchQueryList[0]
                   this.searchList.push(data)
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index cf8046bb1..2061146c6 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -104,6 +104,29 @@
                                       @change="onChangedatet"></a-range-picker>
                     </div>
                   </a-col>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('statisticalNodes')">
+                        <span>{{ $t('statisticalNodes') }}</span>
+                      </div>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                                allowClear
+                                class="box-input"
+                                show-search
+                                optionFilterProp="label"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="queryParam.firstLevelDutyTerritory">
+                        <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                         :key="key"
+                                         :label="item.key"
+                                         :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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">
@@ -1043,7 +1066,8 @@
             text: this.$t('areaOfResponsibility'),
             dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           }
-        ]
+        ],
+        firstLevelDutyTerritoryList:[],
       }
     },
     created() {
@@ -1058,6 +1082,7 @@
       this.isTrue = this.$route.query.title == '市场清单详情' ? false : true
       this.getHeader()
       this.getList()
+      this.getFirstLevelDutyTerritory()
     },
     computed: {
       columns() {
@@ -1079,6 +1104,15 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       sVisible() {
         this.getDataAdmin()
       },
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 2e5448823..62c423b60 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -461,7 +461,7 @@
     <batSetting :url="url" ref="batSettingRef" :roleSwitchingCode="roleSwitchingCode" @batSettingForm="batSettingForm"/>
     <addModel ref="addModelRef" @addModelForm="addModelForm"/>
     <modifyHistory ref="modifyHistoryRef"/>
-    <uploadFile ref="uploadFile" :isMultiple="true" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :isMultiple="false" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
     <TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
     <referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
     <SelectedBy ref="SelectedByRef" :isSingleChoice="true"
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index e04a92304..8e15fb797 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -113,6 +113,7 @@
         :columns="columns"
         rowKey="id"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        @change="tableOnChange"
         :pagination="false"
         :scroll="{x:800,y: 500}"
         :data-source="dataSource"
@@ -355,6 +356,7 @@
             align: 'left',
             dataIndex: 'dutyTerritory_dictText',
             ellipsis: true,
+            sorter:true,
             width: 100
           },
           {
@@ -602,6 +604,17 @@
         this.$refs.SelectedByRef.submitLoading = false
         this.getUserAllDutyTerritoryList()
       },
+      tableOnChange(pagination, filters, sorter) {
+        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+        if (sorter.columnKey == 'flowTypeShow') {
+          this.orderByField = 'flowType'
+        } else if (sorter.columnKey == 'taskDefinitionKeyName') {
+          this.orderByField = 'taskDefinitionKey'
+        } else {
+          this.orderByField = sorter.columnKey
+        }
+        this.getList()
+      },
       getUserAllDutyTerritoryList() {
         let query = {
           projectLibraryId: this.$route.query.id,
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index e647ce260..803374ea9 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -79,6 +79,29 @@
                                          :triggerChange="false" :dictCode="'duty_territory'"/>
                     </div>
                   </a-col>
+                  <a-col :md="6" :sm="8">
+                    <div class="box-title-text">
+                      <div class="title-text" :title="$t('statisticalNodes')">
+                        <span>{{ $t('statisticalNodes') }}</span>
+                      </div>
+                      <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
+                                allowClear
+                                class="box-input"
+                                show-search
+                                optionFilterProp="label"
+                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                v-model="queryParam.firstLevelDutyTerritory">
+                        <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
+                                         :key="key"
+                                         :label="item.key"
+                                         :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </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">
@@ -320,6 +343,7 @@
         },
         queryParam: {},
         orderByField: '',
+        firstLevelDutyTerritoryList:[],
         columns: [
           {
             title: this.$t('category'),
@@ -429,10 +453,20 @@
       this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
       this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
       this.getList()
+      this.getFirstLevelDutyTerritory()
     },
     computed: {},
     methods: {
       ...mapGetters(['userInfo']),
+      getFirstLevelDutyTerritory() {
+        getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+          if (res.success) {
+            this.firstLevelDutyTerritoryList = res.result
+          } else {
+            this.firstLevelDutyTerritoryList = []
+          }
+        })
+      },
       onSelectChange(value) {
         this.selectedRowKeys = value
       },