diff --git a/src/components/ebiz/parentList/Parent.vue b/src/components/ebiz/parentList/Parent.vue index ef5782985..f6ad553ca 100644 --- a/src/components/ebiz/parentList/Parent.vue +++ b/src/components/ebiz/parentList/Parent.vue @@ -59,28 +59,12 @@ export default { this.getList() }, mounted() { - setTimeout(() => { - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_left_button', { - img: this.$assetsUrl + 'images/del-close-btn@3x.png', - intercept: '1' //是否拦截原生返回事件 1是 其他否 - }) - }, 100) - // 筛选按钮的点击事件 - window.appCallBack = this.appCallBack let str = location.hash this.locationHashFlag = str.search(/myInfo/i) // 调用初始化加载，判断是否弹出Dialog弹出框的方法 this.init() }, methods: { - appCallBack(data) { - if (data.trigger == 'left_button_click') { - this.$jump({ - flag: 'home' - }) - } - }, /** * @Description: 初始化加载，判断是否弹出Dialog弹出框的方法 * @author:zhangqi diff --git a/src/views/ebiz/allowance/application/AccountInfo.vue b/src/views/ebiz/allowance/application/AccountInfo.vue index a40365df2..24a01bc2c 100644 --- a/src/views/ebiz/allowance/application/AccountInfo.vue +++ b/src/views/ebiz/allowance/application/AccountInfo.vue @@ -79,9 +79,10 @@ import { Icon, Area, Checkbox, - CheckboxGroup + CheckboxGroup, Dialog } from 'vant' import { checkCard } from '@/api/ebiz/sale/sale' +import { checkPhone } from '@/api/ebiz/customer/customer' import { saveOrUpdateAllowanceUrl, getAllowanceDetail } from '@/api/ebiz/allowance/allowance' import BankCardScan from '@/components/ebiz/sale/BankCardScan' import IndexBar from '@/components/ebiz/allowance/application/IndexBar' @@ -257,8 +258,16 @@ export default { this.accountBankInfo.mobile = data.mobile // 赋值是否是享受人本人银行卡的单选项 this.accountBankInfo.isSelf = data.isSelf - // 赋值id标识, 只有当时编辑操作的时候才对id进行赋值 - this.accountBankInfo.id = data.id + // 判断是否是根据‘再次申请’的操作流程，进入到本页面的， + // 因为新增，编辑，还有再次申请对'accountBankInfo'对象中的id字段赋值不同 + if (this.$route.query.reapply) { + // 'accountBankInfo'存储账户信息数据的对象中的id字段要设置为空('')值 + this.accountBankInfo.id = '' + } else { + // 赋值id标识, 当是编辑操作的时候给id赋一个不为空的值(参数data中的id字段不为空)， + // 但如果是使用在选择父母列表选择数据后存储的缓存进行赋值的操作，这个id标识赋就是一个空('')值(参数data中的id字段就是一个空值) + this.accountBankInfo.id = data.id + } }, /** @@ -475,14 +484,23 @@ export default { loadingType: 'spinner', message: '加载中……' }) - let res = await checkCard(cardData) this.$toast.clear() + // 对银行卡做鉴权 + let res = await checkCard(cardData) if (res.result !== '0') { if (!res.resultMessage) { return this.$toast('当前系统繁忙，请重新输入银行卡号！') } return this.$toast(res.resultMessage) } + // 对手机号做鉴权，检测是否是银行卡绑定的手机号 + let result = await checkPhone(cardData) + if (result.result !== '0') { + if (!res.resultMessage) { + return this.$toast('该手机号不是银行卡预留手机号，请重新填写！') + } + return this.$toast('该手机号不是银行卡预留手机号，请重新填写！') + } } } else { this.$toast(whiteRes.resultMessage) diff --git a/src/views/ebiz/allowance/application/AttachmentManagement.vue b/src/views/ebiz/allowance/application/AttachmentManagement.vue index a800974e1..c1c3276a1 100644 --- a/src/views/ebiz/allowance/application/AttachmentManagement.vue +++ b/src/views/ebiz/allowance/application/AttachmentManagement.vue @@ -1279,7 +1279,7 @@ export default { flag: 'h5', extra: { url: location.origin + `/#/allowance/application/SignatureConfirmation?${str}`, - pullRefresh: '1', + pullRefresh: '0', // 0:不需要下拉刷新 1:需要下拉刷新 backToFirst: '1' }, routerInfo: { diff --git a/src/views/ebiz/allowance/application/BaseInfo.vue b/src/views/ebiz/allowance/application/BaseInfo.vue index 3adbd0e63..5a5037d24 100644 --- a/src/views/ebiz/allowance/application/BaseInfo.vue +++ b/src/views/ebiz/allowance/application/BaseInfo.vue @@ -247,8 +247,8 @@ export default { // 清除存储ORC扫描银行卡功能后存储的银行卡图片缓存 localStorage.removeItem('bankCardUrlPath') // 银行卡 - // 判断是新增操作还是编辑操作的类型，根据不同操作类型调用不同接口查询数据 - if (this.$route.query.edit) { + // 判断是新增操作还是编辑或者是再次申请操作的类型，根据不同操作类型调用不同接口查询数据 + if (this.$route.query.edit || this.$route.query.reapply) { // 从路由参数中获取'allowanceNo'津贴流水号，定义参数格式 let params = { allowanceNo: this.$route.query.allowanceNo @@ -268,10 +268,13 @@ export default { this.applicantInfo.idType = applyData.idType // 赋值申请人证件号码 this.applicantInfo.idNo = applyData.idNo - // 赋值津贴申请流水号 - this.applicantInfo.allowanceNo = applyData.allowanceNo - // 赋值id唯一标识 - this.enjoyUserInfo.id = enjoyData.id + // 只有在编辑的操作模式下，才将申请人数据对象中的津贴申请流水号和享受人数据对象中的id唯一标识赋值给对应的变量 + if (this.$route.query.edit) { + // 赋值津贴申请流水号 + this.applicantInfo.allowanceNo = applyData.allowanceNo + // 赋值id唯一标识 + this.enjoyUserInfo.id = enjoyData.id + } // 赋值享受人姓名 this.enjoyUserInfo.name = enjoyData.name // 赋值享受人角色 @@ -553,9 +556,9 @@ export default { // 计算享受人年龄 let age = utilsAge.getAge(this.enjoyUserInfo.birthday, new Date()) // 享受人年龄需要满60周岁，才能申请津贴 - if (age < 60) { - return this.$toast('享受人需年满60周岁！') - } + // if (age < 60) { + // return this.$toast('享受人需年满60周岁！') + // } // 调用保存当前录入的基本信息数据的方法 this.save() } else { @@ -585,9 +588,16 @@ export default { // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号 str = `edit=1&allowancePageFlag=2&allowanceNo=${res.content.allowanceNo}` } else { - //如果从津贴申请列表新增津贴申请进入 - // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号 - str = `allowanceNo=${res.content.allowanceNo}` + if (this.$route.query.reapply) { + // 如果根据已审批通过-点击再次申请进入的津贴流程，在跳转到下一页'账户信息'时，路由中还要携带一个reapply参数， + // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号 + str = `reapply=1&allowanceNo=${res.content.allowanceNo}` + } else { + // 如果从津贴申请列表新增津贴申请进入 + // 拼接路由参数，res.content.allowanceNo：接口返回的津贴申请流水号 + str = `allowanceNo=${res.content.allowanceNo}` + } + localStorage.allowancePageFlag = '2' } // 获取津贴申请流水号，并赋值给变量，当做一个参数，用于传入顶部导航组件 diff --git a/src/views/ebiz/allowance/application/List.vue b/src/views/ebiz/allowance/application/List.vue index f036f77cd..6f5c1a65a 100644 --- a/src/views/ebiz/allowance/application/List.vue +++ b/src/views/ebiz/allowance/application/List.vue @@ -104,7 +104,7 @@ export default { } }, mounted() { - if(!this.active){ + if (!this.active) { this.active = 'uncommit' } setTimeout(() => { @@ -314,14 +314,13 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/allowance/application/BaseInfo?allowanceNo=' + order.allowanceNo + '&type=reapply&edit=1' + url: location.origin + '/#/allowance/application/BaseInfo?reapply=1&allowanceNo=' + order.allowanceNo }, routerInfo: { path: '/allowance/application/BaseInfo', query: { - allowanceNo: order.allowanceNo, - type: 'reapply', - edit: 1 + reapply: 1, + allowanceNo: order.allowanceNo } } }) diff --git a/src/views/ebiz/allowance/js/methods.js b/src/views/ebiz/allowance/js/methods.js index fa1973614..f60b119b6 100644 --- a/src/views/ebiz/allowance/js/methods.js +++ b/src/views/ebiz/allowance/js/methods.js @@ -5,19 +5,6 @@ export function selectComp(that, index, type = '') { // index：1-父母列表；2-职业类别；3-弹出申请人身份证扫描功能；4-弹出享受人身份证扫描功能 if (index == 1) { ;[that.parentShowPicker, title] = [true, '父母列表'] - - setTimeout(() => { - console.log('进入左上角返回方法了吗？') - that.$jump({ - flag: 'navigation', - extra: { - title, - hiddenLeft: '1' - } - }) - goBackBtn(that) - }, 400) - } else if (index == 2) { ;[that.occupationShowPicker, title] = [true, '职业类别'] } else if (index == 3) { @@ -42,17 +29,6 @@ export function selectComp(that, index, type = '') { }, 400) } -function goBackBtn(that) { - console.log('是的，已经进入左上角返回方法了') - that.$jump({ - flag: 'webview_left_button', - extra: { - img: that.$assetsUrl + 'images/del-close.png', - route: { flag: '', extra: {} } - } - }) -} - // 关闭按钮的显示 function closeBtn(that) { that.$jump({ diff --git a/src/views/ebiz/allowance/myInfo/AccountInfo.vue b/src/views/ebiz/allowance/myInfo/AccountInfo.vue index e77cc0a48..ebc017876 100644 --- a/src/views/ebiz/allowance/myInfo/AccountInfo.vue +++ b/src/views/ebiz/allowance/myInfo/AccountInfo.vue @@ -82,6 +82,7 @@ import { CheckboxGroup } from 'vant' import { checkCard } from '@/api/ebiz/sale/sale' +import { checkPhone } from '@/api/ebiz/customer/customer' import { getAllowanceBaseDetail, saveOrUpdateAllowanceBase } from '@/api/ebiz/allowance/myInfo' import BankCardScan from '@/components/ebiz/sale/BankCardScan' import IndexBar from '@/components/ebiz/allowance/myInfo/IndexBar' @@ -452,14 +453,23 @@ export default { loadingType: 'spinner', message: '加载中……' }) - let res = await checkCard(cardData) this.$toast.clear() + // 对银行卡做鉴权 + let res = await checkCard(cardData) if (res.result !== '0') { if (!res.resultMessage) { return this.$toast('当前系统繁忙，请重新输入银行卡号！') } return this.$toast(res.resultMessage) } + // 对手机号做鉴权，检测是否是银行卡绑定的手机号 + let result = await checkPhone(cardData) + if (result.result !== '0') { + if (!result.resultMessage) { + return this.$toast('该手机号不是银行卡预留手机号，请重新填写！') + } + return this.$toast('该手机号不是银行卡预留手机号，请重新填写！') + } } } else { this.$toast(whiteRes.resultMessage)