diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index ffac331..5329f13 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -71,6 +71,10 @@ export default { needAuth: { type: Boolean, default: true + }, + depositNumber: { + type: String, + default: '' } }, created() { @@ -102,9 +106,21 @@ export default { } return str; } - this.leftObj['流水号'] = tmpFunc2() - this.leftObj['经办机构'] = '国税支行营业部' - this.rightObj['经办柜员'] = '002110' + if(num%2 === 1) { + this.leftObj['流水号'] = tmpFunc2() + this.leftObj['经办机构'] = '国税支行营业部' + this.rightObj['经办柜员'] = '002110' + if(this.depositNumber) { + this.rightObj['定存编号'] = this.depositNumber + } + }else { + this.leftObj['流水号'] = tmpFunc2() + this.leftObj['经办机构'] = '国税支行营业部' + this.rightObj['经办柜员'] = '002110' + if(this.depositNumber) { + this.leftObj['定存编号'] = this.depositNumber + } + } const tmpFunc = () => { const date = new Date() var y = date.getFullYear(); diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index dbe8284..06c839c 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -460,7 +460,7 @@ export default { {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:412}, {name:'银行承兑汇票',src:require('@/assets/img/seal/paid.png'),id:30}, {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:411}, - {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:192}, + {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:429}, ], commonArr:[/* 普通凭证箱 */ {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17}, diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue index 992a0ac..f053bd8 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue @@ -46,7 +46,7 @@ > @@ -157,7 +157,7 @@ export default { form:{ identification: 'CNY人民币', state: '正常', - moneyTotal: 0, + moneyTotal: '0', receiveCounter: '', }, formName:{ diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue index ea2b085..371caba 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue @@ -150,7 +150,7 @@ export default { form:{ identification: 'CNY人民币', state: '正常', - moneyTotal: 0, + moneyTotal: '0', }, formName:{ identification: '币种', diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue index b131f63..1d879fe 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ - + diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue index 669babd..4ebf8e1 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue @@ -28,12 +28,12 @@ - + - + diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue index 7e52612..a309d73 100644 --- a/src/pages/manage/list/business/deposit.vue +++ b/src/pages/manage/list/business/deposit.vue @@ -12,12 +12,12 @@ - + CNY人民币 - + @@ -25,12 +25,12 @@ - + - + @@ -96,7 +96,7 @@ export default { }, rules: { customerName: vercustomer, - interestRate: verrate, + // interestRate: verrate, username: [ { required: true, diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue index 87cdcca..2d13ea8 100644 --- a/src/pages/manage/list/business/openAccount.vue +++ b/src/pages/manage/list/business/openAccount.vue @@ -28,7 +28,7 @@ - + @@ -39,16 +39,16 @@ - + - + - + @@ -59,7 +59,7 @@ - + CNY人民币 @@ -71,12 +71,12 @@ - + - + @@ -148,7 +148,7 @@ export default { foreignCurrencyCertificate: '外汇证号' // }, rules: { - customerName: vercustomer, + // customerName: vercustomer, accountNature: [ { required: true, @@ -163,48 +163,48 @@ export default { trigger: 'blur' } ], - accountManagement: [ - { - required: true, - message: '请选择账户科目', - trigger: 'blur' - } - ], - currencyType: [ - { - required: true, - message: '请选择币种', - trigger: 'blur' - } - ], - currencyMark: [ - { - required: true, - message: '请选择钞汇标识', - trigger: 'blur' - } - ], - calculateWay: [ - { - required: true, - message: '请选择计息方式', - trigger: 'blur' - } - ], - outAccountWay: [ - { - required: true, - message: '请选择出账页标志', - trigger: 'blur' - } - ], - withdrawingWay: [ - { - required: true, - message: '请选择支取方式', - trigger: 'blur' - } - ] + // accountManagement: [ + // { + // required: true, + // message: '请选择账户科目', + // trigger: 'blur' + // } + // ], + // currencyType: [ + // { + // required: true, + // message: '请选择币种', + // trigger: 'blur' + // } + // ], + // currencyMark: [ + // { + // required: true, + // message: '请选择钞汇标识', + // trigger: 'blur' + // } + // ], + // calculateWay: [ + // { + // required: true, + // message: '请选择计息方式', + // trigger: 'blur' + // } + // ], + // outAccountWay: [ + // { + // required: true, + // message: '请选择出账页标志', + // trigger: 'blur' + // } + // ], + // withdrawingWay: [ + // { + // required: true, + // message: '请选择支取方式', + // trigger: 'blur' + // } + // ] }, second:[// 二级卡数组 diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue index 2bca0f5..0eb1dc5 100644 --- a/src/pages/manage/list/business/transfer.vue +++ b/src/pages/manage/list/business/transfer.vue @@ -11,54 +11,55 @@ - + - + - + - + - + - + - + CNY人民币 - + - + - + @@ -149,6 +150,13 @@ export default { trigger: 'blur' } ], + transinName: [ + { + required: true, + message: '请输入转入户名', + trigger: 'blur' + } + ], money: [ { required: true, @@ -156,6 +164,7 @@ export default { trigger: 'blur' } ], + }, second:[// 二级卡数组 diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue index dfad940..bdcb95f 100644 --- a/src/pages/manage/list/business/withdrawal.vue +++ b/src/pages/manage/list/business/withdrawal.vue @@ -15,15 +15,15 @@ - + - + - + @@ -37,11 +37,15 @@ v-model="form.issueDate" type="date" placeholder="选择日期" - ref="issueDate"> + ref="issueDate" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + disabled + > - + diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue index 730e348..44a995d 100644 --- a/src/pages/manage/list/client/corporateClient.vue +++ b/src/pages/manage/list/client/corporateClient.vue @@ -42,7 +42,7 @@ - + @@ -60,7 +60,7 @@ import { mapState, mapMutations, mapGetters } from 'vuex' import { mobPattern, namePattern, ratePattern, vercustomer } from '@/utils/verify.js' import { addOperation, getOperation } from '@/api/http'; -import { phoneListen, checkRequired, myValidate, checkHanzi, checkName, ismoney } from '@/utils/utilFunction.js' +import { phoneListen, checkRequired, myValidate, checkHanzi, checkName, ismoney, messageIdCard } from '@/utils/utilFunction.js' import MyTitle from '@/components/myTitle' import NeedBefore from '@/components/needBefore' import MyDialog from '@/components/dialog' @@ -86,7 +86,7 @@ export default { idNumber: '', name: '', phone: '', - documentType: '', + documentType: '统一社会信用代码证', companyName: '', registeredCapital: '', codeNumber: '', @@ -152,6 +152,8 @@ export default { if(sessionStorage.getItem('firmClientIdentity')) { this.idNumberJudge = true const { idNumber, userName } = this.dataFlow + console.log('dataFlow---') + console.log(idNumber) this.form.idNumber = idNumber this.form.name = userName } @@ -216,7 +218,10 @@ export default { }, submitForm() { - + if(!this.form.idNumber) { + messageIdCard() + return + } this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index 534f609..a4147d1 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -13,31 +13,31 @@ - + - + CNY人民币 - + - + - + - + - + @@ -45,45 +45,38 @@

请输入密码

-
- +
+
- + - + - + - - + + - + - + - + -
@@ -93,26 +86,18 @@
- 提交 - +