Merge tag 'Hotfix-80' into develop

Finish Hotfix-80

src/views/deposit_commerce/refund_list.vue

@@ -138,6 +138,30 @@
                 </el-form-item>
 
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="格力内部备注" prop="refFactoryNo">
+
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
+
+                </el-form-item>
+
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" prop="factoryNo">
+                  <el-input v-model="screenForm.factoryNo"></el-input>
+                </el-form-item>
+
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                  <el-date-picker v-model="screenForm.startAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                  <el-date-picker v-model="screenForm.endAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品编码" >
                   <div class="fanwei">
@@ -367,6 +391,10 @@ export default {
         refRegionWork: "",
         endSubmitTime: "",
         refTradeCategory: "",
+        refFactoryNo: "",
+        factoryNo: "",
+        startAcceptTime: "",
+        endAcceptTime: "",
       }, // 搜索表单
       refundDepositArr: [
         {

src/views/deposit_home/refund_list.vue

@@ -11,7 +11,7 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
@@ -138,6 +138,31 @@
                 </el-form-item>
 
               </el-col>
+
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="格力内部备注" prop="refFactoryNo">
+
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
+
+                </el-form-item>
+
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" prop="factoryNo">
+                  <el-input v-model="screenForm.factoryNo"></el-input>
+                </el-form-item>
+
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                  <el-date-picker v-model="screenForm.startAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                  <el-date-picker v-model="screenForm.endAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品编码" >
                   <div class="fanwei">
@@ -367,6 +392,10 @@ export default {
         refRegionWork: "",
         endSubmitTime: "",
         refTradeCategory: "",
+        refFactoryNo: "",
+        factoryNo: "",
+        startAcceptTime: "",
+        endAcceptTime: "",
       }, // 搜索表单
       refundDepositArr: [
         {