From abfe975a16814520295a4c61afc773393ded74e1 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Fri, 1 Apr 2022 17:13:14 +0800 Subject: [PATCH] update --- src/components/dialogTwo/index.vue | 4 +- src/pages/counter/list/index.vue | 1 - .../ImportantCash/controlCash2/cashOut.vue | 1 + .../manage/list/acceptanceDraft/invoice.vue | 121 ++++++++++++---- src/pages/manage/list/cityWide/cityWideIn.vue | 132 +++++++++++++----- .../manage/list/cityWide/cityWideOut.vue | 124 +++++++++++----- src/pages/manage/list/dayEnd/branchDayEnd.vue | 52 ++++++- src/pages/manage/list/dayEnd/tellerCash.vue | 81 +++++++---- .../manage/list/dayEnd/tellerCertificate.vue | 85 +++++++++-- src/store/modules/system.js | 26 ++-- 10 files changed, 477 insertions(+), 150 deletions(-) diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue index ceeea5f..8eaa028 100644 --- a/src/components/dialogTwo/index.vue +++ b/src/components/dialogTwo/index.vue @@ -186,6 +186,9 @@ const obj = { 'controlCash2/cashPaid': '凭证调入', 'controlCash2/cashOut': '凭证调出', 'controlCash3/index': '支票出售', + 'tallerCash': '柜员现金轧账', + 'tellerCertificate': '柜员凭证轧账', + 'branchDayEnd': '网点日终轧帐', 'spacial': '提交' } const nameMap = { @@ -350,7 +353,6 @@ export default { } }, created() { - console.log('神马情况！') if(!this.needAuth) { this.flow = 3 } diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index d318ab9..39f4705 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -913,7 +913,6 @@ export default { } } }) - // 重要空白凭证箱 getOperation({ parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2' diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue index d3c06e1..90ebc9c 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue @@ -188,6 +188,7 @@ export default { if(!this.form.startNumber) { this.$message({ message: '请先输入起始号码', + center: true, type: 'warning' }); this.$refs.startNumber.focus() diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue index 207f235..d91fe01 100644 --- a/src/pages/manage/list/acceptanceDraft/invoice.vue +++ b/src/pages/manage/list/acceptanceDraft/invoice.vue @@ -8,25 +8,19 @@ - + - - + + + - - - - - - - CNY人民币 - + + - - + @@ -37,28 +31,37 @@ ref="expireDate"> - + + + 身份证 + 港澳台居民回乡证 + 护照 + + + + + CNY人民币 + + + - - + + - - + + 银行承兑汇票 - - - 否 + + + + + + @@ -139,6 +148,10 @@ export default { moneyOrderNumber: '', // 汇票号码 expireDate: '', // 到期日期 money: '', // 金额 + ApplicantDocuments: '', // 申请人证件类型 + certificateNumber: '', // 证件号码 + drawBillDate: '', // 出票日期 + isTransfer: '否', // 是否转让 // 非必填项 accountName: '', // 出票人名称 collectionName: '', // 收款人名称 @@ -148,16 +161,34 @@ export default { tradeAddress: '', // 出票行地址 collectionTradeName: '', // 收款人行名 billType: '', // 票据类型 - drawBillDate: '', // 出票日期 - isTransfer: '否', // 是否转让 + serviceCharge: '' // 手续费金额 }, rules: { + + currencyType: [ + { + required: true, + message: '请选择币种', + trigger: 'blur' + } + ], + ApplicantDocuments: [ + { + required: true, + message: '请选择申请人证件类型', + trigger: 'blur' + } + ], accountNumber: [ { required: true, message: '请输入出票人账号', trigger: 'blur' + }, + { + pattern: /^[0-9]*$/, + message: '请输入数字' } ], collectionNumber: [ @@ -165,6 +196,10 @@ export default { required: true, message: '请输入收款人账号', trigger: 'blur' + }, + { + pattern: /^[0-9]*$/, + message: '请输入数字' } ], moneyOrderNumber: [ @@ -174,6 +209,13 @@ export default { trigger: 'blur' } ], + moneyOrderMoney: [ + { + required: true, + message: '请输入汇票费金额', + trigger: 'blur' + } + ], expireDate: [ { required: true, @@ -187,7 +229,28 @@ export default { message: '请输入金额', trigger: 'blur' } - ] + ], + certificateNumber: [ + { + required: true, + message: '请输入证件号码', + trigger: 'blur' + } + ], + isTransfer: [ + { + required: true, + message: '请选择是否转让', + trigger: 'blur' + } + ], + drawBillDate: [ + { + required: true, + message: '请选择出票日期', + trigger: 'blur' + } + ], }, myTable2: { // accountName: '', // 出票人名称 @@ -299,6 +362,10 @@ export default { }, } }, + created() { + this.form.moneyOrderMoney = '6.00' + this.form.serviceCharge = '5.00' + }, mounted() { const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,30,374' autoPlay2(parentId, this.form, this.myTable2, this.myTable) @@ -313,6 +380,12 @@ export default { autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, + getBlur() { + if(this.form.accountNumber) { + this.form.accountTradeName = '小白1' + this.form.collectionTradeName = '小白2' + } + }, ismoney: ismoney, checkHanzi: checkHanzi, checkName: checkName diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue index efb28b4..243a826 100644 --- a/src/pages/manage/list/cityWide/cityWideIn.vue +++ b/src/pages/manage/list/cityWide/cityWideIn.vue @@ -9,33 +9,8 @@ - + - - - - - - - - - - - - - - - - - - - - - CNY人民币 @@ -44,19 +19,52 @@ + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + - + @@ -112,7 +120,7 @@ export default { voucherNumber: '', // 凭证号码 // 非必填项 currency: 'CNY人民币', // 币种 - proposeTime: '', // 提出场次 + proposeTime: 1, // 提出场次 insertDate: '', // 提入日期 otherAccountUsername: '', // 他行收款户名 exchangeNumber: '', // 交换行号 @@ -121,6 +129,27 @@ export default { exchangeName: '' // 交换行名 }, rules: { + customsNumber: [ + { + required: true, + message: '请输入报单号', + trigger: 'blur' + } + ], + exchangeNumber: [ + { + required: true, + message: '请输入交换行号', + trigger: 'blur' + } + ], + currency: [ + { + required: true, + message: '请选择币种', + trigger: 'blur' + } + ], shroffAccountNumber: [ { required: true, @@ -136,11 +165,11 @@ export default { } ], accountUsername: [ - { - required: true, - message: '请输入收款户名', - trigger: 'blur' - } + // { + // required: true, + // message: '请输入收款户名', + // trigger: 'blur' + // } ], billType: [ { @@ -260,7 +289,19 @@ export default { } }, created() { - + const tmpFunc = () => { + const date = new Date() + var y = date.getFullYear(); + var m = date.getMonth() + 1; + m = m < 10 ? '0' + m : m; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + return y + '-' + m + '-' + d; + + } + this.form.insertDate = tmpFunc() + this.form.exchangeNumber = 20082289056288 + this.form.exchangeName = '交换行名' }, mounted() { const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,29,345,359' @@ -275,6 +316,20 @@ export default { autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, + getFocus() { + if(!this.form.shroffAccountNumber) { + this.$message({ + message: '请先输入本行收款账号', + center: true, + type: 'warning' + }); + this.$refs.shroffAccountNumber.focus() + + } + }, + getBlur() { + this.form.accountUsername = '小白' + }, ismoney: ismoney, inputListen: inputListen, checkHanzi: checkHanzi, @@ -296,4 +351,7 @@ export default { overflow-x: hidden; } } + /deep/.el-row { + padding-bottom: 30px; + } diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue index 3eb9b43..abfe5ca 100644 --- a/src/pages/manage/list/cityWide/cityWideOut.vue +++ b/src/pages/manage/list/cityWide/cityWideOut.vue @@ -9,21 +9,28 @@ - + - - + + + CNY人民币 + - - - + + - - + + + + + + + + + + + + - - - + - - - CNY人民币 - + + - - + + - - - - + + + - - + + + @@ -112,34 +120,56 @@ export default { voucherNumber: '', // 凭证号码 // 非必填项 currency: 'CNY人民币', // 币种 - proposeTime: '', // 提出场次 + proposeTime: 1, // 提出场次 proposeDate: '', // 提出日期 otherAccountUsername: '', // 其他收款户名 drawBillDate: '', // 出票日期 abstract: '', // 摘要 }, rules: { + drawBillDate: [ + { + required: true, + message: '请输入出票日期', + trigger: 'blur' + } + ], shroffAccountNumber: [ { required: true, message: '请输入本行收款账号', trigger: 'blur' + }, + { + pattern: /^[0-9]*$/, + message: '请输入数字' } + // { + // type: number, + // message: '请输入数字', + // } ], - money: [ + currency: [ { required: true, - message: '请输入金额', + message: '请选择币种', trigger: 'blur' } ], - shroffAccountUsername: [ + money: [ { required: true, - message: '请输入本行收款户名', + message: '请输入金额', trigger: 'blur' } ], + shroffAccountUsername: [ + // { + // required: true, + // message: '请输入本行收款户名', + // trigger: 'blur' + // } + ], billType: [ { required: true, @@ -244,12 +274,21 @@ export default { } }, created() { - + const tmpFunc = () => { + const date = new Date() + var y = date.getFullYear(); + var m = date.getMonth() + 1; + m = m < 10 ? '0' + m : m; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + return y + '-' + m + '-' + d; + } + this.form.proposeDate = tmpFunc() }, mounted() { const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,29,345,346' autoPlay2(parentId, this.form, this.myTable2, this.myTable) - this.$refs.shroffAccountNumber.focus() + this.$refs.shroffAccountNumber.focus() }, methods: { submitForm() { @@ -259,6 +298,23 @@ export default { autoPlay(parentId, this.form, this.myTable2, this.myTable) }, this.$refs)); }, + getFocus() { + // console.log('test') + if(!this.form.shroffAccountNumber) { + this.$message({ + message: '请先输入本行收款账号', + center: true, + type: 'warning' + }); + this.$refs.shroffAccountNumber.focus() + + } + }, + getBlur() { + if(this.form.shroffAccountNumber) { + this.form.shroffAccountUsername = '小白' + } + }, ismoney: ismoney, inputListen: inputListen, checkHanzi: checkHanzi, diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index 1c95801..e5309ee 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -10,13 +10,14 @@ - + 提交 + @@ -24,17 +25,25 @@ import { myValidate, checkHanzi } from '@/utils/utilFunction.js' import { mapState, mapMutations, mapGetters } from 'vuex' import MyTitle from '@/components/myTitle' +import MyDialog from '@/components/dialogTwo' export default { name: 'index', components:{ - MyTitle + MyTitle, + MyDialog }, data() { return { + visible: false, + moduleName: 'branchDayEnd', form:{ username: '', password: '' }, + formName: { + username: '主管柜员号', + password: '登录密码' + }, rules: { username: [ { @@ -54,7 +63,16 @@ export default { } }, created() { - + // const tmpFunc = () => { + // const date = new Date() + // var y = date.getFullYear(); + // var m = date.getMonth() + 1; + // m = m < 10 ? '0' + m : m; + // var d = date.getDate(); + // d = d < 10 ? ('0' + d) : d; + // return y + '-' + m + '-' + d; + // } + // this.form.data = tmpFunc() }, mounted() { this.$refs.username.focus() @@ -65,9 +83,31 @@ export default { }), submitIt() { this.$refs.form.validate(myValidate(() => { - this.setTipsOperate('验证成功') + this.visible = true; }, this.$refs)); }, + submitForm2() { + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + const formList = [] + formList.push({"answerId":'546',"emptyOne": 101, "emptyTwo": this.form.username, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,543,546","type": "3"}) + formList.push({"answerId":'547',"emptyOne": 102, "emptyTwo": this.form.password, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,543,547","type": "3"}) + let params= { + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,543', + lcJudgmentRuleReq:formList, + projectId:+projectId, + startTime:startTime, + } + addOperation(params).then((data)=>{ + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); + // this.setNeedsModule(moduleName) + // this.setDataFlow({ ...this.form }) + }).catch((error)=>{ + }) + }, checkHanzi: checkHanzi } }; @@ -82,4 +122,8 @@ export default { /deep/.el-input input { width: 420px; } + .body { + padding-top: 50px; + padding-left: 50px; + } diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue index e3831df..748ea32 100644 --- a/src/pages/manage/list/dayEnd/tellerCash.vue +++ b/src/pages/manage/list/dayEnd/tellerCash.vue @@ -8,12 +8,13 @@ - + + - + + @@ -64,6 +65,7 @@ 提交 + @@ -74,18 +76,26 @@ import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig' import { myValidate, checkHanzi } from '@/utils/utilFunction.js' import { mapState, mapMutations, mapGetters } from 'vuex' import MyTitle from '@/components/myTitle' +import MyDialog from '@/components/dialogTwo' export default { name: 'index', components:{ - MyTitle + MyTitle, + MyDialog }, data() { return { headerCellStyle: headerCellStyle, + moduleName: 'tellerCertificate', + visible: false, form:{ date: '', counterNumber: '' }, + formName:{ + date: '日期', + counterNumber: '柜员号' + }, rules: { date: [ { @@ -104,18 +114,47 @@ export default { }, tableData: [ { - certificateName: '身份证', - stockNum: 100, - startNumber: '01', - endNumber: '02', - cashBoxNum: 0 + certificateName: '银行卡', + stockNum: 19, + startNumber: '003001', + endNumber: '003019', + cashBoxNum: '' + }, + { + certificateName: '定期存单', + stockNum: 20, + startNumber: '003501', + endNumber: '003520', + cashBoxNum: '' + }, + { + certificateName: '现金支票', + stockNum: 20, + startNumber: '003601', + endNumber: '003620', + cashBoxNum: '' + }, + { + certificateName: '转账支票', + stockNum: 20, + startNumber: '003701', + endNumber: '003720', + cashBoxNum: '' } - ], - visible:false, + ] } }, created() { - + const tmpFunc = () => { + const date = new Date() + var y = date.getFullYear(); + var m = date.getMonth() + 1; + m = m < 10 ? '0' + m : m; + var d = date.getDate(); + d = d < 10 ? ('0' + d) : d; + return y + '-' + m + '-' + d; + } + this.form.date = tmpFunc() }, methods: { ...mapMutations({ @@ -126,9 +165,33 @@ export default { }, submitForm() { this.$refs.form.validate(myValidate(() => { - this.setTipsOperate('验证成功') + this.visible = true }, this.$refs)); }, + submitForm2() { + let projectId = sessionStorage.getItem('projectId') + let startTime = sessionStorage.getItem('startTime') + const formList = [] + + formList.push({"answerId":'544',"emptyOne": 99, "emptyTwo": this.form.date, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,542,544","type": "3"}) + formList.push({"answerId":'545',"emptyOne": 100, "emptyTwo": this.form.counterNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,542,545","type": "3"}) + + let params= { + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,542', + lcJudgmentRuleReq:formList, + projectId:+projectId, + startTime:startTime, + } + addOperation(params).then((data)=>{ + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); + // this.setNeedsModule(moduleName) + // this.setDataFlow({ ...this.form }) + }).catch((error)=>{ + }) + }, tableRowClassName: tableRowClassName, checkHanzi: checkHanzi } diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 4b7a76a..604345c 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -2432,21 +2432,19 @@ export default { }, initState(state) { state.businessSelect = JSON.parse(JSON.stringify(myInitState)) - // state.businessSelect.splice(0, state.businessSelect.length, ...myInitState) - // function deepClone(obj){ - // 　　let objClone = Array.isArray(obj) ? [] : {}; // 先判断是不是数组 - // 　　if (obj && typeof obj === 'object') { // 确定是引用类型 - // 　　　　for(let key in obj){ - // 　　　　　　if (obj[key] && typeof obj[key] === 'object'){ // 判断是否有深层嵌套 - // 　　　　　　　　objClone[key] = deepClone(obj[key]); - // 　　　　　　}else{ - // 　　　　　　　　objClone[key] = obj[key] - // 　　　　　　} - // 　　　　} - // 　　} - // 　　return objClone; + // function deepClone(obj) { + // let objClone = Array.isArray(obj)? []: {} + // if(obj && typeof obj === 'object') { + // for(let key in obj) { + // if(obj[key] && typeof obj[key] === object) { + // objClone[key] = deepClone(obj[key]) + // }else { + // objClone[key] = obj[key] + // } + // } + // } + // return objClone // } - console.log(state.businessSelect) state.businessKey = '' }, setShowBusiness(state, isShow) {