1、

src/api/bussiness/bussinesscontactinfo.js

@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/cyzh-bussiness-contact-info/bussinesscontactinfo/save',
+    url: '/api/cyzh-bussiness-contact-info/bussinesscontactinfo/submit',
     method: 'post',
     data: row
   })

src/api/bussiness/bussinesstransferorder.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/cyzh-bussiness-transfer-order/bussinesstransferorder/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/cyzh-bussiness-transfer-order/bussinesstransferorder/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/cyzh-bussiness-transfer-order/bussinesstransferorder/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/cyzh-bussiness-transfer-order/bussinesstransferorder/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/cyzh-bussiness-transfer-order/bussinesstransferorder/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/api/guosen/bussiness.js

@@ -77,12 +77,19 @@ export const enableBussiness = (params) => {
   })
 }
 
-export const queryBalance = (id) => {
+export const queryBusinessBalance = (bussinessId) => {
   return request({
-    url: '/api/cyzh-guosen/bussiness/queryBalance',
+    url: '/api/cyzh-guosen/bussiness/queryBusinessBalance',
     method: 'get',
     params: {
-      id
+      bussinessId
     }
   })
 }
+
+export const queryPlatformBalance = () => {
+  return request({
+    url: '/api/cyzh-guosen/bussiness/queryPlatformBalance',
+    method: 'get',
+  })
+}

src/views/billrecord/chongzhi.vue

@@ -92,16 +92,27 @@
                   value:0
                 },
                 {
-                  label:"已付款",
+                  label:"付款成功",
                   value: 1
                 },
                 {
-                  label:"已取消",
-                  value: 2
+                  label:"付款失败",
+                  value: 3
+                },
+                {
+                  label:"系统异常",
+                  value: 4
                 },
-
               ]
             },
+            {
+              label: "汇款备注码",
+              prop: "remitComment",
+            },
+            {
+              label: "描述",
+              prop: "failReason",
+            },
             {
               label: "时间",
               prop: "createTime",
@@ -109,7 +120,6 @@
               search: true,
               valueFormat: "yyyy-MM-dd HH:mm:ss"
             },
-
           ]
         },
         data: []

src/views/bussiness/bussinessinfo.vue

@@ -96,6 +96,7 @@
           contactLicenceNo: '',
           contactMobile: '',
           contactEmail: '',
+          servicePhone: ''
         },
         //详情
         detailData:{},
@@ -125,6 +126,20 @@
           dialogClickModal: false,
           labelWidth: 150,
           column: [
+            {
+              label: "关联采购商",
+              prop: "bussinessId",
+              type: "select",
+              filterable: true,
+              dicUrl: "/api/cyzh-guosen/bussiness/listBussiness?size=500",
+              props:{
+                label: "name",
+                value: "id"
+              },
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: true
+            },
             {
               label: "商户签约类型",
               prop: "signType",
@@ -272,6 +287,7 @@
               type: "select",
               slot: true,
               dicUrl: "/api/blade-system/dict-biz/dictionary?code=merchant_register_status",
+              display: false,
               props:{
                 label: "dictValue",
                 value: "dictKey"
@@ -289,7 +305,7 @@
           addBtn: this.vaildData(this.permission.bussinessinfo_add, false),
           viewBtn: this.vaildData(this.permission.bussinessinfo_view, false),
           delBtn: this.vaildData(this.permission.bussinessinfo_delete, false),
-          editBtn: this.vaildData(this.permission.bussinessinfo_edit, false)
+          editBtn: this.vaildData(this.permission.bussinessinfo_edit, false),
         };
       },
       ids() {
@@ -337,28 +353,9 @@
         }
         getByTypeAndBussinessInfoId(10, item.id).then(res =>{
           that.data2 = res.data.data;
-          // that.data2= {
-          //   id: res.data.data.id,
-          //   contactType: 10,
-          //   bussinessInfoId: item.id,
-          //   legalName: res.data.data.legalName,
-          //   legalLicenceType: res.data.data.legalLicenceType,
-          //   legalLicenceNo: res.data.data.legalLicenceNo,
-          //   legalLicenceFrontUrl: res.data.data.legalLicenceFrontUrl,
-          //   legalLicenceBackUrl: res.data.data.legalLicenceBackUrl
-          // }
         }),
         getByTypeAndBussinessInfoId(11, item.id).then(res => {
           that.data3= res.data.data;
-          // {
-          //   id: res.data.data.id,
-          //   contactType: 11,
-          //   bussinessInfoId: item.id,
-          //   contactName: res.data.data.contactName,
-          //   contactLicenceNo: res.data.data.contactLicenceNo,
-          //   contactMobile: res.data.data.contactMobile,
-          //   contactEmail: res.data.data.contactEmail,
-          // }
         })
         that.$refs.addDialog.open()
       },
