diff --git a/src/App.vue b/src/App.vue index 15aa33c..3d89d37 100644 --- a/src/App.vue +++ b/src/App.vue @@ -87,6 +87,8 @@ font-size: 16px; min-width: 1300px; min-height: 800px; + display: flex; + justify-content: center; } .selectBusiness { width: 100%; diff --git a/src/assets/img/cash/100元.png b/src/assets/img/cash/100元.png new file mode 100644 index 0000000..a281d2f Binary files /dev/null and b/src/assets/img/cash/100元.png differ diff --git a/src/assets/img/cash/10元.png b/src/assets/img/cash/10元.png new file mode 100644 index 0000000..20af51d Binary files /dev/null and b/src/assets/img/cash/10元.png differ diff --git a/src/assets/img/cash/1元.png b/src/assets/img/cash/1元.png new file mode 100644 index 0000000..754dc80 Binary files /dev/null and b/src/assets/img/cash/1元.png differ diff --git a/src/assets/img/cash/1角.png b/src/assets/img/cash/1角.png new file mode 100644 index 0000000..3de0f2d Binary files /dev/null and b/src/assets/img/cash/1角.png differ diff --git a/src/assets/img/cash/20元.png b/src/assets/img/cash/20元.png new file mode 100644 index 0000000..af72876 Binary files /dev/null and b/src/assets/img/cash/20元.png differ diff --git a/src/assets/img/cash/50元.png b/src/assets/img/cash/50元.png new file mode 100644 index 0000000..f9720a2 Binary files /dev/null and b/src/assets/img/cash/50元.png differ diff --git a/src/assets/img/cash/5元.png b/src/assets/img/cash/5元.png new file mode 100644 index 0000000..4d0cad9 Binary files /dev/null and b/src/assets/img/cash/5元.png differ diff --git a/src/assets/img/cash/5角.png b/src/assets/img/cash/5角.png new file mode 100644 index 0000000..e631a72 Binary files /dev/null and b/src/assets/img/cash/5角.png differ diff --git a/src/assets/img/cash/乘号3.svg b/src/assets/img/cash/乘号3.svg new file mode 100644 index 0000000..e8c8071 --- /dev/null +++ b/src/assets/img/cash/乘号3.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/src/assets/img/computer.png b/src/assets/img/computer.png index 878514a..1b6ad59 100644 Binary files a/src/assets/img/computer.png and b/src/assets/img/computer.png differ diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 6ce7219..c7ad205 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -137,6 +137,7 @@

- 请从以下物品中选取所需材料 -

+

- 请领取您所需要的现金 -

- 请从物品栏选中或拖拽所需材料 -

@@ -277,6 +278,29 @@

{{item.name}}

+ +
+ +
+ +
+ + + +
+
+
@@ -339,27 +363,44 @@ -

请选择客户签字或返还资料

- - 客户签字 - 返还资料 - +
+
+
客户对话中
+ +
+

请选择以下一个业务进行办理

+
+ + + +
+
+ -

请问需要取出几张银行卡

- - 取出一张 - 取出两张 - +
+
+
提示
+ +
+

您已选择:

+

面额 {{ item.name }} {{ item.num + '张' }} = {{ parseInt(item.name)*item.num + '元' }}

+

总额 {{ backMoneyTotal + '元' }}

+

确定从钱箱取出吗?

+
+ + +
+
@@ -373,6 +414,7 @@ import backButton from '@/components/backButton' import { myConfig } from './myConfig.js' import saveSystemModule from '@/mixins/saveSystemModule' import CheckPhoto from '@/components/checkPhoto' +import { inputListen } from '@/utils/utilFunction.js' // import TipDialog from '@/components/tipDialog' export default { @@ -421,6 +463,7 @@ export default { // peopleSign: [], // moneyBox: [], peopleJudge: false, + tipsDialog: false, peopleDo: 1, showBusiness: false, manageVisible: false, // 显示系统录入 @@ -489,6 +532,17 @@ export default { {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15}, {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23}, ], + // id乱配 + cashboxGoodsShelf2: [ + {name:'100元', src:require('@/assets/img/cash/100元.png'), id:15, num: ''}, + {name:'50元', src:require('@/assets/img/cash/50元.png'), id:4399, num: ''}, + {name:'20元', src:require('@/assets/img/cash/20元.png'), id:4400, num: ''}, + {name:'10元', src:require('@/assets/img/cash/10元.png'), id:4401, num: ''}, + {name:'5元', src:require('@/assets/img/cash/5元.png'), id:4402, num: ''}, + {name:'1元', src:require('@/assets/img/cash/1元.png'), id:4403, num: ''}, + {name:'5角', src:require('@/assets/img/cash/5角.png'), id:4404, num: ''}, + {name:'1角', src:require('@/assets/img/cash/1角.png'), id:4405, num: ''}, + ], // 总盒子里面的东西 写在computed了 业务物品 // goodsShelfTotalData:[ // {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13, @@ -665,6 +719,14 @@ export default { }, computed: { // 业务一和其他业务的银行卡不一样 + backMoneyArr() { + return this.cashboxGoodsShelf2.filter(item => item.num>0) + }, + backMoneyTotal() { + return this.cashboxGoodsShelf2.reduce((total, item) => { + return total + parseInt(item.name) * item.num + }, 0) + }, needPasswordAgain() { if(this.id == '62,1' || this.id == '62,2' || this.id == '62,3' || this.id == '129' || this.id == '167' || this.id == '301') { return true @@ -1125,9 +1187,22 @@ export default { } this.voucherCardGet = false }, + changeTipsDialog(changeIt = false) { + this.tipsDialog = changeIt + }, + getMoneyTotal(changeIt) { + // 如果是确认，执行一些东西 + if(changeIt) { + console.log(this.backMoneyTotal) + } + this.tipsDialog = false + }, changePeopleJudge() { this.peopleJudge = true; }, + closePeopleJudge() { + this.peopleJudge = false; + }, peopleDoing(peopleDo) { this.peopleDo = peopleDo; this.peopleJudge = false; @@ -1157,68 +1232,6 @@ export default { }, showData(type,nbm) {/* 展示弹窗-type为弹窗标题文字 */ this.nbm = nbm - // 业务的东西 - // this.goodsShelfTotalData = [...this.goods2] - // if(type == '普通凭证箱' || type == '系统'){ - // // this.goodsShelfTotalData = this.systemInputGoodsShelf - // let parentId = '' - // if(type == '普通凭证箱'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3' - // } - // if(type == '系统'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5' - // } - // }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱' || type == '身份证扫描器'){ - // // this.goodsShelfTotalData = this.auditGoodsShelf - // let parentId = '' - // if(type == '重要空白凭证箱'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' - // } - // if(type == '资料'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,11' - // } - // if(type == '验钞机'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9' - // } - // if(type == '身份证扫描仪'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7' - // } - // let param= { - // parentId: parentId - // } - // }else if(type == '打印机' || type == '客户签字' || type == '印章盒'){ - // // this.goodsShelfTotalData = this.printoutGoodsShelf - // let parentId = '' - // if(type == '打印机'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10' - // }else if(type == '客户签字'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' - // }else if(type == '返还资料'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,12' - // }else if(type == '印章盒'){ - // parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8' - // } - // }else if(type == '钱箱'){ - // // this.goodsShelfTotalData = this.cashboxGoodsShelf; - // let param= { - // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1' - // } - // getOperation(param).then((data)=> { - // if (data.data.status == 200) { - // var list = data.data.judgmentRuleReqs - // for(var j=0;j{ - // }) - // } this.changeShowGoods(true) if(type !== '系统') { this.$store.commit('system/changePop',{show:true,text:type, id: this.id}) @@ -1744,29 +1757,28 @@ export default { let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') let formList = []; - if(this.needBackMoney && this.goodState.length === 0) { - if(this.goodState.length === 0) { - let params= { - parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', - lcJudgmentRuleReq: [ - { - "answerId":15, - "emptyOne": "", - "emptyTwo": "", - "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,1,"+15, - "type": "" - } - ], - projectId:+projectId, - startTime:startTime, - } - addOperation(params).then((data)=>{ - this.setTipsOperate('取钱成功!') - }).catch((error)=>{ - }) - }else { - // this.setTipsOperate('你的钱还在钱箱里！') - } + if(this.needBackMoney) { + this.tipsDialog = true + console.log(this.backMoneyArr) + // let params= { + // parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', + // lcJudgmentRuleReq: [ + // { + // "answerId":15, + // "emptyOne": "", + // "emptyTwo": "", + // "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,1,"+15, + // "type": "" + // } + // ], + // projectId:+projectId, + // startTime:startTime, + // } + // addOperation(params).then((data)=>{ + // this.setTipsOperate('取钱成功!') + // }).catch((error)=>{ + // }) + // console.log(this.) // 如果需要钱箱取钱并且满足了 }else { @@ -1949,24 +1961,9 @@ export default { const targetDom = this.$refs.goods.getBoundingClientRect() return evt.originalEvent.pageXtargetDom.left && evt.originalEvent.pageYtargetDom.top }, - // inputListenCard(val, prop) { - // const tmpCheck = val.substr(val.length-1, 1); - // if(tmpCheck === ' ') { - // return; - // } - // if(val === '') { - // this[prop] = val; - // return; - // } - // const tmpGet = Number(val.replace(/\D+/, '')) - // if(tmpGet <= 2 && tmpGet>0) { - // this[prop] = tmpGet - // }else { - // this.setTipsOperate('最多只能取出两张') - // this[prop] = 2 - // } - - // } + inputChange(item) { //输入框值改变 + item.num = item.num.replace(/[^\d]/g, '') + }, } }; @@ -2099,7 +2096,7 @@ export default { width: 8vw; } .computer { - top: 30vh; + top: 40vh; left: 44vw; width: 10vw; } @@ -2200,9 +2197,9 @@ export default { width: 139px; } .computer { - top: 90px; - left: 850px; - width: 200px; + top: 140px; + left: 790px; + width: 230px; } .card-machine { top: 355px; @@ -2430,11 +2427,11 @@ export default { left: 40vw; width: 8vw; } - .computer { - top: 30vh; - left: 44vw; - width: 10vw; - } + // .computer { + // top: 30vh; + // left: 44vw; + // width: 10vw; + // } .card-machine { top: 45vh; left: 52vw; @@ -2541,11 +2538,11 @@ export default { left: 38vw; width: 8vw; } - .computer { - top: 30vh; - left: 44vw; - width: 10vw; - } + // .computer { + // top: 30vh; + // left: 44vw; + // width: 10vw; + // } .card-machine { top: 48vh; left: 55vw; @@ -2781,7 +2778,7 @@ export default { width: 7vw; } .computer { - top: 22vh; + top: 29vh; left: 40vw; width: 10vw; } @@ -2892,8 +2889,8 @@ export default { width: 112px; } .computer { - top: 29vh; - left: 42vw; + top: 34vh; + left: 40vw; width: 148px; } .card-machine { @@ -3077,6 +3074,7 @@ export default { z-index: 99; } .data-dia { + min-height: 60vh; border-radius: 16px; // margin-top: 4vh !important; background: #fff; @@ -3201,7 +3199,7 @@ export default { } .list { width: 940px; - max-height: 30vh; + max-height: 50vh; min-height: 30vh; overflow: auto; display: flex; @@ -3250,6 +3248,43 @@ export default { } } } + .backMoneyBox { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: wrap; + .backMoney { + width: 50%; + display: flex; + justify-content: center; + margin: 10px 0; + img { + width: 148px; + height: 73.5px; + margin-right: 10px; + // box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); + } + input { + width: 204px; + height: 72px; + text-align: center; + opacity: 0.5; + border: 4px solid rgba(219,219,219,1); + border-radius: 16px; + &:focus { + outline: none; + opacity: 1; + border: 4px solid rgba(97,145,255,1); + } + } + .isInputMoney { + opacity: 1; + border: 4px solid rgba(97,145,255,1); + } + } + + } } .seal{ width: 970px; @@ -3520,4 +3555,94 @@ color: #fff; /deep/.z500 { z-index: 5000; } +/deep/.bgNone { + background-color: transparent; + box-shadow: 0 0 0 0!important; + .peopleDialog { + width: 580px; + height: 466px; + background: #FFFFFF; + border-radius: 16px; + box-shadow: 0 0 0 0!important; + h2 { + margin-top: 14.3%; + // opacity: 0.8; + font-family: PingFangHeavy; + font-size: 30px; + color: #000000; + letter-spacing: 0.36px; + font-weight: 500; + text-align: center; + } + .dia-footer { + margin-top: 10vh; + button { + width: 512px; + height: 60px; + margin: 10px 0 0 0; + background: #6191FF; + border-radius: 16px; + font-size: 30px; + color: #FFFFFF; + letter-spacing: 0.36px; + text-align: center; + font-weight: 600; + } + } + } + .tipsDialog { + width: 580px; + height: 520px; + background: #FFFFFF; + border-radius: 16px; + box-shadow: 0 0 0 0!important; + font-family: PingFangHeavy; + h3 { + // opacity: 0.8; + font-size: 30px; + color: #000000; + letter-spacing: 0.36px; + line-height: 42px; + font-weight: 500; + height: 42px; + img { + width: 18px; + height: 42px; + // line-height: 24px; + display: inline-block; + font-size: 30px; + font-weight: 400; + color: green; + } + } + .dia-footer { + display: flex; + justify-content: center; + align-items: center; + button { + // font-style: ; + font-size: 30px; + color: #FFFFFF; + letter-spacing: 0.36px; + text-align: center; + font-weight: 600; + margin: 0 10px; + &:nth-child(1) { + width: 240px; + height: 60px; + opacity: 0.3; + background: #6191FF; + border-radius: 16px; + } + &:nth-child(2) { + width: 240px; + height: 60px; + background: #6191FF; + border-radius: 16px; + } + } + } + } + +} \ No newline at end of file diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue index 4e9f18a..9aa7568 100644 --- a/src/pages/manage/list/business/openAccount.vue +++ b/src/pages/manage/list/business/openAccount.vue @@ -170,13 +170,13 @@ export default { // trigger: 'blur' // } // ], - // currency: [ - // { - // required: true, - // message: '请选择币种', - // trigger: 'blur' - // } - // ], + currency: [ + { + required: true, + message: '请选择币种', + trigger: 'blur' + } + ], // goldLogo: [ // { // required: true, @@ -198,13 +198,13 @@ export default { // trigger: 'blur' // } // ], - // drawWay: [ - // { - // required: true, - // message: '请选择支取方式', - // trigger: 'blur' - // } - // ] + drawWay: [ + { + required: true, + message: '请选择支取方式', + trigger: 'blur' + } + ] }, second:[// 二级卡数组 diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue index 3b8bce9..976e7d5 100644 --- a/src/pages/manage/list/client/corporateClient.vue +++ b/src/pages/manage/list/client/corporateClient.vue @@ -13,9 +13,11 @@ + - + + 万
@@ -119,10 +121,17 @@ export default { trigger: 'blur' } ], - phone: [{ + phone: [ + { pattern: mobPattern, message: '联系电话格式有误' - }], + }, + { + required: true, + message: '请输入联系电话', + trigger: 'blur' + } + ], name: [{ pattern: namePattern, message: '法人姓名格式有误' diff --git a/src/styles/font/PingFang Bold.ttf b/src/styles/font/PingFang Bold.ttf new file mode 100644 index 0000000..accaf1f Binary files /dev/null and b/src/styles/font/PingFang Bold.ttf differ diff --git a/src/styles/font/PingFang ExtraLight.ttf b/src/styles/font/PingFang ExtraLight.ttf new file mode 100644 index 0000000..d9b574b Binary files /dev/null and b/src/styles/font/PingFang ExtraLight.ttf differ diff --git a/src/styles/font/PingFang Heavy.ttf b/src/styles/font/PingFang Heavy.ttf new file mode 100644 index 0000000..f4cf788 Binary files /dev/null and b/src/styles/font/PingFang Heavy.ttf differ diff --git a/src/styles/font/PingFang Light.ttf b/src/styles/font/PingFang Light.ttf new file mode 100644 index 0000000..a513705 Binary files /dev/null and b/src/styles/font/PingFang Light.ttf differ diff --git a/src/styles/font/PingFang Medium.ttf b/src/styles/font/PingFang Medium.ttf new file mode 100644 index 0000000..982661b Binary files /dev/null and b/src/styles/font/PingFang Medium.ttf differ diff --git a/src/styles/font/PingFang Regular.ttf b/src/styles/font/PingFang Regular.ttf new file mode 100644 index 0000000..8790adb Binary files /dev/null and b/src/styles/font/PingFang Regular.ttf differ diff --git a/src/styles/font/myfont.css b/src/styles/font/myfont.css new file mode 100644 index 0000000..d507686 --- /dev/null +++ b/src/styles/font/myfont.css @@ -0,0 +1,17 @@ +@font-face { + font-family: PingFangMedium; + src: url('./PingFang Medium.ttf'); + font-weight: 500; +} +@font-face { + font-family: PingFangBold; + src: url('./PingFang Bold.ttf'); +} +@font-face { + font-family: PingFangHeavy; + src: url('./PingFang Heavy.ttf'); +} +@font-face { + font-family: PingFangRegular; + src: url('./PingFang Regular.ttf'); +} \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index b7626c0..b55f05d 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,4 +1,5 @@ @import "./default/index.scss"; +@import "./font/myfont.css"; @import "./font/iconfont.css"; @import "./font/icon/iconfont.css"; @import "./lib/index.scss";