9.14 营收统计接口调完

src/api/company.js

@@ -124,3 +124,40 @@ export function revenue_sum_count(query) {
     params: query,
   });
 }
+
+//立即提现列表
+export function revenue_sum_ljtx(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/amount/selectList",
+    method: "get",
+    params: query,
+  });
+}
+
+// 立即提现提交
+export function revenue_sum_ljtx_sub(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/applyCathList",
+    method: "post",
+    data: query,
+  });
+}
+
+
+//提现申请列表
+export function revenue_withdraw_list(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/cath/selectList",
+    method: "get",
+    params: query,
+  });
+}
+
+// 提现申请审核
+export function revenue_withdraw_sh(query) {
+  return fetch({
+    url: "/api/order/admin/wallet/withDrawProcess",
+    method: "post",
+    data: query,
+  });
+}

src/views/revenue/revenue_sum.vue

@@ -5,7 +5,11 @@
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px">
           <el-row>
             <el-form-item label="所属公司">
-              <el-select v-model="listQuery.branchId" placeholder="请选择">
+              <el-select
+                v-model="listQuery.branchId"
+                placeholder="请选择"
+                @change="change_query_branch"
+              >
                 <el-option label="全部" :key="undefined" :value="undefined"></el-option>
                 <el-option
                   v-for="val in companys_list"
@@ -78,8 +82,7 @@
             </p>
             <p class="money_label">
               可提现金额，
-              <a @click="company_withdraw" v-show="elements['company_with']">立即提现 ></a>
-              <a @click="mendian_withdraw" v-show="elements['store_with']">立即提现 ></a>
+              <a @click="lijitixian">立即提现 ></a>
             </p>
           </div>
         </div>
@@ -129,41 +132,73 @@
       </div>
     </div>
     <el-dialog title="公司提现" :visible.sync="c_w_dialog" width="40%" @close="c_w_dialog=false">
-      <el-form>
+      <el-form :rules="c_w_rules" ref="c_w_form" :model="c_w_form">
         <div style="display:flex;justify-content: space-between;">
           <el-col :span="10">
-            <el-form-item label="银行账号">
-              <el-input style="width:70%"></el-input>
+            <el-form-item label="银行账号" prop="c_w_account">
+              <el-input
+                v-model="c_w_form.c_w_account"
+                type="number"
+                controls="false"
+                placeholder="请输入银行账号"
+                style="width:70%"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="全部提现">
-              <el-switch active-color="#13ce66" inactive-color="#ff4949"></el-switch>
+              <el-switch v-model="c_w_form.c_w_isall" @change="change_all_with"></el-switch>
             </el-form-item>
           </el-col>
         </div>
-        <el-table></el-table>
+        <el-table :data="c_w_data" border>
+          <el-table-column label="门店简称" align="center" prop="companyName"></el-table-column>
+          <el-table-column label="门店剩余金额" align="center" prop="balance"></el-table-column>
+          <el-table-column label="提现金额" align="center">
+            <template slot-scope="{row}">
+              <el-input-number
+                v-model="row.withdraw_money"
+                type="number"
+                :min="0"
+                :step="0.01"
+                placeholder="请输入提现金额"
+              ></el-input-number>
+            </template>
+          </el-table-column>
+        </el-table>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="c_w_dialog = false">取 消</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button type="primary" @click="c_w_ok('c_w_form')">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog title="门店提现" :visible.sync="m_w_dialog" width="30%" @close="m_w_dialog=false">
-      <el-form ref="form" :model="form" label-width="80px">
+      <el-form ref="m_w_form" :rules="m_w_rules" :model="m_w_form" label-width="80px">
         <el-form-item label="剩余金额">
-          <el-input style="width:60%"></el-input>
+          <el-input v-model="m_w_item.balance" disabled style="width:60%"></el-input>
         </el-form-item>
-        <el-form-item label="提现金额">
-          <el-input style="width:60%"></el-input>
+        <el-form-item label="提现金额" prop="withdraw_money">
+          <el-input-number
+            type="number"
+            v-model="m_w_form.withdraw_money"
+            style="width:60%"
+            :step="0.01"
+            placeholder="请输入提现金额"
+            :min="0.01"
+          ></el-input-number>
         </el-form-item>
-        <el-form-item label="银行账号">
-          <el-input style="width:60%"></el-input>
+        <el-form-item label="银行账号" prop="account">
+          <el-input
+            type="number"
+            v-model="m_w_form.account"
+            style="width:60%"
+            placeholder="请输入银行账号"
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="m_w_dialog = false">取 消</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button type="primary" @click="m_w_ok('m_w_form')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -198,8 +233,10 @@ import {
   branchCompany_all_list,
   revenue_sum_list,
   revenue_sum_count,
