+
撤回
@@ -150,7 +150,7 @@ layout("/layouts/platform_h5.html"){
})
}).then((res) => {
if (res.code === 0) {
- this.$refs.suggestionBoxInfoRef.onClose()
+ this.$refs.infoRef.onClose()
this.$toast.success(res.msg)
this.doSearch()
}
@@ -165,11 +165,12 @@ layout("/layouts/platform_h5.html"){
// 撤回
onRevoke(row) {
+ debugger
this.$dialog.confirm({
title: '提示',
message: '您确定要撤回吗?',
}).then(() => {
- this.$axios.post('/flow/common/revokeTask', {taskId: row.startTaskId}).then(res => {
+ this.$axios.post('/flow/common/revokeTask', {taskId: row.taskId}).then(res => {
if (res.code === 0) {
this.$toast.success('撤回成功');
this.doSearch();
@@ -206,9 +207,7 @@ layout("/layouts/platform_h5.html"){
v.text = v.name
v.value = v.id
})
- if (hasAdmin && !this.pageForm.unionId) {
- this.unitList.unshift({ text: "全部单位", value: null })
- }
+ this.unitList.unshift({ text: "全部单位", value: null })
if (this.unitList && this.unitList.length > 0) {
this.$set(this.pageForm, "unitId", this.unitList[0].value)
}
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html
index 2b5a899d..90915af5 100644
--- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html
@@ -25,14 +25,14 @@ layout("/layouts/platform_h5.html"){
-
+
{{row.userName + '(' + row.loginName + ')'}}
{{row.unionName}}
{{row.unitName}}
{{row.subsidyStandards}}
{{row.applyTime}}
- {{row.taskName}}
+ {{row.curTaskName}}
@@ -88,7 +88,7 @@ layout("/layouts/platform_h5.html"){
},
onEdit(row) {
- this.$pjaxReplace('/platform/h5/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
+ this.$pjaxReplace('/platform/difficultHelp/apply/h5?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html
index fdf973c1..0e63dc2f 100644
--- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html
@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
{{row.unitName}}
{{row.subsidyStandards}}
{{row.applyTime}}
-
{{row.taskName}}
+
{{row.curTaskName}}
diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html
index 557d2670..200658ec 100644
--- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html
@@ -24,7 +24,7 @@ layout("/layouts/platform_h5.html"){
{{row.unionName}}
{{row.unitName}}
{{row.applyDateTime}}
-
{{row.taskName}}
+
{{row.curTaskName}}
diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html
index 8f14e65f..ccd368d8 100644
--- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html
@@ -32,7 +32,7 @@ layout("/layouts/platform_h5.html"){
{{row.unionName}}
{{row.unitName}}
{{row.applyDateTime}}
-
{{row.taskName}}
+
{{row.curTaskName}}
diff --git a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html
index 41f5f6fe..1031ce4d 100644
--- a/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html
+++ b/src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html
@@ -24,7 +24,7 @@ layout("/layouts/platform_h5.html"){
{{row.unionName}}
{{row.unitName}}
{{row.applyDateTime}}
-
{{row.taskName}}
+
{{row.curTaskName}}