From ea9b02e4927568ff02af29204d632e51902f79ea Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 16 May 2022 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E6=8E=A7=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 20 +++++++++++++++++++
 .../ParameterItemCollectionList.vue           | 14 ++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index a3662b2e3..0a9f5c0a6 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -52,6 +52,10 @@ export default {
       type: Object,
       default: {},
       require: true
+    },
+    formInline: {
+      type: Object,
+      default: true
     }
   },
   components: {
@@ -118,9 +122,25 @@ export default {
     tableOnChange(pagination, filters, sorter) {
       console.log(pagination,filters,sorter,'iiiiiiiiiiiiiiiii')
     },
+    getTableListReset() {
+      let params = {
+        paramsManifestId: this.paramsManifest.id,
+      }
+      this.loading = true
+      getAction(this.url.tableList, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.loading = false
+        }
+      })
+    },
     getTableList() {
       let params = {
         paramsManifestId: this.paramsManifest.id,
+        ...this.formInline
       }
       this.loading = true
       getAction(this.url.tableList, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 2cbcc1357..c60dac214 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -9,7 +9,7 @@
               <span>{{$t('NiONumber')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
-                     v-model="formInline.input"></a-input>
+                     v-model="formInline.nioNumber"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -18,7 +18,7 @@
               <span>{{$t('ParameterName')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterName')"
-                     v-model="formInline.input"></a-input>
+                     v-model="formInline.paramsName"></a-input>
           </div>
         </a-col>
         <a-col :md="6" :sm="8">
@@ -26,7 +26,7 @@
             <div class="title-text" :title="$t('certificationCategory')">
               <span>{{$t('certificationCategory')}}</span>
             </div>
-            <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
+            <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
                                :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
                                :type="'select'"
                                :triggerChange="false" :dictCode="'cert_category'"/>
@@ -49,7 +49,7 @@
               <span>{{$t('completedBy')}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('completedBy')"
-                     v-model="formInline.title"></a-input>
+                     v-model="formInline.dre"></a-input>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -121,7 +121,7 @@
     </div>
     <div style="width: 100%">
 <!-- 表格-10控件-->
-      <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue' @value='value'/>
+      <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue' :formInline='formInline' @value='value'/>
     </div>
 <!--  添加--->
     <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
@@ -277,10 +277,10 @@ export default {
     },
     searchQuery() {
       this.pageNo = 1
-      // this.getlist()
+      this.$refs.CollectionTabel.getTableList()
     },
     searchReset() {
-      this.queryParam = {}
+      this.$refs.CollectionTabel.getTableListReset()
     },
     handleDel(){
       let param={