huoran
/
FE_bankTeaching
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

update

Browse Source
20240205
luoJunYong.123 3 years ago
parent da8bebcf5e
commit 60d9fa8ceb
3 changed files with 261 additions and 245 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/components/checkPhoto/index.vue
  2. 407
      src/pages/counter/list/index.vue
  3. 19
      src/store/modules/system.js

20
src/components/checkPhoto/index.vue
Unescape View File

@ -1,5 +1,6 @@
<template>
<div class="relative -translate-y-2/4" style="margin-top: 10px;color: black;">
<!-- <div class="bg-gray-400" @click="closeIt">关闭</div> -->
<template v-if="imgSrcId==14">
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 95px;top: 110px;">{{ dataFlow.userName }}</h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" v-if="dataFlow.sex==1" style="left: 446px;top: 110px;">√</h3>
@ -44,6 +45,10 @@ export default {
imgSrcName: {
require: true
},
// showImg: {
// type: Boolean,
// default: false
// }
// requireTalk: {
// type: String,
// default: ''
@ -57,9 +62,16 @@ export default {
// }
},
mounted() {
// console.log('---showImg')
// console.log(this.showImg)
},
watch: {
showImg: {
handler(newVal) {
console.log(newVal)
},
immediate: true
}
// 盖章逻辑 挂着
// imgSrc: {
// handler(newVal) {
@ -94,6 +106,12 @@ export default {
// immediate: true
// }
},
methods: {
closeIt() {
this.$emit('update:showImg', false)
},
},
computed: {
...mapGetters({
dataFlow: 'system/dataFlow'

407
src/pages/counter/list/index.vue
Unescape View File

@ -82,7 +82,7 @@
</div>
<div class="sth currency-detector cp" @click="showData('验钞机',6)">
<img v-lazy="lazyImg[16]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.checkMoneyMechine">
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.currencyDetector">
</div>
</el-tooltip>
@ -93,7 +93,7 @@
</div>
<div class="sth printer cp" @click="showData('打印机',7)">
<img v-lazy="lazyImg[18]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.printMechine">
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.printer">
</div>
</el-tooltip>
@ -402,6 +402,18 @@
<router-view></router-view>
</div>
<!-- <div v-show="showImg" v-drag style="background-color: blur;width: 100vw; height: 100vh;">
<div class="dia-header">
<check-photo :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" :showImg.sync="showImg" style="width: 850px;z-index: 9999;" ref="photoCheck">
<div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
<seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
</seal-name>
</div>
</check-photo>
</div>
</div> -->
<!-- 图片查看器 -->
<el-dialog
@ -410,14 +422,7 @@
:visible.sync="showImg"
width="850px"
>
<!-- <p style="position: absolute;top: 350px; left: 90px;">test</p> -->
<!-- <template v-if="428">
<h3 class="subpixel-antialiased text-4xl text-center" style="position: absolute;top: 10px;">你可能需要的信息: xxx</h3>
</template> -->
<!-- <img :src="imgSrc" class="imgPop imgIndex min-w-full " alt=""> -->
<check-photo :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName">
<!-- <div name="" /> -->
<div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
<seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
</seal-name>
@ -732,7 +737,7 @@ export default {
peopleSign: false,
cultureIn: false,
sealBox: false,
currencyDetector: false,
// currencyDetector: false,
printer: false,
resource: false,
backPeople: false,
@ -740,8 +745,8 @@ export default {
proofImportantBox: false,
swipingCard: false,
idCard: false,
checkMoneyMechine: false,
printMechine: false
currencyDetector: false,
printer: false
},
finishSealedArr: [],
sealChecked:[],/* 印章盒选中 */
@ -819,15 +824,18 @@ export default {
439: '销户章'
}
return (id) => {
// finishSealedArr
if(!this.finishSealedArr.includes(id)) {
return []
}else {
return this.sealArr.filter(item => {
// && this.finishSealedArr.includes(item.id)
if(item.name.includes(stampMap2[id])) {
console.log(item.id)
return item
}
})
}
}
},
// sealChecked 印章盒选中的印章盖上去
sealCoverIt() {
@ -946,7 +954,10 @@ export default {
peopleSign: 'system/peopleSign',
goodState: 'system/goodState',
getSelectList: 'system/getSelectList',
needBackMoney: 'system/needBackMoney'
needBackMoney: 'system/needBackMoney',
}),
...mapState({
businessKey: state => state.system.businessKey
})
},
watch: {
@ -1023,6 +1034,12 @@ export default {
},
id(newVal) {
},
businessKey: {
handler(newVal) {
this.getThingsCache()
},
immediate: true
},
// 'passwordForm.password'(newVal) {
// // passwordForm:{
// // password:'',
@ -1071,6 +1088,150 @@ export default {
})
this.startPlay()
this.getThingsCache();
},
mounted(){
let that = this
// 拖拽-物品栏
new Sortable(this.$refs.goods, {
animation: 150,
group: {
name:'shared',
pull:'clone',// 是否可以被移出或克隆
put:false// 禁止拖入
},
sort: false,// 禁止排序
onEnd: function (/**Event*/evt) { // 结束拖拽
// 判断拖拽的地址 popUp和popUpSeal都是可以被拖拽上去的
if(!that.$refs.popUp && !that.$refs.popUpSeal) return that.setTipsOperate('非可拖拽的交互！')
let targetDom
if(that.$refs.popUp) {
targetDom = that.$refs.popUp.getBoundingClientRect()
}else if(that.$refs.popUpSeal) {
targetDom = that.$refs.popUpSeal.getBoundingClientRect()
}
if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
// console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
// that.clickList.push(that.goodsShelfTotalData[evt.oldIndex].name)
if(that.$refs.popUp) {
if(that.myMap) {
const id = that.goodsShelfTotalData[evt.oldIndex].id
that.outThingsGoods([id])
that.pushThings({ idArr: [id], name: that.myMap})
}else{
for(var i=0;i<that.popArr.length;i++){
if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
if (that.receptionList == null){
that.receptionList = []
}
if (that.receptionList.length){
for(var j=0;j< that.receptionList.length;j++){
if (that.receptionList[j].name == that.goodsShelfTotalData[evt.oldIndex].name){
return;
}
}
that.receptionList.push(that.popArr[i])
}else{
that.receptionList.push(that.popArr[i])
}
}
}
}
}
// 印章的拖拽
else if(that.$refs.popUpSeal) {
const id = that.goodsShelfTotalData[evt.oldIndex].id
that.outThingsGoods([ id ])
that.pushThings({ idArr: [ id ], name: that.myMap})
}
}
}
},
});
// (item, index) in importanceArr" :ref="'importanceArr'+index
// 拖拽-弹框
new Sortable(this.$refs.popUp, {
animation: 150,
group: {
name:'shared',
pull:'clone',// 是否可以被移出或克隆
put:false
},
sort: false,// 禁止排序
// 结束拖拽
onEnd: function (/**Event*/evt) {
if(!that.$refs.goods) return that.setTipsOperate('非可拖拽的交互！')
let targetDom = that.$refs.goods.getBoundingClientRect()
if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
that.checkList.push(that.importanceArr[evt.oldIndex].name)
if(that.goodsShelfTotalData.length > 0){
for(var i=0;i<that.goodsShelfTotalData.length;i++){
if(that.goodsShelfTotalData[i].name == that.importanceArr[evt.oldIndex].name){
return
}
}
// that.goodsShelfTotalData.push(that.importanceArr[evt.oldIndex])
that.addGoods(that.importanceArr[evt.oldIndex])
}
}
}
// // console.log(refParamBox,'目标dom',refParamBox.getBoundingClientRect());
// // 判断拖拽的地址
// let targetDom = that.$refs.goods.getBoundingClientRect()
// console.log(evt.oldIndex)
// if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
// if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
// console.log(evt)
// // this.importanceArr[evt.oldIndex]
// // this.importanceArr
// alert('拉入到弹框')
// }
// }
},
});
},
methods: {
...mapMutations({
startPlay: 'system/startPlay',
replaceThingsGoods: 'system/replaceThingsGoods',
replaceThings: 'system/replaceThings',
setShowBusiness: 'system/setShowBusiness',
changeShowGoods: 'system/changeShowGoods',
setGoodsOpen: 'system/setGoodsOpen',
removeGoodsOpen: 'system/removeGoodsOpen',
addGoodsOpen: 'system/addGoodsOpen',
setBusinessKey: 'system/setBusinessKey',
addGoods: 'system/addGoods',
deleteGoods: 'system/deleteGoods',
stampJudge: 'system/stampJudge',
payMoney: 'system/payMoney',
backPeople: 'system/backPeople',
backCulture: 'system/backCulture',
pushThings: 'system/pushThings',
pushThingsGoods: 'system/pushThingsGoods',
outThings: 'system/outThings',
outThings2: 'system/outThings2',
outThingsGoods: 'system/outThingsGoods',
setTipsOperate: 'system/setTipsOperate'
}),
getThingsCache() {
// 初始化印章缓存
this.finishSealedArr.splice(0, this.finishSealedArr.length)
// 传票栏
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4'
@ -1082,6 +1243,8 @@ export default {
this.pushThings({ idArr: [...list], name: 'cultureIn'})
}
this.finishGoods.cultureIn = true
}else {
this.finishGoods.cultureIn = false
}
})
// 重要空白凭证箱
@ -1095,6 +1258,8 @@ export default {
this.pushThingsGoods([...list])
}
this.finishGoods.proofImportantBox = true
}else {
this.finishGoods.proofImportantBox = false
}
})
@ -1108,6 +1273,8 @@ export default {
this.pushThingsGoods([...list])
}
this.finishGoods.proofBox = true
}else {
this.finishGoods.proofBox = false
}
})
@ -1161,6 +1328,8 @@ export default {
}
this.finishGoods.sealBox = true
}else {
this.finishGoods.sealBox = false
}
})
@ -1180,6 +1349,8 @@ export default {
}
}
this.finishGoods.moneyBox = true
}else {
this.finishGoods.moneyBox = false
}
})
@ -1203,6 +1374,8 @@ export default {
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.swipingCard = true
}else {
this.finishGoods.swipingCard = false
}
})
@ -1212,6 +1385,8 @@ export default {
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.idCard = true
}else{
this.finishGoods.idCard = false
}
})
@ -1220,7 +1395,9 @@ export default {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,9'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.checkMoneyMechine = true
this.finishGoods.currencyDetector = true
}else {
this.finishGoods.currencyDetector = false
}
})
@ -1229,148 +1406,12 @@ export default {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
console.log(data)
this.finishGoods.printMechine = true
}
})
},
mounted(){
let that = this
// 拖拽-物品栏
new Sortable(this.$refs.goods, {
animation: 150,
group: {
name:'shared',
pull:'clone',// 是否可以被移出或克隆
put:false// 禁止拖入
},
sort: false,// 禁止排序
onEnd: function (/**Event*/evt) { // 结束拖拽
// 判断拖拽的地址 popUp和popUpSeal都是可以被拖拽上去的
if(!that.$refs.popUp && !that.$refs.popUpSeal) return that.setTipsOperate('非可拖拽的交互！')
let targetDom
if(that.$refs.popUp) {
targetDom = that.$refs.popUp.getBoundingClientRect()
}else if(that.$refs.popUpSeal) {
targetDom = that.$refs.popUpSeal.getBoundingClientRect()
}
if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
// console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
// that.clickList.push(that.goodsShelfTotalData[evt.oldIndex].name)
if(that.$refs.popUp) {
if(that.myMap) {
const id = that.goodsShelfTotalData[evt.oldIndex].id
that.outThingsGoods([id])
that.pushThings({ idArr: [id], name: that.myMap})
}else{
for(var i=0;i<that.popArr.length;i++){
if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
if (that.receptionList == null){
that.receptionList = []
}
if (that.receptionList.length){
for(var j=0;j< that.receptionList.length;j++){
if (that.receptionList[j].name == that.goodsShelfTotalData[evt.oldIndex].name){
return;
}
}
that.receptionList.push(that.popArr[i])
this.finishGoods.printer = true
}else {
that.receptionList.push(that.popArr[i])
}
}
}
}
this.finishGoods.printer = false
}
// 印章的拖拽
else if(that.$refs.popUpSeal) {
const id = that.goodsShelfTotalData[evt.oldIndex].id
that.outThingsGoods([ id ])
that.pushThings({ idArr: [ id ], name: that.myMap})
}
}
}
},
});
// (item, index) in importanceArr" :ref="'importanceArr'+index
// 拖拽-弹框
new Sortable(this.$refs.popUp, {
animation: 150,
group: {
name:'shared',
pull:'clone',// 是否可以被移出或克隆
put:false
},
sort: false,// 禁止排序
// 结束拖拽
onEnd: function (/**Event*/evt) {
if(!that.$refs.goods) return that.setTipsOperate('非可拖拽的交互！')
let targetDom = that.$refs.goods.getBoundingClientRect()
if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
that.checkList.push(that.importanceArr[evt.oldIndex].name)
if(that.goodsShelfTotalData.length > 0){
for(var i=0;i<that.goodsShelfTotalData.length;i++){
if(that.goodsShelfTotalData[i].name == that.importanceArr[evt.oldIndex].name){
return
}
}
// that.goodsShelfTotalData.push(that.importanceArr[evt.oldIndex])
that.addGoods(that.importanceArr[evt.oldIndex])
}
}
}
// // console.log(refParamBox,'目标dom',refParamBox.getBoundingClientRect());
// // 判断拖拽的地址
// let targetDom = that.$refs.goods.getBoundingClientRect()
// console.log(evt.oldIndex)
// if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
// if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
// console.log(evt)
// // this.importanceArr[evt.oldIndex]
// // this.importanceArr
// alert('拉入到弹框')
// }
// }
},
});
})
},
methods: {
...mapMutations({
startPlay: 'system/startPlay',
replaceThingsGoods: 'system/replaceThingsGoods',
replaceThings: 'system/replaceThings',
setShowBusiness: 'system/setShowBusiness',
changeShowGoods: 'system/changeShowGoods',
setGoodsOpen: 'system/setGoodsOpen',
removeGoodsOpen: 'system/removeGoodsOpen',
addGoodsOpen: 'system/addGoodsOpen',
setBusinessKey: 'system/setBusinessKey',
addGoods: 'system/addGoods',
deleteGoods: 'system/deleteGoods',
stampJudge: 'system/stampJudge',
payMoney: 'system/payMoney',
backPeople: 'system/backPeople',
backCulture: 'system/backCulture',
pushThings: 'system/pushThings',
pushThingsGoods: 'system/pushThingsGoods',
outThings: 'system/outThings',
outThings2: 'system/outThings2',
outThingsGoods: 'system/outThingsGoods',
setTipsOperate: 'system/setTipsOperate'
}),
voucherCardGetIt(number) {
if(number === 2) {
@ -2019,59 +2060,13 @@ export default {
// 进去会排序 多的不用管
const sealArr = [...this.sealChecked]
this.stampJudge(sealArr)
this.sealChecked = []
// this.sealChecked = []
// this.$store.commit('system/changePop', {show: false, text: ''})
this.$nextTick(() => {
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8'
}).then((data)=>{
const stampJudge = {
18: {add:[24, 21], delete: [14]},
452:{ add: [432, 433] },
458:{ add: [419, 418], delete: [426]},
459:{ add: [478, 477], delete: [407]},
460:{ add: [466,468,467], delete: [406]},
463:{ add: [480, 488], delete: [413]},
464:{ add: [482, 481], delete: [479]},
444:{ add: [420, 421], delete: [425]},
445:{ add: [422, 424], delete: [427]},
446:{ add: [419, 418], delete: [426]},
447:{ add: [269, 22], delete: [17]},
455:{ add: [487, 441], delete: [409]},
456:{ add: [473, 472], delete: [411]},
457:{ add: [476, 474], delete: [412]}
}
const stampMap = {
449: 429,
19: 428,
452: 432,
465: 438,
461: 467,
20: 23,
435: 435,
436: 437,
484: 431,
462: 468,
448: 430,
454: 439
}
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
const allKeys = Object.keys(stampJudge)
if(list.length) {
for(let i=0; i<list.length; i++) {
if(allKeys.includes(list[i])) {
}else {
this.finishSealedArr.push(stampMap[list[i]])
}
}
}
this.stampJudge({
sealArr,
cb: (successId) => {
this.finishSealedArr.push(successId)
}
})
})
this.sealChecked = []
}else if (this.nbm == 6){ //验钞机
if(this.goodState.length === 0 || this.goodState[0].id !== 15) {
this.setTipsOperate('请放入现金!')

19
src/store/modules/system.js
Unescape View File

@ -8,7 +8,7 @@ const allGoods = {
16: {name:'银行卡',src:require('@/assets/img/goods/bankCard.png'),id:16},
428: {name:'定期存单',src:require('@/assets/img/goods/储蓄存单.png'),id:428},
439: {name:'预留印鉴卡',src:require('@/assets/img/goods/预留印鉴卡.png'),id:439},
412: {name:'转账支票',src:require('@/assets/img/goods/xd-zzzp.png'),id:412},
412: {name:'转账支票',src:require('@/assets/img/goods/sy-zzzp.png'),id:412},
30: {name:'银行承兑汇票',src:require('@/assets/img/goods/银行承兑汇票.png'),id:30},
411: {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:411},
425: {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425},
@ -2541,11 +2541,12 @@ export default {
state.businessSelect[state.businessKey].data.splice(index, 1)
}
},
stampJudge(state, sealArr) {
// cb是回调函数
stampJudge(state, { sealArr, cb }) {
// const needStamp = state.businessSelect[state.businessKey].isStamp
const id = state.businessSelect[state.businessKey].sealBox[0]
let judgeDelete = true // 盖完章是否变化
let judgeDelete = true // 盖完章是否变化 为false的会删掉。。。
let stampSuccess = '' // 盖章成功
if(sealArr.length === 1) {
const seal = sealArr[0]
@ -2681,6 +2682,8 @@ export default {
addOperation(params).then((data)=>{
if(judgeDelete) {
this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox])
console.log(id)
cb(id)
}
// 盖章会消失的删掉
state.businessSelect[state.businessKey].sealBox.splice(0, 1)
@ -2795,11 +2798,11 @@ export default {
},
actions: {
async getJudgeData({ state, commit }, params) {
const judgeId = myInitState[state.businessKey].id
console.log(judgeId)
const { data: { userScores } } = await reportDetail(Number(judgeId))
const { lcRuleRecords } = userScores.find(item => item.judgmentName.includes('系统录入'))
console.log(lcRuleRecords)
// const judgeId = myInitState[state.businessKey].id
// console.log(judgeId)
// const { data: { userScores } } = await reportDetail(Number(judgeId))
// const { lcRuleRecords } = userScores.find(item => item.judgmentName.includes('系统录入'))
// console.log(lcRuleRecords)
}
},
getters: {

Write Preview
Loading…
Cancel
Save