diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index ef8e3e2..becb28c 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -196,6 +196,7 @@ import Sortable from 'sortablejs' import manage from '../../manage/index'; import { addOperation, getOperation } from '@/api/http'; import backButton from '@/components/backButton' +import { myConfig } from './myConfig.js' export default { name: 'index', @@ -602,7 +603,7 @@ export default { } }else{ let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2') - console.log(nomCurrentCancellCard2) + this.receptionList = JSON.parse(nomCurrentCancellCard2); if(this.receptionList == null){ @@ -611,32 +612,50 @@ export default { } }).catch((error)=>{ }) - }else if (this.$store.state.system.id == '118,1'){ - this.nbm = 118 + }else if (myConfig[this.$store.state.system.id]){ + const { nbm, parentId, name } = myConfig[this.$store.state.system.id] + console.log(nbm) + console.log(sessionStorage.getItem(name)) + this.nbm = nbm let param= { - parentId: '0,5,26,58,118' + parentId } getOperation(param).then((data)=> { + console.log(data) + if (data.data.status == 200) { - var list = data.data.judgmentRuleReqs - for(var j=0;j{ }) + // const { nbm, name } = myConfig[this.$store.state.system.id] + // this.nbm = nbm + // let tmpName = sessionStorage.getItem(name) + // this.receptionList = JSON.parse(tmpName); + + // if(this.receptionList == null){ + // this.receptionList = [] + // } }else{ let dataList = JSON.parse(sessionStorage.getItem('dataList')); if (dataList){ @@ -1002,11 +1021,15 @@ export default { sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList)) } - }else if (this.$store.state.system.id == '118,1'){ - this.nbm = 118 + }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id] + + const { nbm, name } = myConfig[this.$store.state.system.id] + console.log(nbm) + this.nbm = nbm this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ - sessionStorage.setItem('nomtimeOpenAccount1', JSON.stringify(this.receptionList)) + sessionStorage.setItem(name, JSON.stringify(this.receptionList)) + console.log(sessionStorage.getItem(name)) } }else if (this.$store.state.system.id == '67,3'){ diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js new file mode 100644 index 0000000..35846a5 --- /dev/null +++ b/src/pages/counter/list/myConfig.js @@ -0,0 +1,21 @@ +const myConfig = { + '118,1': { + nbm: 118, + name: 'nomtimeOpenAccount1', + parentId: '0,5,26,58,118' + }, + '118,2': { + nbm: 118, + name: 'nomtimeOpenAccount2', + parentId: '0,5,26,58,118' + }, + '131': { + nbm: 131, + name: 'nomtimeDeposit1', + parentId: '0,5,26,58,119' + } +} + +export { + myConfig +} \ No newline at end of file diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index a3d4f4b..eccccf9 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -5,7 +5,7 @@ -
+

请输入凭证号

@@ -57,7 +57,7 @@ -
+

请输入密码

@@ -209,17 +209,33 @@ export default{ methods: { getFormData(){ const parentId = '0,5,26,58,119' - autoPlay2(parentId, this.form, this.myTable2, this.myTable) + const cards = { + 131: 'nomtimeDeposit1' + // 129: 'nomCurrentCancellPassword' + } + autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards) }, popUp(text) { + this.$store.commit('system/changePop',{show:true,text, id: '131'}) + }, + popUp2(text) { this.$store.commit('system/changePop',{show:true,text}) }, submitForm() { + let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1') this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 this.visible = true; const parentId = '0,5,26,58,119' - autoPlay(parentId, this.form, this.myTable2, this.myTable) + const cards = [ + { + 131: nomtimeDeposit1 + } + // { + // 129: nomCurrentCancellPassword + // } + ] + autoPlay(parentId, this.form, this.myTable2, this.myTable, cards) }, this.$refs)); }, diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index 4955d9d..4f07c8c 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -43,8 +43,8 @@ -
-

请填凭证号码

+
+

请刷身份证

@@ -158,8 +158,8 @@ export default{ getFormData(){ const parentId = '0,5,26,58,118' const cards = { - 13: 'nomtimeOpenAccount', - // 128: 'nomCurrentCancellCard2', + 13: 'nomtimeOpenAccount1', + 128: 'nomtimeOpenAccount2', // 129: 'nomCurrentCancellPassword' } autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards) @@ -167,6 +167,12 @@ export default{ popUp1(text) { this.$store.commit('system/changePop',{show:true,text, id: '118,1'}) }, + popUp2(text) { + this.$store.commit('system/changePop',{show:true,text, id: '118,2'}) + }, + popUp3(text) { + this.$store.commit('system/changePop',{show:true,text, id: '118,1'}) + }, popUp(text) { this.$store.commit('system/changePop',{show:true,text}) }, @@ -175,15 +181,14 @@ export default{ // 验证通过逻辑写在这 this.visible = true; let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1') - // let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2') - // let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword') + let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2') const cards = [ { 13: nomtimeOpenAccount1 }, - // { - // 128: nomtimeOpenAccount2 - // }, + { + 128: nomtimeOpenAccount2 + }, // { // 129: nomCurrentCancellPassword // } diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue index ed2a432..8a9ee36 100644 --- a/src/pages/manage/list/servicesAccount/passwordChange.vue +++ b/src/pages/manage/list/servicesAccount/passwordChange.vue @@ -70,7 +70,7 @@