From af2cd362f388c35383cae95f1c012ea1215624e7 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Tue, 26 Jul 2022 11:14:40 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/components/case/index.vue | 2 +- src/components/dialog/index.vue | 4 +++- src/components/dialogTwo/index.vue | 2 +- .../manage/list/ImportantCash/controlCash3/index.vue | 12 ++++++------ src/pages/manage/list/acceptanceDraft/invoice.vue | 1 - src/pages/manage/list/business/transfer.vue | 1 + src/pages/manage/list/business/withdrawal.vue | 2 +- .../manage/list/servicesAccount/relieveLost.vue | 5 ++++- src/pages/manage/navbar/index.vue | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3de478e --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# 银行系统前端 \ No newline at end of file diff --git a/src/components/case/index.vue b/src/components/case/index.vue index b8ae656..230da32 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -610,7 +610,7 @@ export default { Cookie.set('admin-systemId', systemId) // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统 location.href = process.env.NODE_ENV === 'development' ? - `http://${location.hostname}:8080/#/` : + `http://${location.hostname}:8085/#/` : location.href.includes('occupationlab.com') ? 'https://www.occupationlab.com/pyTrials' : `${location.origin}/pyTrials` diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue index 17fbaea..76ad4ca 100644 --- a/src/components/dialog/index.vue +++ b/src/components/dialog/index.vue @@ -156,7 +156,7 @@ const nameMap = { 15: 'IC卡', 115: '转账支票', 116: '现金支票', - 123: '存单', + 123: '现金支票', 127: '银行' }, accountType: { @@ -390,6 +390,8 @@ export default { return y + '-' + m + '-' + d; } this.rightObj['会计时间'] = tmpFunc() + if (this.leftObj['支取方式'] == 114) this.leftObj['支取方式'] = '印鉴' + console.log("🚀 ~ file: index.vue ~ line 393 ~ created ~ this.rightObj",this.leftObj, this.rightObj, this.showForm,this.formName) // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期 }, data() { diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue index 33e7de5..e84872f 100644 --- a/src/components/dialogTwo/index.vue +++ b/src/components/dialogTwo/index.vue @@ -320,7 +320,7 @@ export default { d = d < 10 ? ('0' + d) : d; return y + '-' + m + '-' + d; } - this.rightObj['调入日期'] = tmpFunc() + this.rightObj[this.moduleName === 'controlCash/cashTransferInto' ? '上缴日期' : '调入日期'] = tmpFunc() // 流水号（研发自定义号码生成规则）、经办柜员（002110）、经办机构：国税支行营业部、会计时间：展示操作当日日期 }, data() { diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue index 6dda88f..6e97e90 100644 --- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue +++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue @@ -228,12 +228,12 @@ export default { setTipsOperate: 'system/setTipsOperate' }), onBlur() { - // if(this.form.username) { - // const { collectingCompany } = this.dataFlow - // this.form.customerName = collectingCompany - // }else { - // this.form.customerName = '' - // } + if(this.form.username) { + const { collectingCompany } = this.dataFlow + this.form.customerName = collectingCompany + }else { + this.form.customerName = '' + } }, getBlur() { diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue index 2a26485..4ad1f14 100644 --- a/src/pages/manage/list/acceptanceDraft/invoice.vue +++ b/src/pages/manage/list/acceptanceDraft/invoice.vue @@ -24,7 +24,6 @@ - diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue index afae500..fb63ff0 100644 --- a/src/pages/manage/list/business/transfer.vue +++ b/src/pages/manage/list/business/transfer.vue @@ -288,6 +288,7 @@ export default { submitForm2() { const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,27,227' autoPlay(parentId, this.form, this.myTable2, this.myTable) + console.log("🚀 ~ file: transfer.vue ~ line 291 ~ submitForm2 ~ parentId, this.form, this.myTable2, this.myTable", parentId, this.form, this.myTable2, this.myTable) this.setNeedsModule(moduleName) }, ismoney: ismoney, diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue index 18f1a5f..766e760 100644 --- a/src/pages/manage/list/business/withdrawal.vue +++ b/src/pages/manage/list/business/withdrawal.vue @@ -22,7 +22,7 @@ - + diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue index ad6d781..9642c61 100644 --- a/src/pages/manage/list/servicesAccount/relieveLost.vue +++ b/src/pages/manage/list/servicesAccount/relieveLost.vue @@ -223,13 +223,16 @@ export default{ if(sessionStorage.getItem('servicesPasswordRelieveLost')) { this.idNumberJudge = true const { idNumber, userName } = this.dataFlow + console.log("🚀 ~ file: relieveLost.vue ~ line 226 ~ created ~ this.dataFlow", this.dataFlow) this.form.idNumber = idNumber this.form.customerName = userName } if(sessionStorage.getItem('servicesPasswordRelieveLost2')) { this.cardNumberJudge = true - const { voucherNumber } = this.dataFlow + const { voucherNumber, userName } = this.dataFlow + console.log("🚀 ~ file: relieveLost.vue ~ line 232 ~ created ~ this.dataFlow", this.dataFlow) this.form.voucherNumber = voucherNumber + this.form.customerName = userName } diff --git a/src/pages/manage/navbar/index.vue b/src/pages/manage/navbar/index.vue index b95200b..8070d9f 100644 --- a/src/pages/manage/navbar/index.vue +++ b/src/pages/manage/navbar/index.vue @@ -179,7 +179,7 @@ export default { { icon: 'menu-icon icon-index', index: '/index/list6', - title: '重空现金', + title: '重控现金', logo: require('@/assets/img/systemInput/重空现金.svg'), children:[ {