Finish Hotfix-69

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

@@ -163,10 +163,10 @@
         </el-col>
         <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
-          <div class="value">{{  detailList.geLiInerNote}}</div>
-          <!-- <div class="value">
+          <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
+          <div class="value">
             <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
-          </div> -->
+          </div>
 
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">

src/views/deposit_commerce/refund_list.vue

@@ -44,9 +44,9 @@
             <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="机型" prop="refProjectName">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.startSpecification"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.endSpecification"></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -56,34 +56,34 @@
               </el-form-item> -->
               <el-form-item label="特价编号" prop="">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.startSpecialNo"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <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 type="number"></el-input>
+                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.endRefFactoryNo"></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 type="number"></el-input>
-                  <span>-</span>
-                  <el-input type="number"></el-input>
-                </div>
+            <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>
             </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="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 :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refRegionWork">
+                <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -223,7 +223,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column> -->
-            <el-table-column align="right" label="特价编号" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="right" label="厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
@@ -292,8 +292,16 @@ export default {
         refEnginRecordNo: "",
         customerKeyword: "",
         refProjectName: "",
-        // startDeliverTime: "",
-        // endDeliverTime: "",
+        confirmName: "",
+        startSpecification: "",
+        endSpecification: "",
+        startSpecialNo: "",
+        endSpecialNo: "",
+        startRefFactoryNo: "",
+        endRefFactoryNo: "",
+        startInstallTime: "",
+        endInstallTime: "",
+        refRegionWork: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
       examine: "",
@@ -477,6 +485,9 @@ export default {
     //重置
     resetFn() {
       this.$refs.searchForm.resetFields();
+      this.searchForm.endSpecification = "";
+      this.searchForm.endSpecialNo = "";
+      this.searchForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {

src/views/deposit_home/refund_list.vue

@@ -37,16 +37,16 @@
               </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">
+              <el-form-item label="机型" prop="startSpecification">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.startSpecification"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.endSpecification"></el-input>
                 </div>
               </el-form-item>
             </el-col>
@@ -54,36 +54,46 @@
               <!-- <el-form-item label="特价编号" prop="refProjectName">
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item> -->
-              <el-form-item label="特价编号" prop="">
+              <el-form-item label="特价编号" prop="startSpecialNo">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.startSpecialNo"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <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">
+              <el-form-item label="厂编号" prop="startRefFactoryNo">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <el-input v-model="searchForm.endRefFactoryNo"></el-input>
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
+            <!-- <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="安装日期" prop="refProjectName">
                 <div class="fanwei">
-                  <el-input type="number"></el-input>
+                  <el-input type="number" v-model="searchForm.startInstallTime"></el-input>
                   <span>-</span>
-                  <el-input type="number"></el-input>
+                  <el-input type="number" v-model="searchForm.endInstallTime"></el-input>
                 </div>
               </el-form-item>
-            </el-col>
+            </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="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>
+            </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>
+            </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>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -228,7 +238,7 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="right" label="厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
@@ -297,8 +307,16 @@ export default {
         refEnginRecordNo: "",
         customerKeyword: "",
         refProjectName: "",
-        // startDeliverTime: "",
-        // endDeliverTime: "",
+        confirmName: "",
+        startSpecification: "",
+        endSpecification: "",
+        startSpecialNo: "",
+        endSpecialNo: "",
+        startRefFactoryNo: "",
+        endRefFactoryNo: "",
+        startInstallTime: "",
+        endInstallTime: "",
+        refRegionWork: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
       examine: "",
@@ -482,6 +500,9 @@ export default {
     //重置
     resetFn() {
       this.$refs.searchForm.resetFields();
+      this.searchForm.endSpecification = "";
+      this.searchForm.endSpecialNo = "";
+      this.searchForm.endRefFactoryNo = "";
     },
     //搜索
     searchFn() {