+  revenue_sum_ljtx,
+  revenue_sum_ljtx_sub,
 } from "api/company.js";
-
+//
 export default {
   name: "carApplyList",
   components: {
@@ -208,7 +245,38 @@ export default {
     Element1,
   },
   data() {
+    var yhk_yz = (rule, value, callback) => {
+      if (!/^([1-9]{1})(\d{14}|\d{18})$/.test(value)) {
+        callback(new Error("请输入正确的银行卡号"));
+      } else {
+        callback();
+      }
+    };
     return {
+      m_w_form: {
+        withdraw_money: "",
+        account: "",
+      },
+      m_w_rules: {
+        withdraw_money: [
+          { required: true, message: "请输入提现金额", trigger: "blur" },
+        ],
+        account: [
+          { required: true, message: "请输入银行账号", trigger: "blur" },
+          { validator: yhk_yz, trigger: "blur" },
+        ],
+      },
+      c_w_data: [],
+      c_w_form: {
+        c_w_account: "",
+        c_w_isall: false,
+      },
+      c_w_rules: {
+        c_w_account: [
+          { required: true, message: "请输入银行账号", trigger: "blur" },
+          { validator: yhk_yz, trigger: "blur" },
+        ],
+      },
       title_text: "",
       BASE_API: process.env.BASE_API,
       add_edit_dialog: false,
@@ -230,6 +298,7 @@ export default {
       btn_disable: null,
       companys_list: [],
       branchCompany_list: [],
+      branchCompany_list_copy: [],
       c_w_dialog: false,
       m_w_dialog: false,
       balance: undefined,
@@ -237,6 +306,7 @@ export default {
       otherAmount: undefined,
       withdrawals: undefined,
       all_amount: undefined,
+      m_w_item: {},
     };
   },
   created() {
@@ -251,6 +321,120 @@ export default {
     },
   },
   methods: {
+    change_query_branch(val) {
+      if (val) {
+        this.branchCompany_list = this.branchCompany_list_copy.filter(
+          (item) => {
+            return item.companyId == val;
+          }
+        );
+      } else {
+        this.branchCompany_list = this.branchCompany_list_copy;
+      }
+    },
+    change_all_with() {
+      let is_all = this.c_w_form.c_w_isall;
+      if (is_all) {
+        this.c_w_data.map((item) => {
+          item.withdraw_money = item.balance;
+        });
+      } else {
+        this.c_w_data.map((item) => {
+          item.withdraw_money = "";
+        });
+      }
+    },
+    c_w_ok(formname) {
+      this.$refs[formname].validate((valid) => {
+        if (valid) {
+          let list = [];
+          let has_err = false;
+          this.c_w_data.forEach((element) => {
+            if (element.withdraw_money != "" && element.withdraw_money != 0) {
+              if (element.withdraw_money <= element.balance) {
+                list.push({
+                  companyId: element.companyId,
+                  amount: element.withdraw_money,
+                });
+              } else {
+                has_err = true;
+              }
+            }
+          });
+          if (has_err) {
+            this.$message({
+              message: "提现金额不能大于剩余金额!",
+              type: "warning",
+            });
+            return;
+          }
+          let data = {
+            accountNumber: this.c_w_form.c_w_account,
+            companyIds: list,
+          };
+          revenue_sum_ljtx_sub(data).then((res) => {
+            if (res.status == 200) {
+              this.c_w_dialog = false;
+              this.c_w_form = {
+                c_w_account: "",
+                c_w_isall: false,
+              };
+              this.$message({
+                message: "提现申请已提交！",
+                type: "success",
+              });
+            } else {
+              this.$message.error({
+                message: res.message,
+              });
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    m_w_ok(formname) {
+      this.$refs[formname].validate((valid) => {
+        if (valid) {
+          if (this.m_w_form.withdraw_money > this.m_w_item.balance) {
+            this.$message({
+              message: "提现金额不能大于剩余金额!",
+              type: "warning",
+            });
+            return;
+          }
+          let data = {
+            companyIds: [
+              {
+                companyId: this.m_w_item.companyId,
+                amount: this.m_w_form.withdraw_money,
+              },
+            ],
+            accountNumber: this.m_w_form.account,
+          };
+          revenue_sum_ljtx_sub(data).then((res) => {
+            if (res.status == 200) {
+              this.m_w_dialog = false;
+              this.m_w_form = {
+                withdraw_money: "",
+                account: "",
+              };
+              this.$message({
+                message: "提现申请已提交！",
+                type: "success",
+              });
+            } else {
+              this.$message.error({
+                message: res.message,
+              });
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
     //所有公司
     get_all_companys() {
       company_all_list().then((res) => {
@@ -264,6 +448,7 @@ export default {
       branchCompany_all_list({ state: 1 }).then((res) => {
         if (res.status == 200) {
           this.branchCompany_list = res.data;
+          this.branchCompany_list_copy = res.data;
         }
       });
     },
@@ -304,7 +489,7 @@ export default {
         }
         this.listLoading = false;
         this.list = listRs;
-        console.log(response.data.data);
+
         this.total = totalCountRs;
       });
     },
@@ -329,6 +514,7 @@ export default {
       };
       this.startTime = undefined;
       this.endTime = undefined;
+      this.branchCompany_list = this.branchCompany_list_copy;
       this.getList();
     },
     handleSizeChange(val) {
@@ -339,11 +525,20 @@ export default {
       this.listQuery.page = val;
       this.getList();
     },
-    company_withdraw() {
+    lijitixian() {
+      revenue_sum_ljtx({ page: 1, limit: 999 }).then((res) => {
+        if (res.data.totalCount > 1) {
           this.c_w_dialog = true;
-    },
-    mendian_withdraw() {
+          this.c_w_data = res.data.data;
+          this.c_w_form = {
+            c_w_account: "",
+            c_w_isall: false,
+          };
+        } else {
           this.m_w_dialog = true;
+          this.m_w_item = res.data.data[0];
+        }
+      });
     },
   },
 };

src/views/revenue/revenue_withdraw.vue

@@ -5,10 +5,10 @@
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px">
           <el-row>
             <el-form-item label="状态">
-              <el-select v-model="listQuery.type" placeholder="请选择">
-                <el-option label="全部" value="0"></el-option>
-                <el-option label="公司" value="1"></el-option>
-                <el-option label="门店" value="2"></el-option>
+              <el-select v-model="listQuery.status" placeholder="请选择">
+                <el-option label="全部" :key="undefined" :value="undefined"></el-option>
+                <el-option label="已提现" value="1"></el-option>
+                <el-option label="未提现" value="0"></el-option>
               </el-select>
             </el-form-item>
 
@@ -16,18 +16,20 @@
               <el-date-picker
                 type="date"
                 placeholder="开始时间"
-                v-model="listQuery.daystart"
+                v-model="listQuery.startTime"
+                value-format="timestamp"
                 style="width: 40%;"
               ></el-date-picker>&nbsp;—
               <el-date-picker
                 type="date"
                 placeholder="结束时间"
-                v-model="listQuery.dayend"
+                v-model="listQuery.endTime"
+                value-format="timestamp"
                 style="width: 40%;"
               ></el-date-picker>
             </el-form-item>
             <el-form-item label="提现号">
-              <el-input v-model="listQuery.number" placeholder="请输入提现号"></el-input>
+              <el-input v-model="listQuery.orderNo" placeholder="请输入提现号"></el-input>
             </el-form-item>
           </el-row>
           <el-row>
@@ -43,17 +45,22 @@
         </el-form>
       </div>
       <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
-        <el-table-column align="center" label="提现号" prop="name"></el-table-column>
-        <el-table-column align="center" label="所属公司" prop="name"></el-table-column>
-        <el-table-column align="center" label="所属门店" prop="name"></el-table-column>
-        <el-table-column align="center" label="提现金额" prop="name"></el-table-column>
-        <el-table-column align="center" label="发起时间" prop="name"></el-table-column>
-        <el-table-column align="center" label="状态" prop="name"></el-table-column>
+        <el-table-column align="center" label="提现号" prop="orderNo"></el-table-column>
+        <el-table-column align="center" label="所属公司" prop="branchName"></el-table-column>
+        <el-table-column align="center" label="所属门店" prop="companyName"></el-table-column>
+        <el-table-column align="center" label="提现金额" prop="amount"></el-table-column>
+        <el-table-column align="center" label="发起时间" prop="crtTimeStr"></el-table-column>
+        <el-table-column align="center" label="状态">
+          <template slot-scope="{row}">
+            <span v-if="row.stauts==0">未审核</span>
+            <span v-else>审核</span>
+          </template>
+        </el-table-column>
 
         <el-table-column align="center" label="操作">
           <template slot-scope="{row}">
-            <el-button type="text" @click="vailde_now(row)">立即审核</el-button>
-            <el-button type="text" @click="vailde_check(row)">查看凭证</el-button>
+            <el-button type="text" v-if="row.stauts==0" @click="vailde_now(row)">立即审核</el-button>
+            <el-button type="text" v-else @click="vailde_check(row)">查看凭证</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -79,7 +86,7 @@
         <el-form-item label="凭证" style="margin-left: 100px;">
           <el-upload
             class="avatar-uploader"
-            action="https://jsonplaceholder.typicode.com/posts/"
+            :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
           >
@@ -91,14 +98,20 @@
             ></i>
           </el-upload>
         </el-form-item>
+        <el-form-item label="是否通过" style="margin-left: 100px;">
+          <el-radio-group v-model="is_pass">
+            <el-radio :label="1">通过</el-radio>
+            <el-radio :label="2">不通过</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="update_vailed_dialog = false">取 消</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button type="primary" @click="up_valid_ok">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog :visible.sync="show_vailed_dialog" width="30%" @close="show_vailed_dialog=false">
-      <img src alt />
+      <img v-if="show_image" class="show_img" :src="show_image.cono" alt />
     </el-dialog>
   </div>
 </template>
@@ -121,13 +134,18 @@ import {
   add_company,
   del_company,
   upd_company,
+  revenue_withdraw_list,
 } from "api/company";
 import { getAllZone } from "api/base_info/constant/";
 import Element1 from "../admin/menu/components/element";
 import ElRow from "element-ui/packages/row/src/row";
 import ElCol from "element-ui/packages/col/src/col";
 import { getToken } from "utils/auth";
-import { company_all_list, branchCompany_all_list } from "api/company.js";
+import {
+  company_all_list,
+  branchCompany_all_list,
+  revenue_withdraw_sh,
+} from "api/company.js";
 
 export default {
   name: "carApplyList",
@@ -138,6 +156,7 @@ export default {
   },
   data() {
     return {
+      is_pass: 1,
       title_text: "",
       BASE_API: process.env.BASE_API,
       add_edit_dialog: false,
@@ -147,10 +166,10 @@ export default {
       listQuery: {
         page: 1,
         limit: 10,
-        type: "0",
-        number: "",
-        daystart: "",
-        dayend: "",
+        status: undefined,
+        orderNo: undefined,
+        startTime: undefined,
+        endTime: undefined,
       },
       inline: true,
       tableKey: 0,
@@ -174,8 +193,35 @@ export default {
     },
   },
   methods: {
-    handleAvatarSuccess(res, file) {
-      this.imageUrl = URL.createObjectURL(file.raw);
+    up_valid_ok() {
+      if (this.imageUrl) {
+        let data = {
+          orderNo: this.vailde_item.orderNo,
+          cono: this.imageUrl,
+          stauts: this.is_pass,
+        };
+        revenue_withdraw_sh(data).then((res) => {
+          if (res.status == 200) {
+            this.update_vailed_dialog = false;
+            this.$message({
+              message: "操作成功",
+              type: "success",
+            });
+          } else {
+            this.$message.error({
+              message: res.message,
+            });
+          }
+        });
+      } else {
+        this.$message({
+          message: "请上传凭证",
+          type: "warning",
+        });
+      }
+    },
+    handleAvatarSuccess(res) {
+      this.imageUrl = res.data;
     },
     //所有公司
     get_all_companys() {
@@ -186,17 +232,12 @@ export default {
       });
     },
 
-    handleAvatarSuccess(res, file) {
-      this.company_form.businessLicense = res.data;
-    },
-
     /**
      * 获取列表
      * */
     getList() {
       this.listLoading = true;
-      company_list(this.listQuery).then((response) => {
-        console.log(response);
+      revenue_withdraw_list(this.listQuery).then((response) => {
         let totalCountRs = undefined;
         let listRs = undefined;
         if (
@@ -205,6 +246,9 @@ export default {
         ) {
           listRs = response.data.data;
           totalCountRs = response.data.totalCount;
+          listRs.map(function (item) {
+            item.crtTimeStr = timestamp2Date(item.crtTime);
+          });
         }
         this.listLoading = false;
         this.list = listRs;
@@ -225,10 +269,10 @@ export default {
       this.listQuery = {
         page: 1,
         limit: 10,
-        type: "0",
-        number: "",
-        daystart: "",
-        dayend: "",
+        status: undefined,
+        orderNo: undefined,
+        startTime: undefined,
+        endTime: undefined,
       };
       this.getList();
     },
@@ -243,6 +287,7 @@ export default {
     // 立即审核
     vailde_now(row) {
       this.update_vailed_dialog = true;
+      this.imageUrl = undefined;
       this.vailde_item = row;
     },
     //查看凭证
@@ -269,4 +314,8 @@ export default {
 .customWidth1 {
   width: 35%;
 }
+.show_img {
+  width: 100%;
+  height: 100%;
+}
 </style>