diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue index 24ad80b..a38a479 100644 --- a/src/components/needBefore/index.vue +++ b/src/components/needBefore/index.vue @@ -1,7 +1,10 @@ @@ -12,6 +15,7 @@ const obj = { // 'currentAccount/openAccount': '/counter/list/manage/currentAccount', // 'currentAccount/deposit': '/counter/list/manage/currentAccount' 'consumerClient': '客户信息 -> 个人客户信息建立', + 'corporateClient': '客户信息 -> 公司客户信息建立', 'currentAccount/openAccount': '活期业务 -> 开户', 'currentAccount/deposit': '活期业务 -> 存款', 'currentAccount/withdrawal': '活期业务 -> 取款', @@ -30,13 +34,25 @@ export default { moduleName: { type: String, require: true + }, + unNeed: { + type: Boolean, + default: false } }, created() { - this.$message({ - message: '请先完成' + obj[this.moduleName], - type: 'info' - }); + if(this.unNeed) { + this.$message({ + message: '您无需完成该操作!', + type: 'info' + }); + }else { + this.$message({ + message: '请先完成' + obj[this.moduleName], + type: 'info' + }); + } + }, methods: { goto() { @@ -46,7 +62,13 @@ export default { message: '请先完成' + obj[this.moduleName], type: 'info' }); - } + }, + goto2() { + this.$message({ + message: '您无需完成该操作!', + type: 'info' + }); + }, }, computed: { ...mapGetters({ @@ -56,14 +78,23 @@ export default { } - \ No newline at end of file diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue index b932a28..1111ddf 100644 --- a/src/components/selectBusiness/index.vue +++ b/src/components/selectBusiness/index.vue @@ -196,19 +196,6 @@ export default { }, selectBusiness() { if(!this.takeCheck) { - // this.$confirm('由于您未选择一个业务,系统将返回主界面, 是否继续?', '提示', { - // confirmButtonText: '确定', - // cancelButtonText: '取消', - // type: 'warning', - // center: true - // }).then(() => { - // this.$router.push('/index') - // }).catch(() => { - // this.$message({ - // type: 'info', - // message: '请选择一个业务' - // }); - // }); this.$message({ type: 'info', message: '请选择一个业务' @@ -216,8 +203,16 @@ export default { return } this.setBusinessKey(this.takeCheck) + if(!this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id) { + this.$message({ + type: 'info', + message: '业务开发中,尽请期待!' + }); + return + } this.setShowBusiness(false) sessionStorage.setItem('businessKey', this.$store.state.system.businessKey) + }, }, computed: { diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 4757061..713427b 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -315,16 +315,15 @@ export default { popArr:[/* 弹窗展示的物品 */ {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19}, - {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:'预留印鉴卡'}, - {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'}, + {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:439}, + {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:'现金支票'}, - // {name:'存款凭条',src:require('@/assets/img/seal/paid.png'),id:'存款凭条'}, - {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:'取款凭条'}, - {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:'转账凭条'}, - {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:'业务收费凭证'}, - {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单'}, - {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:'普通空白凭证'}, + {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:411}, + {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425}, + {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:426}, + {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:479}, + {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:427}, + {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:438}, {name:'身份证',src:require('@/assets/img/goods/idcard.png'),id:13}, {name:'身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:23}, {name:'开户申请书',src:require('@/assets/img/goods/khsqs.png'),id:14}, @@ -399,19 +398,19 @@ export default { importanceArr:[/* 重要空白凭证 */ {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, {name:'定期存单',src:require('@/assets/img/seal/paid.png'),id:19}, - {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:'预留印鉴卡'}, - {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:'转账支票'}, + {name:'预留印鉴卡',src:require('@/assets/img/seal/paid.png'),id:439}, + {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:'现金支票'}, + {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:411}, {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:192}, ], commonArr:[/* 普通凭证箱 */ {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17}, - {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:'取款凭条'}, - {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:'转账凭条'}, - {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:'业务收费凭证'}, - {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单'}, - {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:'普通空白凭证'}, + {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425}, + {name:'转账凭条',src:require('@/assets/img/goods/zzpt.png'),id:426}, + {name:'业务收费凭证',src:require('@/assets/img/goods/ywsfpz.png'),id:479}, + {name:'利息清单',src:require('@/assets/img/goods/lxqd.png'),id:427}, + {name:'普通空白凭证',src:require('@/assets/img/goods/ptkbpz.png'),id:438}, ], sealChecked:[],/* 印章盒选中 */ importantChecked:[],// 重要凭证选中 @@ -480,7 +479,7 @@ export default { if (this.$store.state.system.id == '62,1'){ this.nbm = 62 let param= { - parentId: '285,287,5,26,57,62,75' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,62,75' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -504,7 +503,7 @@ export default { }else if (this.$store.state.system.id == '63'){ this.nbm = 63 let param= { - parentId: '285,287,5,26,57,63,78' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,63,78' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -528,7 +527,7 @@ export default { }else if (this.$store.state.system.id == '64'){ this.nbm = 64 let param= { - parentId: '285,287,5,26,57,64,85' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,64,85' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -552,7 +551,7 @@ export default { }else if (this.$store.state.system.id == '65'){ this.nbm = 65 let param= { - parentId: '285,287,5,26,57,65,94' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,65,94' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -576,7 +575,7 @@ export default { }else if (this.$store.state.system.id == '66'){ this.nbm = 66 let param= { - parentId: '285,287,5,26,57,66,103' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,66,103' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -600,7 +599,7 @@ export default { }else if (this.$store.state.system.id == '67,1'){ this.nbm = 67 let param= { - parentId: '285,287,5,26,57,67,113' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,67,113' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -622,7 +621,9 @@ export default { }).catch((error)=>{ }) }else if (myConfig[this.$store.state.system.id]){ - const { nbm, parentId, name } = myConfig[this.$store.state.system.id] + let { nbm, parentId, name } = myConfig[this.$store.state.system.id] + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + parentId + this.nbm = nbm let param= { parentId @@ -710,7 +711,7 @@ export default { if (this.$store.state.system.id == '33'){ this.nbm = 33 let param= { - parentId: '285,287,5,25,33,41' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,33,41' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -734,7 +735,7 @@ export default { }else if (this.$store.state.system.id == '34'){ this.nbm = 34 let param= { - parentId: '285,287,5,25,34,54' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,34,54' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -758,7 +759,7 @@ export default { }else if (this.$store.state.system.id == '67,2'){ this.nbm = 67 let param= { - parentId: '285,287,5,26,57,67,116' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,57,67,116' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -782,7 +783,8 @@ export default { }).catch((error)=>{ }) }else if (myConfig[this.$store.state.system.id]){ - const { nbm, parentId, name } = myConfig[this.$store.state.system.id] + let { nbm, parentId, name } = myConfig[this.$store.state.system.id] + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + parentId this.nbm = nbm let param= { parentId @@ -1118,25 +1120,25 @@ export default { // this.goodsShelfTotalData = this.systemInputGoodsShelf let parentId = '' if(type == '普通凭证箱'){ - parentId = '285,287,3' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,3' } if(type == '系统'){ - parentId = '285,287,5' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5' } }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){ // this.goodsShelfTotalData = this.auditGoodsShelf let parentId = '' if(type == '重要空白凭证箱'){ - parentId = '285,287,2' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,2' } if(type == '资料'){ - parentId = '285,287,11' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,11' } if(type == '验钞机'){ - parentId = '285,287,9' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,9' } if(type == '身份证扫描仪'){ - parentId = '285,287,7' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,7' } let param= { parentId: parentId @@ -1145,18 +1147,18 @@ export default { // this.goodsShelfTotalData = this.printoutGoodsShelf let parentId = '' if(type == '打印机'){ - parentId = '285,287,10' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,10' } if(type == '客户签字'){ - parentId = '285,287,12' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,12' } if(type == '印章盒'){ - parentId = '285,287,8' + parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,8' } }else if(type == '钱箱'){ // this.goodsShelfTotalData = this.cashboxGoodsShelf; let param= { - parentId: '285,287,1' + parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,1' } getOperation(param).then((data)=> { if (data.data.status == 200) { @@ -1226,6 +1228,7 @@ export default { that.checkList.length=0 that.checkList.push(item.id) }else{ + // console.log(item.id) arr.includes(item.id) ? arr.splice(arr.indexOf(item.id), 1) : arr.push(item.id); } } @@ -1488,7 +1491,7 @@ export default { let startTime = sessionStorage.getItem('startTime') for (var i=0;i { // 验证通过逻辑写在这 - const parentId = '285,287,5,30,374' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,30,374' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue index d9ec133..2f4fc4c 100644 --- a/src/pages/manage/list/business/deposit.vue +++ b/src/pages/manage/list/business/deposit.vue @@ -182,7 +182,7 @@ export default { }, methods: { getFormData(){ - const parentId = '285,287,5,27,225' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,225' autoPlay2(parentId, this.form, this.myTable2, this.myTable) }, submitForm() { @@ -192,7 +192,7 @@ export default { // 验证通过逻辑写在这 this.visible = true; let formList = []; - const parentId = '285,287,5,27,225' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,225' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue index 77a04d2..cd6ebd1 100644 --- a/src/pages/manage/list/business/openAccount.vue +++ b/src/pages/manage/list/business/openAccount.vue @@ -297,7 +297,7 @@ export default { }, methods: { getFormData(){ - const parentId = '285,287,5,27,224' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,224' autoPlay2(parentId, this.form, this.myTable2, this.myTable) }, submitForm(){ @@ -306,7 +306,7 @@ export default { this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - const parentId = '285,287,5,27,224' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,224' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue index 8b73007..731daba 100644 --- a/src/pages/manage/list/business/transfer.vue +++ b/src/pages/manage/list/business/transfer.vue @@ -233,7 +233,7 @@ export default { }, methods: { getFormData(){ - const parentId = '285,287,5,27,227' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,227' autoPlay2(parentId, this.form, this.myTable2, this.myTable) }, submitForm() { @@ -242,7 +242,7 @@ export default { this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - const parentId = '285,287,5,27,227' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,227' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue index 536114b..76f13b3 100644 --- a/src/pages/manage/list/business/withdrawal.vue +++ b/src/pages/manage/list/business/withdrawal.vue @@ -206,14 +206,14 @@ export default { }, methods: { getFormData(){ - const parentId = '285,287,5,27,226' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,226' autoPlay2(parentId, this.form, this.myTable2, this.myTable) }, submitForm() { this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - const parentId = '285,287,5,27,226' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,27,226' autoPlay(parentId, this.form, this.myTable2, this.myTable) // let tmpIndex = 100; // for(const key in this.myTable2) { diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue index 0e1eb56..7f7d20a 100644 --- a/src/pages/manage/list/cityWide/cityWideIn.vue +++ b/src/pages/manage/list/cityWide/cityWideIn.vue @@ -263,7 +263,7 @@ export default { }, mounted() { - const parentId = '285,287,5,29,345,359' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,29,345,359' autoPlay2(parentId, this.form, this.myTable2, this.myTable) this.$refs.shroffAccountNumber.focus() }, @@ -271,7 +271,7 @@ export default { submitForm() { this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 - const parentId = '285,287,5,29,345,359' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,29,345,359' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue index ea830b5..085a9bd 100644 --- a/src/pages/manage/list/cityWide/cityWideOut.vue +++ b/src/pages/manage/list/cityWide/cityWideOut.vue @@ -247,7 +247,7 @@ export default { }, mounted() { - const parentId = '285,287,5,29,345,346' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,29,345,346' autoPlay2(parentId, this.form, this.myTable2, this.myTable) this.$refs.shroffAccountNumber.focus() }, @@ -255,7 +255,7 @@ export default { submitForm() { this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 - const parentId = '285,287,5,29,345,346' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,29,345,346' autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue index 4a39688..2972633 100644 --- a/src/pages/manage/list/client/consumerClient.vue +++ b/src/pages/manage/list/client/consumerClient.vue @@ -1,6 +1,6 @@ // 个人客户 diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index 73cb540..e1e15b5 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -257,7 +257,7 @@ export default{ }, mounted() { this.$refs.clientName.focus() - const parentId = '285,287,5,26,38,289' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289' const cards = { 302: 'nomCallDepositCard', 392: 'nomCallDepositCard2', @@ -279,7 +279,7 @@ export default{ this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - const parentId = '285,287,5,26,38,289' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,289' const nomCallDepositCard = sessionStorage.getItem('nomCallDepositCard') const nomCallDepositCard2 = sessionStorage.getItem('nomCallDepositCard2') const nomCallDepositClosedPassword = sessionStorage.getItem('nomCallDepositClosedPassword') diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index 044fe2d..60e6f89 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -213,7 +213,7 @@ export default{ }, methods: { getFormData(){ - const parentId = '285,287,5,26,38,288' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288' const cards = { 291: 'nomCallDepositOpen2', 297: 'nomCallDepositOpen3', @@ -234,7 +234,7 @@ export default{ this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; - const parentId = '285,287,5,26,38,288' + const parentId = this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,26,38,288' const nomCallDepositOpen2 = sessionStorage.getItem('nomCallDepositOpen2') const nomCallDepositOpen3 = sessionStorage.getItem('nomCallDepositOpen3') const nomCallDepositOpenPassword = sessionStorage.getItem('nomCallDepositOpenPassword') diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue index 3c8943e..4e49844 100644 --- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue +++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue @@ -1,6 +1,6 @@ /* 个人业务>活期业务>销户 */