Merge remote-tracking branch 'origin/master'

dangan-ui/src/views/dangan/retrieval/index.vue

@@ -18,7 +18,7 @@
     </div>
 
     <!-- 常住人口登记表1 -->
-    <div class="content" v-if="option1.open">
+    <div class="content" v-if="option1.open&&option1.list&&option1.list.length>0">
       <el-divider content-position="left">常住人口登记表1</el-divider>
       <el-table v-loading="option1.loading" :data="option1.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -60,7 +60,7 @@
     </div>
 
     <!-- 常住人口登记表2 -->
-    <div class="content" v-if="option3.open">
+    <div class="content" v-if="option3.open&&option3.list&&option3.list.length>0">
       <el-divider content-position="left">常住人口登记表2</el-divider>
       <el-table v-loading="option3.loading" :data="option3.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -111,7 +111,7 @@
     </div>
 
     <!-- 常住人口登记表3 -->
-    <div class="content" v-if="option9.open">
+    <div class="content" v-if="option9.open&&option9.list&&option9.list.length>0">
       <el-divider content-position="left">常住人口登记表3</el-divider>
       <el-table v-loading="option9.loading" :data="option9.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -165,7 +165,7 @@
     </div>
 
     <!-- 常住卡 -->
-    <div class="content" v-if="option2.open">
+    <div class="content" v-if="option2.open&&option2.list&&option2.list.length>0">
       <el-divider content-position="left">常住卡</el-divider>
       <el-table v-loading="option2.loading" :data="option2.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -203,7 +203,7 @@
     </div>
 
     <!-- 出生医学证明 -->
-    <div class="content" v-if="option4.open">
+    <div class="content" v-if="option4.open&&option4.list&&option4.list.length>0">
       <el-divider content-position="left">出生医学证明</el-divider>
       <el-table v-loading="option4.loading" :data="option4.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -244,7 +244,7 @@
     </div>
 
     <!-- 一胎证明 -->
-    <div class="content" v-if="option6.open">
+    <div class="content" v-if="option6.open&&option6.list&&option6.list.length>0">
       <el-divider content-position="left">一胎证明</el-divider>
       <el-table v-loading="option6.loading" :data="option6.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -282,7 +282,7 @@
     </div>
 
     <!-- 迁移证 -->
-    <div class="content" v-if="option5.open">
+    <div class="content" v-if="option5.open&&option5.list&&option5.list.length>0">
       <el-divider content-position="left">迁移证</el-divider>
       <el-table v-loading="option5.loading" border :data="option5.list">
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -324,7 +324,7 @@
     </div>
 
     <!-- 准迁证 -->
-    <div class="content" v-if="option8.open">
+    <div class="content" v-if="option8.open&&option8.list&&option8.list.length>0">
       <el-divider content-position="left">准迁证</el-divider>
       <el-table v-loading="option8.loading" :data="option8.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -377,7 +377,7 @@
     </div>
 
     <!-- 转非农业人口批复存根 -->
-    <div class="content" v-if="option7.open">
+    <div class="content" v-if="option7.open&&option7.list&&option7.list.length>0">
       <el-divider content-position="left">转非农业人口批复存根</el-divider>
       <el-table v-loading="option7.loading" :data="option7.list" border>
 <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->

dangan-ui/src/views/index.vue

@@ -18,7 +18,7 @@
     </div>
 
     <!-- 常住人口登记表1 -->
-    <div class="content" v-if="option1.open">
+    <div class="content" v-if="option1.open&&option1.list&&option1.list.length>0">
       <el-divider content-position="left">常住人口登记表1</el-divider>
       <el-table v-loading="option1.loading" :data="option1.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -60,7 +60,7 @@
     </div>
 
     <!-- 常住人口登记表2 -->
-    <div class="content" v-if="option3.open">
+    <div class="content" v-if="option3.open&&option3.list&&option3.list.length>0">
       <el-divider content-position="left">常住人口登记表2</el-divider>
       <el-table v-loading="option3.loading" :data="option3.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -111,7 +111,7 @@
     </div>
 
     <!-- 常住人口登记表3 -->
-    <div class="content" v-if="option9.open">
+    <div class="content" v-if="option9.open&&option9.list&&option9.list.length>0">
       <el-divider content-position="left">常住人口登记表3</el-divider>
       <el-table v-loading="option9.loading" :data="option9.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -165,7 +165,7 @@
     </div>
 
     <!-- 常住卡 -->
-    <div class="content" v-if="option2.open">
+    <div class="content" v-if="option2.open&&option2.list&&option2.list.length>0">
       <el-divider content-position="left">常住卡</el-divider>
       <el-table v-loading="option2.loading" :data="option2.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -203,7 +203,7 @@
     </div>
 
     <!-- 出生医学证明 -->
-    <div class="content" v-if="option4.open">
+    <div class="content" v-if="option4.open&&option4.list&&option4.list.length>0">
       <el-divider content-position="left">出生医学证明</el-divider>
       <el-table v-loading="option4.loading" :data="option4.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -244,7 +244,7 @@
     </div>
 
     <!-- 一胎证明 -->
-    <div class="content" v-if="option6.open">
+    <div class="content" v-if="option6.open&&option6.list&&option6.list.length>0">
       <el-divider content-position="left">一胎证明</el-divider>
       <el-table v-loading="option6.loading" :data="option6.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -282,7 +282,7 @@
     </div>
 
     <!-- 迁移证 -->
-    <div class="content" v-if="option5.open">
+    <div class="content" v-if="option5.open&&option5.list&&option5.list.length>0">
       <el-divider content-position="left">迁移证</el-divider>
       <el-table v-loading="option5.loading" border :data="option5.list">
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -324,7 +324,7 @@
     </div>
 
     <!-- 准迁证 -->
-    <div class="content" v-if="option8.open">
+    <div class="content" v-if="option8.open&&option8.list&&option8.list.length>0">
       <el-divider content-position="left">准迁证</el-divider>
       <el-table v-loading="option8.loading" :data="option8.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->
@@ -377,7 +377,7 @@
     </div>
 
     <!-- 转非农业人口批复存根 -->
-    <div class="content" v-if="option7.open">
+    <div class="content" v-if="option7.open&&option7.list&&option7.list.length>0">
       <el-divider content-position="left">转非农业人口批复存根</el-divider>
       <el-table v-loading="option7.loading" :data="option7.list" border>
         <!--        <el-table-column label="档案目录ID" align="center" prop="muId" min-width="90" fixed/>-->