Merge remote-tracking branch 'origin/dev' into dev

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -92,6 +92,7 @@
         @findPage="findPage"
         button3Name="补充信息"
         @handleButton3="handleButton3"
+        handleButton3
       ></kt-common-table>
     </el-main>
     <el-dialog
@@ -217,6 +218,9 @@ export default {
       },
       totalAmount: 0,
       columns: [
+        { prop: "approval", label: "提现方式",
+          formatter: this.approvalFormatter
+        },
         //数据列
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
@@ -259,6 +263,15 @@ export default {
   created() {},
   mounted() {},
   methods: {
+    approvalFormatter(row, column) {
+      let approval = row.approval;
+      switch (approval) {
+        case 1:
+          return <el-tag type="warning">线上</el-tag>;
+        default:
+          return <el-tag >线下</el-tag>;
+      }
+    },
     exportDetails() {
       this.$api.task
         .exportAmountAuditing({
@@ -286,6 +299,10 @@ export default {
       this.bankfindPage(val);
     },
     handleButton3({ row }) {
+      if (row.approval === 1){
+        this.$message.error("线上数据自动审核，无需处理!!");
+        return;
+      }
       this.rowlist = row;
       this.bankForm = {};
       this.dialogVisibleBatch = true;

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -181,6 +181,9 @@ export default {
       },
       totalAmount: 0,
       columns: [
+        { prop: "approval", label: "提现方式",
+          formatter: this.approvalFormatter
+        },
         //数据列
         { prop: "id", label: "提现单号" },
         { prop: "userId", label: "业务员工号" },
@@ -201,7 +204,7 @@ export default {
         { prop: "bankAddress", label: "开户行" },
         { prop: "bankAccount", label: "银行" },
         { prop: "bankNumber", label: "账号" },
-        { prop: "createTime", label: "提现时间" }
+        { prop: "createTime", label: "提现时间" },
       ]
     };
   },
@@ -225,6 +228,15 @@ export default {
     window.removeEventListener("resize", this.handleResize);
   },
   methods: {
+    approvalFormatter(row, column) {
+      let approval = row.approval;
+      switch (approval) {
+        case 1:
+          return <el-tag type="warning">线上</el-tag>;
+        default:
+          return <el-tag >线下</el-tag>;
+      }
+    },
     // 简单的防抖函数
     handleResize() {
       // 如果已经有定时器存在清除
@@ -391,6 +403,10 @@ export default {
         });
     },
     handleButton2({ row, index }) {
+      if (row.approval === 1){
+        this.$message.error("线上数据自动审核，无需处理!!");
+        return;
+      }
       this.dialogVisibleBatch = true;
       this.rowlist = row;
       this.picId = "";
@@ -401,6 +417,10 @@ export default {
       // });
     },
     handleButton3({ row, index }) {
+      if (row.approval === 1){
+        this.$message.error("线上数据自动审核，无需处理!!");
+        return;
+      }
       let auditid = Cookies.get("user"); // 放置token到Cookie
       let auditname = Cookies.get("name"); // 放置token到Cookie
       this.$confirm("是否确认审核并线下支付？", "提示", {})
@@ -429,6 +449,10 @@ export default {
         });
     },
     handleButton4({ row, index }) {
+      if (row.approval === 1){
+        this.$message.error("线上数据自动审核，无需处理!!");
+        return;
+      }
       this.auditRejectId = row.id;
       this.auditRejectdialogVisible = true;
     },