1、提现统计

src/api/bussinessmng/bussinessuserwithdraw.js

@@ -48,3 +48,13 @@ export const update = (row) => {
   })
 }
 
+export const withdrawStat = (params) => {
+  return request({
+    url: '/api/cyzh-bussiness-user-withdraw/bussinessuserwithdraw/withdrawStat',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+

src/views/bussiness/order.vue

@@ -4,8 +4,11 @@
     <span v-if="type.prop==='tab1'">
       <chongzhi ref="chongzhi"></chongzhi>
     </span>
-    <span v-else-if="type.prop==='tab2'">
-    <debit ref="debit"></debit>
+    <!--<span v-else-if="type.prop==='tab2'">
+      <debit ref="debit"></debit>
+    </span>-->
+    <span v-else-if="type.prop==='tab3'">
+      <withdraw ref="withdraw"></withdraw>
     </span>
   </basicContainer>
 
@@ -15,10 +18,12 @@
 <script>
   import chongzhi from "@/views/billrecord/chongzhi";
   import debit from "@/views/guosen/debit";
+  import withdraw from "@/views/guosen/withdraw";
   export default {
     components:{
       chongzhi,
-      debit
+      debit,
+      withdraw
     },
     data() {
       return {
@@ -29,11 +34,17 @@
             icon: 'el-icon-info',
             label: '采购明细',
             prop: 'tab1',
-          }, {
+          },
+          /*  {
             icon: 'el-icon-warning',
             label: '扣款明细',
             prop: 'tab2',
-          }]
+          },*/
+            {
+              icon: 'el-icon-warning',
+              label: '扣款明细',
+              prop: 'tab3',
+            }]
         },
 
       }
@@ -49,9 +60,14 @@
           this.$nextTick(()=>{
             this.$refs.chongzhi.searchReset();
           })
-        }else{
+        }else if(this.type.prop==='tab2'){
           this.$nextTick(()=>{
             this.$refs.debit.searchReset();
+            // this.$refs.withdraw.searchReset();
+          })
+        }else{
+          this.$nextTick(()=>{
+            this.$refs.withdraw.searchReset();
           })
         }
       }

src/views/bussinessmng/bussinessgoods.vue

@@ -134,7 +134,12 @@
               hide: true,
               addDisplay: true,
               editDisplay: true,
