diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index ff9dfaa..16b4418 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -1,14 +1,13 @@ @@ -146,4 +148,19 @@ export default { /deep/.popbody { width: 100vw!important; } + .myPopBtns { + display: flex; + justify-content: center; + align-items: center; + & > .btn { + width: 180px; + border-radius: 10px; + font-size: 18px; + } + + } + + // /deep/.el-dialog { + // min-height: 50vh; + // } \ No newline at end of file diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 713427b..0a4948e 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -1489,7 +1489,7 @@ export default { if (this.nbm == 0){ // 客户签字 let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); this.setNeedsModule(moduleName) this.setDataFlow({ ...this.form }) }).catch((error)=>{ @@ -394,7 +394,7 @@ export default { watch: { dataFlowId(newVal) { this.idNumberJudge = true - const { idType, userName, sex, birthday, nationality, mailbox, phone, idNumber } = this.dataFlow + const { idType, userName, sex, birthday, nationality, mailbox, idNumber } = this.dataFlow this.form.idNumber = idNumber this.form.idType = idType this.form.userName = userName @@ -402,7 +402,6 @@ export default { this.form.birthday = birthday this.form.nationality = nationality this.form.mailbox = mailbox - this.form.phone = phone } } }; diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue index cd02795..b438b09 100644 --- a/src/pages/manage/list/client/corporateClient.vue +++ b/src/pages/manage/list/client/corporateClient.vue @@ -222,27 +222,27 @@ export default { let firmClientIdentitys = JSON.parse(firmClientIdentity); if (firmClientIdentitys && firmClientIdentitys.length > 0){ for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); }).catch((error)=>{ }) }else { diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue index 3b9a1dd..894fca6 100644 --- a/src/pages/manage/list/personal/currentAccount/deposit.vue +++ b/src/pages/manage/list/personal/currentAccount/deposit.vue @@ -174,21 +174,21 @@ export default{ let nomBusinessDepositCard = sessionStorage.getItem('nomBusinessDepositCard') let nomBusinessDepositCards = nomBusinessDepositCard // JSON.parse(nomBusinessDepositCard); if (this.cardNumberJudge){ - // formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": "285,287,5,26,57,63,78","type": ""})// 卡号 - formList.push({"answerId":78,"emptyOne": "", "emptyTwo": this.form.idCardNumber, "operationIds": "285,287,5,26,57,63,78","type": ""}) + // formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,78","type": ""})// 卡号 + formList.push({"answerId":78,"emptyOne": "", "emptyTwo": this.form.idCardNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,78","type": ""}) if(this.form.currency){ - formList.push({ "answerId":'80', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,63,80", "type": "1" })//币种 + formList.push({ "answerId":'80', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,80", "type": "1" })//币种 } if(this.form.money){ - formList.push({ "answerId":'82', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285,287,5,26,57,63,82", "type": "3" })//金额 + formList.push({ "answerId":'82', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,82", "type": "3" })//金额 } if(this.form.remark){ - formList.push( {"answerId":'84',"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285,287,5,26,57,63,84", "type": "3"})//摘要 + formList.push( {"answerId":'84',"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,84", "type": "3"})//摘要 } formList.push( - { "answerId":'79', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285,287,5,26,57,63,79", "type": "3" },//客户姓名 - { "answerId":'81', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285,287,5,26,57,63,81", "type": "1" },//钞汇标识 - {"answerId":'83',"emptyOne": "15", "emptyTwo": this.form.annualInterest, "operationIds": "285,287,5,26,57,63,83", "type": "3"},//年利率 + { "answerId":'79', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,79", "type": "3" },//客户姓名 + { "answerId":'81', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,81", "type": "1" },//钞汇标识 + {"answerId":'83',"emptyOne": "15", "emptyTwo": this.form.annualInterest, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,63,83", "type": "3"},//年利率 ); let params= { parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,63', @@ -197,10 +197,10 @@ export default{ startTime:startTime, } addOperation(params).then((data)=>{ - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); }).catch((error)=>{ }) }else { diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index 20d23bf..d5af1e0 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -579,7 +579,7 @@ export default { let drawPassword = accountPassword; let drawPasswordTwo = accountPasswordTwo; let drawPasswordThree = accountPasswordThree; - formLists.push({"answerId":75,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285,287,5,26,57,62,75","type": "3"}) + formLists.push({"answerId":75,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,75","type": "3"}) let param= { parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,62,75', lcJudgmentRuleReq: formLists, @@ -591,46 +591,46 @@ export default { }).catch((error)=>{ }) formList.push( - {"answerId":'77',"emptyOne": "17", "emptyTwo": drawPassword, "operationIds": "285,287,5,26,57,62,77", "type": "3"},//支取密码 + {"answerId":'77',"emptyOne": "17", "emptyTwo": drawPassword, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,77", "type": "3"},//支取密码 ) if(this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)){ - if (this.form.accountTypesTwo){formList.push({"answerId":'272',"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo,"operationIds": "285,287,5,26,57,62,272","type": "1"})}//账户类型2 - if (this.form.drawWaysTwo){formList.push({"answerId":'274',"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo,"operationIds": "285,287,5,26,57,62,274","type": "1"})} //支取方式2 - if (this.form.voucherTypesTwo){formList.push({"answerId":'271',"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo,"operationIds": "285,287,5,26,57,62,271","type": "1"})} //凭证类型2 + if (this.form.accountTypesTwo){formList.push({"answerId":'272',"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo,"operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,272","type": "1"})}//账户类型2 + if (this.form.drawWaysTwo){formList.push({"answerId":'274',"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo,"operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,274","type": "1"})} //支取方式2 + if (this.form.voucherTypesTwo){formList.push({"answerId":'271',"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo,"operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,271","type": "1"})} //凭证类型2 formList.push( - {"answerId":'275',"emptyOne": "17", "emptyTwo": drawPasswordTwo, "operationIds": "285,287,5,26,57,62,275", "type": "3"},//支取密码 + {"answerId":'275',"emptyOne": "17", "emptyTwo": drawPasswordTwo, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,62,275", "type": "3"},//支取密码 ) for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); }).catch((error)=>{ }) }, diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue index 1b20377..8758e4e 100644 --- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue +++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue @@ -205,19 +205,19 @@ export default{ // 验证通过逻辑写在这 // if (nomCurrentWithdrawalCards && nomCurrentWithdrawalCards.length > 0 && nomCurrentWithdrawalPasswords){ if (this.cardNumberJudge && this.form.cardNumber){ - // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": "285,287,5,26,57,64,85","type": ""})// 卡号 - formList.push({"answerId":85,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": "285,287,5,26,57,64,85","type": ""}) - // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": "285,287,5,26,57,64,91","type": ""}) - formList.push({"answerId":91,"emptyOne": "", "emptyTwo": this.form.drawPassword, "operationIds": "285,287,5,26,57,64,91","type": "3"}) - if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "285,287,5,26,57,64,87","type": "1"})}//币种 - if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "285,287,5,26,57,64,89", "type": "3"})}//金额 - if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "285,287,5,26,57,64,93", "type": "3"})}//摘要 + // formList.push({"answerId":85,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalCards, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,85","type": ""})// 卡号 + formList.push({"answerId":85,"emptyOne": "", "emptyTwo": this.form.cardNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,85","type": ""}) + // formList.push({"answerId":91,"emptyOne": "", "emptyTwo": nomCurrentWithdrawalPassword, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,91","type": ""}) + formList.push({"answerId":91,"emptyOne": "", "emptyTwo": this.form.drawPassword, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,91","type": "3"}) + if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,87","type": "1"})}//币种 + if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,89", "type": "3"})}//金额 + if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,93", "type": "3"})}//摘要 formList.push( - {"answerId":'86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "285,287,5,26,57,64,86", "type": "3"},//客户姓名 - {"answerId":'88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "285,287,5,26,57,64,88", "type": "1"},//钞汇标识 - {"answerId":'90', "emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "285,287,5,26,57,64,90", "type": "1"},//支取方式 - {"answerId":'92', "emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "285,287,5,26,57,64,92", "type": "3"},//手续费 - // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": "285,287,5,26,57,64,91","type": ""}// 密码框 + {"answerId":'86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,86", "type": "3"},//客户姓名 + {"answerId":'88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,88", "type": "1"},//钞汇标识 + {"answerId":'90', "emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,90", "type": "1"},//支取方式 + {"answerId":'92', "emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,92", "type": "3"},//手续费 + // {"answerId":91,"emptyOne": "", "emptyTwo": "", "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,26,57,64,91","type": ""}// 密码框 ) let params= { parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,64', @@ -226,10 +226,10 @@ export default{ startTime:startTime, } addOperation(params).then((data)=>{ - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); this.setDataFlow({ ...this.form }) this.setNeedsModule(moduleName) }).catch((error)=>{ diff --git a/src/store/modules/system.js b/src/store/modules/system.js index e828773..f38a706 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -730,7 +730,6 @@ export default { birthday:'2008',//出生日期 // nationality:'汉',//民族 mailbox:'广东省深圳市阳光村',//通讯地址 - phone:'13222223122',//联系电话 voucherNumber @@ -1724,7 +1723,7 @@ export default { if(stampSuccess) { let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') - let formList = [ {"answerId":stampSuccess, "emptyOne": "", "emptyTwo": "", "operationIds": "285,287,8,"+stampSuccess,"type": ""} ] + let formList = [ {"answerId":stampSuccess, "emptyOne": "", "emptyTwo": "", "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,8,"+stampSuccess,"type": ""} ] let params= { parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,8', lcJudgmentRuleReq:formList, diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js index e276dd5..a7bff2b 100644 --- a/src/utils/utilFunction.js +++ b/src/utils/utilFunction.js @@ -167,10 +167,10 @@ const autoPlay = (parentId, form, myTable2, myTable, cards=[]) => { console.log('---提交的') console.log(formList) addOperation(params).then((data)=>{ - Message.success({ - center: true, - message: '提交成功' - }) + // Message.success({ + // center: true, + // message: '提交成功' + // }) }).catch((error)=>{ }) }