Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching

20240205
yujialong 3 years ago
commit 79c821eb09
  1. 22
      src/components/checkPhoto/index.vue
  2. 3
      src/layouts/header/index.vue
  3. 491
      src/pages/counter/list/index.vue
  4. 19
      src/store/modules/system.js

@ -1,5 +1,8 @@
<template>
<div class="relative -translate-y-2/4" style="margin-top: 10px;color: black;">
<!-- <div class="bg-gray-400" @click="closeIt">关闭</div> -->
<img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;" />
<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 +47,10 @@ export default {
imgSrcName: {
require: true
},
// showImg: {
// type: Boolean,
// default: false
// }
// requireTalk: {
// type: String,
// default: ''
@ -57,9 +64,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 +108,12 @@ export default {
// immediate: true
// }
},
methods: {
closeIt() {
this.$emit('update:showImg', false)
},
},
computed: {
...mapGetters({
dataFlow: 'system/dataFlow'

@ -59,7 +59,8 @@ export default {
align-items: center;
position: relative;
height: 68px;
background-color: #fff;
// background-color: #fff;
background-color: rgb(250,250,250);
z-index: 1001;
.logo{
width: 500px;

@ -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,28 +402,33 @@
<router-view></router-view>
</div>
<div v-show="showImg" style="background-color: blur;">
<div v-drag class="relative w-screen h-screen" ref="imgCheckDrag">
<check-photo :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" :showImg.sync="showImg" class="dia-header" 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
<!-- <el-dialog
custom-class="data-dia "
class="imgIndex"
: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>
</div>
</check-photo>
</el-dialog>
<check-photo :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" class="dia-header">
<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>
</el-dialog> -->
<!-- <tip-dialog /> -->
@ -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,14 +824,17 @@ export default {
439: '销户章'
}
return (id) => {
// finishSealedArr
return this.sealArr.filter(item => {
// && this.finishSealedArr.includes(item.id)
if(item.name.includes(stampMap2[id])) {
console.log(item.id)
return item
}
})
if(!this.finishSealedArr.includes(id)) {
return []
}else {
return this.sealArr.filter(item => {
// && this.finishSealedArr.includes(item.id)
if(item.name.includes(stampMap2[id])) {
return item
}
})
}
}
},
// sealChecked
@ -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,173 +1088,22 @@ export default {
})
this.startPlay()
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'cultureIn'})
}
this.finishGoods.cultureIn = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
// this.pushThings({ idArr: [...list], name: 'cultureIn'})
this.pushThingsGoods([...list])
}
this.finishGoods.proofImportantBox = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.pushThingsGoods([...list])
}
this.finishGoods.proofBox = true
}
})
// Obj
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])) {
this.outThingsGoods([...stampJudge[list[i]].delete])
this.pushThingsGoods([...stampJudge[list[i]].add])
}else {
this.finishSealedArr.push(stampMap[list[i]])
}
}
}
this.finishGoods.sealBox = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
if(this.needBackMoney) {
this.pushThingsGoods([...list])
this.outThings2({ name: 'moneyBox', index: 0 })
}else {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'moneyBox'})
}
}
this.finishGoods.moneyBox = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,556'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'backPeople'})
}
this.finishGoods.backPeople = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,6'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.swipingCard = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.idCard = true
}
})
//
getOperation({
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
}
})
//
getOperation({
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
}
})
this.getThingsCache();
},
mounted(){
let that = this
//
new Sortable(this.$refs.imgCheckDrag, {
animation: 150,
group: {
name:'shared',
pull:'clone',//
put:false//
},
})
// -
new Sortable(this.$refs.goods, {
animation: 150,
@ -1371,6 +1237,191 @@ export default {
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'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'cultureIn'})
}
this.finishGoods.cultureIn = true
}else {
this.finishGoods.cultureIn = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
// this.pushThings({ idArr: [...list], name: 'cultureIn'})
this.pushThingsGoods([...list])
}
this.finishGoods.proofImportantBox = true
}else {
this.finishGoods.proofImportantBox = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,3'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.pushThingsGoods([...list])
}
this.finishGoods.proofBox = true
}else {
this.finishGoods.proofBox = false
}
})
// Obj
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])) {
this.outThingsGoods([...stampJudge[list[i]].delete])
this.pushThingsGoods([...stampJudge[list[i]].add])
}else {
this.finishSealedArr.push(stampMap[list[i]])
}
}
}
this.finishGoods.sealBox = true
}else {
this.finishGoods.sealBox = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
if(this.needBackMoney) {
this.pushThingsGoods([...list])
this.outThings2({ name: 'moneyBox', index: 0 })
}else {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'moneyBox'})
}
}
this.finishGoods.moneyBox = true
}else {
this.finishGoods.moneyBox = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,556'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
const list = data.data.judgmentRuleReqs.map(item => item.answerId)
if(list.length) {
this.outThingsGoods([...list])
this.pushThings({ idArr: [...list], name: 'backPeople'})
}
this.finishGoods.backPeople = true
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,6'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.swipingCard = true
}else {
this.finishGoods.swipingCard = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,7'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.idCard = true
}else{
this.finishGoods.idCard = false
}
})
//
getOperation({
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.currencyDetector = true
}else {
this.finishGoods.currencyDetector = false
}
})
//
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,10'
}).then((data)=>{
if(data.status == 200 && data.data.judgmentRuleReqs) {
this.finishGoods.printer = true
}else {
this.finishGoods.printer = false
}
})
},
voucherCardGetIt(number) {
if(number === 2) {
@ -2019,59 +2070,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('请放入现金!')

@ -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: {

Loading…
Cancel
Save