-              viewDisplay: false
+              viewDisplay: false,
+              rules: [{
+                required: false,
+                message: "请选择关联采购商",
+                trigger: "blur"
+              }],
             },
             {
               label: "关联采购商",

src/views/guosen/debit.vue

@@ -82,10 +82,10 @@
         <el-button type="text" size="small" icon="el-icon-zoom-in" @click="handleDetail(scope.row)">分佣对象
         </el-button>
       </template>
-      <template slot="menuLeft">
+      <template slot="menuLeft" v-if="data.length > 0">
         <el-button type="warning"
                    size="small"
-                   v-if="permission.debt_stat && data.length > 0"
+                   v-if="permission.debt_stat"
                    @click="handleStat">
           分润统计</el-button><span style="color: red; font-weight:bold">{{debtStat}}</span>
       </template>
@@ -269,7 +269,7 @@
             },
             {
               label: "时间",
-              prop: "updateTime",
+              prop: "createTime",
               type: "date",
               search: true,
               valueFormat: "yyyy-MM-dd HH:mm:ss",

src/views/guosen/withdraw.vue

@@ -0,0 +1,412 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.bussinessuserwithdraw_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot="menu" slot-scope="{row}">
+        <el-button type="text" size="small" icon="el-icon-zoom-in" @click="handleDetail(row)">收款对象</el-button>
+      </template>
+      <template slot="menuLeft" v-if="data.length > 0">
+        <el-button type="warning"
+                   size="small"
+                   v-if="permission.bussinessuserwithdraw_stat"
+                   @click="handleStat">
+          代付统计</el-button><span style="color: red; font-weight:bold">{{withdrawStat}}</span>
+      </template>
+    </avue-crud>
+    <el-dialog :modal-append-to-body="false" :visible.sync="withdrawDetailVisible" title="收款对象" width="40%">
+      <div>
+        <span style="margin:10px;">
+          <font size="3">收款账户名：</font>
+        </span>
+        <span style="margin:10px;">
+          {{withdrawObject.receiverAccountName}}
+        </span>
+      </div>
+      <div>
+        <span style="margin:10px;">
+          <font size="3">
+            银行卡编码：
+          </font>
+        </span>
+        <span style="margin:10px;">
+          {{withdrawObject.bankCode}}
+        </span>
+      </div>
+      <div>
+        <span style="margin:10px;">
+          <font size="3">
+            账户类型：
+          </font>
+        </span>
+        <span>
+          {{withdrawObject.receiveType}}
+        </span>
+      </div>
+      <div>
+        <span style="margin:10px;">
+          <font size="3">
+            银行卡号：
+          </font>
+        </span>
+        <span>
+          {{withdrawObject.bankAccountNo}}
+        </span>
+      </div>
+      <div>
+        <span style="margin:10px;">
+          <font size="3">
+            收款金额：
+          </font>
+        </span>
+        <span>
+          {{withdrawObject.orderAmount}}
+        </span>
+      </div>
+      <div>
+        <span style="margin:10px;">
+          <font size="3">
+            收款状态：
+          </font>
+        </span>
+        <span>
+          {{withdrawObject.$withdrawStatus}}
+        </span>
+      </div>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove, withdrawStat} from "@/api/bussinessmng/bussinessuserwithdraw";
+  import {mapGetters} from "vuex";
+
+  export default {
+    props:{
+      userInfoId: null
+    },
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        withdrawStat:"",
+        withdrawObject:{},
+        withdrawDetailVisible: false,
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          editDisplay: false,
+          addDisplay: false,
+          delBtn: false,
+          menu: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "采购商",
+              prop: "bussinessId",
+              type: "select",
+              search: true,
+              filterable: true,
+              dicUrl: "/api/cyzh-guosen/bussiness/listBussiness?size=500",
+              props:{
+                label: "name",
+                value: "id"
+              },
+            },
+            {
+              label: "收款账号",
+              prop: "bankAccountNo",
+              hide: true
+            },
+            {
+              label: "到账类型",
+              prop: "receiveType",
+              type: "select",
+              hide: true,
+              dicData: [
+                {
+                  label: '实时',
+                  value: "REAL_TIME"
+                },
+                {
+                  label: '2小时到账',
+                  value: "TWO_HOUR"
+                },
+                {
+                  label: '次日到账',
+                  value: "NEXT_DAY"
+                }
+              ]
+            },
+            {
+              label: "收款金额（元）",
+              prop: "orderAmount",
+            },
+            {
+              label: "收款用户",
+              prop: "userInfoId",
+              type: "select",
+              filterable: true,
+              dicUrl: "/api/cyzh-bussiness-user-info/bussinessuserinfo/listUserInfo",
+              props:{
+                label: "userName",
+                value: "id"
+              },
+            },
+            {
+              label: "收款状态",
+              prop: "withdrawStatus",
+              type: "select",
+              search: true,
+              dicData: [
+                {
+                  label: '待发起',
+                  value: 10
+                },
+                {
+                  label: '处理中',
+                  value: 11
+                },
+                {
+                  label: '处理中',
+                  value: 12
+                },
+                {
+                  label: '处理中',
+                  value: 13
+                },
+                {
+                  label: '失败',
+                  value: 14
+                },
+                {
+                  label: '成功',
+                  value: 15
+                },
+              ]
+            },
+            {
+              label: "是否冲退",
+              prop: "isReversed",
+              dicData: [
+                {
+                  label: '是',
+                  value: 1
+                },
+                {
+                  label: '否',
+                  value: 0
+                },
+              ]
+            },
+            {
+              label: "失败原因",
+              prop: "failReason",
+            },
+            {
+              label: "采购商订单号",
+              prop: "bussinessOrderId",
+            },
+            {
+              label: "时间",
+              prop: "createTime",
+              type: "date",
+              search: true,
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              searchSpan: 4,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.bussinessuserwithdraw_add, false),
+          viewBtn: this.vaildData(this.permission.bussinessuserwithdraw_view, false),
+          delBtn: this.vaildData(this.permission.bussinessuserwithdraw_delete, false),
+          editBtn: this.vaildData(this.permission.bussinessuserwithdraw_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      handleDetail(row){
+        this.withdrawDetailVisible = true;
+        this.withdrawObject = row;
+      },
+      handleStat(){
+        withdrawStat(this.query).then(res =>{
+          this.withdrawStat = "¥" + res.data.data;
+        })
+      },
+      searchReset() {
+        this.debtStat = "";
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+                .then(() => {
+                  return remove(row.id);
+                })
+                .then(() => {
+                  this.onLoad(this.page);
+                  this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                  });
+                });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+                .then(() => {
+                  return remove(this.ids);
+                })
+                .then(() => {
+                  this.onLoad(this.page);
+                  this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                  });
+                  this.$refs.crud.toggleSelection();
+                });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.withdrawStat = "";
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        if(this.userInfoId != null){
+          params['userInfoId'] = this.userInfoId;
+        }
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/test/bussinessmng/testbussinessinfo.vue

@@ -57,7 +57,6 @@
     add,
     update,
     remove,
-    agreeSign
   } from "@/api/bussinessmng/bussinessinfo";
   import {testMerchantRegister} from "@/api/bussinessmng/bussinessregisterrequest";
   import {getByTypeAndBussinessInfoId} from "@/api/bussinessmng/bussinesscontactinfo";