diff --git a/package-lock.json b/package-lock.json index 7df6906..94a6aa9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "4.2.0", "dependencies": { "@tailwindcss/postcss7-compat": "^2.2.7", + "animate.css": "^4.1.1", "autoprefixer": "^9.8.6", "axios": "^0.18.1", "babel-polyfill": "^6.26.0", @@ -2435,6 +2436,11 @@ "node": ">=0.4.2" } }, + "node_modules/animate.css": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz", + "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==" + }, "node_modules/ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -19654,6 +19660,11 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "animate.css": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz", + "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==" + }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", diff --git a/package.json b/package.json index 1a64b52..ef3870b 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@tailwindcss/postcss7-compat": "^2.2.7", + "animate.css": "^4.1.1", "autoprefixer": "^9.8.6", "axios": "^0.18.1", "babel-polyfill": "^6.26.0", diff --git a/src/assets/img/others/iceDun.jpg b/src/assets/img/others/iceDun.jpg new file mode 100644 index 0000000..b7b605f Binary files /dev/null and b/src/assets/img/others/iceDun.jpg differ diff --git a/src/components/case/index.vue b/src/components/case/index.vue index c4df9cf..2bd1bae 100644 --- a/src/components/case/index.vue +++ b/src/components/case/index.vue @@ -95,7 +95,7 @@
- +
+

