+
+
+
{{item.name}}
+
+
@@ -261,9 +264,9 @@ export default {
}
};
return {
- cultureArr: [], // 传票栏
- peopleSign: [],
- moneyBox: [],
+ // cultureIn: [], // 传票栏
+ // peopleSign: [],
+ // moneyBox: [],
takeCheck: '', // 选择业务逻辑 myKey用来确定选择哪个项目
businessArr: [
{
@@ -405,6 +408,7 @@ export default {
showBusiness: false,
manageVisible: false, // 显示系统录入
checkList: [],// 物品栏选中
+ // tmpBox: [], // 存储暂未保存的证件
elseBoxCheck:[],/* 所有其他可从物品栏拖拽物品进入的弹框 */
//身份证扫描仪//审核资料//验钞机//选择重要空白凭证
// 拿业务的东西替换掉
@@ -469,6 +473,13 @@ export default {
{name:'开户申请书回单',src:require('@/assets/img/goods/khsqs.png'),id:142},
{name:'存款凭条凭证联',src:require('@/assets/img/goods/ckpt.png'),id:171},
{name:'存款凭条回单',src:require('@/assets/img/goods/ckpt.png'),id:172},
+ {name:'取款凭条凭证联',src:require('@/assets/img/goods/qkpt.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/zzpt.png'),id:'转账凭条回单'},
+ {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单凭证联'},
+ {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单回单'},
+ {name:'盖过章的复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:231},
],
receptionList:[
@@ -755,7 +766,7 @@ export default {
}
}
}
- if(this.$store.state.system.popText == '密码器'){
+ else if(this.$store.state.system.popText == '密码器'){
if(this.$store.state.system.id == '62,1'){
}else if(this.$store.state.system.id == '64'){
@@ -791,7 +802,7 @@ export default {
}
}
}
- if(this.$store.state.system.popText == '身份证扫描仪' || this.$store.state.system.popText.includes('身份证扫描') || this.$store.state.system.popText.includes('银行')){
+ else if(this.$store.state.system.popText == '身份证扫描仪' || this.$store.state.system.popText.includes('身份证扫描') || this.$store.state.system.popText.includes('银行')){
if (this.$store.state.system.id == '33'){
this.nbm = 33
let param= {
@@ -919,15 +930,15 @@ export default {
}
}
}
- if(this.$store.state.system.popText == '钱箱') {
- this.receptionList.splice(0, this.receptionList.length, ...this.moneyBox)
- }
- if(this.$store.state.system.popText == '客户签字') {
- this.receptionList.splice(0, this.receptionList.length, ...this.peopleSign)
- }
- if(this.$store.state.system.popText == '传票栏') {
- this.receptionList.splice(0, this.receptionList.length, ...this.cultureArr)
- }
+ // else if(this.$store.state.system.popText == '钱箱') {
+ // this.receptionList.splice(0, this.receptionList.length, ...this.moneyBox)
+ // }
+ // else if(this.$store.state.system.popText == '客户签字') {
+ // this.receptionList.splice(0, this.receptionList.length, ...this.peopleSign)
+ // }
+ // else if(this.$store.state.system.popText == '传票栏') {
+ // this.receptionList.splice(0, this.receptionList.length, ...this.cultureArr)
+ // }
if(!this.showGoods) this.checkList = []
return this.$store.state.system.showPop;
},
@@ -937,18 +948,27 @@ export default {
id:function(){/* 文字 */
return this.$store.state.system.id;
},
- goods:function () {/* 物品栏的物品 */
- return this.$store.state.system.goods
- },
-
showGoods:function() {
return this.$store.state.system.showGoods
},
- goodsOpen:function () {/* 物品栏的物品 */
- return this.$store.state.system.goodsOpen
+ myMap() { // 用做对照表 相应的popText对应相应的数组名字
+ if(this.popText === '钱箱') {
+ return 'moneyBox'
+ }else if(this.popText === '客户签字'){
+ return 'peopleSign'
+ }else if(this.popText == '传票栏') {
+ return 'cultureArr'
+ }else if(this.popText == '印章盒') {
+ return 'sealBox'
+ }else {
+ return ''
+ }
},
...mapGetters({
goodsShelfTotalData: 'system/goods2',
+ cultureIn: 'system/cultureIn', // 传票栏
+ peopleSign: 'system/peopleSign',
+ goodState: 'system/goodState',
})
},
watch: {
@@ -1002,6 +1022,9 @@ export default {
};
})
}
+ }else {
+ // 去掉临时存储的证件
+ // this.tmpBox.splice(0, this.tmpBox.length)
}
}
},
@@ -1049,44 +1072,45 @@ export default {
if(evt.originalEvent.pageY
targetDom.top){
/* oldindex识别是拖拽了哪个文件 */
// console.log(that.goodsShelfTotalData[evt.oldIndex].name,'执行拖拽2');
- that.checkList.push(that.goodsShelfTotalData[evt.oldIndex].name)
- // 钱箱等的拖拽
+ // that.clickList.push(that.goodsShelfTotalData[evt.oldIndex].name)
+
if(that.$refs.popUp) {
- for(var i=0;i item.id === that.goodsShelfTotalData[evt.oldIndex].id)
+ if(index !== -1) {
+ return
}
+ that.pushThings({ idArr: that.goodsShelfTotalData[evt.oldIndex].id, name: that.myMap})
+ // that.tmpBox.push(that.goodsShelfTotalData[evt.oldIndex].id)
+ that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
+ // for(var i=0;i item === id)
+ // if( index!== -1 ) {
+ // this.tmpBox.splice(index, 1)
+ // }
+ }else {
+ //
+ }
+ // this.receptionList.splice(index,1);
},
toggleGoods() {
this.changeShowGoods(!this.showGoods)
@@ -1337,6 +1376,12 @@ export default {
this.commonChecked.includes(id) ? this.commonChecked.splice(this.commonChecked.indexOf(id), 1) : this.commonChecked.push(id);
},
closePop() {// 关闭弹窗
+ // if(this.myMap) {
+ // // const index = this[this.myMap].length-this.tmpBox.length // 计算原来的减去临时的长度后从哪个位置开始删
+ // this.pushThingsGoods([...this.tmpBox])
+ // this.outThings({ name: this.myMap, idArr: [...this.tmpBox]})
+ // }
+
this.receptionList = [];
this.changeShowGoods(false)
this.$store.commit('system/changePop',{show:false,text:''})
@@ -1371,7 +1416,7 @@ export default {
// this.$store.commit('system/changeGoods',{push:arr})
// // 加东西
// this.auditGoodsShelf.push({name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16}) //
- this.closePop()
+ // this.closePop()
// this.changeShowGoods(false)
clickList = []
this.importantChecked = []
@@ -1394,28 +1439,34 @@ export default {
this.$message.error('请输入密码和确认密码');
}
}else if(this.popText == '印章盒') {
- const id = this.receptionList[0].id
- const sealArr = [...this.sealChecked]
- this.stampJudge({ sealArr, id})
- }else if(this.popText == '钱箱') {
- console.log(this.receptionList)
- for(let i=0; i item.id)
- this.backPeople(idArr)
- // this.stampJudge()
- }else if(this.popText == '传票栏') {
- const idArr = this.receptionList.map(item => item.id)
- this.backCulture(idArr)
- // this.stampJudge()
- }else{
- console.log('-刷卡确认')
+ }
+ // else if(this.popText == '钱箱') {
+ // for(let i=0; i item.id)
+ // this.backPeople(idArr)
+ // // this.stampJudge()
+ // }else if(this.popText == '传票栏') {
+ // const idArr = this.receptionList.map(item => item.id)
+ // this.backCulture(idArr)
+ // }
+ else{
// this.goodsShelfTotalData = this.auditGoodsShelf
if (this.$store.state.system.id == '33'){
this.nbm = 33
@@ -1760,12 +1811,8 @@ export default {
}
}
+ this.closePop()
}
-
-
-
-
-
this.$store.commit('system/changePop', {show: false, text: ''})
},
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 1c017c4..0651898 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -24,15 +24,22 @@ const allGoods = {
142: {name:'开户申请书回单',src:require('@/assets/img/goods/khsqs.png'),id:142},
171: {name:'存款凭条凭证联',src:require('@/assets/img/goods/ckpt.png'),id:171},
172: {name:'存款凭条回单',src:require('@/assets/img/goods/ckpt.png'),id:172},
+ '取款凭条凭证联': {name:'取款凭条凭证联',src:require('@/assets/img/goods/qkpt.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/zzpt.png'),id:'转账凭条回单'},
+ '利息清单凭证联': {name:'利息清单凭证联',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单凭证联'},
+ '利息清单回单': {name:'利息清单回单',src:require('@/assets/img/goods/lxqd.png'),id:'利息清单回单'},
+ 231: {name:'盖过章的复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:231},
}
-
+import { Message } from 'element-ui';
export default {
namespaced: true,
state: {/* 管理柜台状态 */
showPop: false,// 弹框
- popText:'钱箱',
+ popText:'',
fullScreen:false,// 银行系统是否全屏
showGoods: false, // 物品栏的展开和关闭
// 业务选择表:
@@ -51,7 +58,28 @@ export default {
'附件章': [23]
},
backPeople: [142, 13, 172, 16],
- cultureArr: [23, 141, 171]
+ cultureArr: [23, 141, 171],
+ // 各种物品信息
+ moneyBox: [], // 钱箱
+ peopleSign: [], // 客户签字
+ cultureIn: [], // 传票栏
+ sealBox: [] // 印章盒
+ },
+ '项目二': {
+ data: [16, 13, 23, '转账凭条'],
+ needs: ['利息清单', '取款凭条', 15],
+ isStamp: {
+ '付讫章': ['取款凭条', '利息清单'],
+ '转讫章': ['转账凭条'],
+ '附件章': [23]
+ },
+ backPeople: [23, '转账凭条回单', '取款凭条回单', '利息清单回单', 15],
+ cultureArr: [13, '取款凭条凭证联', '转账凭条凭证联', '利息清单回单'], // 入库
+ // 各种物品信息
+ moneyBox: [15], // 钱箱
+ peopleSign: [], // 客户签字
+ cultureIn: [], // 传票栏传票栏
+ sealBox: [] // 印章盒
},
},
goods:[// 物品栏的物品
@@ -94,27 +122,69 @@ export default {
],
},
mutations: {
+ pushThings(state, { name, idArr}) {
+ if(name === 'sealBox') { // 印章盒只能放一个东西
+ const sealBox = state.businessSelect[state.businessKey][name]
+ if(sealBox.length === 1) {
+ this.commit('system/pushThingsGoods', [...sealBox])
+ state.businessSelect[state.businessKey][name].splice(0, 1, idArr)
+ }else {
+ state.businessSelect[state.businessKey][name].push(idArr)
+ }
+ }else {
+ if(!(idArr instanceof Array)) {
+ state.businessSelect[state.businessKey][name].push(idArr)
+ }else {
+ state.businessSelect[state.businessKey][name].push(...idArr)
+ }
+ }
+
+ },
+ pushThingsGoods(state, idArr) {
+ state.businessSelect[state.businessKey].data.push(...idArr)
+ },
+ outThings(state, { name, idArr}) {
+ if(!(idArr instanceof Array)) {
+ const index = state.businessSelect[state.businessKey][name].findIndex(item => item.id === idArr)
+ state.businessSelect[state.businessKey][name].splice(index, 1)
+ }else {
+ for(let i=0; i item.id === idArr[i])
+ state.businessSelect[state.businessKey][name].splice(index, 1)
+ }
+ }
+ },
+ outThingsGoods(state, idArr) {
+ console.log(idArr)
+ for(let i=0; i item === idArr[i])
+ if(index !== -1) {
+ state.businessSelect[state.businessKey].data.splice(index, 1)
+ }
+ }
+ },
+
backCulture(state, idArr) {
for(let i=0; i item === idArr[i])
if(index !== -1) {
- const index2 = state.businessSelect[state.businessKey].data.findIndex(item => item === idArr[i])
- console.log(index2)
- state.businessSelect[state.businessKey].cultureArr.splice(index, 1)
- state.businessSelect[state.businessKey].data.splice(index2, 1)
+ // const index2 = state.businessSelect[state.businessKey].data.findIndex(item => item === idArr[i])
+ state.businessSelect[state.businessKey].cultureArr.splice(index, 1) // 我需要传票的少了相应的那个
+ // state.businessSelect[state.businessKey].data.splice(index2, 1)
}
+ this.commit('system/outThingsGoods', [...idArr])
}
},
backPeople(state, idArr) {
for(let i=0; i item === idArr[i])
if(index !== -1) {
- const index2 = state.businessSelect[state.businessKey].data.findIndex(item => item === idArr[i])
- console.log(index2)
state.businessSelect[state.businessKey].backPeople.splice(index, 1)
- state.businessSelect[state.businessKey].data.splice(index2, 1)
+ // const index2 = state.businessSelect[state.businessKey].data.findIndex(item => item === idArr[i])
+ // state.businessSelect[state.businessKey].data.splice(index2, 1)
}
}
+ this.commit('system/outThingsGoods', [...idArr])
},
payMoney(state) {
const index = state.businessSelect[state.businessKey].data.findIndex(item => item === 15)
@@ -122,26 +192,51 @@ export default {
state.businessSelect[state.businessKey].data.splice(index, 1)
}
},
- stampJudge(state, { sealArr, id }) {
+ stampJudge(state, sealArr) {
const needStamp = state.businessSelect[state.businessKey].isStamp
+ const id = state.businessSelect[state.businessKey].sealBox.length[0]
+ let judge = true
for(let seal in needStamp) {
for(let i=0; i item === id)
if(seal === '业务专用章') {
if(id === 14) {
- state.businessSelect[state.businessKey].data.splice(index, 1, 141)
- state.businessSelect[state.businessKey].data.push(142)
+ state.businessSelect[state.businessKey].data.splice(index, 1, 141, 142)
+ }
+ else if(id === 17) {
+ state.businessSelect[state.businessKey].data.splice(index, 1, 171, 172)
}
- if(id === 17) {
- state.businessSelect[state.businessKey].data.splice(index, 1, 171)
- state.businessSelect[state.businessKey].data.push(172)
+ }else if(seal === '付讫章') {
+ if(id === '取款凭条') {
+ // state.businessSelect[state.businessKey].data.splice(index, 1, '取款凭条凭证联', '取款凭条回单')
+ state.businessSelect[state.businessKey].data.push('取款凭条凭证联', '取款凭条回单')
+ }
+ else if(id === '利息清单') {
+ // state.businessSelect[state.businessKey].data.splice(index, 1, '利息清单凭证联', '利息清单回单')
+ state.businessSelect[state.businessKey].data.push('利息清单凭证联', '利息清单回单')
+ }
+ }else if(seal === '转讫章') {
+ if(id === '转账凭条') {
+ // state.businessSelect[state.businessKey].data.splice(index, 1, '转账凭条凭证联', '转账凭条回单')
+ state.businessSelect[state.businessKey].data.push('转账凭条凭证联', '转账凭条回单')
+ }
+ }else if(seal === '附件章') {
+ if(id === 23) {
+ // state.businessSelect[state.businessKey].data.splice(index, 1, 231)
+ state.businessSelect[state.businessKey].data.push(231)
}
}
+ judge = false
}
}
}
- console.log('gai')
+ if(judge) {
+ console.log('xsws')
+ console.log(sealArr)
+ this.commit('system/pushThingsGoods', [...state.businessSelect[state.businessKey].sealBox])
+ }
+ state.businessSelect[state.businessKey].sealBox.splice(0, 1)
},
setBusinessKey: (state, val) => {
// 这个是容错的 后面可以删掉
@@ -233,14 +328,35 @@ export default {
getters: {
// 选择项目物品栏中的物品 根据myKey判断有什么
goods2(state) {
- console.log('???')
- console.log(state.businessKey)
// 调试容错采用if-else
const arr = []
for(const item of state.businessSelect[state.businessKey].data) {
arr.push(allGoods[item])
}
return arr
+ },
+ goodState(state) {
+ const arr = []
+ if(state.popText === '钱箱') {
+ for(let item of state.businessSelect[state.businessKey].moneyBox) {
+ arr.push(allGoods[item])
+ }
+ }else if(state.popText === '客户签字'){
+ for(let item of state.businessSelect[state.businessKey].peopleSign) {
+ arr.push(allGoods[item])
+ }
+ }else if(state.popText == '传票栏') {
+ for(let item of state.businessSelect[state.businessKey].cultureIn) {
+ arr.push(allGoods[item])
+ }
+ }else if(state.popText == '印章盒') {
+ for(let item of state.businessSelect[state.businessKey].sealBox) {
+ arr.push(allGoods[item])
+ }
+ }else {
+ // return
+ }
+ return arr
}
}
}
\ No newline at end of file