Merge branch 'bug1' into develop

src/views/deposit_commerce/deposit_list.vue

@@ -518,6 +518,7 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
+        settlementStatus:'',mailFactoryStatus:'',
         startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:''
 
       }, // 搜索表单

src/views/deposit_commerce/refund_list.vue

@@ -646,7 +646,8 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
-        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:''
+        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',
+        settlementStatus:'',mailFactoryStatus:''
 
       }, // 搜索表单
       refundDepositArr: [

src/views/deposit_home/deposit_list.vue

@@ -853,7 +853,8 @@ export default {
         startSettlementNo: '',
         endSettlementNo:'',
         inFactoryType: '',
-        endMailFactoryDate:'',startMailFactoryDate:''
+        endMailFactoryDate:'',startMailFactoryDate:'',
+        settlementStatus:'',mailFactoryStatus:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_home/refund_list.vue

@@ -541,6 +541,8 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
+        settlementStatus:'',mailFactoryStatus:'',
+
         startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',endMailFactoryDate:'',startMailFactoryDate:''
       }, // 搜索表单
       refundDepositArr: [