diff --git a/src/components/ebiz/allowance/application/IndexBar.vue b/src/components/ebiz/allowance/application/IndexBar.vue
index 1db9ef988..d0397f784 100644
--- a/src/components/ebiz/allowance/application/IndexBar.vue
+++ b/src/components/ebiz/allowance/application/IndexBar.vue
@@ -129,7 +129,7 @@ export default {
let str = location.hash
let i = str.search(/AttachmentManagement/i)
let k = str.search(/SignatureConfirmation/i)
- if ((i !== -1 || k !== -1) && pageIndex != 4) {
+ if ((i !== -1 || k !== -1) && pageIndex != 3 && pageIndex != 4) {
this.$dialog
.confirm({
className: 'dialog-blue',
diff --git a/src/components/ebiz/allowance/myInfo/IndexBar.vue b/src/components/ebiz/allowance/myInfo/IndexBar.vue
index ecb245191..bf3e66ae6 100644
--- a/src/components/ebiz/allowance/myInfo/IndexBar.vue
+++ b/src/components/ebiz/allowance/myInfo/IndexBar.vue
@@ -111,48 +111,48 @@ export default {
default:
break
}
- this.$jump({
- flag: 'h5',
- extra: {
- forbidSwipeBack: '1',
- url: location.origin + `/#${url}`
- },
- routerInfo: { path: url }
- })
- // let str = location.hash
- // let i = str.search(/AttachmentManagement/i)
- // if (i !== -1 && pageIndex != 2 && pageIndex != 3) {
- // this.$dialog
- // .confirm({
- // className: 'dialog-blue',
- // title: '提示',
- // message: '离开此页可能会丢失部分数据,是否确认离开?'
- // // cancelButtonColor: '#E9332E',
- // // confirmButtonColor: '#FFFFFF'
- // })
- // .then(() => {
- // this.$jump({
- // flag: 'h5',
- // extra: {
- // forbidSwipeBack: '1',
- // url: location.origin + `/#${url}`
- // },
- // routerInfo: { path: url }
- // })
- // })
- // .catch(() => {
- // return
- // })
- // } else {
- // this.$jump({
- // flag: 'h5',
- // extra: {
- // forbidSwipeBack: '1',
- // url: location.origin + `/#${url}`
- // },
- // routerInfo: { path: url }
- // })
- // }
+ // this.$jump({
+ // flag: 'h5',
+ // extra: {
+ // forbidSwipeBack: '1',
+ // url: location.origin + `/#${url}`
+ // },
+ // routerInfo: { path: url }
+ // })
+ let str = location.hash
+ let i = str.search(/AttachmentManagement/i)
+ if (i !== -1 && pageIndex != 3) {
+ this.$dialog
+ .confirm({
+ className: 'dialog-blue',
+ title: '提示',
+ message: '离开此页可能会丢失部分数据,是否确认离开?'
+ // cancelButtonColor: '#E9332E',
+ // confirmButtonColor: '#FFFFFF'
+ })
+ .then(() => {
+ this.$jump({
+ flag: 'h5',
+ extra: {
+ forbidSwipeBack: '1',
+ url: location.origin + `/#${url}`
+ },
+ routerInfo: { path: url }
+ })
+ })
+ .catch(() => {
+ return
+ })
+ } else {
+ this.$jump({
+ flag: 'h5',
+ extra: {
+ forbidSwipeBack: '1',
+ url: location.origin + `/#${url}`
+ },
+ routerInfo: { path: url }
+ })
+ }
},
selectTab() {
let endIndex = location.hash.indexOf('?', 1)
diff --git a/src/components/ebiz/parentList/Parent.vue b/src/components/ebiz/parentList/Parent.vue
index e1dd11553..82a73e4d1 100644
--- a/src/components/ebiz/parentList/Parent.vue
+++ b/src/components/ebiz/parentList/Parent.vue
@@ -35,10 +35,17 @@ import { getAllowanceBaseList, check } from '@/api/ebiz/parentList/parentList'
import { getAllowanceBaseDetail } from '@/api/ebiz/allowance/myInfo'
import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
import utils from '@/assets/js/business-common'
-import { IndexBar, IndexAnchor, Tag, Icon } from 'vant'
+import { IndexBar, IndexAnchor, Tag, Icon, Dialog } from 'vant'
export default {
name: 'Parent',
+ components: {
+ [IndexBar.name]: IndexBar,
+ [IndexAnchor.name]: IndexAnchor,
+ [Tag.name]: Tag,
+ [Icon.name]: Icon,
+ [Dialog.name]: Dialog
+ },
data() {
return {
data: [],
@@ -50,17 +57,45 @@ export default {
created() {
this.getList()
},
- components: {
- [IndexBar.name]: IndexBar,
- [IndexAnchor.name]: IndexAnchor,
- [Tag.name]: Tag,
- [Icon.name]: Icon
- },
mounted() {
let str = location.hash
this.locationHashFlag = str.search(/myInfo/i)
+ // 调用初始化加载,判断是否弹出Dialog弹出框的方法
+ this.init()
},
methods: {
+ /**
+ * @Description: 初始化加载,判断是否弹出Dialog弹出框的方法
+ * @author:zhangqi
+ * @Date:2021-09-17
+ */
+ init() {
+ if (this.$route.query.isOpenDialog) {
+ Dialog.confirm({
+ className: 'dialog-blue',
+ title: '提示',
+ message: '申请资料已保存成功,\n' +
+ '赶快去列表页【点击申请】吧!'
+ })
+ .then(() => {
+ this.$jump({
+ flag: 'h5',
+ extra: {
+ title: '津贴申请列表',
+ forbidSwipeBack: 1, //当前页面禁止右滑返回
+ url: location.origin + `/#/allowance/application/List`
+ },
+ routerInfo: {
+ path: `/allowance/application/List`,
+ type: '1'
+ }
+ })
+ })
+ .catch(() => {
+ // on cancel
+ })
+ }
+ },
choose(data) {
let params = {
enjoyId: data.id
diff --git a/src/router/ebiz/allowance.js b/src/router/ebiz/allowance.js
index dc9726ee2..598b137a8 100644
--- a/src/router/ebiz/allowance.js
+++ b/src/router/ebiz/allowance.js
@@ -13,6 +13,8 @@ const approvalList = () => import('@/views/ebiz/allowance/approval/List')
const approvalDetail = () => import('@/views/ebiz/allowance/Detail')
+const parentList = () => import('@/components/ebiz/parentList/Parent')
+
export default [
//津贴申请
{
@@ -116,5 +118,15 @@ export default [
title: '津贴申请详情',
index: 1
}
- }
+ },
+ // 父母列表页面
+ {
+ path: '/allowance/myInfo/parentList',
+ name: 'parentList',
+ component: parentList,
+ meta: {
+ title: '父母列表',
+ index: 1
+ }
+ }
]
diff --git a/src/views/ebiz/allowance/application/AccountInfo.vue b/src/views/ebiz/allowance/application/AccountInfo.vue
index 2ffd7ffc1..af39f9739 100644
--- a/src/views/ebiz/allowance/application/AccountInfo.vue
+++ b/src/views/ebiz/allowance/application/AccountInfo.vue
@@ -184,8 +184,8 @@ export default {
if (this.$route.query.edit) {
// 把账户信息数据对象赋值给一个新的变量
let data = res.content.allowanceDTO.allowanceBankDTO
- // 赋值持卡人姓名(享受人)
- this.accountBankInfo.accountName = data.accountName
+ // 赋值持卡人姓名(享受人),获取享受人数据中的享受人姓名,并赋值给变量
+ this.accountBankInfo.accountName = this.allowanceUserInfo.enjoyUserInfo.name
// 赋值银行所在省编码
this.accountBankInfo.bankProvinceCode = data.bankProvinceCode
// 赋值银行所在地区编码
diff --git a/src/views/ebiz/allowance/application/AttachmentManagement.vue b/src/views/ebiz/allowance/application/AttachmentManagement.vue
index d7dc8c2ce..fa421c372 100644
--- a/src/views/ebiz/allowance/application/AttachmentManagement.vue
+++ b/src/views/ebiz/allowance/application/AttachmentManagement.vue
@@ -217,33 +217,45 @@
-