bug修复

src/components/base/AppList.vue

@@ -52,6 +52,8 @@
           v-on="$listeners"
           style="height: 100%"
           ref="table"
+          hright="250"
+          max-height="750"
         >
           <template v-for="item in currentColumns">
             <el-table-column v-bind="item" :key="item.prop" v-if="visible(item)">
@@ -322,6 +324,7 @@ export default {
         this.$message.success('保存成功')
         this.columnsOptionsVisible = false
         this.customColumns = this.editableColumns
+        window.localStorage.setItem('customColumns', this.customColumns)
       })
     },
     // 获取用户设置的列表项

src/modules/invoice/views/List.vue

@@ -243,6 +243,7 @@ export default {
     }
   },
   created() {
+    window.localStorage.getItem('customColumns')
     getCondition().then(res => {
       this.conditionList = res.data
     })

src/modules/payment/components/Channel.vue

@@ -65,6 +65,8 @@ export default {
             )
           }
         }
+      } else if (this.dealList.service_fee_rules_type === '' || this.dealList.service_fee_rules_type === '0') {
+        return this.dealList.service_charge_ratio
       }
     }
   }

src/modules/payment/components/Collection.vue

@@ -57,21 +57,51 @@
     </tr>
     <tr>
       <th>首款首次缴费时间</th>
-      <td colspan="2">{{ dealList.first_first_time }}</td>
+      <td colspan="2">{{ firstFirstTime }}</td>
       <th>首款末次缴费时间</th>
-      <td colspan="2">{{ dealList.first_last_time }}</td>
+      <td colspan="2">{{ firstLastTime }}</td>
     </tr>
     <tr>
       <th>尾款首次缴费时间</th>
-      <td colspan="2">{{ dealList.final_first_time }}</td>
+      <td colspan="2">{{ finalFirstTime }}</td>
       <th>尾款末次缴费时间</th>
-      <td colspan="2">{{ dealList.final_last_time }}</td>
+      <td colspan="2">{{ finalLastTime }}</td>
     </tr>
   </table>
 </template>
 
 <script>
 export default {
+  computed: {
+    finalLastTime() {
+      if (this.dealList.final_last_time === '1970-01-01') {
+        return '-'
+      } else {
+        return this.dealList.final_last_time
+      }
+    },
+    finalFirstTime() {
+      if (this.dealList.final_first_time === '1970-01-01') {
+        return '-'
+      } else {
+        return this.dealList.final_first_time
+      }
+    },
+    firstLastTime() {
+      if (this.dealList.first_last_time === '1970-01-01') {
+        return '-'
+      } else {
+        return this.dealList.first_last_time
+      }
+    },
+    firstFirstTime() {
+      if (this.dealList.first_first_time === '1970-01-01') {
+        return '-'
+      } else {
+        return this.dealList.first_first_time
+      }
+    }
+  },
   props: {
     dealList: {
       type: Object,

src/modules/payment/components/SecondChannel.vue

@@ -51,10 +51,10 @@ export default {
           this.dealList.secondary_service_fee_rules_type === '1' ||
           this.dealList.secondary_service_fee_rules_type === '3'
         ) {
-          if (this.dealList.secondary_service_charge_ratio) {
-            return this.dealList.secondary_service_charge_ratio + '%'
-          } else {
+          if (!this.dealList.secondary_service_charge_ratio) {
             return 0 + '%'
+          } else {
+            return this.dealList.secondary_service_charge_ratio + '%'
           }
         } else {
           if (this.dealList.secondary_service_charge_ratio) {
@@ -67,6 +67,11 @@ export default {
                 100.0 +
               '%'
             )
+          } else if (
+            this.dealList.secondary_service_fee_rules_type === '' ||
+            this.dealList.secondary_service_fee_rules_type === '0'
+          ) {
+            return this.dealList.secondary_service_charge_ratio
           }
         }
       }

src/modules/payment/views/Detail.vue

@@ -37,7 +37,7 @@
     <app-card title="渠道信息">
       <Channel :dealList="dealList" />
     </app-card>
-    <app-card title="二级渠道信息">
+    <app-card title="二级渠道信息" v-show="this.dealList.secondary_channel_id !== ''">
       <second-channel :dealList="dealList" />
     </app-card>
     <app-card title="支付待确认记录">
@@ -116,6 +116,7 @@ export default {
       payDetail(params)
         .then(res => {
           this.dealList = res.data.list[0]
+          console.log(this.dealList, '----')
         })
         .catch(error => {
           this.$message.error(error.message)

src/modules/payment/views/List.vue

@@ -324,6 +324,8 @@ export default {
                     )
                   }
                 }
+              } else if (row.service_fee_rules_type === '' || row.service_fee_rules_type === '0') {
+                return row.service_charge_ratio
               }
             }
           },
@@ -379,6 +381,7 @@ export default {
     }
   },
   created() {
+    window.localStorage.getItem('customColumns')
     console.log(11111)
     this.fetchCondition() // 获取过滤条件
   },