From da3f684f9ee5a3bc6dd0e7e0e3ee86103ce0852f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 10:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  |   7 +-
 .../ParameterItemCollectionList.vue           | 129 ++++++++++++------
 2 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 1399e3518..fb66f9bdc 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -161,6 +161,10 @@
         type: Object,
         default: true
       },
+      queryParamQuery: {
+        type: Object,
+        default: true
+      },
       currentPersonRole: {
         type: String,
         default: true
@@ -591,7 +595,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
-          ...this.formInline
+          ...this.formInline,
+          ...currentPersonRole
         }
         this.loading = true
         getAction(url, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index a81744a55..99c19a08b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -33,17 +33,17 @@
                                v-model="formInline.paramsName"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
-                      </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
-                    </div>
-                  </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('certificationCategory')">-->
+<!--                        <span>{{$t('certificationCategory')}}</span>-->
+<!--                      </div>-->
+<!--                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
+<!--                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
+<!--                                         :type="'select'"-->
+<!--                                         :triggerChange="false" :dictCode="'cert_category'"/>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
                       <div class="title-text" :title="$t('areaOfResponsibility')">
@@ -64,29 +64,32 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('status')">
-                        <span>{{$t('status')}}</span>
-                      </div>
-                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
-                                class="box-input"
-                                allowClear
-                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                v-model="formInline.state">
-                        <a-select-option v-for="(item, key) in statusList"
-                                         :key="key"
-                                         :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name}}
-                     </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('status')">-->
+<!--                        <span>{{$t('status')}}</span>-->
+<!--                      </div>-->
+<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
+<!--                                class="box-input"-->
+<!--                                allowClear-->
+<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                                v-model="formInline.state">-->
+<!--                        <a-select-option v-for="(item, key) in statusList"-->
+<!--                                         :key="key"-->
+<!--                                         :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                        </a-select-option>-->
+<!--                      </a-select>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                   <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-col>
@@ -187,7 +190,7 @@
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'
@@ -391,6 +394,7 @@
   import TableCollection from '@/components/tableCollection/index'
   import { getAction, postAction } from '../../../api/manage'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
@@ -408,45 +412,55 @@
       AssignedBy,
       TaskCutOffTime,
       ReferenceParameter,
-      SynchronousSubmissionLibrary
+      SynchronousSubmissionLibrary,
+      globalAdvancedQuery
     },
     data() {
       this.statusList = [
         {
           value: '1',
-          name: this.$t('CollectionInitiated')
+          title: this.$t('CollectionInitiated'),
+          key:'1',
         },
         {
           value: '2',
-          name: this.$t('handledInterface')
+          title: this.$t('handledInterface'),
+          key:'2',
         },
         {
           value: '3',
-          name: this.$t('ReturnedPerson')
+          title: this.$t('ReturnedPerson'),
+          key:'3',
         },
         {
           value: '4',
-          name: this.$t('completed')
+          title: this.$t('completed'),
+          key:'4',
         },
         {
           value: '5',
-          name: this.$t('Filledreturn')
+          title: this.$t('Filledreturn'),
+          key:'5',
         },
         {
           value: '6',
-          name: this.$t('Submitted')
+          title: this.$t('Submitted'),
+          key:'6',
         },
         {
           value: '7',
-          name: this.$t('ReturnedEngineer')
+          title: this.$t('ReturnedEngineer'),
+          key:'7',
         },
         {
           value: '8',
-          name: this.$t('SynchronizedLibrary')
+          title: this.$t('SynchronizedLibrary'),
+          key:'8',
         },
         {
           value: '9',
-          name: this.$t('alteration')
+          title: this.$t('alteration'),
+          key:'9',
         }
       ]
       return {
@@ -502,9 +516,24 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        fieldList: [
+          {
+            type: '',
+            value: 'attestationType',
+            text: this.$t('certificationCategory'),
+            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'attestationRank',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+        ],
         selectedRowKeys: [],
         textLoading: false,
         formInline: {},
+        queryParamQuery:{},
         url: {
           tableHeader: 'params/collectManifest/getHeader',
           tableList: 'params/collectManifest/list',
@@ -740,6 +769,20 @@
           return flag
         }
       },
+      // 高级搜索
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
       // 认证工程师 批量删除 权限
       // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
       homoJurisdictionBatchdelete() {
@@ -1392,6 +1435,8 @@
       },
       searchReset() {
         this.$refs.CollectionTabel.getTableListReset()
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       // 批量删除 -- 与下发收集一致
       handleDelJurisdiction() {