@@ -378,17 +375,19 @@
         }
       },
       submit(item) {
-        merchantRegister(item).then(() => {
-          this.onLoad(this.page);
-          this.resetData()
-          this.$refs.addDialog.close()
+        merchantRegister(item).then(res => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-        }, error => {
-          window.console.log(error);
         });
+        this.$message({
+          type: "success",
+          message: "操作成功，请等待结果"
+        });
+        this.onLoad(this.page);
+        this.$refs.addDialog.close();
+        this.resetData();
       },
       rowSave(row, done, loading) {
         add(row).then(() => {

src/views/bussiness/bussinesstransferorder.vue

@@ -0,0 +1,260 @@
+<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.bussinesstransferorder_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot="transferStatus", slot-scope="{row}">
+        <el-tag v-if="row.transferStatus === 'SUCCESS'" plain type="success">成功</el-tag>
+        <el-tag v-if="row.transferStatus === 'REQUEST_RECEIVE'" plain type="warning">正在处理</el-tag>
+        <el-tag v-if="row.transferStatus === 'FAIL'" plain type="danger">失败</el-tag>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/bussiness/bussinesstransferorder";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "商户请求号",
+              prop: "requestNo",
+            },
+            {
+              label: "转出方商户编号",
+              prop: "fromMerchantNo",
+              type: "select",
+              dicUrl: "/api/cyzh-guosen/bussiness/listBussiness?size=500",
+              props:{
+                label: "name",
+                value: "merchantNo"
+              },
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: true
+            },
+            {
+              label: "转入方商户编号",
+              prop: "toMerchantNo",
+              type: "select",
+              dicUrl: "/api/cyzh-guosen/bussiness/listBussiness?size=500",
+              props:{
+                label: "name",
+                value: "merchantNo"
+              },
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: true
+            },
+            {
+              label: "转账金额",
+              prop: "orderAmount",
+            },
+            {
+              label: "手续费",
+              prop: "fee",
+            },
+            {
+              label: "扣账金额",
+              prop: "debitAmount",
+            },
+            {
+              label: "入账金额	",
+              prop: "receiveAmount",
+            },
+            {
+              label: "转账完成时间",
+              prop: "finishTime",
+            },
+            {
+              label: "转账订单状态",
+              prop: "transferStatus",
+              slot: true
+            },
+          ]
+        },
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.bussinesstransferorder_add, false),
+          viewBtn: this.vaildData(this.permission.bussinesstransferorder_view, false),
+          delBtn: this.vaildData(this.permission.bussinesstransferorder_delete, false),
+          editBtn: this.vaildData(this.permission.bussinesstransferorder_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      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.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;
+        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/bussiness/comps/bussinessinfo-add.vue

@@ -1,6 +1,6 @@
 <template>
     <basic-container>
-        <el-dialog title="商户进件信息" :append-to-body="true" :visible.sync="dialogFormVisible" top="1vh" @close="dialogClose" @open="openDialog">
+        <el-dialog title="商户进件信息" :append-to-body="true" :visible.sync="dialogFormVisible" top="1vh" @close="dialogClose" @open="openDialog" :close-on-click-modal="false">
             <!-- 步骤条 -->
             <div class="steps">
                 <el-steps :active="active" process-status="finish" align-center>
@@ -13,7 +13,7 @@
             <el-card style="margin-top: 40px;" v-if="active==0">
                 <div style="margin-top:10px;">
                     <el-form  :model="form1" :rules="rules1" ref="form1" label-width="120px" label-position="right" size="small">
-                        <el-form-item label="商户类型" prop="signType">
+                        <el-form-item label="商户签约类型" prop="signType">
                             <el-select v-model="form1.signType" placeholder="请输入商户类型" clearable="true">
                                 <el-option v-for="item in signTypeOptions" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                             </el-select>
@@ -75,7 +75,7 @@
                             <el-col span="12">
                                 <el-form-item prop="licenceUrl" label="商户证件照片" style="width: 45%;">
                                     <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
-                                               :on-success="uploadLicenceUrl">
+                                               :on-success="uploadLicenceUrl" :before-upload="beforeUploadLicenceUrl">
                                         <img v-if="form1.licenceUrl" :src="form1.licenceUrl" class="avatar">
                                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                                     </el-upload>
@@ -84,7 +84,7 @@
                             <el-col span="12">
                                 <el-form-item prop="handLicenceUrl" label="手持营业执照在经营场所的照片" style="width: 45%;">
                                     <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
-                                               :on-success="uploadHandLicenceUrl">
+                                               :on-success="uploadHandLicenceUrl" :before-upload="beforeUploadLicenceUrl">
                                         <img v-if="form1.handLicenceUrl" :src="form1.handLicenceUrl" class="avatar">
                                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                                     </el-upload>
@@ -93,7 +93,7 @@
                         </el-row>
                         <el-form-item prop="openAccountLicenceUrl" label="开户许可证照片" style="width: 45%;">
                             <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
-                                       :on-success="uploadOpenAccountLicenceUrl">
+                                       :on-success="uploadOpenAccountLicenceUrl" :before-upload="beforeUploadLicenceUrl">
                                 <img v-if="form1.openAccountLicenceUrl" :src="form1.openAccountLicenceUrl" class="avatar">
                                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                             </el-upload>
@@ -128,7 +128,7 @@
                             <el-col span="12">
                                 <el-form-item prop="legalLicenceFrontUrl" label="请上传法人证件正面照片" style="width: 45%;">
                                     <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
-                                               :on-success="uploadLegalLicenceFrontUrl">
+                                               :on-success="uploadLegalLicenceFrontUrl" :before-upload="beforeUploadContactUrl">
                                         <img v-if="form2.legalLicenceFrontUrl" :src="form2.legalLicenceFrontUrl" class="avatar">
                                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                                     </el-upload>
@@ -137,7 +137,7 @@
                             <el-col span="12">
                                 <el-form-item prop="legalLicenceBackUrl" label="法人证件反面照片" style="width: 45%;">
                                     <el-upload class="avatar-uploader" action="/api/putObject" :show-file-list="false"
-                                               :on-success="uploadLegalLicenceBackUrl">
+                                               :on-success="uploadLegalLicenceBackUrl" :before-upload="beforeUploadContactUrl">
                                         <img v-if="form2.legalLicenceBackUrl" :src="form2.legalLicenceBackUrl" class="avatar">
                                         <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                                     </el-upload>
@@ -194,14 +194,13 @@
     } from "@/api/bussinessregion/bussinessregion";
     import {getDictionary} from "@/api/system/dictbiz";
     import {add as saveBussInfo, update as updateBussInfo} from "@/api/bussiness/bussinessinfo"
