Merge tag 'Hotfix-35' into develop

Finish Hotfix-35

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

@@ -10,17 +10,27 @@
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="24" :lg="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">
+            {{
+              detailList.enginOrderType == "HOME"
+                ? "工程登录编号"
+                : "工程信息编号"
+            }}
+          </div>
           <div class="value">{{ detailList.refEnginRecordNo }}</div>
         </el-col>
+        <!-- <el-col :xs="12" :sm="24" :lg="8" class="item">
+          <div class="label">工程信息编号</div>
+          <div class="value">{{ detailList.refEnginRecordNo }}</div>
+        </el-col> -->
         <el-col :xs="12" :sm="24" :lg="8" class="item">
-          <div class="label">项目类别</div>
+          <div class="label">项目名称</div>
           <div class="value">{{ detailList.refProjectName }}</div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">行业类别</div>
           <div class="value">
-            {{ detailList.refProjectNo == "HOME" ? "家用" : "商用" }}
+            {{ detailList.refPromiseStatus }}
           </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
@@ -65,62 +75,113 @@
           <div class="label">押金比例</div>
           <div class="value">{{detailList.}}</div>
         </el-col> -->
+
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{ detailList.refInstallAddress }}</div>
+          <div class="label">单据状态</div>
+          <div class="value">
+            {{
+              detailList.examineStatus == "SAVE"
+                ? "保存"
+                : detailList.examineStatus == "WAIT"
+                ? "待审核"
+                : detailList.examineStatus == "OK"
+                ? "通过"
+                : detailList.examineStatus == "FAIL"
+                ? "不通过"
+                : "关闭"
+            }}
+          </div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">第几次申报</div>
-          <div class="value">{{ detailList.refDeclareNo }}</div>
+          <div class="label">销售类型</div>
+          <div class="value">{{ detailList.saleTypeName }}</div>
         </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">不扣押金</div>
+          <div class="value">{{ detailList.customerName }}</div>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">项目说明</div>
-          <div class="value">{{ detailList.refProjectNote }}</div>
+          <div class="label">第几次申报</div>
+          <div class="value">{{ detailList.refDeclareNo }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">项目类型</div>
-          <div class="value">{{ detailList.refProjectName }}</div>
+          <div class="value">{{ detailList.refProjectType }}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">经销商名称</div>
-          <div class="value">{{ detailList.customerName }}</div>
+          <div class="label">经销商编码</div>
+          <div class="value">{{ detailList.customerNumber }}</div>
         </el-col>
-        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">寄厂日期</div>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">安装时间</div>
           <div class="value">
             <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
               :disabled="title == '详情'"
               class="selectStyle"
-              v-model="detailList.sendFactoryDate"
+              v-model="detailList.installDate"
               type="datetime"
-              prefix-icon="''"
-              placeholder="请选择寄厂日期"
               default-time="00:00:00"
               value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{ detailList.refInstallAddress }}</div>
+        </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">工程订单号</div>
+          <div class="value">{{ detailList.customerName }}</div>
         </el-col> -->
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">经销商名称</div>
+          <div class="value">{{ detailList.customerName }}</div>
+        </el-col>
+
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">项目说明</div>
+          <div class="value">{{ detailList.refProjectNote }}</div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">提货日期</div>
-          <div class="value">{{detailList.}}</div>
+          <div class="label">订单日期</div>
+          <div class="value">{{ detailList.customerName }}</div>
         </el-col> -->
-        <el-col :xs="24" :sm="24" :lg="8" class="item">
-          <div class="label">安装时间</div>
+
+        <!-- <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">格力内部备注</div>
+          <div class="value">{{ detailList.customerName }}</div>
+        </el-col> -->
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">文件编码</div>
+          <div class="value">{{ detailList.customerName }}</div>
+        </el-col> -->
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">备注</div>
+          <div class="value">{{ detailList.applyNote }}</div>
+        </el-col>
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">寄厂日期</div>
           <div class="value">
             <el-date-picker
-              prefix-icon="''"
-              placeholder="请选择安装时间"
               :disabled="title == '详情'"
               class="selectStyle"
-              v-model="detailList.installDate"
+              v-model="detailList.sendFactoryDate"
               type="datetime"
+              prefix-icon="''"
+              placeholder="请选择寄厂日期"
               default-time="00:00:00"
               value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
           </div>
-        </el-col>
+        </el-col> -->
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">提货日期</div>
+          <div class="value">{{detailList.}}</div>
+        </el-col> -->
       </el-row>
     </div>
     <h3>货品信息</h3>

src/views/finance/wallet.vue

@@ -185,7 +185,7 @@
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="操作"
             min-width="160"
@@ -201,7 +201,7 @@
                 修改
               </el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
       </div>
     </div>
@@ -404,12 +404,12 @@ export default {
       this.dialogExportForm = false;
     },
     exportOKFn() {
-      this.dialogExportForm = false;
+      downloadFiles("/wallet/count/export", { ...this.exportForm });
       this.exportForm = {
         endCustomerId: "",
         startCustomerId: "",
       };
-      downloadFiles("/wallet/count/export", { ...this.exportForm });
+      this.dialogExportForm = false;
     },
     //导出
     exportFn() {