diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index 507ed7e..cb2fad4 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -56,6 +56,10 @@ export default { showForm: { type: Object, default: () => ({}) + }, + formName: { + type: Object, + default: () => ({}) } }, created() { @@ -68,12 +72,17 @@ export default { // console.log(Date.format(this.showForm[key])) // } if(num%2 === 0) { - this.leftObj[key] = this.showForm[key] + this.leftObj[this.formName[key]] = this.showForm[key] }else { - this.rightObj[key] = this.showForm[key] + this.rightObj[this.formName[key]] = this.showForm[key] } num++; } + this.leftObj['流水号'] = '2333333333333' + this.leftObj['经办机构'] = '国税支行营业部' + this.rightObj['经办柜员'] = '002110' + this.rightObj['会计时间'] = new Date() + // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期 }, data() { return { diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue new file mode 100644 index 0000000..6d24b03 --- /dev/null +++ b/src/components/needBefore/index.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 0b4b4a1..9caba51 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -948,11 +948,12 @@ export default { this.$store.commit('system/setBusinessKey', sessionStorage.getItem('businessKey')) } if(sessionStorage.getItem('businessSelect')) { - this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect'))) + // 调试时注释掉 + // this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect'))) } window.addEventListener("beforeunload",()=>{ sessionStorage.setItem('businessKey', this.$store.state.system.businessKey) - sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) + // sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) }) }, mounted(){ @@ -1064,6 +1065,9 @@ export default { }, methods: { ...mapMutations({ + callChangeCard: 'system/callChangeCard', + callChangeId: 'system/callChangeId', + callChangePassword: 'system/callChangePassword', replaceThingsGoods: 'system/replaceThingsGoods', replaceThings: 'system/replaceThings', setShowBusiness: 'system/setShowBusiness', @@ -1295,6 +1299,7 @@ export default { return } } + this.callChangeCard() } if(this.popText.includes('身份证扫描')) { @@ -1309,8 +1314,12 @@ export default { return } } + this.callChangeId() } - + if(this.popText.includes('密码器') && this.nbm !== 8 && this.passwordForm.passwordAgain) { + this.callChangePassword() + } + if (this.$store.state.system.id == '33'){ this.nbm = 33 // this.goodsShelfTotalData = this.auditGoodsShelf diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue index e8b3158..fbc470a 100644 --- a/src/pages/manage/list/client/consumerClient.vue +++ b/src/pages/manage/list/client/consumerClient.vue @@ -68,7 +68,7 @@ 提交 - + + + + + @@ -54,14 +59,20 @@ -
+

请刷卡

+
+ +
-
+

请输入密码

+
+ +
@@ -155,8 +166,8 @@ 提交
- - +
+ +

请先完成上一个步骤

+ + diff --git a/src/store/modules/system.js b/src/store/modules/system.js index c5014d2..f97f80c 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -730,23 +730,27 @@ export default { importanceArr: [ 16 ], // 重要空白凭证箱 commonArr: [ 17 ], // 普通凭证箱 + // 以下为数据流: needsModule: { 'consumerClient': false, 'currentAccount/openAccount': false, 'currentAccount/deposit': false, }, - dataFlowGo: 0, + // dataFlowGo: 0, + dataFlowCard: 0, + dataFlowId: 0, + dataFlowPassword: 0, dataFlow: { peopleNumber: '随机111222', + userName:'肥仔',//用户名字 idType: '身份证', idNumber:'441325466661230215',//证件号码 - userName:'肥仔',//用户名字 sex:'男',//性别 birthday:'2008',//出生日期 // nationality:'汉',//民族 mailbox:'肥仔无处不在',//通讯地址 - phone:'12325647895',//联系电话 + phone:'13222223122',//联系电话 } }, @@ -1326,17 +1330,23 @@ export default { ], }, mutations: { - callChange(state) { - state.businessSelect[state.businessKey].dataFlowGo = 1 - state.businessSelect[state.businessKey].dataFlowGo = 0 + setNeedsModule(state, name) { + state.businessSelect[state.businessKey].needsModule[name] = true + }, + // this.callChangeCard() this.callChangeId()this.callChangePassword() + callChangeCard(state) { + state.businessSelect[state.businessKey].dataFlowCard += 1 }, - setDataFlow(state, { name, val}) { - // 项目一中的数据 - // dataFlow: { - // peopleNumber: '' - // } - console.log(state.businessSelect[state.businessKey]) - state.businessSelect[state.businessKey].dataFlow[name] = val + callChangeId(state) { + state.businessSelect[state.businessKey].dataFlowId += 1 + }, + callChangePassword(state) { + state.businessSelect[state.businessKey].dataFlowPassword += 1 + }, + setDataFlow(state, obj) { + for(let key in obj) { + state.businessSelect[state.businessKey].dataFlow[key] = obj[key] + } }, initState(state) { state.businessSelect = { ...myInitState } @@ -1348,10 +1358,7 @@ export default { state.businessSelect[state.businessKey].data.splice(0, state.businessSelect[state.businessKey].data.length, ...idArr) }, replaceThings(state, { name, idArr }) { - console.log(idArr) state.businessSelect[state.businessKey][name].splice(0, state.businessSelect[state.businessKey][name].length, ...idArr) - console.log('替换后') - console.log(state.businessSelect[state.businessKey][name]) }, pushThings(state, { name, idArr}) { if(name === 'sealBox') { // 印章盒只能放一个东西 @@ -1372,10 +1379,8 @@ export default { } }, pushThingsGoods(state, idArr) { - console.log('吐出去') for(let i=0; i item === idArr[i]) - console.log(index) if(index === -1) { state.businessSelect[state.businessKey].data.push(idArr[i]) } @@ -1675,12 +1680,39 @@ export default { }, getters: { + // 刷卡器卡号 + idCardNumber(state) { + return '213224896' + }, + // 获得流到哪个模块的名字 + needsModule(state) { + return (module) => { + const obj = state.businessSelect[state.businessKey].needsModule + for(let key in obj) { + if(module === key) { + return '' + } + if(!obj[key]) { + return key + } + } + } + }, // 选择项目物品栏中的物品 根据myKey判断有什么 dataFlow(state) { return state.businessSelect[state.businessKey].dataFlow }, - dataFlowGo(state) { - return state.businessSelect[state.businessKey].dataFlowGo + // dataFlowGo(state) { + // return state.businessSelect[state.businessKey].dataFlowGo + // }, + dataFlowCard(state) { + return state.businessSelect[state.businessKey].dataFlowCard + }, + dataFlowId(state) { + return state.businessSelect[state.businessKey].dataFlowId + }, + dataFlowPassword(state) { + return state.businessSelect[state.businessKey].dataFlowPassword }, goods2(state) { // 调试容错采用if-else diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js index ee3345a..c98855c 100644 --- a/src/utils/utilFunction.js +++ b/src/utils/utilFunction.js @@ -44,7 +44,8 @@ const checkName = function(val, form, prop) { const rateListen = function(val, form, prop) { // 检查符号 允许% - const charReg = /[`~!@#$^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/im; + // const charReg = /[`~!@#$^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/im; + const charReg =/^\\d+(\\.\\d)?\\d{0,1}%$/ // 检查空格 if(charReg.test(val) || /[\u4E00-\u9FA5]/i.test(val)) { return;