-    import {add as saveContactInfo, update as updateContactInfo} from "@/api/bussiness/bussinesscontactinfo"
-    import {isvalidatemobile, isEmail} from "@/util/validate"
+    import {add as saveContactInfo} from "@/api/bussiness/bussinesscontactinfo"
     export default {
         props:{
             form1:Object,
             form2:Object,
             form3:Object,
-            curEvent: 'add'
+            curEvent: 'add',
         },
         data() {
             var validatemobile = (rule, value, callback) => {
@@ -244,6 +243,7 @@
                     label: 'cityName',
                     value: 'cityCode',
                 },
+                bussinessRoleOptions: [],
                 signTypeOptions: [],
                 legalLicenceTypeOptions: [],
                 dialogFormVisible: false,
@@ -279,13 +279,13 @@
                         { required: true, message: '请输入开户许可证编号', trigger: 'blur' },
                     ],
                     licenceUrl: [
-                        { required: false, message: '请上传商户证件照片', trigger: 'blur' },
+                        { required: true, message: '请上传商户证件照片', trigger: 'blur' },
                     ],
                     openAccountLicenceUrl: [
-                        { required: false, message: '请上传法人证件照正面照片', trigger: 'blur' },
+                        { required: true, message: '请上传法人证件照正面照片', trigger: 'blur' },
                     ],
                     handLicenceUrl: [
-                        { required: false, message: '请上传法人证件照反面照片', trigger: 'blur' },
+                        { required: true, message: '请上传法人证件照反面照片', trigger: 'blur' },
                     ],
                 },
                 rules2:{
@@ -299,10 +299,10 @@
                         {required: true, message: '请输入法人证件号码', trigger: 'blur' },
                     ],
                     legalLicenceFrontUrl:[
-                        {required: false, message: '请上传法人证件正面照片', trigger: 'blur' },
+                        {required: true, message: '请上传法人证件正面照片', trigger: 'blur' },
                     ],
                     legalLicenceBackUrl:[
-                        {required: false, message: '请上传法人证件反面照片', trigger: 'blur' },
+                        {required: true, message: '请上传法人证件反面照片', trigger: 'blur' },
                     ]
                 },
                 rules3:{
@@ -322,24 +322,42 @@
         },
         created() {
             this.loadProvince();
-            this.loadSignTypeList("business_sign_type");
-            this.loadLegalLicenceTypeList("legal_licence_type");
+            this.loadDict("business_sign_type");
+            this.loadDict("legal_licence_type");
+            this.loadDict("yee_business_role");
         },
         methods: {
+            beforeUploadLicenceUrl(file){
+                if(file.size > 5242880){
+                    this.$message.error("图片大小不能超过2.5M");
+                    return false;
+                }else{
+                    return true;
+                }
+            },
+            beforeUploadContactUrl(file){
+                if(file.size > 1048576){
+                    this.$message.error("图片大小不能超过1M");
+                    return false;
+                }else{
+                    return true;
+                }
+            },
             openDialog(){
                 if(this.curEvent == 'edit'){
                     this.loadCity(this.form1.province);
                     this.loadDistrict(this.form1.city);
                 }
             },
-            loadSignTypeList(code){
+            loadDict(code){
                 getDictionary({"code":code}).then(res =>{
-                    this.signTypeOptions = res.data.data;
-                })
-            },
-            loadLegalLicenceTypeList(code){
-                getDictionary({"code":code}).then(res =>{
-                    this.legalLicenceTypeOptions = res.data.data;
+                    if(code === 'business_sign_type'){
+                        this.signTypeOptions = res.data.data;
+                    }else if(code === 'legal_licence_type'){
+                        this.legalLicenceTypeOptions = res.data.data;
+                    }else if(code === 'yee_business_role'){
+                        this.bussinessRoleOptions = res.data.data;
+                    }
                 })
             },
             loadProvince(){
@@ -391,7 +409,7 @@
             },
             //上传法人证件反面照片
             uploadLegalLicenceBackUrl(res) {
-                this.form2.legalLegalLicenceBackUrl = res.data
+                this.form2.legalLicenceBackUrl = res.data
             },
             next(){
                 switch (this.active){
@@ -404,6 +422,7 @@
                                         type: "success",
                                         message: res.data.msg
                                     });
+                                    this.form1.id = res.data.data.id;
                                     this.form.bussinessInfoId = res.data.data.id;
                                     this.form2.bussinessInfoId = res.data.data.id;
                                     this.form3.bussinessInfoId = res.data.data.id;
@@ -426,53 +445,32 @@
                     case 1:
                         let validForm2 = this.validForm('form2');
                         if(validForm2){
-                            if(this.curEvent == "add"){
-                                this.form2.contactType = 10;
-                                saveContactInfo(this.form2).then(res => {
-                                    this.$message({
-                                        type: "success",
-                                        message: res.data.msg
-                                    });
-                                    this.form2.id = res.data.data.id;
-                                    this.handelNext()
-                                });
-                            }else if(this.curEvent == "edit" && this.form2.id != null){
-                                this.form2.contactType = 10;
-                                updateContactInfo(this.form2).then(res => {
-                                    this.$message({
-                                        type: "success",
-                                        message: res.data.msg
-                                    });
-                                    this.form2.id = res.data.data.id;
-                                    this.handelNext()
+                            this.form2.contactType = 10;
+                            this.form2.bussinessInfoId = this.form1.id
+                            saveContactInfo(this.form2).then(res => {
+                                this.$message({
+                                    type: "success",
+                                    message: res.data.msg
                                 });
-                            }
+                                this.form2.id = res.data.data.id;
+                                this.handelNext()
+                            });
                         }
                         break;
                     case 2:
                         let validForm3 = this.validForm('form3');
                         if(validForm3){
-                            if(this.curEvent == "add"){
-                                this.form3.contactType = 11;
-                                saveContactInfo(this.form3).then(res => {
-                                    this.$message({
-                                        type: "success",
-                                        message: res.data.msg
-                                    });
-                                    this.form3.id = res.data.data.id;
-                                    this.handelNext()
+                            this.form3.contactType = 11;
+                            this.form3.bussinessInfoId = this.form1.id
+                            this.form3.servicePhone = this.form3.contactMobile;
+                            saveContactInfo(this.form3).then(res => {
+                                this.$message({
+                                    type: "success",
+                                    message: res.data.msg
                                 });
-                            }else if(this.curEvent == "edit" && this.form3.id != null){
-                                this.form3.contactType = 11;
-                                updateContactInfo(this.form3).then(res => {
-                                    this.$message({
-                                        type: "success",
-                                        message: res.data.msg
-                                    });
-                                    this.form3.id = res.data.data.id;
-                                    this.handelNext()
-                                });
-                            }
+                                this.form3.id = res.data.data.id;
+                                this.handelNext()
+                            });
                         }
                         break;
                     default:
@@ -500,9 +498,15 @@
                 }
             },
             submit(){
-                this.form.bussinessInfoId = this.form1.id;
-                this.$emit('submit', this.form)
-                this.active = 0;
+                this.$confirm("确定提交进件申请吗?如果需要修改，请先点击保存后再提交申请", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.form.bussinessInfoId = this.form1.id;
+                    this.$emit('submit', this.form)
+                    this.active = 0;
+                });
             },
             dialogClose(){
                 this.active = 0;

src/views/bussiness/comps/bussinessinfo-detail.vue

@@ -186,6 +186,8 @@
             openDialog(){
                 this.loadCity(this.form1.province);
                 this.loadDistrict(this.form1.city);
+                this.loadLegalDetail();
+                this.loadContactDetail();
             },
             loadLegalLicenceTypeList(code){
                 getDictionary({"code":code}).then(res =>{
@@ -213,8 +215,6 @@
                 })
             },
             open() {
-                this.loadLegalDetail();
-                this.loadContactDetail();
                 this.dialogFormVisible = true;
             },
             close() {

src/views/guosen/bussiness.vue

@@ -23,12 +23,6 @@
         <el-tag type="danger" v-if="scope.row.enable == 1">禁用</el-tag>
       </template>
       <template slot="menu" slot-scope="{row}">
-        <el-button
-                type ="text"
-                size="mini"
-                plain
-                @click="handleProduct(row.id)">编辑费率
-        </el-button>
         <el-button
                 type ="text"
                 size="mini"
@@ -44,10 +38,16 @@
                 @click="handleEnable(row.id, 1)">禁用
         </el-button>
       </template>
+      <template slot="registerStatus" slot-scope="{row}">
+        <el-tag plain type="warning" size="small" v-if="row.registerStatus == 100">资料完善中</el-tag>
+        <el-tag plain type="primary" size="small" v-if="row.registerStatus == 98">送审中</el-tag>
+        <el-tag plain type="warning" size="small" v-if="row.registerStatus == 101">协议待签署</el-tag>
+        <el-tag plain type="warning" size="small" v-if="row.registerStatus == 102">审核中</el-tag>
+        <el-tag plain type="success" size="small" v-if="row.registerStatus == 200">审核成功</el-tag>
+        <el-tag plain type="danger" size="small" v-if="row.registerStatus == 400">审核失败</el-tag>
+        <el-tag plain type="danger" size="small" v-if="row.registerStatus == 99">送审失败</el-tag>
+      </template>
     </avue-crud>
-    <el-dialog :modal-append-to-body="false" title="采购商服务费率配置页面" append-to-body center top="2vh" :visible.sync="rateStrategyVisible" @close="closeRateStrategyDialog">
-      <bussinessratestrategy :bussinessId="bussinessId" v-if="rateStrategyVisible"></bussinessratestrategy>
-    </el-dialog>
   </basic-container>
 </template>
 
@@ -82,7 +82,6 @@
           total: 0
         },
         bussinessId: null,
-        rateStrategyVisible: false,
         selectionList: [],
         option: {
           height: 'auto',
@@ -99,13 +98,13 @@
           dialogWidth: "30%",
           column: [
            {
-              label: "商户号名称",
+              label: "采购商名称",
               labelWidth: 130,
               prop: "name",
               span: 24,
               rules: [{
                 required: true,
-                message: "请输入商户号名称",
+                message: "请输入采购商名称",
                 trigger: "blur"
               }]
             },
@@ -192,17 +191,6 @@
                 trigger: "blur"
               }]
             },
-            // {
-            //   label: "关联账号的id",
-            //   prop: "accountId",
-            //   hide: true,
-            //   display: false,
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入关联账号的id",
-            //     trigger: "blur"
-            //   }]
-            // },
             {
               label: "余额(元)",
               prop: "remain",
@@ -214,7 +202,7 @@
               }]
             },
             {
-              label: "状态",
+              label: "启用状态",
               prop: "enable",
               type: "select",
               slot: true,
@@ -230,6 +218,18 @@
                 },
               ],
             },
