diff --git a/src/api/api.js b/src/api/api.js index 4a88966..80e7061 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -3,8 +3,8 @@ import router from '../router'; // 创建axios实例 const service = axios.create({ // baseURL: "http://www.huorantech.cn:9000",//线上 - // baseURL: "http://39.108.250.202:9000/", // 中台测试服 - baseURL: "http://192.168.31.137:9000/", // 赓 + baseURL: "http://39.108.250.202:9000/", // 中台测试服 + // baseURL: "http://192.168.31.137:9000/", // 赓 // baseURL: "http://192.168.31.151:9000/", // 榕 // baseURL: "http://192.168.31.125:9000/", // 坤 // baseURL: 'http://39.108.250.202:9000', diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 708fd77..bf69204 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -104,7 +104,7 @@
-
+

{{item.name}}

@@ -1297,7 +1297,7 @@ export default { this.$message.error('请输入密码和确认密码'); } }else{ - console.log('...') + console.log('-刷卡确认') this.goodsShelfTotalData = this.auditGoodsShelf if (this.$store.state.system.id == '33'){ this.nbm = 33 @@ -1366,313 +1366,63 @@ export default { sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList)) } - }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id] - - const { nbm, name, isPassword } = myConfig[this.$store.state.system.id] - this.nbm = nbm - if(!isPassword) { - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem(name, JSON.stringify(this.receptionList)) - } - }else { - if (this.passwordForm.passwordAgain){ - let formList = [] - this.toggleGoods() - this.$message.success(`${this.popText}操作成功！`) - this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗 - console.log('---关闭弹窗') - if (this.nbm == 0){ //用户 - }else if (this.nbm == 1){ //传票箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 2){ //普通凭证箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 3){ //重要空白凭证箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 4){ //钱箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - let formList = []; - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 5){ //印章盒 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 6){ //验钞机 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 7){ //打印机 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 9){//资料 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 10){ //刷卡器 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 11){ //身份证扫描仪 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else{ - this.goodsShelfTotalData = this.auditGoodsShelf - if (this.$store.state.system.id == '33'){ + }else if (this.$store.state.system.id == '33'){ this.nbm = 33 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList)) } - } - if (this.$store.state.system.id == '34'){ - this.nbm = 34 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList)) - } - } - if (this.$store.state.system.id == '63'){ - this.nbm = 63 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList)) - } - } - if (this.$store.state.system.id == '64'){ - this.nbm = 64 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList)) - } - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword) - } - }else if (this.$store.state.system.id == '65'){ - this.nbm = 65 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('nomCurrentTransferCard', JSON.stringify(this.receptionList)) - } - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem('nomCurrentTransferPassword', accountPassword) - } - }else if (this.$store.state.system.id == '66'){ - this.nbm = 66 + }else if (this.$store.state.system.id == '34'){ + this.nbm = 34 + // this.goodsShelfTotalData = this.auditGoodsShelf + if (this.receptionList.length >0){ + sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList)) + } + }else if (this.$store.state.system.id == '63'){ + this.nbm = 63 + // this.goodsShelfTotalData = this.auditGoodsShelf + if (this.receptionList.length >0){ + sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList)) + } + }else if (this.$store.state.system.id == '64'){ + this.nbm = 64 + // this.goodsShelfTotalData = this.auditGoodsShelf + if (this.receptionList.length >0){ + sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList)) + } + if (this.passwordForm.passwordAgain){ + let accountPassword = ''; + accountPassword = this.passwordForm.passwordAgain + sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword) + } + }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id] + + const { nbm, name, isPassword } = myConfig[this.$store.state.system.id] + this.nbm = nbm + if(!isPassword) { // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ - sessionStorage.setItem('nomCurrentSettleCard', JSON.stringify(this.receptionList)) + sessionStorage.setItem(name, JSON.stringify(this.receptionList)) } + }else { if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem('nomCurrentSettlePassword', accountPassword) - } - }else if (this.$store.state.system.id == '67,1'){ - this.nbm = 67 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('nomCurrentCancellCard1', JSON.stringify(this.receptionList)) - } - }else if (this.$store.state.system.id == '67,2'){ - this.nbm = 67 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList)) - } - - }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id] - - const { nbm, name, isPassword } = myConfig[this.$store.state.system.id] - this.nbm = nbm - if(!isPassword) { - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem(name, JSON.stringify(this.receptionList)) + let accountPassword = ''; + accountPassword = this.passwordForm.passwordAgain + sessionStorage.setItem(name, accountPassword) } - }else { - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem(name, accountPassword) - } - } - - - }else if (this.$store.state.system.id == '67,3'){ - this.nbm = 67 - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem('nomCurrentCancellPassword', accountPassword) - } - }else if (this.$store.state.system.id == '62,1'){ - this.nbm = 62 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList)) - } - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem(name, accountPassword) - } + } + + }else if (this.$store.state.system.id == '67,3'){ - this.nbm = 67 - if (this.passwordForm.passwordAgain){ - let accountPassword = ''; - accountPassword = this.passwordForm.passwordAgain - sessionStorage.setItem('nomCurrentCancellPassword', accountPassword) - } - }else if (this.$store.state.system.id == '62,1'){ + this.nbm = 67 + if (this.passwordForm.passwordAgain){ + let accountPassword = ''; + accountPassword = this.passwordForm.passwordAgain + sessionStorage.setItem('nomCurrentCancellPassword', accountPassword) + } + }else if (this.$store.state.system.id == '62,1'){ this.nbm = 62 + console.log('62,11111111111111111111') // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList)) @@ -1682,224 +1432,223 @@ export default { accountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('accountPassword', accountPassword) } - }else if (this.$store.state.system.id == '62,2'){ - this.nbm = 62 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList)) - } - if (this.passwordForm.passwordAgain){ - let accountPasswordTwo = '' - accountPasswordTwo = this.passwordForm.passwordAgain - sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo) - } - }else if (this.$store.state.system.id == '62,3'){ - this.nbm = 62 - // this.goodsShelfTotalData = this.auditGoodsShelf - if (this.receptionList.length >0){ - sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList)) - } - if (this.passwordForm.passwordAgain){ - let accountPasswordThree = '' - accountPasswordThree = this.passwordForm.passwordAgain - sessionStorage.setItem('accountPasswordThree', accountPasswordThree) - } - } + }else if (this.$store.state.system.id == '62,2'){ + this.nbm = 62 + // this.goodsShelfTotalData = this.auditGoodsShelf + + if (this.receptionList.length >0){ + sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList)) + } + if (this.passwordForm.passwordAgain){ + let accountPasswordTwo = '' + accountPasswordTwo = this.passwordForm.passwordAgain + sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo) + } + }else if (this.$store.state.system.id == '62,3'){ + this.nbm = 62 + // this.goodsShelfTotalData = this.auditGoodsShelf + if (this.receptionList.length >0){ + sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList)) + } + if (this.passwordForm.passwordAgain){ + let accountPasswordThree = '' + accountPasswordThree = this.passwordForm.passwordAgain + sessionStorage.setItem('accountPasswordThree', accountPasswordThree) + } + } } - - - if (this.receptionList.length >0){ - let formList = [] - this.toggleGoods() + + + + let formList = [] + this.toggleGoods() this.$message.success(`${this.popText}操作成功！`) this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗 console.log('---关闭弹窗') - if (this.nbm == 0){ //用户 - }else if (this.nbm == 1){ //传票箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 2){ //普通凭证箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 3){ //重要空白凭证箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 4){ //钱箱 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - let formList = []; - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 5){ //印章盒 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 6){ //验钞机 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 7){ //打印机 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 9){//资料 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 10){ //刷卡器 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) - }else if (this.nbm == 11){ //身份证扫描仪 - let projectId = sessionStorage.getItem('projectId') - let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - this.$message({ - message: '提交成功', - type: 'success' - }); - }).catch((error)=>{ - }) + if (this.nbm == 0){ //用户 + }else if (this.nbm == 1){ //传票箱 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 2){ //普通凭证箱 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 3){ //重要空白凭证箱 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 4){ //钱箱 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + let formList = []; + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 5){ //印章盒 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 6){ //验钞机 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 7){ //打印机 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 9){//资料 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 10){ //刷卡器 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else if (this.nbm == 11){ //身份证扫描仪 + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + for (var i=0;i{ + this.$message({ + message: '提交成功', + type: 'success' + }); + }).catch((error)=>{ + }) + }else{ + this.goodsShelfTotalData = this.auditGoodsShelf + } - // this.toggleGoods() - } - }} this.$store.commit('system/changePop', {show: false, text: ''}) - } }, toPart(){ this.$router.push('/index') diff --git a/src/store/modules/system.js b/src/store/modules/system.js index c131363..2951f6d 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -1,4 +1,25 @@ /* 银行系统 */ + +/* 所有物品名字 */ +const allGoods = { + 16: {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, + 19: {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:'转账支票'}, + 30: {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/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:'普通空白凭证'}, + 13: {name:'身份证',src:require('@/assets/img/goods/idcard.png'),id:13}, + 23: {name:'身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:23}, + 14: {name:'开户申请书',src:require('@/assets/img/goods/khsqs.png'),id:14}, + 15: {name:'现金',src:require('@/assets/img/goods/cash-sm.png'),id:15}, + 17: {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17}, +} + export default { namespaced: true, state: {/* 管理柜台状态 */ @@ -8,24 +29,7 @@ export default { showGoods: false, // 物品栏的展开和关闭 // 业务选择表: businessKey: '', - allGoods:{/* 所有物品名字 */ - 16: {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16}, - 19: {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:'转账支票'}, - 30: {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/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:'普通空白凭证'}, - 13: {name:'身份证',src:require('@/assets/img/goods/idcard.png'),id:13}, - 23: {name:'身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:23}, - 14: {name:'开户申请书',src:require('@/assets/img/goods/khsqs.png'),id:14}, - 15: {name:'现金',src:require('@/assets/img/goods/cash-sm.png'),id:15}, - 17: {name:'存款凭条',src:require('@/assets/img/goods/ckpt.png'),id:17}, - }, + businessSelect: { '': { data: [], @@ -167,7 +171,7 @@ export default { // 调试容错采用if-else const arr = [] for(const item of state.businessSelect[state.businessKey].data) { - arr.push(state.allGoods[item]) + arr.push(allGoods[item]) } return arr }