Merge tag 'Hotfix-30' into develop

Finish Hotfix-30

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

@@ -602,22 +602,64 @@ export default {
     },
     //审批驳回
     async rejectFn() {
-      if (!this.detailList.installDate) {
-        this.$message.error("请选择安装时间");
-        return;
-      }
-      let data = {
-        ...this.detailList,
-        checkBy: this.checkBy,
-        // checkDate: this.checkDate,
-        isRefundDeposit: this.isRefundDeposit,
-        checkNote: this.checkNote,
-        examineResult: 0,
-      };
-      await getDepositManageExamine(data);
-      this.$message.success("审批驳回");
-      this.goBack();
-      this.$emit("updateList");
+      this.$confirm("此操作将审批订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // if (!this.detailList.installDate) {
+          //   this.$message.error("请选择安装时间");
+          //   return;
+          // }
+          let data = {
+            ...this.detailList,
+            checkBy: this.checkBy,
+            // checkDate: this.checkDate,
+            isRefundDeposit: this.isRefundDeposit,
+            checkNote: this.checkNote,
+            examineResult: 0,
+          };
+          getDepositManageExamine(data)
+            .then((res) => {
+              if (!res.data) {
+                this.goBack();
+                this.$emit("updateList");
+              } else {
+                this.$confirm("审批成功！是否跳转下一张待审批订单?", "提示", {
+                  confirmButtonText: "跳转",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                })
+                  .then(() => {
+                    this.$successMsg("进入下一张待审批订单");
+                    this.detailList = res.data;
+                  })
+                  .catch(() => {
+                    this.goBack();
+                    this.$emit("updateList");
+                  });
+              }
+            })
+            .finally((res) => {});
+        })
+        .catch(() => {});
+      // if (!this.detailList.installDate) {
+      //   this.$message.error("请选择安装时间");
+      //   return;
+      // }
+      // let data = {
+      //   ...this.detailList,
+      //   checkBy: this.checkBy,
+      //   // checkDate: this.checkDate,
+      //   isRefundDeposit: this.isRefundDeposit,
+      //   checkNote: this.checkNote,
+      //   examineResult: 0,
+      // };
+      // await getDepositManageExamine(data);
+      // this.$message.success("审批驳回");
+      // this.goBack();
+      // this.$emit("updateList");
     },
     //审批通过
     async adoptFn() {
@@ -627,10 +669,10 @@ export default {
         type: "warning",
       })
         .then(() => {
-          if (!this.detailList.installDate) {
-            this.$message.error("请选择安装时间");
-            return;
-          }
+          // if (!this.detailList.installDate) {
+          //   this.$message.error("请选择安装时间");
+          //   return;
+          // }
           let data = {
             ...this.detailList,
             checkBy: this.checkBy,
@@ -736,4 +778,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/finance/balance_sum.vue

@@ -64,6 +64,8 @@
           fit
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -80,12 +82,16 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="总金额"
             prop="total"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.total | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
@@ -179,7 +185,11 @@ export default {
     //获取列表数据
     async getDataList(data) {
       const res = await getFinanceTotalCustomer(data);
-      console.log(res);
+      // console.log(res);
+      res.data.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["total"];
+      });
       this.dataList = res.data;
     },
     //余额
@@ -210,4 +220,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/finance/finance_sum.vue

@@ -69,12 +69,16 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="余额"
             prop="totalAmount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.totalAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="right"
             label="可用信用额度"
@@ -163,7 +167,7 @@ export default {
       const res = await getFinanceTotal(data);
       res.data.forEach((item) => {
         item.sums1 = [];
-        item.sums2 = ["freezeCreditAmount", "usedCreditAmount"];
+        item.sums2 = ["freezeCreditAmount", "usedCreditAmount", "totalAmount"];
       });
       this.dataList = res.data;
     },