@@ -238,6 +239,11 @@ export default { } } }, + caseVisible(newVal) { + if(!newVal) { + console.log(this.$refs.scrollTag) + } + } }, props: { sendSync: { @@ -316,17 +322,17 @@ export default { ...mapMutations({ initState: 'system/initState' }), - getQueryVariable(name) { - var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') - if(window.location.href.split('?')[1]){ - var r = window.location.href.split('?')[1].match(reg) - if (r != null){ - return (r[2]) - }else{ - return null - } - } - }, + getQueryVariable(name) { + var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)') + if(window.location.href.split('?')[1]){ + var r = window.location.href.split('?')[1].match(reg) + if (r != null){ + return (r[2]) + }else{ + return null + } + } + }, //获取项目列表 getData(){ let params = { diff --git a/src/components/tipDialog/index.vue b/src/components/tipDialog/index.vue new file mode 100644 index 0000000..ce10f0c --- /dev/null +++ b/src/components/tipDialog/index.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 0ccbf22..6bc200d 100644 --- a/src/main.js +++ b/src/main.js @@ -18,6 +18,7 @@ import VueLazyload from 'vue-lazyload'; import plugins from '@/plugins'; import filters from '@/plugins/filters' import axios from 'axios' +import animated from 'animate.css' Vue.prototype.$axios = axios @@ -44,6 +45,8 @@ Vue.directive('throttle', {/* 节流 */ Vue.use(plugins); +Vue.use(animated) + Vue.use(VueLazyload, { preLoad: 1.3, // loading: require('@/assets/img/loading4.gif'), diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index b2e4ad7..adf746d 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -115,11 +115,14 @@ + +
{{ popText }}
+

- 请从以下物品中选取所需材料 -

- 请从物品栏选中或拖拽所需材料 -

@@ -186,12 +189,15 @@

{{item.name}}

-
+ + +

{{item.name}}

+
@@ -215,17 +221,24 @@

{{item.name }}

+ + + + +
- -
- + +
+ + +
+ + @@ -291,12 +306,14 @@ import { addOperation, getOperation } from '@/api/http'; import backButton from '@/components/backButton' import { myConfig } from './myConfig.js' import saveSystemModule from '@/mixins/saveSystemModule' +import TipDialog from '@/components/tipDialog' export default { name: 'index', components: { manage: manage, - backButton + backButton, + TipDialog }, mixins: [saveSystemModule], data() { @@ -1071,7 +1088,6 @@ export default { // } }, created() { - if(!sessionStorage.getItem('firstLoad')) { const loading = this.$loading({ lock: true, @@ -1242,6 +1258,7 @@ export default { outThings: 'system/outThings', outThings2: 'system/outThings2', outThingsGoods: 'system/outThingsGoods', + setTipsOperate: 'system/setTipsOperate' }), changePeopleJudge() { this.peopleJudge = true; @@ -1508,29 +1525,36 @@ export default { if(this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') { if (this.$store.state.system.id == '33' && this.popText === '身份证扫描仪'){ + this.nbm = 33 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList)) } - console.log(sessionStorage.getItem('nomClientIdentity')) + this.showManage() }else if (this.$store.state.system.id == '34' && this.popText === '身份证扫描仪' ){ + this.nbm = 34 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '63' && this.popText === '刷卡器'){ + this.nbm = 63 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '64' && this.popText === '刷卡器'){ + this.nbm = 64 if (this.receptionList.length >0){ sessionStorage.setItem('nomCurrentWithdrawalCard', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '64,2' && this.popText === '密码器'){ this.nbm = 64 @@ -1539,60 +1563,70 @@ export default { accountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('nomCurrentWithdrawalPassword', accountPassword) } + this.showManage() }else if (this.$store.state.system.id == '65' && this.popText === '刷卡器'){ + this.nbm = 65 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomCurrentTransferCard', JSON.stringify(this.receptionList)) } + this.showManage() // if (this.passwordForm.passwordAgain){ // let accountPassword = ''; // accountPassword = this.passwordForm.passwordAgain // sessionStorage.setItem('nomCurrentTransferPassword', accountPassword) // } }else if (this.$store.state.system.id == '66' && this.popText === '刷卡器'){ + this.nbm = 66 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomCurrentSettleCard', JSON.stringify(this.receptionList)) } + this.showManage() // if (this.passwordForm.passwordAgain){ // let accountPassword = ''; // accountPassword = this.passwordForm.passwordAgain // sessionStorage.setItem('nomCurrentSettlePassword', accountPassword) // } }else if (this.$store.state.system.id == '66,2' && this.popText === '密码器'){ + this.nbm = 66 if (this.passwordForm.passwordAgain){ let accountPassword = ''; accountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('nomCurrentSettlePassword', accountPassword) } + this.showManage() }else if (this.$store.state.system.id == '67,1' && this.popText === '刷卡器'){ this.nbm = 67 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomCurrentCancellCard1', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '67,2' && this.popText === '身份证扫描仪'){ this.nbm = 67 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList)) } - + this.showManage() }else if (this.$store.state.system.id == '33'){ this.nbm = 33 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '34'){ this.nbm = 34 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList)) } + this.showManage() }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id] const { nbm, name, isPassword, machine } = myConfig[this.$store.state.system.id] @@ -1608,7 +1642,7 @@ export default { sessionStorage.setItem(name, accountPassword) } } - + this.showManage() }else if (this.$store.state.system.id == '67,3'){ this.nbm = 67 @@ -1617,11 +1651,13 @@ export default { accountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('nomCurrentCancellPassword', accountPassword) } + this.showManage() }else if (this.$store.state.system.id == '62,1' && this.popText === '刷卡器'){ this.nbm = 62 if (this.receptionList.length >0){ sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '62,1' && this.popText === '密码器'){ this.nbm = 62 if (this.passwordForm.passwordAgain){ @@ -1629,6 +1665,7 @@ export default { accountPassword = this.passwordForm.passwordAgain sessionStorage.setItem('accountPassword', accountPassword) } + this.showManage() }else if (this.$store.state.system.id == '62,2' && this.popText === '刷卡器'){ this.nbm = 62 // this.goodsShelfTotalData = this.auditGoodsShelf @@ -1636,6 +1673,7 @@ export default { if (this.receptionList.length >0){ sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '62,2' && this.popText === '密码器'){ this.nbm = 62 if (this.passwordForm.passwordAgain){ @@ -1643,12 +1681,14 @@ export default { accountPasswordTwo = this.passwordForm.passwordAgain sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo) } + this.showManage() }else if (this.$store.state.system.id == '62,3' && this.popText === '刷卡器'){ this.nbm = 62 // this.goodsShelfTotalData = this.auditGoodsShelf if (this.receptionList.length >0){ sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList)) } + this.showManage() }else if (this.$store.state.system.id == '62,3' && this.popText === '密码器'){ this.nbm = 62 if (this.passwordForm.passwordAgain){ @@ -1656,6 +1696,7 @@ export default { accountPasswordThree = this.passwordForm.passwordAgain sessionStorage.setItem('accountPasswordThree', accountPasswordThree) } + this.showManage() } @@ -1671,7 +1712,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('成功刷银行卡!') }).catch((error)=>{ }) }else if (this.popText === '身份证扫描仪'){ //身份证扫描仪 @@ -1686,9 +1727,15 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ + this.setTipsOperate('成功刷身份证!') }).catch((error)=>{ }) + }else if (this.popText === '密码器') { + this.setTipsOperate('输入密码成功!') } + // this.showGoods = false + this.changeShowGoods(false) + }else { let formList = [] // this.toggleGoods() @@ -1698,24 +1745,35 @@ export default { let projectId = sessionStorage.getItem('projectId') let startTime = sessionStorage.getItem('startTime') - for (var i=0;i{ - - }).catch((error)=>{ - }) - + // 如果是在签字,返还资料。 if(this.peopleDo === 1) { + for (var i=0;i item.id) - this.outThings({name: this.myMap, idArr: [ ...tmpGoods ]}) - this.pushThingsGoods([...tmpGoods]) + // this.outThings({name: this.myMap, idArr: [ ...tmpGoods ]}) + // this.pushThingsGoods([...tmpGoods]) + let params= { + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,555', + lcJudgmentRuleReq:formList, + projectId:+projectId, + startTime:startTime, + } + addOperation(params).then((data)=>{ + this.setTipsOperate('签字成功!') + }).catch((error)=>{ + }) + }else { + for (var i=0;i{ + this.setTipsOperate('返还资料成功!') + }).catch((error)=>{ + }) } }else if (this.nbm == 1){ //传票栏 let projectId = sessionStorage.getItem('projectId') @@ -1728,7 +1786,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('成功入库') }).catch((error)=>{ }) }else if (this.nbm == 2){ //普通凭证箱 @@ -1746,7 +1804,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('成功取货') }).catch((error)=>{ }) clickList = [] @@ -1765,7 +1823,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('成功取货') }).catch((error)=>{ }) clickList = [] @@ -1774,25 +1832,30 @@ export default { let startTime = sessionStorage.getItem('startTime') let formList = []; if(this.needBackMoney && this.goodState.length === 0) { - // 如果需要钱箱取钱并且满足了 - let params= { - parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', - lcJudgmentRuleReq: [ - { - "answerId":15, - "emptyOne": "", - "emptyTwo": "", - "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,1,"+15, - "type": "" - } - ], - projectId:+projectId, - startTime:startTime, + if(this.goodState.length === 0) { + let params= { + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', + lcJudgmentRuleReq: [ + { + "answerId":15, + "emptyOne": "", + "emptyTwo": "", + "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,1,"+15, + "type": "" + } + ], + projectId:+projectId, + startTime:startTime, + } + addOperation(params).then((data)=>{ + this.setTipsOperate('钱箱的钱被你拿走啦!') + }).catch((error)=>{ + }) + }else { + this.setTipsOperate('你的钱还在钱箱里!') } - addOperation(params).then((data)=>{ - - }).catch((error)=>{ - }) + // 如果需要钱箱取钱并且满足了 + }else { for (var i=0;i 0) { + let params= { + parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,1', + lcJudgmentRuleReq:formList, + projectId:+projectId, + startTime:startTime, + } + addOperation(params).then((data)=>{ + this.setTipsOperate('你的钱在钱箱里啦!') + }).catch((error)=>{ + }) + }else { + this.setTipsOperate('钱箱的钱还在你手里!') } - addOperation(params).then((data)=>{ - - }).catch((error)=>{ - }) } }else if (this.nbm == 5){ //印章盒 if(this.goodState.length === 0) { - this.$message({ - message: '请放入证件进行盖章!', - type: 'warning' - }); + this.setTipsOperate('请放入证件进行盖章!') return } if(this.sealChecked.length === 0) { - this.$message({ - message: '请选择印章!', - type: 'warning' - }); + this.setTipsOperate('请选择印章!') return } @@ -1858,7 +1919,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('验钞成功!') }).catch((error)=>{ }) @@ -1874,7 +1935,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('打印成功!') }).catch((error)=>{ }) }else if(this.nbm == 8){ // 密码器 @@ -1889,11 +1950,11 @@ export default { if(this.passwordForm.password.length >=6 && this.passwordForm.passwordAgain.length >=6){ if(this.passwordForm.password == this.passwordForm.passwordAgain) { this.$store.commit('system/changePop', {show: false, text: ''}) - this.$message.success(`${this.popText}操作成功!`) + this.setTipsOperate('成功输入密码!') } } }else{ - this.$message.error('请输入密码和确认密码'); + this.setTipsOperate('您输入的密码和确认密码不一致!') } }else if (this.nbm == 9){//资料 let projectId = sessionStorage.getItem('projectId') @@ -1906,7 +1967,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('成功审核资料!') }).catch((error)=>{ }) }else if (this.nbm == 10){ //刷卡器 @@ -1920,7 +1981,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('刷卡成功!') }).catch((error)=>{ }) }else if (this.nbm == 11){ //身份证扫描仪 @@ -1934,7 +1995,7 @@ export default { startTime:startTime, } addOperation(params).then((data)=>{ - + this.setTipsOperate('验证身份成功!') }).catch((error)=>{ }) }else{ @@ -1942,23 +2003,26 @@ export default { } // 如果不是钱箱或传票栏或印章盒或传票栏或客户,刷卡后返回 - if(this.nbm !== 4 && this.nbm!== 1 && this.nbm!== 5 && this.nbm!== 1 && this.nbm!== 0) { + if(this.nbm !== 4 && this.nbm!== 1 && this.nbm!== 5 && this.nbm!== 1 && (this.nbm!== 0 && this.peopleDo === 1)) { + const tmpGoods = this.goodState.map(item => item.id) this.outThings({name: this.myMap, idArr: [ ...tmpGoods ]}) this.pushThingsGoods([...tmpGoods]) + } - // this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗 + this.$store.commit('system/changePop',{show:false,text:''}) // 关闭弹窗 } - // this.closePop() + this.closePop() // } if(this.nbm !== 5) { // 印章盒特殊处理 this.$store.commit('system/changePop', {show: false, text: ''}) } - this.$message({ - message: '提交成功', - type: 'success' - }); + // this.$message({ + // message: '提交成功', + // type: 'success' + // }); + }, toPart(){ this.$router.push('/index') diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue index 7c8b08f..dd176b7 100644 --- a/src/pages/lobbyManager/list/index.vue +++ b/src/pages/lobbyManager/list/index.vue @@ -161,7 +161,12 @@

- 请单击选中复印材料、双击可放大预览 -

  • - + +

    {{ item.name }}

@@ -185,7 +190,7 @@

开户申请书

@@ -250,7 +255,10 @@ export default { { img: require('@/assets/img/goods/cash-sm.png'), name: '境外汇款申请书', key: 415 }, ], elImg2: [ + + { img: require('@/assets/img/goods/accountApplyBook.jpg'), name: '开户申请书', key: 405 }, { img: require('@/assets/img/idCard-sm.png'), name: '身份证', key: 14 }, + ], listLi1 : [ {checked: 1, click: 1, src: require('@/assets/img/goods/accountApplyBook.jpg'), title: '开户申请书'}, diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue index dcdadf0..d91b79b 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue @@ -145,14 +145,13 @@ export default { } }, methods: { + ...mapMutations({ + setTipsOperate: 'system/setTipsOperate' + }), submitClick() { this.$refs.form.validate(myValidate(() => { if(this.form.number <= 0) { - this.$message({ - message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。', - type: 'warning', - center: true - }); + this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。') return } this.visible = true diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue index 3b185d4..60ed583 100644 --- a/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue +++ b/src/pages/manage/list/ImportantCash/controlCash2/cashTransferInto.vue @@ -139,14 +139,13 @@ export default { } }, methods: { + ...mapMutations({ + setTipsOperate: 'system/setTipsOperate' + }), submitClick() { this.$refs.form.validate(myValidate(() => { if(this.form.number <= 0) { - this.$message({ - message: '您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。', - type: 'warning', - center: true - }); + this.setTipsOperate('您的起始号码卡号比结束号码卡号排序更后,请检查一下哈。') return } this.visible = true diff --git a/src/pages/manage/list/ImportantCash/controlCash3/index.vue b/src/pages/manage/list/ImportantCash/controlCash3/index.vue index 19424c2..c78158a 100644 --- a/src/pages/manage/list/ImportantCash/controlCash3/index.vue +++ b/src/pages/manage/list/ImportantCash/controlCash3/index.vue @@ -211,6 +211,9 @@ export default { this.$refs.username.focus() }, methods: { + ...mapMutations({ + setTipsOperate: 'system/setTipsOperate' + }), onBlur() { this.form.customerName = '小白' }, diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue index eb46368..ce9aa1b 100644 --- a/src/pages/manage/list/client/consumerClient.vue +++ b/src/pages/manage/list/client/consumerClient.vue @@ -304,14 +304,15 @@ export default { changeShowGoods: 'system/changeShowGoods', setDataFlow: 'system/setDataFlow', setNeedsModule: 'system/setNeedsModule', - setPopId: 'system/setPopId' + setPopId: 'system/setPopId', + setTipsOperate: 'system/setTipsOperate' }), popUp(){// 唤起弹窗 // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'33'}) // this.changeShowGoods(true) // this.$store.commit('system/changePop',{show: false, text: '', id:'33'}) - this.$message.warning('请刷身份证'); + this.setTipsOperate('请刷身份证'); this.setPopId('33') sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') @@ -388,11 +389,7 @@ export default { this.setNeedsModule(moduleName) this.setDataFlow({ ...this.form }) }).catch((error)=>{ - this.$message({ - message: '服务器繁忙哦,提交失败。', - center: true, - type: 'info' - }); + this.setTipsOperate('服务器繁忙哦,提交失败。') }) }, diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue index 1f918f5..8a997b4 100644 --- a/src/pages/manage/list/client/corporateClient.vue +++ b/src/pages/manage/list/client/corporateClient.vue @@ -203,7 +203,8 @@ export default { setDataFlow: 'system/setDataFlow', setNeedsModule: 'system/setNeedsModule', setPopId: 'system/setPopId', - setNeedsModule: 'system/setNeedsModule' + setNeedsModule: 'system/setNeedsModule', + setTipsOperate: 'system/setTipsOperate' }), popUp(){// 唤起弹窗 // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'}) @@ -215,7 +216,7 @@ export default { // } // } // this.setDataFlow({ ...tmpForm }) - this.$message.warning('请刷身份证'); + this.setTipsOperate('请刷身份证'); this.setPopId('34') sessionStorage.setItem('computerPath', this.$route.fullPath) this.$router.push('/counter/list/') @@ -280,11 +281,7 @@ export default { this.setNeedsModule(moduleName) this.setDataFlow({ userName: this.form.name }) }).catch((error)=>{ - this.$message({ - message: '服务器繁忙哦,提交失败。', - center: true, - type: 'info' - }); + this.setTipsOperate('服务器繁忙哦,提交失败。') }) }else { this.$message.error('有必填项未填哦~'); diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue index 59415a8..aac58d6 100644 --- a/src/pages/manage/list/dayEnd/branchDayEnd.vue +++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue @@ -24,8 +24,8 @@