1、分润新增账户完成

src/api/guosen/bussinessbonusrecords.js

@@ -48,9 +48,17 @@ export const update = (row) => {
   })
 }
 
-export const bonus = (row) => {
+export const payForBonus = (row) => {
   return request({
-    url: '/api/cyzh-guosen/bussinessbonusrecords/bonus',
+    url: '/api/cyzh-guosen/bussinessbonusrecords/payForBonus',
+    method: 'post',
+    data: row
+  })
+}
+
+export const withdrawForBonus = (row) => {
+  return request({
+    url: '/api/cyzh-guosen/bussinessbonusrecords/withdrawForBonus',
     method: 'post',
     data: row
   })

src/views/guosen/bussinessbonusaccount.vue

@@ -33,6 +33,8 @@
 
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/guosen/bussinessbonusaccount";
+  import {getList as getBankCodeList} from "@/api/guosen/bankcode";
+  import {getDetail as getUserInfoDetail} from "@/api/bussinessmng/bussinessuserinfo";
   import {mapGetters} from "vuex";
 
   export default {
@@ -61,15 +63,62 @@
           dialogWidth: "30%",
           column: [
             {
-              label: "账号名称",
-              prop: "account",
-              span: 24,
+              label:"所属商户",
+              prop: "bussinessName",
+              display:false
+            },
+            {
+              label:"签约商户",
+              prop: "userInfoName",
+              display:false
+            },
+            {
+              label: "签约商户",
+              prop: "bussinessId",
+              type: "select",
+              hide:true,
+              dicUrl: "/api/cyzh-guosen/bussiness/listBussiness?size=500&registerStatus=200",
+              props:{
+                label: "name",
+                value: "id"
+              },
+              cascaderItem: ['userInfoId'],
               rules: [{
                 required: true,
-                message: "请输入账号名称",
-                trigger: "blur"
+                message: "请选择签约商户",
+                trigger: "change"
               }]
             },
+            {
+              label: "签约用户",
+              prop: "userInfoId",
+              type: "select",
+              cascaderIndex:0,
+              hide:true,
+              dicUrl: "/api/cyzh-bussiness-user-info/bussinessuserinfo/listUserInfo?size=500&bussinessId={{bussinessId}}&registerStatus=200",
+              props:{
+                label: "userName",
+                value: "id"
+              },
+              rules: [{
+                required: false,
+                message: "请选择签约用户",
+                trigger: "change"
+              }],
+              change: (value, column) => {
+                this.userChange(value, column);
+              },
+
+            },
+            // {
+            //   label: "账号名称",
+            //   prop: "account",
+            //   rules: [{
+            //     required: true,
+            //     message: "请输入账号名称",
+            //     trigger: "blur"
+            //   }]
+            // },
             {
               label: "分润比例",
               span: 24,
@@ -84,7 +133,6 @@
             {
               label: "收款方开户行",
               prop: "receiverBankCode",
-              span: 24,
               type: "select",
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=bank_type",
               props:{
@@ -157,7 +205,24 @@
       }
     },
     methods: {
+      userChange(data){
+        if(data.value){
+          let that = this;
+          getUserInfoDetail(data.value).then(res => {
+            let userInfo = res.data.data;
+            let accountObj = that.findObject(that.option.column, "account");
+            let bankAccountTypeObj = that.findObject(that.option.column, "bankAccountType");
+            let receiverAccountNoObj = that.findObject(that.option.column, "receiverAccountNo");
+            that.form.account = userInfo.userName;
+            that.form.bankAccountType = userInfo.bankAccountType;
+            that.form.receiverAccountNo = userInfo.bankCardNo;
+            that.form.receiverBankCode = userInfo.bankCode;
+          });
+        }
+      },
       rowSave(row, done, loading) {
+        row.bussinessName = row.$bussinessId;
+        row.userInfoName = row.$userInfoId;
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -171,6 +236,8 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        row.bussinessName = row.$bussinessId;
+        row.userInfoName = row.$userInfoId;
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({

src/views/guosen/bussinessbonusrecords.vue

@@ -46,7 +46,8 @@
     add,
     update,
     remove,
-    bonus,
+    payForBonus,
+    withdrawForBonus,
   } from "@/api/guosen/bussinessbonusrecords";
   import {
     getYesterdayData
@@ -241,7 +242,7 @@
       },
       bonusDo(row,done,loading) {
           this.$alert("确定分润吗？").then(()=>{
-            bonus(row).then(() => {
+            withdrawForBonus(row).then(() => {
               this.onLoad(this.page);
               this.$message({
                 type: "success",