diff --git a/src/assets/img/goods/copies.jpg b/src/assets/img/goods/copies.jpg index 870b763..bb3fd26 100644 Binary files a/src/assets/img/goods/copies.jpg and b/src/assets/img/goods/copies.jpg differ diff --git a/src/assets/img/goods/sy-zzzp.png b/src/assets/img/goods/sy-zzzp.png index e2ba4d5..8c67736 100644 Binary files a/src/assets/img/goods/sy-zzzp.png and b/src/assets/img/goods/sy-zzzp.png differ diff --git a/src/assets/img/goods/xd-zzzp.png b/src/assets/img/goods/xd-zzzp.png index 9ae7ab2..a8ad3de 100644 Binary files a/src/assets/img/goods/xd-zzzp.png and b/src/assets/img/goods/xd-zzzp.png differ diff --git a/src/assets/img/goods/xjzp.png b/src/assets/img/goods/xjzp.png index 84bd00c..9de3a82 100644 Binary files a/src/assets/img/goods/xjzp.png and b/src/assets/img/goods/xjzp.png differ diff --git a/src/assets/img/goods/开户许可证.png b/src/assets/img/goods/开户许可证.png index 8a98766..78a431d 100644 Binary files a/src/assets/img/goods/开户许可证.png and b/src/assets/img/goods/开户许可证.png differ diff --git a/src/assets/img/goods/开户许可证复印件.png b/src/assets/img/goods/开户许可证复印件.png index 38e773b..a404515 100644 Binary files a/src/assets/img/goods/开户许可证复印件.png and b/src/assets/img/goods/开户许可证复印件.png differ diff --git a/src/assets/img/goods/营业执照.png b/src/assets/img/goods/营业执照.png index 64cc127..e411236 100644 Binary files a/src/assets/img/goods/营业执照.png and b/src/assets/img/goods/营业执照.png differ diff --git a/src/assets/img/goods/营业执照复印件.png b/src/assets/img/goods/营业执照复印件.png index c8d70c7..f506f7a 100644 Binary files a/src/assets/img/goods/营业执照复印件.png and b/src/assets/img/goods/营业执照复印件.png differ diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index e24c14c..e5f98f2 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -10,7 +10,7 @@
- +
@@ -71,15 +71,20 @@ - +======= + + +>>>>>>> 30dc4392a3d14954db2a470097760650ed0cd212
@@ -115,7 +120,7 @@
-
+
{{ popText }}
@@ -134,7 +139,7 @@
-
+
@@ -211,9 +216,32 @@ + + + +
+
+ {{magnifyData.userName}} +
+
+ {{magnifyData.sex}} + {{magnifyData.nation}} +
+
+ {{magnifyData.dateBirthYear}} + {{magnifyData.dateBirthMonth}} + {{magnifyData.dateBirthDay}} +
+
+ {{magnifyData.address}} +
+
+ {{magnifyData.idCardNo}} +
+
@@ -268,15 +296,32 @@ export default { elseBoxCheck:[],/* 所有其他可从物品栏拖拽物品进入的弹框 */ //身份证扫描仪//审核资料//验钞机//选择重要空白凭证 // 拿业务的东西替换掉 + magnifyData:{}, auditGoodsShelf:[ - {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, + userName:'啧啧啧', + sex:'男', + nation:'汉', + dateBirthYear:'1994', + dateBirthMonth:'4', + dateBirthDay:'1', + address:'奥斯卡巅峰计划拉水电费啥地方', + idCardNo:'465852346854168479'}, {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, ], //系统录入 //选择普通空白凭证 systemInputGoodsShelf:[ - {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, + userName:'啧啧啧', + sex:'男', + nation:'汉', + dateBirthYear:'1994', + dateBirthMonth:'4', + dateBirthDay:'1', + address:'奥斯卡巅峰计划拉水电费啥地方', + idCardNo:'465852346854168479'}, {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, @@ -284,7 +329,15 @@ export default { ], //打印资料 //客户签字 //印章盒 printoutGoodsShelf:[ - {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, + userName:'啧啧啧', + sex:'男', + nation:'汉', + dateBirthYear:'1994', + dateBirthMonth:'4', + dateBirthDay:'1', + address:'奥斯卡巅峰计划拉水电费啥地方', + idCardNo:'465852346854168479'}, {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}, @@ -293,17 +346,30 @@ export default { ], //钱箱 cashboxGoodsShelf:[ - {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, + userName:'啧啧啧', + nation:'男', + dateBirth:'汉', + address:'奥斯卡巅峰计划拉水电费啥地方', + idCardNo:'465852346854168479'}, {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, ], // 总盒子里面的东西 写在computed了 业务物品 - // goodsShelfTotalData:[ - // {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13}, - // {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, - // {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, - // {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, - // ], + goodsShelfTotalData:[ + {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, + userName:'啧啧啧', + sex:'男', + nation:'汉', + dateBirthYear:'1994', + dateBirthMonth:'4', + dateBirthDay:'1', + address:'深圳市宝安区新安街道华联全景G1栋403', + idCardNo:'4 4 1 4 2 2 1 9 9 8 0 8 1 6 8 4 7 9 '}, + {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14}, + {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, + {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, + ], // goods:[/* 物品栏物品 */ // ], popArr:[/* 弹窗展示的物品 */ @@ -318,7 +384,15 @@ export default { {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/goods/idcard.png'),id:13, + userName:'啧啧啧', + sex:'男', + nation:'汉', + dateBirthYear:'1994', + dateBirthMonth:'4', + dateBirthDay:'1', + address:'奥斯卡巅峰计划拉水电费啥地方', + idCardNo:'465852346854168479'}, {name:'身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:23}, {name:'开户申请书',src:require('@/assets/img/goods/khsqs.png'),id:14}, {name:'现金',src:require('@/assets/img/goods/cash-sm.png'),id:15}, @@ -330,40 +404,30 @@ export default { {name:'存款凭条回单',src:require('@/assets/img/goods/ckpt.png'),id:22}, {name:'取款凭条凭证联',src:require('@/assets/img/goods/qkpt.png'),id:420}, {name:'取款凭条回单',src:require('@/assets/img/goods/qkpt.png'),id:421}, - {name:'转账凭条凭证联',src:require('@/assets/img/goods/zzpt.png'),id:419}, {name:'转账凭条回单',src:require('@/assets/img/goods/zzpt.png'),id:418}, - {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:422}, {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:424}, - {name:'旧定期存单',src:require('@/assets/img/seal/paid.png'),id:430}, {name:'新定期存单',src:require('@/assets/img/seal/paid.png'),id:429}, - {name:'新定期存单凭证联',src:require('@/assets/img/seal/paid.png'),id:485}, {name:'新定期存单回单',src:require('@/assets/img/seal/paid.png'),id:486}, - {name:'法人身份证',src:require('@/assets/img/goods/idcard.png'),id:442}, {name:'法人身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:431}, - {name:'开立银行结算账户申请书',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:432}, - {name:'统一社会信用代码证',src:require('@/assets/img/goods/营业执照.png'),id:434}, {name:'统一社会信用代码证复印件',src:require('@/assets/img/goods/营业执照复印件.png'),id:435}, {name:'开户许可证',src:require('@/assets/img/goods/开户许可证.png'),id:436}, {name:'开户许可证复印件',src:require('@/assets/img/goods/开户许可证复印件.png'),id:437}, {name:'开立银行结算账户申请书凭证联',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:432}, {name:'开立银行结算账户申请书回单',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:433}, - {name:'现金存款凭证',src:require('@/assets/img/goods/CashCertificate.png'),id:409}, {name:'现金存款凭证联',src:require('@/assets/img/goods/CashCertificate.png'),id:487}, {name:'现金存款凭证回单',src:require('@/assets/img/goods/CashCertificate.png'),id:441}, - {name:'现金支票本联',src:require('@/assets/img/goods/xjzp.png'),id:473}, {name:'现金支票存根',src:require('@/assets/img/goods/xjzp.png'),id:472}, {name:'转账支票本联',src:require('@/assets/img/goods/sy-zzzp.png'),id:476}, {name:'转账支票存根',src:require('@/assets/img/goods/sy-zzzp.png'),id:474}, - {name:'特殊业务申请书',src:require('@/assets/img/goods/businessSpecialApplication.png'),id:407}, {name:'特殊业务申请书凭证联',src:require('@/assets/img/goods/businessSpecialApplication.png'),id:478}, {name:'特殊业务申请书回单',src:require('@/assets/img/goods/businessSpecialApplication.png'),id:477}, @@ -1186,7 +1250,7 @@ export default { let _this = this _this.clickNum++; if (_this.clickNum === 2) { - _this.clickNum = 0; + _this.clickNum = 0; // 处理双击事件... _this.showImg = true _this.imgSrc = item.src @@ -1243,6 +1307,8 @@ export default { if(!(judge)) { this.clickNum2 = 0; this.showImg = true + console.log(item) + this.magnifyData = item this.imgSrc = item.src } } @@ -2533,29 +2599,30 @@ export default { background:url("../../../assets/img/integrated-counter-bg.png"); } .counter { + width: 65vw; top: 30%; - left: 8%; - height: 63vh; + left: 18%; + height: 67vh; } .glass { // 玻璃窗 - top: 15vh; - left: 35vw; - width: 35vw; + top: 13vh; + left: 46vw; + width: 33vw; } .employee { // 柜员 - top: 430px; - left: 490px; + top: 373px; + left: 675px; width: 283px; position: relative; } .employeeText { // 资料文字 position: absolute; - top: 580px; - left: 710px; + top: 517px; + left: 893px; color: #000; transform: rotateZ(38deg) scale3d(1, 1, 1) skew(-19deg, -9deg); font-size: 18px; @@ -2569,66 +2636,66 @@ export default { .man { // 人 top: 191px; - left: 846px; + left: 1090px; width: 199px; } .money-box { // 钱箱 - top: 540px; - left: 190px; + top: 480px; + left: 353px; width: 129px; } .important { // 重空箱 - top: 48vh; - left: 18vw; + top: 51vh; + left: 26vw; width: 118px; } .voucher-box { // 普通箱 - top: 35vh; - left: 24vw; + top: 40vh; + left: 31vw; width: 112px; } .summons { // 传票栏 - top: 35vh; - left: 30vw; + top: 42vh; + left: 35vw; width: 112px; } .computer { - top: 30vh; - left: 35vw; + top: 29vh; + left: 42vw; width: 148px; } .card-machine { - top: 50vh; - left: 43vw; - width: 66px; + top: 48vh; + left: 50vw; + width: 60px; } .idCard-scanner { - top: 53vh; - left: 46vw; + top: 52vh; + left: 53vw; width: 46px; } .seal-box { top: 55vh; - left: 49vw; + left: 57vw; width: 50px; } .currency-detector { - top: 55vh; - left: 51vw; + top: 56vh; + left: 62vw; width: 117px; } .printer { top: 60vh; - left: 56vw; + left: 67vw; width: 149px; } .cipher-machine { - top: 391px; - left: 711px; + top: 394px; + left: 932px; width: 79px; } } @@ -2775,14 +2842,14 @@ export default { background: #fff; position: fixed; // top: 7%; - top: 7vh!important; + margin-top: 7vh!important; left: 50%; transform: translate(-50%, 0); padding: 0 15px 15px; z-index: 997; border: 1px solid #e6e6e6; max-height: 600px; - overflow: auto; + //overflow: auto; .dia-header { position: relative; .data-title { @@ -2887,16 +2954,15 @@ export default { } .list { width: 940px; - min-height: 204px; - max-height: 360px; + max-height: 30vh; + min-height: 30vh; overflow: auto; - margin: 0 auto; display: flex; - align-items: center; + flex-wrap: wrap; .img-wrap{ background: url(../../../assets/img/data-frame.png) 0 0 / cover no-repeat; - width: 180px; - height: 180px; + width: 140px; + height: 140px; display: flex; justify-content: center; margin: 5px 10px; @@ -2904,8 +2970,8 @@ export default { cursor: pointer; .file { position: relative; - max-width: 180px; - max-height: 130px; + max-width: 135px; + max-height: 90px; text-align: center; margin: 10px 10px ; img { @@ -2915,7 +2981,7 @@ export default { position: absolute; bottom: 0; width: 100%; - line-height: 54px; + line-height: 40px; text-align: center; font-size: 18px; color: #000; @@ -2925,7 +2991,7 @@ export default { font-size: 18px; white-space:nowrap; position: absolute; - bottom: 15px; + bottom: 7px; left: 50%; transform: translate(-50%,0); } @@ -2939,14 +3005,18 @@ export default { } } .seal{ - width: 1100px; - padding: 0 5%; + width: 970px; + margin-top: -5vh; + max-height: 30vh; + min-height: 30vh; + overflow: auto; display: flex; - justify-content: space-between; + justify-content: space-around; + flex-wrap: wrap; .box{ border: 2px solid #e6e6e6; width: 45%; - min-height: 300px; + min-height: 280px; border-radius: 10px; padding: 10px; } @@ -2954,6 +3024,9 @@ export default { display: flex; width: 50%; flex-wrap: wrap; + max-height: 30vh; + min-height: 30vh; + overflow: auto; .file { position: relative; width: 140px; @@ -2978,7 +3051,7 @@ export default { position: absolute; bottom: 0; width: 100%; - line-height: 54px; + line-height: 37px; text-align: center; font-size: 18px; color: #000; @@ -3024,7 +3097,7 @@ export default { } } .dia-footer { - margin-top: 100px; + margin-top: 65px; text-align: center; button { width: 300px; @@ -3061,7 +3134,19 @@ export default { min-height: 65vh; .seal{ margin-top: -5vh; + max-height: 30vh; + min-height: 30vh; + //overflow: auto; + //display: flex; + //justify-content: space-around; + //flex-wrap: wrap; .left{ + max-height: 30vh; + min-height: 30vh; + overflow: auto; + display: flex; + //justify-content: space-around; + flex-wrap: wrap; .file { //height: 10vh; img { @@ -3071,7 +3156,7 @@ export default { z-index: 9; } p { - line-height: 5vh; + line-height: 4vh; } } } @@ -3080,7 +3165,7 @@ export default { border: 2px solid #e6e6e6; height: 2vh; width: 45%; - min-height: 300px; + min-height: 280px; border-radius: 10px; padding: 10px; } diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue index ce206bc..2ca8d68 100644 --- a/src/pages/lobbyManager/list/index.vue +++ b/src/pages/lobbyManager/list/index.vue @@ -48,7 +48,7 @@
-
+
取号成功
@@ -391,14 +391,15 @@ export default { //margin-left: 30px; } img{ - width: 100%; + margin-left: 10px; + width: 30%; } p{ font-size: 18px; color: #000; text-align: center; font-weight: bold; - padding: 0 18px; + padding: 0 15px; } &.checked{ background: rgba(97,145,255,0.10) url(../../../assets/svg/checked.svg) 96% 7%/auto no-repeat; diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue index 034fc0b..08c2dcd 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue @@ -6,7 +6,7 @@ - + @@ -128,7 +128,7 @@ export default { cellStyle: cellStyle, text:'柜员现金轧账',/* 顶部文字 */ form:{ - identification: 'CYN人民币', + identification: 'CNY人民币', state: '正常' }, tableData: [ diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue index a1405cf..1663305 100644 --- a/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash/cashTransferInto.vue @@ -5,7 +5,7 @@ - + @@ -128,7 +128,7 @@ export default { cellStyle: cellStyle, text:'柜员现金轧账',/* 顶部文字 */ form:{ - identification: 'CYN人民币', + identification: 'CNY人民币', state: '正常' }, tableData: [ diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index e1e15b5..f542058 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -126,7 +126,7 @@ export default{ payMoney: '', // 支取金额(未对标) // 非必填项 // voucherNumber: '', // 凭证号码 - currency: 'CYN人民币', // 币种 + currency: 'CNY人民币', // 币种 clientName: '', // 客户姓名 currencyMark: '钞户', // 钞汇标识 depositNumber: '', // 定存编号 diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index 4d14911..64685a9 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -84,7 +84,7 @@ export default{ // 必填项 // identityCard: '', // 身份证 customerName: '', // 客户姓名 - currency: 'CYN人民币', // 币种 + currency: 'CNY人民币', // 币种 currencyMark: '钞户', // 钞汇标识 voucherType: '存单', // 凭证类型 noticeType: '后台没有这个', // 通知类型 diff --git a/src/store/modules/system.js b/src/store/modules/system.js index c06bab6..8450d7f 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -785,9 +785,7 @@ export default { // cardNumber: '', // 卡号 voucherNumber, - idNumber, currency:'CNY人民币', - userName, goldLogo:'钞户', serviceCharge:'0.00', chargeWay:'密码',