diff --git a/src/api/http.js b/src/api/http.js index 2f8b0e8..55bb292 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -37,4 +37,10 @@ export const checkTest2= (params) => { pageSize: 10000, ...params }) +} + +export const reportDetail = (reportId) => { + return get( '/occupationlab/achievement/reportDetail',{ + reportId + }) } \ No newline at end of file diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue new file mode 100644 index 0000000..267be42 --- /dev/null +++ b/src/components/checkPhoto/index.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue index 262ea18..bf7ac4e 100644 --- a/src/components/selectBusiness/index.vue +++ b/src/components/selectBusiness/index.vue @@ -221,6 +221,7 @@ export default { } this.setBusinessKey(this.takeCheck) + this.$store.dispatch('system/getJudgeData') if(!this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id) { this.$message({ type: 'info', diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 39f4705..6ce7219 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -323,38 +323,13 @@ width="850px" > - - - - - - - - - + + + + + @@ -397,6 +372,7 @@ import { addOperation, getOperation } from '@/api/http'; import backButton from '@/components/backButton' import { myConfig } from './myConfig.js' import saveSystemModule from '@/mixins/saveSystemModule' +import CheckPhoto from '@/components/checkPhoto' // import TipDialog from '@/components/tipDialog' export default { @@ -404,6 +380,7 @@ export default { components: { manage: manage, backButton, + CheckPhoto // TipDialog }, mixins: [saveSystemModule], @@ -649,6 +626,8 @@ export default { clickNum2:0, showImg:false, imgSrc:'', + imgSrcId: '', + imgSrcName: '', nbm:0, lazyImg: [ require('@/assets/img/man.png'), @@ -778,6 +757,8 @@ export default { showImg(newVal) { if(!newVal) { this.imgSrc = '' + this.imgSrcId = '' + this.imgSrcName = '' } }, @@ -895,12 +876,7 @@ export default { sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect)) }) this.startPlay() - // console.log(this.getSelectList.accountQualitySelectList) - - - // 缓存物品栏和货架上的东西 - // if(!sessionStorage.getItem('systemData')) // 传票栏 getOperation({ parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,4' @@ -923,7 +899,6 @@ export default { // this.pushThings({ idArr: [...list], name: 'cultureIn'}) this.pushThingsGoods([...list]) } - } }) @@ -1256,6 +1231,8 @@ export default { this.clickNum = 0; this.showImg = true this.imgSrc = item.src + this.imgSrcId = item.id + this.imgSrcName = item.name } setTimeout(function () { let arr @@ -1301,6 +1278,8 @@ export default { console.log(item) this.magnifyData = item this.imgSrc = item.src + this.imgSrcId = item.id + this.imgSrcName = item.name } }else { this.controlGoodsDblClickFn = setTimeout(() => { diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue index abfe5ca..d016d92 100644 --- a/src/pages/manage/list/cityWide/cityWideOut.vue +++ b/src/pages/manage/list/cityWide/cityWideOut.vue @@ -307,7 +307,7 @@ export default { type: 'warning' }); this.$refs.shroffAccountNumber.focus() - + } }, getBlur() { diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index e5309ee..83a0096 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -98,6 +98,7 @@ export default { projectId:+projectId, startTime:startTime, } + addOperation(params).then((data)=>{ // this.$message({ // message: '提交成功', diff --git a/src/pages/manage/list/personal/accountService/changePassword.vue b/src/pages/manage/list/personal/accountService/changePassword.vue index eaefd43..c1fbe45 100644 --- a/src/pages/manage/list/personal/accountService/changePassword.vue +++ b/src/pages/manage/list/personal/accountService/changePassword.vue @@ -24,7 +24,7 @@ - +

请刷身份证

diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue index bbc2933..b5c7dbb 100644 --- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue +++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue @@ -80,7 +80,7 @@
- +

请刷身份证

diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index 9834b0c..3b35d9b 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -34,7 +34,7 @@
- +

请刷身份证

diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue index feee551..2df0991 100644 --- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue +++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue @@ -273,6 +273,11 @@ export default{ prop: 'drawPassword',//支取密码 type: '3', "subjectId": 17, + }, + 564: { + prop: 'newVoucherNumber',// 新凭证号码 + type: '3', + "subjectId": 44, } }, myTable2: { diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue index 7f53f72..e4f5806 100644 --- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue +++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue @@ -10,13 +10,13 @@
- - + + @@ -46,7 +46,7 @@
- +

请刷身份证

diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue index e762f45..b04a12f 100644 --- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue +++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue @@ -5,13 +5,13 @@ - - + + @@ -41,14 +41,14 @@ - + @@ -75,9 +75,9 @@ export default{ MyDialog }, created() { - if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) { - this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword') - } + // if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) { + // this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword') + // } // if(this.isNeedBefore) { // if(sessionStorage.getItem('nomUsefulPhrasesContinueCard')) { // this.cardNumberJudge = true @@ -110,7 +110,7 @@ export default{ currency: '', // 币种 depositTerm: '', // 存期 voucherNumber: '', // 银行卡卡号 - drawPassword: '', // 支付密码 + // drawPassword: '', // 支付密码 // 非必填项 depositNumber: '', // 定存编号 goldLogo: '', // 钞汇标识 @@ -122,7 +122,7 @@ export default{ currency: '币种', // depositTerm: '存期', // voucherNumber: '银行卡卡号', // - drawPassword: '支付密码', // + // drawPassword: '支付密码', // // 非必填项 depositNumber: '定存编号', // goldLogo: '钞汇标识', // @@ -185,11 +185,11 @@ export default{ type: '1', "subjectId": 27, }, - 178: { - prop: 'drawPassword', - type: '3', - "subjectId": 17, - } + // 178: { + // prop: 'drawPassword', + // type: '3', + // "subjectId": 17, + // } }, } }, @@ -227,9 +227,9 @@ export default{ if(this.form.voucherNumber) { this.cardNumberJudge = true } - if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) { - this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword') - } + // if(sessionStorage.getItem('nomUsefulPhrasesContinuePassword')) { + // this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword') + // } } autoPlay2(parentId, this.form, this.myTable2, this.myTable, cards, callback) }, @@ -255,10 +255,10 @@ export default{ return } - if(!this.form.drawPassword) { - messagePassword() - return - } + // if(!this.form.drawPassword) { + // messagePassword() + // return + // } this.$refs.form.validate(myValidate(() => { // 验证通过逻辑写在这 diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue index 2a96cdb..abbc6bb 100644 --- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue +++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue @@ -39,7 +39,7 @@
- +

请刷身份证

@@ -56,13 +56,13 @@
- - + + @@ -109,17 +109,17 @@ export default{ this.form.drawPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword') } - // if(this.isNeedBefore) { - // if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) { - // this.idNumberJudge = true - // this.form.idNumber = this.dataFlow.idNumber || '441515199812064569' - // } - // if(sessionStorage.getItem('nomUsefulPhrasesOpenCard')) { - // this.cardNumberJudge = true - // this.form.voucherNumber = this.dataFlow.voucherNumber || '159753' - // } - // return - // } + if(this.isNeedBefore) { + if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) { + this.idNumberJudge = true + this.form.idNumber = this.dataFlow.idNumber || '441515199812064569' + } + if(sessionStorage.getItem('nomUsefulPhrasesOpenCard')) { + this.cardNumberJudge = true + this.form.voucherNumber = this.dataFlow.voucherNumber || '159753' + } + return + } if(sessionStorage.getItem('nomUsefulPhrasesOpenCard2')) { this.idNumberJudge = true diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue index 41e9522..982ea28 100644 --- a/src/pages/manage/list/servicesAccount/passwordLost.vue +++ b/src/pages/manage/list/servicesAccount/passwordLost.vue @@ -23,7 +23,7 @@ - +

请刷身份证

diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue index 76b251e..226330c 100644 --- a/src/pages/manage/list/servicesAccount/relieveLost.vue +++ b/src/pages/manage/list/servicesAccount/relieveLost.vue @@ -31,7 +31,7 @@ - +

请刷身份证

diff --git a/src/store/modules/system.js b/src/store/modules/system.js index 604345c..e46efc3 100644 --- a/src/store/modules/system.js +++ b/src/store/modules/system.js @@ -1223,7 +1223,7 @@ const sealArray = [/* 印章盒物品默认排序 */ ] import { Message } from 'element-ui'; -import { addOperation, getSubjectInfo } from '@/api/http'; +import { addOperation, getSubjectInfo, reportDetail } from '@/api/http'; export default { namespaced: true, state: {/* 管理柜台状态 */ @@ -2792,7 +2792,13 @@ export default { } }, actions: { - + async getJudgeData({ state, commit }, params) { + const judgeId = myInitState[state.businessKey].id + console.log(judgeId) + const { data: { userScores } } = await reportDetail(Number(judgeId)) + const { lcRuleRecords } = userScores.find(item => item.judgmentName.includes('系统录入')) + console.log(lcRuleRecords) + } }, getters: { getSelectList(state) { diff --git a/test.js b/test.js index 6b495cc..5750299 100644 --- a/test.js +++ b/test.js @@ -1,48 +1,176 @@ -const idNumber = '441356199611035698' -const birthday = '1996-11-03' -const userName = '小白' -const capital = 100 -const peopleNumber = '111222' -const voucherNumber = (() => { - const $chars = '1234567890'; - const maxPos = $chars.length; - let str = ''; - for (let i = 0; i < 8; i++) { - str += $chars.charAt(Math.floor(Math.random() * maxPos)); - } - return '6227' + str; -})() -const sex = 1 // 1为男,2为女。 - -const t = { - peopleNumber, - userName, - idType: 83, - idNumber,//证件号码 - sex,//性别 1为男, - birthday,//出生日期 - // nationality:'汉',//民族 - mailbox:'广东省深圳市阳光村',//通讯地址 - voucherNumber, - currency:12, - goldLogo:13, - serviceCharge:'0.00', - drawWay:18, - interest: '0.1', - balance: 666, - depositNumber: '0912', - capital, // 不知道是多少 - withdrawType: 124, // 支取类别 - withdrawWay: 125, // 支取方式 - withdrawType: 124, // 支取类别 - withdrawWay: 126, // 支取方式 - depositTerm: 86, - monthDeposit: 100, - signDate: '2001-03-01', - depositType: 92, - voucherType: 123, - noticeType: 95, - payType: 13, - payMoney: 102.8, - 'corporateClient': false, +const nameMap = { + sex: { + 1: '男', + 2: '女' + }, + idType: { + 82: '统一社会信用代码证', + 83: '身份证' + }, + certificateType: { + 83: '身份证', + 115: '转账支票', + 116: '现金支票' + }, + currency: { + 12: 'CNY人民币' + }, + goldLogo: { + 13: '钞户' + }, + accountQuality: { + 14: '个人结算户', + 101: '基本户', + 102: '一般户', + 103: '专用户', + 104: '临时户' + }, + accountQualitysTwo: { + 14: '个人结算户', + 101: '基本户', + 102: '一般户', + 103: '专用户', + 104: '临时户' + }, + accountQualitysThree: { + 14: '个人结算户', + 101: '基本户', + 102: '一般户', + 103: '专用户', + 104: '临时户' + }, + voucherType: { + 15: 'IC卡', + 115: '转账支票', + 116: '现金支票', + 123: '存单', + 127: '银行' + }, + accountType: { + 16: '一类户', + 17: '二类户', + 97: '结算户', + 98: '结算户', + 99: '委托保障金户', + 100: '资本临时户' + }, + drawWay: { + 18: '密码', + 93: '现金', + 94: '转账', + 114: '印鉴', + 125: '部分支取', + 126: '全部支取并销户' + }, + drawWayType: { + 133: '现金' + }, + accountQualitysTwo: { + 14: '个人结算户', + 101: '基本户', + 102: '一般户', + 103: '专用户', + 104: '临时户' + }, + voucherTypesTwo: { + 15: 'IC卡', + 115: '转账支票', + 116: '现金支票', + 123: '存单', + 127: '银行' + }, + voucherTypesThree: { + 15: 'IC卡', + 115: '转账支票', + 116: '现金支票', + 123: '存单', + 127: '银行' + }, + accountTypesTwo: { + 16: '一类户', + 17: '二类户', + 97: '结算户', + 98: '结算户', + 99: '委托保障金户', + 100: '资本临时户' + }, + accountTypesThree: { + 16: '一类户', + 17: '二类户', + 97: '结算户', + 98: '结算户', + 99: '委托保障金户', + 100: '资本临时户' + }, + + drawWaysTwo: { + 18: '密码', + 93: '现金', + 94: '转账', + 114: '印鉴', + 125: '部分支取', + 126: '全部支取并销户' + }, + drawWaysThree: { + 18: '密码', + 93: '现金', + 94: '转账', + 114: '印鉴', + 125: '部分支取', + 126: '全部支取并销户' + }, + chargeWay: { + 13: '密码', + }, + chargeWay: { + 13: '密码', + 135: '现金', + }, + certificateDeposit: { + 92: '现金' + }, + extendPeriod: { + 90: '不续存', + 91: '续存' + }, + depositTerm: { + 84: '3个月', + 85: '6个月', + 86: '1年', + 87: '2年', + 88: '3年', + 89: '5年' + }, + withdrawWay: { + 125: '部分支取', + 126: '全部支取并销户' + }, + extendDepositTarget: { + 128: '不续存', + 129: '续存1年', + 130: '续存3年', + 131: '续存5年' + }, + noticeType: { + 95: '1天', + 96: '7天' + }, + depositType: { + 92: '现金' + }, + accountManagement: { + 105: '工业存款', + 106: '商业存款', + 107: '外贸存款', + 108: '其他存款' + }, + calculateWay: { + 109: '季度', + 110: '半年', + 111: '1年' + }, + outAccountWay: { + 112: '按月', + 113: '满页' + }, } \ No newline at end of file