From 5933b4e5ae86d39a8f91512deb3237525c1eb388 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 6 Jun 2022 09:57:14 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue     |  3 ++-
 .../src/components/tableCollection/index.vue    |  3 ++-
 .../components/ParameterItemCollectionList.vue  | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 605be9a05..70ba10bd6 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -280,6 +280,7 @@ export default {
 }
 .add_flex_item{
   flex: 1;
+  margin-right: 10px;
 }
 .selectWid{
   min-width: 150px;
@@ -288,6 +289,6 @@ export default {
   min-width: 150px;
 }
 .add-width{
-  width: 33%;
+  width: 30%;
 }
 </style>
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 6dd2c077e..d38a89d34 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -395,11 +395,12 @@ export default {
       console.log(pagination,filters,sorter,'iiiiiiiiiiiiiiiii')
     },
     getTableListReset() {
-      console.log('清空')
       let params = {
         paramsManifestId: this.paramsManifest.id,
+        userTypes: this.LoginUserType,
       }
       this.loading = true
+      this.$emit('listReset', '')
       getAction(this.url.tableList, params).then((res) => {
         if (res.success) {
           this.dataSource = res.result
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 1410988da..3a59d1ea8 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -67,22 +67,22 @@
         <template slot="title" id="popconfirm">
           <!--     下发收集 -->
           <div @click="distributionAndCollectionJurisdiction" class="operator-text-title">
-            <a-icon type="plus"/>
+            <a-icon type="solution"/>
             {{$t('distributionAndCollection')}}
           </div>
           <!--      冻结配置-->
           <div @click="freezeConfiguration" class="operator-text-title">
-            <a-icon type="plus"/>
+            <a-icon type="solution"/>
             {{$t('FreezeConfiguration')}}
           </div>
           <!--   同步上报库   -->
           <div @click="handleSynchronousReportLibraryJurisdiction" class="operator-text-title">
-            <a-icon type="plus"/>
+            <a-icon type="setting"/>
             {{$t('SynchronousReportLibrary')}}
           </div>
           <!--      强制撤回-->
           <div @click="compulsoryWithdrawaljurisdiction" class="operator-text-title">
-            <a-icon type="bulb"/>
+            <a-icon type="delete"/>
             {{$t('CompulsoryWithdrawal')}}
           </div>
           <!--      分配填写人-->
@@ -112,12 +112,12 @@
       </div>
       <!--      提交-->
       <div @click="handleSubmit" class="operator-text">
-        <a-icon type="plus"/>
+        <a-icon type="check-circle"/>
         {{$t('submit')}}
       </div>
       <!--      退回-->
       <div @click="returnDataJurisdiction" class="operator-text">
-        <a-icon type="plus"/>
+        <a-icon type="delete"/>
         {{$t('sendBack')}}
       </div>
       <!--      批量删除-->
@@ -129,7 +129,7 @@
     <div style="width: 100%">
       <!-- 表格-10控件-->
       <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                        :formInline='formInline' @LoginUserType='LoginUserType' @value='value'/>
+                        :formInline='formInline' @LoginUserType='LoginUserType' @value='value' @listReset='listReset'/>
     </div>
     <!--  添加--->
     <a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
@@ -958,6 +958,9 @@ export default {
         }
       }
     },
+    listReset() {
+      this.formInline = {}
+    },
     handleModule() {
 
       },