From 52caeb30d05d009a54ca2428d9725d7f5f8c191b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 1 Jul 2022 19:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 18 +++++++--------
 .../src/components/tableCollection/index.vue  | 22 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index c6cd18823..c1a98b68e 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -95,7 +95,7 @@
         </div>
       </div>
       <!--      纯下拉单选-->
-      <div v-if='detailDate.controlType === "2"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "2"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type === "pull"'>
             <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
@@ -110,7 +110,7 @@
         </div>
       </div>
       <!--      纯下拉多选-->
-      <div v-if='detailDate.controlType === "3"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "3"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
           <div v-if='item.type==="pull_more"'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'
@@ -125,7 +125,7 @@
         </div>
       </div>
       <!--      纯附件-->
-      <div v-if='detailDate.controlType === "4"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "4"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
           <div v-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
@@ -137,7 +137,7 @@
         </div>
       </div>
       <!--      文本+下拉单选-->
-      <div v-if='detailDate.controlType === "5"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "5"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="pull"'>
             <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
@@ -240,7 +240,7 @@
         </div>
       </div>
       <!--      文本+下拉多选-->
-      <div v-if='detailDate.controlType === "6"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "6"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
@@ -343,7 +343,7 @@
         </div>
       </div>
       <!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "7"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
@@ -443,7 +443,7 @@
         </div>
       </div>
       <!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "8"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="pull"'>
             <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
@@ -465,7 +465,7 @@
         </div>
       </div>
       <!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "9"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="pull_more"'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'
@@ -487,7 +487,7 @@
         </div>
       </div>
       <!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"' class='add_flex'>
+      <div v-else-if='detailDate.controlType === "10"' class='add_flex'>
         <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
           <div v-if='item.type==="pull"'>
             <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 189c10de0..fe68141ec 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -219,7 +219,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 100,
-        pageSizeOptions: ['100', '300', '500', '1000'],
+        pageSizeOptions: ['100', '200'],
         total: 0,
         searchParmes: {},
         loading: false,
@@ -255,6 +255,15 @@
       }
     },
     mounted() {
+      this.getHeader()
+    },
+    watch: {
+      currentPersonRole: {
+        handler: function() {
+          this.getTableList();
+        },
+        immediate: true
+      }
     },
     methods: {
       rowClassName(row, index) {
@@ -393,7 +402,7 @@
           }
         })
       },
-      getData() {
+      getHeader() {
         let paramsManifestid
         let url
         if (this.$route.query.it === undefined) {
@@ -610,15 +619,6 @@
         // this.$emit('detailClick', item)
       }
     },
-    watch: {
-      currentPersonRole: {
-        handler: function() {
-          this.getTableList()
-          this.getData()
-        },
-        immediate: true
-      }
-    }
   }
 </script>
 <style lang='less'>