diff --git a/src/api/ebiz/allowance/myInfo.js b/src/api/ebiz/allowance/myInfo.js new file mode 100644 index 000000000..398d60b26 --- /dev/null +++ b/src/api/ebiz/allowance/myInfo.js @@ -0,0 +1,22 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +// 我的资料-基本信息,账户信息,影响资料等查询详细数据信息的接口 +export function getAllowanceBaseDetail(data) { + return request({ + url: getUrl('/agent/allowanceBase/getAllowanceBaseDetail', 1), + method: 'post', + data + }) +} + +// 我的资料-基本信息,账户信息,影响资料等点击下一步操作时调用的保存接口 +export function saveOrUpdateAllowanceBase(data) { + return request({ + url: getUrl('/agent/allowanceBase/saveOrUpdateAllowanceBase', 1), + method: 'post', + data + }) +} + + diff --git a/src/api/ebiz/parentList/parentList.js b/src/api/ebiz/parentList/parentList.js new file mode 100644 index 000000000..e70cded94 --- /dev/null +++ b/src/api/ebiz/parentList/parentList.js @@ -0,0 +1,20 @@ +import request from '@/assets/js/utils/request' +import getUrl from '@/assets/js/utils/get-url' + +// 代理人客户列表 +export function getAllowanceBaseList(data) { + return request({ + url: getUrl('/agent/allowanceBase/getAllowanceBaseList', 1), + method: 'post', + data + }) +} + +//查询代理人客户信息 +export function getAgentCustomerInfo(data) { + return request({ + url: getUrl('/customer/agent/getAgentCustomerInfo', 1), + method: 'post', + data + }) +} diff --git a/src/components/ebiz/allowance/application/IndexBar.vue b/src/components/ebiz/allowance/application/IndexBar.vue index a4c641bbb..a9d8e2af0 100644 --- a/src/components/ebiz/allowance/application/IndexBar.vue +++ b/src/components/ebiz/allowance/application/IndexBar.vue @@ -45,6 +45,11 @@ export default { valueKey: { type: String, default: 'text' + }, + // 津贴申请的流水单号 + allowanceNo: { + type: String, + default: '' } }, components: { @@ -89,7 +94,7 @@ export default { imgNoCheckedUrl: this.$assetsUrl + 'images/allowance/qmqr_n.png' } ], - //localStorage.allowancePageFlag:控制导航是否可以直接跳转页面 1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认 + //localStorage.allowancePageFlag:控制导航是否可以直接跳转页面 1-基本信息 2-账户信息 3-影像资料 4-签名确认 allowancePageFlag: Number(localStorage.allowancePageFlag) } }, @@ -107,16 +112,16 @@ export default { if (Number(localStorage.allowancePageFlag) < Number(pageIndex)) return switch (pageIndex) { case 1: //跳到基本信息页面 - url = `/allowance/application/BaseInfo?edit=1&allowancePageFlag=${pageIndex}` + url = `/allowance/application/BaseInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}` break case 2: //跳到账户信息页面 - url = `/allowance/application/AccountInfo?edit=1&allowancePageFlag=${pageIndex}` + url = `/allowance/application/AccountInfo?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}` break case 3: //跳到影像资料页面 - url = `/allowance/application/AttachmentManagement?edit=1&allowancePageFlag=${pageIndex}` + url = `/allowance/application/AttachmentManagement?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}` break case 4: //跳到签名确认页面 - url = `/allowance/application/SignatureConfirmation?edit=1&allowancePageFlag=${pageIndex}` + url = `/allowance/application/SignatureConfirmation?edit=1&allowancePageFlag=${pageIndex}&allowanceNo=${this.allowanceNo}` break default: break diff --git a/src/components/ebiz/allowance/myInfo/IndexBar.vue b/src/components/ebiz/allowance/myInfo/IndexBar.vue new file mode 100644 index 000000000..ecb245191 --- /dev/null +++ b/src/components/ebiz/allowance/myInfo/IndexBar.vue @@ -0,0 +1,225 @@ + + + + + + + + + {{ item.pageItem }} + + + + + + + {{ item.pageItem }} + + + + + + + + + diff --git a/src/components/ebiz/allowance/parentList/Parent.vue b/src/components/ebiz/allowance/parentList/Parent.vue deleted file mode 100644 index 27c512620..000000000 --- a/src/components/ebiz/allowance/parentList/Parent.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - {{ parent.customerName }} - {{ parent.customerPhone }} - - - - - - - - - - - - 暂无数据 - - - - - - diff --git a/src/components/ebiz/parentList/Parent.vue b/src/components/ebiz/parentList/Parent.vue new file mode 100644 index 000000000..48b7011fe --- /dev/null +++ b/src/components/ebiz/parentList/Parent.vue @@ -0,0 +1,100 @@ + + + + + + + + + + + {{ parent.name }} + {{ parent.customerPhone }} + + + + + + + + + + + + 暂无数据 + + + + + + diff --git a/src/components/ebiz/allowance/parentList/ParentPicker.vue b/src/components/ebiz/parentList/ParentPicker.vue similarity index 99% rename from src/components/ebiz/allowance/parentList/ParentPicker.vue rename to src/components/ebiz/parentList/ParentPicker.vue index 9a88ce2d8..a9075e5b9 100644 --- a/src/components/ebiz/allowance/parentList/ParentPicker.vue +++ b/src/components/ebiz/parentList/ParentPicker.vue @@ -89,7 +89,8 @@ export default { [Popup.name]: Popup, [Icon.name]: Icon, [Sticky.name]: Sticky, - Parent + [Parent.name]: Parent + }, mounted() { this.showPicker = this.parentShowPicker diff --git a/src/views/ebiz/allowance/application/AccountInfo.vue b/src/views/ebiz/allowance/application/AccountInfo.vue index 7347fd869..177c7e68c 100644 --- a/src/views/ebiz/allowance/application/AccountInfo.vue +++ b/src/views/ebiz/allowance/application/AccountInfo.vue @@ -1,6 +1,6 @@ - + @@ -81,8 +81,8 @@ import { Checkbox, CheckboxGroup } from 'vant' -import { getOrderDetail, checkCard, getAuthCode, autchCodeCheck } from '@/api/ebiz/sale/sale' -import { saveOrUpdateAllowanceUrl } from '@/api/ebiz/allowance/allowance' +import { checkCard } from '@/api/ebiz/sale/sale' +import { saveOrUpdateAllowanceUrl, getAllowanceDetail } from '@/api/ebiz/allowance/allowance' import BankCardScan from '@/components/ebiz/sale/BankCardScan' import IndexBar from '@/components/ebiz/allowance/application/IndexBar' import SelectBankName from '@/components/ebiz/account/SelectBankName' @@ -114,6 +114,7 @@ export default { return { radio: '0', // 定义享受人位置处的单选项是否选中的变量 accountBankInfo: { + id: '', // id唯一标识,用于当做参数传给顶部导航组件,也用于在点击下一步时,传给后台,后台去判断是新增操作还是编辑操作 accountName: '', // 持卡人姓名(享受人) bankProvinceAreaName: '', // 开户银行省市名称 bankProvinceCode: '', // 银行所在省编码 @@ -121,10 +122,10 @@ export default { bankCardNo: '', // 银行卡号 bankName: '', // 银行名称 bankCode: '', // 银行编码 - mobile: '', // 手机号 + mobile: '', // 手机号码 isSelf: 0 // 是否是享受人本人银行卡 1:是; 0:不是 }, - allowanceUserInfo: {}, // 定义存储'allowanceUserInfo'这个缓存中申请人信息与享受人信息的数据的对象 + allowanceUserInfo: {}, // 定义存储申请人信息与享受人信息的数据的对象 areaList, isAreaListShow: false, // 控制显示或隐藏选择开户银行省市的弹窗的变量 isScan: false, // 控制显示或隐藏银行卡扫描页面的变量 @@ -135,34 +136,9 @@ export default { allowancePageFlag: '2' // 定义顶部导航记录当前展示的是第几个页面或流程的标识 } }, - async created() { - // let res = await getOrderDetail({ orderNo: localStorage.orderNo }) - this.$toast.loading({ - duration: 0, // 持续展示 toast - forbidClick: true, // 禁用背景点击 - loadingType: 'spinner', - message: '加载中……' - }) - // if (res.result == 0) { - // //如果是从编辑进来的 - // if (this.$route.query.edit) { - // - // } - // //如果存在填过的账户信息 - // } else { - // this.$toast.clear() - // this.$toast(res.resultMessage) - // } - - // 判断是否有津贴申请的申请人与享受人的信息 - if (this.$CacheUtils.getLocItem('allowanceUserInfo')) { - // 从缓存中获取津贴申请的申请人与享受人的信息 - this.allowanceUserInfo = JSON.parse(this.$CacheUtils.getLocItem('allowanceUserInfo')) - // 获取缓存中津贴申请的申请人与享受人的信息中的享受人姓名 - this.accountBankInfo.accountName = this.allowanceUserInfo.enjoyUserInfo.name - } - - this.$toast.clear() + created() { + // 调用初始化方法 + this.init() }, mounted() { document.body.style.backgroundColor = '#F5F5F5' @@ -177,6 +153,87 @@ export default { window.appCallBack = this.appCallBack }, methods: { + /** + * @Description: 初始化方法,同时判断是新增操作还是编辑操作的类型,根据不同操作类型执行不同程序 + * @author:zhangqi + * @Date:2021-09-14 + */ + init() { + // 开启toast加载提示 + this.$toast.loading({ + duration: 0, // 持续展示 toast + forbidClick: true, // 禁用背景点击 + loadingType: 'spinner', + message: '加载中……' + }) + // 从路由参数中获取'allowanceNo'津贴流水号,定义参数格式 + let params = { + allowanceNo: this.$route.query.allowanceNo + } + // 调用接口方法 + getAllowanceDetail(params).then((res) => { + if (res.result == 0) { + // 给存储申请人信息与享受人信息的数据的对象进行赋值 + this.allowanceUserInfo = { + // 将申请人的数据对象赋值给对象中的属性 + applicantInfo: res.content.allowanceDTO.allowanceApplyDTO, + // 将享受人的数据对象赋值给对象中的属性 + enjoyUserInfo: res.content.allowanceDTO.allowanceEnjoyDTO + } + // 判断是新增操作还是编辑操作的类型,根据不同操作类型执行不同的程序 + if (this.$route.query.edit) { + // 把账户信息数据对象赋值给一个新的变量 + let data = res.content.allowanceDTO.allowanceBankDTO + // 赋值持卡人姓名(享受人) + this.accountBankInfo.accountName = data.accountName + // 赋值银行所在省编码 + this.accountBankInfo.bankProvinceCode = data.bankProvinceCode + // 赋值银行所在地区编码 + this.accountBankInfo.bankAreaCode = data.bankAreaCode + // 调用回显银行卡省市信息的方法 + this.showbackBankAddressStr(data.bankProvinceCode, data.bankAreaCode) + // 赋值银行卡号 + this.accountBankInfo.bankCardNo = data.bankCardNo + // 赋值银行名称 + this.accountBankInfo.bankName = data.bankName + // 赋值银行编码 + this.accountBankInfo.bankCode = data.bankCode + // 赋值手机号码 + this.accountBankInfo.mobile = data.mobile + // 赋值是否是享受人本人银行卡的单选项 + this.accountBankInfo.isSelf = data.isSelf + // 赋值id标识 + this.accountBankInfo.id = data.id + //如果从津贴申请列表点击编辑按钮进入 + if (this.$route.query.edit && !this.$route.query.allowancePageFlag) { + this.allowancePageFlag = '2' + localStorage.setItem('allowancePageFlag', this.allowancePageFlag) + } + } else { + // 获取享受人数据中的享受人姓名,并赋值给变量 + this.accountBankInfo.accountName = this.allowanceUserInfo.enjoyUserInfo.name + localStorage.setItem('allowancePageFlag', this.allowancePageFlag) + } + } else { + this.$toast(res.resultMessage) + } + }) + // 关闭清除toast加载提示 + this.$toast.clear() + }, + + /** + * @Description: 根据银行卡省市编码,查询对应的省市名称的方法 + * @author:zhangqi + * @Date:2021-09-15 + */ + showbackBankAddressStr(provinceCode, cityCode) { + let provinces = areaList.province_list + let cities = areaList.city_list + // 给开户银行省市名称赋值 + this.accountBankInfo.bankProvinceAreaName = `${provinces[provinceCode]}-${cities[cityCode]}` + }, + /** * @Description: 页面左上角关闭事件的回调方法 * @author:zhangqi @@ -404,7 +461,6 @@ export default { * @Date:2021-09-08 */ save() { - let that = this // 根据是否勾选了‘享受人无银行卡/手机号码’的选项,给变量重新赋值 if (this.accountBankInfo.isSelf) { this.accountBankInfo.isSelf = 1 @@ -414,7 +470,7 @@ export default { let str = '' // 定义参数格式 let params = { - allowanceNo: JSON.parse(this.$CacheUtils.getLocItem('allowanceUserInfo')).allowanceNo, + allowanceNo: this.$route.query.allowanceNo, allowanceType: 'BANK_ALLOWANCE', allowanceDTO: { allowanceBankDTO: this.accountBankInfo @@ -424,15 +480,12 @@ export default { saveOrUpdateAllowanceUrl(params).then(res => { if (res.result == '0') { if (this.$route.query.allowancePageFlag) { - str = 'edit=1&allowancePageFlag=3' + str = `edit=1&allowancePageFlag=3&allowanceNo=${this.$route.query.allowanceNo}` } else { + str = `allowanceNo=${this.$route.query.allowanceNo}` //如果从津贴申请列表编辑按钮或者新增津贴申请进入 localStorage.allowancePageFlag = '3' } - // 给‘allowanceUserInfo’缓存中新增加一个判断是否勾选了享受人无银行卡/手机号选项的数据 - let allowanceLocal = JSON.parse(that.$CacheUtils.getLocItem('allowanceUserInfo')) - allowanceLocal.isSelf = this.accountBankInfo.isSelf - that.$CacheUtils.setLocItem('allowanceUserInfo', JSON.stringify(allowanceLocal)) // 跳转到账户信息页面 this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/allowance/application/AttachmentManagement.vue b/src/views/ebiz/allowance/application/AttachmentManagement.vue index 68679621b..19c471444 100644 --- a/src/views/ebiz/allowance/application/AttachmentManagement.vue +++ b/src/views/ebiz/allowance/application/AttachmentManagement.vue @@ -1,6 +1,6 @@ - + diff --git a/src/views/ebiz/allowance/application/BaseInfo.vue b/src/views/ebiz/allowance/application/BaseInfo.vue index be8e898e0..ac79d9de1 100644 --- a/src/views/ebiz/allowance/application/BaseInfo.vue +++ b/src/views/ebiz/allowance/application/BaseInfo.vue @@ -1,7 +1,7 @@ - + { if (res.result == 0) { - // 把数据赋值给一个新的变量 - let data = res.content.allowanceDTO + // 将申请人数据赋值给一个新的变量,以便于在下方给变量赋值 + let applyData = res.content.allowanceDTO.allowanceApplyDTO + // 将享受人数据赋值给一个新的变量,以便于在下方给变量赋值 + let enjoyData = res.content.allowanceBaseDTO.allowanceEnjoyDTO // 赋值申请人工号 - this.applicantInfo.agentCode = data.allowanceApplyDTO.agentCode + this.applicantInfo.agentCode = applyData.agentCode // 赋值申请人姓名 - this.applicantInfo.name = data.allowanceApplyDTO.name + this.applicantInfo.name = applyData.name // 赋值申请人证件类型 - this.applicantInfo.idType = data.allowanceApplyDTO.idType + this.applicantInfo.idType = applyData.idType // 赋值申请人证件号码 - this.applicantInfo.idNo = data.allowanceApplyDTO.idNo + this.applicantInfo.idNo = applyData.idNo // 赋值津贴申请流水号 - this.applicantInfo.allowanceNo = data.allowanceApplyDTO.allowanceNo + this.applicantInfo.allowanceNo = applyData.allowanceNo + // 赋值id唯一标识 + this.enjoyUserInfo.id = enjoyData.id // 赋值享受人姓名 - this.enjoyUserInfo.name = data.allowanceEnjoyDTO.name + this.enjoyUserInfo.name = enjoyData.name // 赋值享受人角色 - this.enjoyUserInfo.relationship = data.allowanceEnjoyDTO.relationship + this.enjoyUserInfo.relationship = enjoyData.relationship // 赋值享受人证件类型 - this.enjoyUserInfo.idType = data.allowanceEnjoyDTO.idType + this.enjoyUserInfo.idType = enjoyData.idType // 赋值享受人证件号码 - this.enjoyUserInfo.idNo = data.allowanceEnjoyDTO.idNo + this.enjoyUserInfo.idNo = enjoyData.idNo // 赋值享受人性别 - this.enjoyUserInfo.sex = data.allowanceEnjoyDTO.sex + this.enjoyUserInfo.sex = enjoyData.sex // 赋值享受人出生日期 - this.enjoyUserInfo.birthday = data.allowanceEnjoyDTO.birthday - // 赋值id标识 - this.enjoyUserInfo.id = data.allowanceEnjoyDTO.id + this.enjoyUserInfo.birthday = enjoyData.birthday //如果从津贴申请列表点击编辑按钮进入 if (this.$route.query.edit && !this.$route.query.allowancePageFlag) { this.allowancePageFlag = '1' localStorage.setItem('allowancePageFlag', this.allowancePageFlag) } + } else { + this.$toast(res.resultMessage) } }) } else { @@ -307,7 +294,6 @@ export default { console.log(err) }) localStorage.setItem('allowancePageFlag', this.allowancePageFlag) - this.$CacheUtils.setLocItem('allowanceUserInfo', '') } }, @@ -583,21 +569,16 @@ export default { saveOrUpdateAllowanceUrl(params).then(res => { if (res.result == '0') { if (this.$route.query.allowancePageFlag) { - str = 'edit=1&allowancePageFlag=2' + // 拼接路由参数,res.content.allowanceNo:接口返回的津贴申请流水号 + str = `edit=1&allowancePageFlag=2&allowanceNo=${res.content.allowanceNo}` } else { - //如果从津贴申请列表编辑按钮或者新增津贴申请进入 + //如果从津贴申请列表新增津贴申请进入 + // 拼接路由参数,res.content.allowanceNo:接口返回的津贴申请流水号 + str = `allowanceNo=${res.content.allowanceNo}` localStorage.allowancePageFlag = '2' } - // 定义存放申请人信息与享受人信息的对象 - let allowanceUserInfo = { - applicantInfo: this.applicantInfo, // 申请人信息 - enjoyUserInfo: this.enjoyUserInfo, // 享受人信息 - allowanceNo: res.content.allowanceNo // 保存基本信息接口调用成功后,返回的津贴申请编号 - } - // 先清除存储申请人和享受人信息的缓存,防止存储缓存时数据有错误 - this.$CacheUtils.removeLocItem('allowanceUserInfo') - // 添加申请人和享受人信息的缓存 - this.$CacheUtils.setLocItem('allowanceUserInfo', JSON.stringify(allowanceUserInfo)) + // 获取津贴申请流水号,并赋值给变量,当做一个参数,用于传入顶部导航组件 + this.applicantInfo.allowanceNo = res.content.allowanceNo // 跳转到账户信息页面 this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/allowance/myInfo/AccountInfo.vue b/src/views/ebiz/allowance/myInfo/AccountInfo.vue index e69de29bb..da96f4956 100644 --- a/src/views/ebiz/allowance/myInfo/AccountInfo.vue +++ b/src/views/ebiz/allowance/myInfo/AccountInfo.vue @@ -0,0 +1,563 @@ + + + + + + + {{ `享受人:${accountBankInfo.accountName}` }} + + + + + + + + + + + + + + + + + + + + + + + + + 如享受人无银行卡/手机号码,可勾选此项,上述信息填写申请人本人信息 + + + + 下一步 + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/ebiz/allowance/myInfo/AttachmentManagement.vue b/src/views/ebiz/allowance/myInfo/AttachmentManagement.vue index e69de29bb..9bfbfc6cd 100644 --- a/src/views/ebiz/allowance/myInfo/AttachmentManagement.vue +++ b/src/views/ebiz/allowance/myInfo/AttachmentManagement.vue @@ -0,0 +1,1363 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 温馨提示:申请人和享受人在同一户口本上需上传户主页、享受人页及本人页;如不在同一户口本上,请上传公安局或居委会开具的关系证明。 + + + + + + + + + + + + + + + + + 下一步 + + + + + + + + diff --git a/src/views/ebiz/allowance/myInfo/BaseInfo.vue b/src/views/ebiz/allowance/myInfo/BaseInfo.vue index e69de29bb..5985be6dd 100644 --- a/src/views/ebiz/allowance/myInfo/BaseInfo.vue +++ b/src/views/ebiz/allowance/myInfo/BaseInfo.vue @@ -0,0 +1,635 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 下一步 + + + + + + + + + + + + + + + + + + + + +
暂无数据