Finish Hotfix-71

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -243,15 +243,15 @@
             <template slot-scope="scope">
               {{ scope.row.totalAmount | numToFixed }}
             </template>
-          </el-table-column>
-          <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip></el-table-column>
+          </el-table-column> -->
+          <!-- <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
           </el-table-column>
           <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus == 'WAIT'">
             <template slot-scope="scope">
               <el-input v-model="scope.row.dataQty"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
             <template slot-scope="scope">
               {{ scope.row.diffAmount | numToFixed }}
@@ -261,7 +261,7 @@
             <template slot-scope="scope">
               <el-input v-model="scope.row.diffAmount"></el-input>
             </template>
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </div>
     </div>

src/views/deposit_commerce/refund_list.vue

@@ -11,8 +11,8 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="160px" size="mini" label-position="left">
-          <el-row :gutter="20">
+        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
+          <el-row :gutter="10">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
                 <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
@@ -37,48 +37,39 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="refProjectName">
-                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              <el-form-item label="审核人" prop="confirmName">
+                <el-input v-model="searchForm.confirmName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
-              <el-form-item label="机型" prop="refProjectName">
-                <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecification"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecification"></el-input>
-                </div>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="机型" prop="startSpecification">
+                <el-input v-model="searchForm.startSpecification" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <!-- <el-form-item label="特价编号" prop="refProjectName">
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item> -->
-              <el-form-item label="特价编号" prop="">
-                <div class="fanwei">
-                  <el-input v-model="searchForm.startSpecialNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endSpecialNo"></el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
-              <el-form-item label="厂编号" prop="refProjectName">
-                <div class="fanwei">
-                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
-                  <span>-</span>
-                  <el-input v-model="searchForm.endRefFactoryNo"></el-input>
-                </div>
+              <el-form-item label="特价编号" prop="startSpecialNo">
+
+                <el-input v-model="searchForm.startSpecialNo" placeholder="请输入"></el-input>
+
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="厂编号" prop="startRefFactoryNo">
+
+                <el-input v-model="searchForm.startRefFactoryNo" placeholder="请输入"></el-input>
+
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              <el-form-item label="安装日期" prop="">
+                <div class="fanwei">
+                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+                  <span>-</span>
+                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+                </div>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -484,10 +475,12 @@ export default {
     },
     //重置
     resetFn() {
+      this.searchForm.startInstallTime = "";
+      this.searchForm.endInstallTime = "";
       this.$refs.searchForm.resetFields();
-      this.searchForm.endSpecification = "";
-      this.searchForm.endSpecialNo = "";
-      this.searchForm.endRefFactoryNo = "";
+      // this.searchForm.endSpecification = "";
+      // this.searchForm.endSpecialNo = "";
+      // this.searchForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {

src/views/deposit_home/components/refund_list-detail.vue

@@ -251,7 +251,7 @@
             <template slot-scope="scope">
               <el-input v-model="scope.row.dataQty"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
             <template slot-scope="scope">
               {{ scope.row.diffAmount | numToFixed }}
@@ -261,7 +261,7 @@
             <template slot-scope="scope">
               <el-input v-model="scope.row.diffAmount"></el-input>
             </template>
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </div>
     </div>

src/views/deposit_home/refund_list.vue

@@ -11,8 +11,8 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="searchForm" :model="searchForm" label-width="160px" size="mini" label-position="left">
-          <el-row :gutter="20">
+        <el-form ref="searchForm" :model="searchForm" label-width="120px" size="mini" label-position="left">
+          <el-row :gutter="10">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
                 <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
@@ -43,45 +43,48 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="机型" prop="startSpecification">
-                <div class="fanwei">
+                <!-- <div class="fanwei">
                   <el-input v-model="searchForm.startSpecification"></el-input>
                   <span>-</span>
                   <el-input v-model="searchForm.endSpecification"></el-input>
-                </div>
+                </div> -->
+                <el-input v-model="searchForm.startSpecification" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <!-- <el-form-item label="特价编号" prop="refProjectName">
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item> -->
               <el-form-item label="特价编号" prop="startSpecialNo">
-                <div class="fanwei">
+                <!-- <div class="fanwei">
                   <el-input v-model="searchForm.startSpecialNo"></el-input>
                   <span>-</span>
                   <el-input v-model="searchForm.endSpecialNo"></el-input>
-                </div>
+                </div> -->
+                <el-input v-model="searchForm.startSpecialNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="厂编号" prop="startRefFactoryNo">
-                <div class="fanwei">
+                <!-- <div class="fanwei">
                   <el-input v-model="searchForm.startRefFactoryNo"></el-input>
                   <span>-</span>
                   <el-input v-model="searchForm.endRefFactoryNo"></el-input>
-                </div>
+                </div> -->
+                <el-input v-model="searchForm.startRefFactoryNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="12">
-              <el-form-item label="安装日期" prop="refProjectName">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="安装日期" prop="">
                 <div class="fanwei">
-                  <el-input type="number" v-model="searchForm.startInstallTime"></el-input>
+                  <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
                   <span>-</span>
-                  <el-input type="number" v-model="searchForm.endInstallTime"></el-input>
+                  <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
                 </div>
               </el-form-item>
-            </el-col> -->
+            </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="6">
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始安装日期" prop="startInstallTime">
                 <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
@@ -90,7 +93,7 @@
               <el-form-item label="结束安装日期" prop="endInstallTime">
                 <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="区域" prop="refRegionWork">
                 <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
@@ -499,10 +502,12 @@ export default {
     },
     //重置
     resetFn() {
+      this.searchForm.startInstallTime = "";
+      this.searchForm.endInstallTime = "";
       this.$refs.searchForm.resetFields();
-      this.searchForm.endSpecification = "";
-      this.searchForm.endSpecialNo = "";
-      this.searchForm.endRefFactoryNo = "";
+      // this.searchForm.endSpecification = "";
+      // this.searchForm.endSpecialNo = "";
+      // this.searchForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {