1、协议签署

src/api/bussiness/bussinessinfo.js

@@ -48,3 +48,10 @@ export const update = (row) => {
   })
 }
 
+export const agreeSign = () => {
+  return request({
+    url: '/api/cyzh-bussiness-info/bussinessinfo/agreeSign',
+    method: 'get',
+  })
+}
+

src/views/bussiness/bussinessinfo.vue

@@ -13,7 +13,6 @@
         </el-button>
       </template>
 
-
       <!-- 操作菜单 -->
       <template slot-scope="{row}" slot="menu">
         <el-button type="text" size="small" icon="el-icon-view" plain class="none-border"
@@ -22,9 +21,9 @@
         <el-button v-if="row.registerStatus == 100 || row.registerStatus == 400 || row.registerStatus == 99" type="text" size="small" icon="el-icon-edit" plain class="none-border"
                    @click.stop="handleEdit(row)">编辑
         </el-button>
-<!--        <el-button type="text" size="small" icon="el-icon-delete" plain class="none-border"-->
-<!--                   @click.stop="rowDel(scope.row,scope.index)">删除-->
-<!--        </el-button>-->
+        <el-button v-if="row.registerStatus == 101" type="text" size="small" icon="el-icon-edit" plain class="none-border"
+                   @click.stop="handleSign(row)">签署协议
+        </el-button>
       </template>
       <template slot="registerStatus" slot-scope="{row}">
         <el-tag plain type="warning" size="small" v-if="row.registerStatus == 100">资料完善中</el-tag>
@@ -50,7 +49,8 @@
     getDetail,
     add,
     update,
-    remove
+    remove,
+    agreeSign
   } from "@/api/bussiness/bussinessinfo";
   import {add as merchantRegister} from "@/api/bussiness/bussinessregisterrequest";
   import {getByTypeAndBussinessInfoId} from "@/api/bussiness/bussinesscontactinfo";
@@ -293,6 +293,10 @@
                 value: "dictKey"
               },
             },
+            {
+              label: "审核意见",
+              prop: "auditOpinion",
+            },
           ]
         },
         data: []
@@ -359,6 +363,11 @@
         })
         that.$refs.addDialog.open()
       },
+      handleSign(){
+        agreeSign().then(res =>{
+          window.open(res.data.data, '_blank');
+        });
+      },
       closeDialog(){
         this.onLoad(this.page);
         this.resetData();
@@ -375,7 +384,7 @@
         }
       },
       submit(item) {
-        merchantRegister(item).then(res => {
+        merchantRegister(item).then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"

src/views/bussiness/bussinesstransferorder.vue

@@ -27,7 +27,7 @@
                    @click="handleDelete">删 除
         </el-button>
       </template>
-      <template slot="transferStatus", slot-scope="{row}">
+      <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>

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

@@ -22,7 +22,7 @@
                             <el-input v-model="form1.licenceNo" placeholder="请输入商户证件编号"></el-input>
                         </el-form-item>
                         <el-form-item label="开户许可证编号" prop="openAccountLicenceNo">
-                            <el-input v-model="form1.openAccountLicenceNo" placeholder="请输入开户许可证编号"></el-input>
+                            <el-input v-model="form1.openAccountLicenceNo" placeholder="如无开户许可证编号，可传基本存款账户编号"></el-input>
                         </el-form-item>
                         <el-form-item label="商户签约名称" prop="signName">
                             <el-input v-model="form1.signName" placeholder="请输入商户签约名称"></el-input>
@@ -413,7 +413,7 @@
             },
             next(){
                 switch (this.active){
-                    case 0:
+                    case 0: {
                         let validForm1 = this.validForm('form1');
                         if(validForm1){
                             if(this.curEvent == "add"){
@@ -442,7 +442,8 @@
                             }
                         }
                         break;
-                    case 1:
+                    }
+                    case 1: {
                         let validForm2 = this.validForm('form2');
                         if(validForm2){
                             this.form2.contactType = 10;
@@ -457,7 +458,8 @@
                             });
                         }
                         break;
-                    case 2:
+                    }
+                    case 2:{
                         let validForm3 = this.validForm('form3');
                         if(validForm3){
                             this.form3.contactType = 11;
@@ -473,6 +475,7 @@
                             });
                         }
                         break;
+                    }
                     default:
                         break;
                 }
@@ -491,9 +494,7 @@
                 return result;
             },
             handelNext(){
-                if (this.active==2) {
-
-                }else{
+                if (this.active !=2) {
                     this.active++
                 }
             },

src/views/wel/index.vue

@@ -598,7 +598,7 @@
         if (this.money < 0) {
           this.money = 1;
         }
-        this.moneyChina = this.convertCurrency(this.money)
+        // this.moneyChina = this.convertCurrency(this.money)
         this.statDatas[0].value = this.bussiness.serviceRate / 1000
         this.statDatas[1].value = this.money * this.bussiness.serviceRate / 1000
         this.statDatas[2].value = parseFloat(this.money)
@@ -647,7 +647,7 @@
         })
 
       },
-      convertCurrency(money) {
+      /*convertCurrency(money) {
         //汉字的数字
         var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
         //基本单位
@@ -696,7 +696,7 @@
         if (parseInt(integerNum, 10) > 0) {
           var zeroCount = 0;
           var IntLen = integerNum.length;
-          for (var i = 0; i < IntLen; i++) {
+          for (let i = 0; i < IntLen; i++) {
             var n = integerNum.substr(i, 1);
             var p = IntLen - i - 1;
             var q = p / 4;
@@ -733,7 +733,7 @@
           chineseStr += cnInteger;
         }
         return chineseStr;
-      },
+      },*/
 
       editBussiness() {
         this.editBussinessVisible = true;

src/views/wel/purchase.vue

@@ -42,8 +42,7 @@
     detail as getParamDetail
   } from "@/api/system/param";
   import {
-    add as addBillrecord,
-    gatewayPay,
+    add as addBillrecord
   } from "@/api/billrecord/billrecord";
 
   export default {
@@ -203,7 +202,7 @@
             });
             this.$emit('finishSubmit', null);
           }else{
-            addBillrecord(this.billrecord).then(res => {
+            addBillrecord(this.billrecord).then(() => {
               this.chongzhiVisible = false;
               this.$emit('finishSubmit', null);
               this.$message({