From a2d6c412eaa32b09267a9d6d31590bb7e451b268 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Tue, 19 Apr 2022 17:41:41 +0800 Subject: [PATCH] update --- src/components/checkPhoto/index.vue | 1 + src/components/selectBusiness/index.vue | 126 +- .../ImportantCash/controlCash/cashOut.vue | 7 +- .../ImportantCash/controlCash2/cashOut.vue | 15 +- .../ImportantCash/controlCash2/cashPaid.vue | 10 +- .../controlCash2/cashTransferInto.vue | 13 +- .../list/ImportantCash/controlCash3/index.vue | 27 +- src/store/modules/system.js | 341 +- src/utils/utilFunction.js | 16 +- test2.js | 441542 ++++++++------- 10 files changed, 231966 insertions(+), 210132 deletions(-) diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue index 7ab74df..0294869 100644 --- a/src/components/checkPhoto/index.vue +++ b/src/components/checkPhoto/index.vue @@ -244,6 +244,7 @@ export default { } }, mapNumber() { + // 通过map映射将相应的数字对应上 const myMap = new Map([ ['0', '零'], ['1', '壹'], diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue index bf7ac4e..2597975 100644 --- a/src/components/selectBusiness/index.vue +++ b/src/components/selectBusiness/index.vue @@ -6,11 +6,11 @@

请选择您要办理的业务:

@@ -22,7 +22,7 @@ diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue index 38eccc9..6249f2c 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -55,7 +55,7 @@ import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig' const moduleName = 'controlCash2/cashOut' -import { inputListen2, myValidate, checkName } from '@/utils/utilFunction' +import { inputListen2, myValidate, checkName, certificateNumber } from '@/utils/utilFunction' import { mapMutations, mapGetters } from 'vuex' import NeedBefore from '@/components/needBefore' import MyDialogTwo from '@/components/dialogTwo' @@ -152,7 +152,11 @@ export default { submitClick() { this.$refs.form.validate(myValidate(() => { if(this.form.number <= 0) { - this.setTipsOperate('结束号码应大于起始号码。') + this.setTipsOperate('结束号码应大于起始号码。') + return + } + if(this.form.startNumber.length !== this.form.endNumber.length) { + this.setTipsOperate('结束号码与起始号码长度不同，请检查') return } this.visible = true @@ -204,7 +208,8 @@ export default { }, tableRowClassName: tableRowClassName, inputListen2, - checkName + checkName, + certificateNumber }, computed: { ...mapGetters({ diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue index 39e7260..5c46ce1 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue @@ -69,7 +69,7 @@ width="150" > @@ -160,7 +160,7 @@ export default { type: 'warning', center: true }).then(() => { - this.form.clickIt1 = '已领用' + this.form.clickIt1 = '已调入' this.form.clickIt2 = '' this.$message({ type: 'success', @@ -174,11 +174,11 @@ export default { }); return }else { - this.form.clickIt1 = '已领用' + this.form.clickIt1 = '已调入' } }, back(row) { - if(this.form.clickIt1 === '已领用') { + if(this.form.clickIt1 === '已调入') { this.$confirm('该项目只能选择将凭证调入或退回凭证，请问是否改为凭证退回?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -209,7 +209,7 @@ export default { let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') const formList = [] - if(this.form.clickIt1 === '已领用') { + if(this.form.clickIt1 === '已调入') { formList.push({"answerId":'525',"emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,31,519,534,525","type": ""}) // // formList.push() } diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue index 95885d8..0838a2c 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue @@ -35,12 +35,12 @@ - + - + @@ -58,7 +58,7 @@ import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig' const moduleName = 'controlCash2/cashTransferInto' -import { inputListen2, myValidate } from '@/utils/utilFunction' +import { inputListen2, myValidate, certificateNumber } from '@/utils/utilFunction' import { mapMutations, mapGetters } from 'vuex' import NeedBefore from '@/components/needBefore' import MyDialogTwo from '@/components/dialogTwo' @@ -149,6 +149,10 @@ export default { this.setTipsOperate('结束号码应大于起始号码') return } + if(this.form.startNumber.length !== this.form.endNumber.length) { + this.setTipsOperate('结束号码与起始号码长度不同，请检查') + return + } this.visible = true } , this.$refs)); @@ -195,7 +199,8 @@ export default { this.form.number = number }, tableRowClassName: tableRowClassName, - inputListen2 + inputListen2, + certificateNumber }, computed: { ...mapGetters({ diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue index b1f5aac..7298db2 100644 --- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue +++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue @@ -31,7 +31,7 @@ - + @@ -45,10 +45,10 @@ - + - + @@ -70,7 +70,7 @@