Merge branch 'bug1' into develop

src/views/deposit_home/deposit_list.vue

@@ -259,9 +259,9 @@
                   <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="寄厂日期" style="margin-bottom: 0">
                       <div class="fanwei">
-                        <el-form-item prop="startInstallTime">
+                        <el-form-item prop="startMailFactoryDate">
                           <el-date-picker
-                            v-model="screenForm.startInstallTime"
+                            v-model="screenForm.startMailFactoryDate"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             class="dateStyle"
                             type="datetime"
@@ -269,9 +269,9 @@
                           />
                         </el-form-item>
                         <span>-</span>
-                        <el-form-item prop="endInstallTime">
+                        <el-form-item prop="endMailFactoryDate">
                           <el-date-picker
-                            v-model="screenForm.endInstallTime"
+                            v-model="screenForm.endMailFactoryDate"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             class="dateStyle"
                             type="datetime"
@@ -852,7 +852,8 @@ export default {
         endInFactoryDate: '',
         startSettlementNo: '',
         endSettlementNo:'',
-        inFactoryType: ''
+        inFactoryType: '',
+        endMailFactoryDate:'',startMailFactoryDate:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_home/refund_list.vue

@@ -181,9 +181,9 @@
                   <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="寄厂日期" style="margin-bottom: 0">
                       <div class="fanwei">
-                        <el-form-item prop="startInstallTime">
+                        <el-form-item prop="startMailFactoryDate">
                           <el-date-picker
-                            v-model="screenForm.startInstallTime"
+                            v-model="screenForm.startMailFactoryDate"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             class="dateStyle"
                             type="datetime"
@@ -191,9 +191,9 @@
                           />
                         </el-form-item>
                         <span>-</span>
-                        <el-form-item prop="endInstallTime">
+                        <el-form-item prop="endMailFactoryDate">
                           <el-date-picker
-                            v-model="screenForm.endInstallTime"
+                            v-model="screenForm.endMailFactoryDate"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             class="dateStyle"
                             type="datetime"
@@ -541,7 +541,7 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
-        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:''
+        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',endMailFactoryDate:'',startMailFactoryDate:''
       }, // 搜索表单
       refundDepositArr: [
         {