+            {
+              label: "进件状态",
+              prop: "registerStatus",
+              type: "select",
+              display: false,
+              slot: true,
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=merchant_register_status",
+              props:{
+                label: "dictValue",
+                value: "dictKey"
+              },
+            },
           ]
         },
         data: []
@@ -254,14 +254,6 @@
       }
     },
     methods: {
-      handleProduct(bussinessId){
-        this.rateStrategyVisible = true;
-        this.bussinessId = bussinessId;
-      },
-      closeRateStrategyDialog(){
-        this.rateStrategyVisible = false;
-        this.bussinessId = null;
-      },
       handleEnable(bussinessId, enable){
         if(enable == 1){
           this.$confirm("确定要禁用吗?", {

src/views/guosen/bussinessbonusrecords.vue

@@ -55,7 +55,7 @@
     mapGetters
   } from "vuex";
   import {dateFormat} from '@/util/date'
-  import {queryBalance} from "../../api/guosen/bussiness";
+  import {queryPlatformBalance} from "../../api/guosen/bussiness";
 
   export default {
     data() {
@@ -235,7 +235,7 @@
     },
     methods: {
       handelQueryBalance(){
-        queryBalance().then(res =>{
+        queryPlatformBalance().then(res =>{
           this.balance = "¥" + res.data.data;
         })
       },

src/views/guosen/bussinessdebitrequest.vue

@@ -57,8 +57,8 @@
 <script>
   import {getList, getDetail, add, update, remove} from "@/api/guosen/bussinessdebitrequest";
   import {mapGetters} from "vuex";
-   import {getToken} from '@/util/auth';
-   import debit from "@/views/guosen/debit"
+  import {getToken} from '@/util/auth';
+  import debit from "@/views/guosen/debit"
 
   export default {
     components:{

src/views/wel/index.vue

@@ -12,84 +12,10 @@
       </div>
     </el-dialog>
 
-    <!--<el-dialog :modal-append-to-body="false" :visible.sync="chongzhiVisible" title="采购页面" width="30%" fullscreen="true">
-      <div align="center" style="font-size: 20px;color: #0099FF;margin-bottom: 20px;">采购金额</div>
-      <div align="center">
-        <span>
-          <el-input placeholder="请输入内容" v-model="money" type="number" :min="1">
-            <template slot="prepend">RMB</template>
-          </el-input>
-        </span>
-        <div align="left" style="margin: 10px;">采购金额(大写)：{{moneyChina}}</div>
-        <div align="center" style="margin: 20px;">
-          <el-button type="success" size="mini" @click="chongzhiConfirm('YJZF')">快捷支付</el-button>
-          <el-button type="success" size="mini" @click="chongzhiConfirm('EBANK')">网银支付</el-button>
-        </div>
-        <el-divider></el-divider>
-        <div>说明：采购后账户余额 = 本次采购金额 - 技术服务费 - 手续费
-          <div>
-            <table style="width: 100%;" border="1" class="myTable">
-              <tr v-for="(item,i) in statDatas" :key="i">
-                <td class="column">{{ item.key }}</td>
-                <td class="column">{{ item.value }}</td>
-              </tr>
-            </table>
-          </div>
-        </div>
-      </div>
-    </el-dialog>-->
-
-    <el-card>
+    <el-card v-if="permission.account_static">
       <el-row :gutter="50">
         <el-col :span="24">
-          <!--  <el-card>
-            {{userInfo.userName}} 欢迎回来
-          </el-card> -->
-
-          <!--<el-card header="基础数据统计" v-if="permission.basic_static">
-            <avue-data-rotate :option="optionMusic"></avue-data-rotate>
-          </el-card>-->
-<!--          <br>-->
-          <!--<el-card header="用户数增长曲线" v-if="permission.user_increase">
-            <div id="userStatistics" :style="{ width: '100%', height: '450px' }"></div>
-          </el-card>-->
-<!--          <accountstatic head="用户财务账本" :data="useraccountData" v-if="permission.account_static"></accountstatic>-->
-          <accountstatic head="采购商财务账本" :statData="bussinessaccountData" v-if="permission.account_static"></accountstatic>
-<!--          <accountstatic head="代理商财务账本" :data="agenteraccountData" v-if="permission.account_static"></accountstatic>-->
-          <!--<el-card header="音乐之声-佣金结算统计" v-if="permission.ordercommission_static">
-
-            <el-button-group>
-              <el-col :span="12">
-                <el-button size="small" :type="buttonDay" icon="el-icon-document" @click="handleDay">按日
-                </el-button>
-              </el-col>
-              <el-col :span="12">
-                <el-button size="small" :type="buttonMonth" icon="el-icon-data-line" @click="handleMonth">按月
-                </el-button>
-              </el-col>
-            </el-button-group>
-
-            <el-date-picker value-format="yyyy-MM-dd" size="small" v-model="selectDate" :type="dateType" :placeholder="dataPlace">
-            </el-date-picker>
-            <el-button-group>
-
-              <el-col :span="12">
-                <el-button size="small" :type="buttonChart" icon="el-icon-data-line" @click="handleStatic">统计
-                </el-button>
-              </el-col>
-            </el-button-group>
-            <el-row>
-
-              <el-col :span="24">
-                <div id="orderStatistics" style="width: 100%;height: 600px;">
-                </div>
-              </el-col>
-            </el-row>
-            &lt;!&ndash; 图形 &ndash;&gt;
-
-          </el-card>-->
-
-
+          <accountstatic head="采购商财务账本" :statData="bussinessaccountData"></accountstatic>
         </el-col>
 
       </el-row>
@@ -97,7 +23,6 @@
     </el-card>
 
     <el-card v-if="permission.bussiness_screen" :span="24">
-
       <el-row>
         <div>
           <el-row :gutter="50">
@@ -121,9 +46,8 @@
                   <span style="color: white;margin-left: 40px;">服务费率(千分比)：{{bussiness.serviceRate}}</span>
                   <span style="color: white;margin-left: 40px;">每日限额(元)：{{bussiness.maxLimit}}</span>
                 </div>
-                <div style="color: white;margin-left: 40px;">
-                  <br/>
-                  <span style="color: white;margin-left: 40px;">商户回调地址：{{bussiness.recallUrl}}</span>
+                <div style="color: white;margin-left: 20px;margin-top:30px;">
+                  <span style="color: white;">商户回调地址：{{bussiness.recallUrl}}</span>
                 </div>
                 <div style="margin-left: 20px;margin-top:30px;">
                   <span style="color: white;">账户余额</span>
@@ -136,19 +60,6 @@
                     {{bussiness.remain}}
                   </span>
                 </div>
-
-                <div style="margin-left: 20px;margin-top:30px;">
-                  <span style="color: white;">在途金额</span>
-                </div>
-                <div style="margin-left: 20px;margin-top:10px;padding-bottom: 20px;">
-                  <span>
-                    <avue-avatar style="margin-bottom: 30px;" src="/img/bg/rmb.png"></avue-avatar>
-                  </span>
-                  <span style="font-size:60px;margin-left:20px;margin-bottom: 20px;color:white;">
-                    {{bussiness.freeze}}
-                  </span>
-                </div>
-
               </div>
             </el-col>
             <el-col span="12" height="400px">
@@ -193,24 +104,6 @@
         </div>
       </el-row>
 
-      <!--<el-row :gutter="50">
-        <el-col span="12">
-          <el-card style="background-color: #f2f2f2;border-radius: 30px;">
-            <div slot="header">
-              <span>推广数据</span>
-            </div>
-            <avue-data-display :option="tgOption"></avue-data-display>
-          </el-card>
-        </el-col>
-        <el-col span="12">
-          <el-card style="background-color: #f2f2f2;border-radius: 30px;">
-            <div slot="header">
-              <span>产品销量</span>
-            </div>
-            <avue-data-display :option="tgOption"></avue-data-display>
-          </el-card>
-        </el-col>
-      </el-row>-->
     </el-card>
 
   </basic-container>
@@ -220,15 +113,6 @@
   import echarts from "echarts";
   import accountstatic from "@/components/index/accountstatic.vue"
   import purchase from "./purchase.vue"
-  /*import {
-    getList as getParams,
-    detail as getParamDetail
-  } from "@/api/system/param";
-  import {
-    add as addBillrecord,
-    gatewayPay,
-
-  } from "@/api/billrecord/billrecord";*/
   import {
     getByAccount,
     update
@@ -367,13 +251,13 @@
           dialogClickModal: false,
           dialogWidth: "30%",
           column: [{
-              label: "商户号名称",
+              label: "采购商名称",
               labelWidth: 130,
               prop: "name",
               span: 24,
               rules: [{
                 required: true,
-                message: "请输入商户号名称",
+                message: "请输入采购商名称",
                 trigger: "blur"
               }]
             },
@@ -880,33 +764,7 @@
       chongzhi() {
         this.chongzhiVisible = true;
       },
-      /*chongzhiConfirm(directPayType) {
-
-        this.billrecord.price = this.money;
-        this.billrecord.bussinessFee = this.statDatas[1].value
-        this.yibaoOrder.orderAmount = this.money;
-        this.yibaoOrder.goodsName = "采购"
-        this.yibaoOrder.notifyUrl = ",,,"
-        this.yibaoOrder.directPayType = directPayType
-        this.yibaoOrder.redirectUrl = "https://music.nanyue6688.com/cyzhtest/#/wel/index";
-        getParamDetail({"paramKey":"maintain"}).then(res => {
-          let systemParam = res.data.data;
-          let paramValue = systemParam.paramValue;
-          if(paramValue == "0"){
-            this.$message({
-              type: "fail",
-              message: "系统维护时间为每天晚上22:00-凌晨07:00"
-            });
-          }else{
-            addBillrecord(this.billrecord).then(res => {
-              this.yibaoOrder.orderId = res.data.data.orderId;
-              gatewayPay(this.yibaoOrder).then(res => {
-                location.href = res.data.data.payUrl;
-              })
-            })
-          }
-        })
-      },*/
+
       //按日
       handleDay() {
         this.buttonDay = "primary";
@@ -935,45 +793,24 @@
           that.useraccountData.todayOut = todayOut.userOut;
           that.agenteraccountData.todayOut = todayOut.proxyOut;
           that.bussinessaccountData.todayOut = todayOut.adsOut;
-          // this.optionTodayOut.series[0].data[0].value = todayOut.userOut;
-          // this.optionTodayOut.series[0].data[1].value = todayOut.proxyOut;
-          // this.optionTodayOut.series[0].data[2].value = todayOut.adsOut;
-          // this.optionTodayOut.series[0].data[3].value = todayOut.operationOut;
-          // this.optionTodayOut.series[0].data[4].value = todayOut.sponsorOut;
-          // this.option.data[0].count = todayOut.total;
           //历史提现
           let historyOut = res.data.data.totalOut;
           that.useraccountData.historyOut = historyOut.userOut;
           that.agenteraccountData.historyOut = historyOut.proxyOut;
           that.bussinessaccountData.historyOut = historyOut.adsOut;
-          // this.optionHistoryOut.series[0].data[0].value = historyOut.userOut;
-          // this.optionHistoryOut.series[0].data[1].value = historyOut.proxyOut;
-          // this.optionHistoryOut.series[0].data[2].value = historyOut.adsOut;
-          // this.optionHistoryOut.series[0].data[3].value = historyOut.operationOut;
-          // this.optionHistoryOut.series[0].data[4].value = historyOut.sponsorOut;
-          // this.option.data[1].count = historyOut.total;
 
           //今日采购
           let todayIn = res.data.data.todayIn;
           that.useraccountData.todayIn = todayIn.userIn;
           that.agenteraccountData.todayIn = todayIn.proxyIn;
           that.bussinessaccountData.todayIn = todayIn.adsIn;
-          // this.optionTodayIn.series[0].data[0].value = todayIn.userIn;
-          // this.optionTodayIn.series[0].data[1].value = todayIn.proxyIn;
-          // this.optionTodayIn.series[0].data[2].value = todayIn.adsIn;
 
-          // this.option.data[2].count = todayIn.total;
           //历史收入
           let historyIn = res.data.data.totalIn;
           that.useraccountData.historyIn = historyIn.userIn;
           that.agenteraccountData.historyIn = historyIn.proxyIn;
           that.bussinessaccountData.historyIn = historyIn.adsIn;
-          // this.optionHistoryIn.series[0].data[0].value = historyIn.userIn;
-          // this.optionHistoryIn.series[0].data[1].value = historyIn.proxyIn;
-          // this.optionHistoryIn.series[0].data[2].value = historyIn.adsIn;
           that.$forceUpdate()
-          // this.option.data[3].count = historyIn.total;
-
 
           that.drawPie();
         })

src/views/wel/purchase.vue

@@ -28,8 +28,7 @@
           </div>
         </div>
         <div align="center" style="margin: 20px;">
-          <el-button type="success" size="mini" @click="purchaseConfirm('YJZF')">快捷支付</el-button>
-          <el-button type="success" size="mini" @click="purchaseConfirm('EBANK')">网银支付</el-button>
+          <el-button type="success" size="mini" @click="purchaseConfirm">确认采购</el-button>
         </div>
       </div>
     </template>
@@ -188,14 +187,11 @@
           that.purchaseMap.set(row.id, row);
         }
       },
-      purchaseConfirm(directPayType) {
+      purchaseConfirm() {
         this.billrecord.price = this.money;
         this.billrecord.bussinessFee = this.statDatas[1].value;
         this.yibaoOrder.orderAmount = this.money;
         this.yibaoOrder.goodsName = "采购"
-        this.yibaoOrder.notifyUrl = ",,,"
-        this.yibaoOrder.directPayType = directPayType
-        this.yibaoOrder.redirectUrl = "https://music.nanyue6688.com/cyzhtest/#/wel/index";
         this.billrecord.purchaseList = Array.from(this.purchaseMap.values());
         getParamDetail({"paramKey":"maintain"}).then(res => {
           let systemParam = res.data.data;
@@ -208,10 +204,6 @@
             this.$emit('finishSubmit', null);
           }else{
             addBillrecord(this.billrecord).then(res => {
-              this.yibaoOrder.orderId = res.data.data.orderId;
-              /*gatewayPay(this.yibaoOrder).then(res => {
-                location.href = res.data.data.payUrl;
-              })*/
               this.chongzhiVisible = false;
               this.$emit('finishSubmit', null);
               this.$message({