c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2025-09-10 09:45:52 +08:00
parent ab6323a7de
commit 538e340be1
17 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhghh5/club/mine/index.html
+1 -1
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="工号">{{row.loginName}}</table-column> <table-column label="工号">{{row.loginName}}</table-column>
<table-column label="申请模式">{{row.mode ? '加入' : '退出'}}</table-column> <table-column label="申请模式">{{row.mode ? '加入' : '退出'}}</table-column>
<table-column label="申请时间">{{row.applyDate}}</table-column> <table-column label="申请时间">{{row.applyDate}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html
+1 -1
View File
@@ -31,7 +31,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column> <table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html
+1 -1
View File
@@ -31,7 +31,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column> <table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html
+1 -1
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column> <table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
+1 -1
View File
@@ -31,7 +31,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column> <table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html
+1 -1
View File
@@ -31,7 +31,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column> <table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html
+1 -1
View File
@@ -33,7 +33,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案人">{{row.createUserName}}</table-column> <table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column> <table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="承办单位">{{row.taskUnitName}}（{{row.taskIsMaster ? '主办' : '协办'}}）</table-column> <table-column label="承办单位">{{row.taskUnitName}}（{{row.taskIsMaster ? '主办' : '协办'}}）</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/suggestionBox/mine/index.html
+1 -1
View File
@@ -20,7 +20,7 @@ layout("/layouts/platform_h5.html"){
<template v-slot="{index,row}"> <template v-slot="{index,row}">
<table-column label="申请人">{{row.userName}}</table-column> <table-column label="申请人">{{row.userName}}</table-column>
<table-column label="申请时间">{{row.submitTime}}</table-column> <table-column label="申请时间">{{row.submitTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/suggestionBox/query/index.html
+1 -1
View File
@@ -21,7 +21,7 @@ layout("/layouts/platform_h5.html"){
<template v-slot="{index,row}"> <template v-slot="{index,row}">
<table-column label="申请人">{{row.userName}}</table-column> <table-column label="申请人">{{row.userName}}</table-column>
<table-column label="申请时间">{{row.submitTime}}</table-column> <table-column label="申请时间">{{row.submitTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/democratic/suggestionBox/xgh/index.html
+1 -1
View File
@@ -26,7 +26,7 @@ layout("/layouts/platform_h5.html"){
<template v-slot="{index,row}"> <template v-slot="{index,row}">
<table-column label="申请人">{{row.userName}}</table-column> <table-column label="申请人">{{row.userName}}</table-column>
<table-column label="申请时间">{{row.submitTime}}</table-column> <table-column label="申请时间">{{row.submitTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html
+30 -16
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform_h5.html"){
<van-field label="申请模式" name="mode" required :rules="[{ required: true }]"> <van-field label="申请模式" name="mode" required :rules="[{ required: true }]">
<template #input> <template #input>
<van-radio-group v-model="formData.mode" @change="modeChange" direction="horizontal"> <van-radio-group v-model="formData.mode" @change="modeChange" direction="horizontal">
<van-radio name="1" shape="square">申请本人</van-radio> <van-radio name="1" shape="square">本人申请</van-radio>
<van-radio v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')" <van-radio v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN, BRANCH_UNION_CHAIRMAN, BRANCH_UNION_OPERATOR')"
name="2" shape="square">替他人申请</van-radio> name="2" shape="square">替他人申请</van-radio>
</van-radio-group> </van-radio-group>
@@ -310,15 +310,14 @@ layout("/layouts/platform_h5.html"){
// 保存 // 保存
onSave() { onSave() {
this.$confirm("您确定保存吗？", "提示", { this.$dialog.confirm({
confirmButtonText: "确定", title: "提示",
cancelButtonText: "取消", message: "您确定要保存吗？",
type: "warning"
}).then(() => { }).then(() => {
this.$axios.post('/platform/difficultHelp/apply/save', {data: JSON.stringify(this.formData)}).then(res => { this.$axios.post('/platform/difficultHelp/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message.success("保存成功") this.$message.success("保存成功")
window.location.href = '/platform/difficultHelp/mine' this.$pjaxReplace('/platform/difficultHelp/mine/h5')
} }
}) })
}) })
@@ -326,18 +325,20 @@ layout("/layouts/platform_h5.html"){
// 提交 // 提交
onSubmit() { onSubmit() {
this.$confirm("您确定要提交吗？", "提示", { this.$refs.formRef.validate().then(() => {
confirmButtonText: "确定", this.$dialog.confirm({
cancelButtonText: "取消", title: "提示",
type: "warning" message: "您确定要提交吗？",
}).then(() => { }).then(() => {
const result = this.isValidIdCard(this.formData.idCard) const result = this.isValidIdCard(this.formData.idCard)
if (result.status === 0) { if (result.status === 0) {
this.$toast(result.msg) this.$toast(result.msg)
return
} }
const bankRes = this.validateCard(this.formData.bankCardNum) const bankRes = this.validateCard(this.formData.bankCardNum)
if (bankRes.status === 0) { if (bankRes.status === 0) {
this.$toast(bankRes.msg) this.$toast(bankRes.msg)
return;
} }
this.$axios.post('/platform/difficultHelp/apply/submit', { this.$axios.post('/platform/difficultHelp/apply/submit', {
@@ -345,28 +346,41 @@ layout("/layouts/platform_h5.html"){
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message.success("提交成功") this.$message.success("提交成功")
window.location.href = '/platform/h5/difficultHelp/mine' this.$pjaxReplace('/platform/difficultHelp/mine/h5')
} }
}) })
}) })
})
}, },
onFinishTask() { onFinishTask() {
this.$confirm("您确定要提交吗？", "提示", { this.$refs.formRef.validate().then(() => {
confirmButtonText: "确定", this.$dialog.confirm({
cancelButtonText: "取消", title: "提示",
type: "warning" message: "您确定要提交吗？",
}).then(() => { }).then(() => {
const result = this.isValidIdCard(this.formData.idCard)
if (result.status === 0) {
this.$toast(result.msg)
return
}
const bankRes = this.validateCard(this.formData.bankCardNum)
if (bankRes.status === 0) {
this.$toast(bankRes.msg)
return;
}
this.$axios.post('/platform/difficultHelp/apply/submitAgain', { this.$axios.post('/platform/difficultHelp/apply/submitAgain', {
data: JSON.stringify(this.formData), data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId") taskId: GetQueryString("taskId")
}).then(res => { }).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.$message.success("提交成功") this.$message.success("提交成功")
window.location.href = '/platform/difficultHelp/mine' this.$pjaxReplace('/platform/difficultHelp/mine/h5')
} }
}) })
}) })
})
}, },
// 查询受助人 // 查询受助人
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/branchunionapproval/index.html
+5 -6
View File
@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="困难类型">{{row.subsidyStandards}}</table-column> <table-column label="困难类型">{{row.subsidyStandards}}</table-column>
<table-column label="填报时间">{{row.applyTime}}</table-column> <table-column label="填报时间">{{row.applyTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
@@ -48,7 +48,7 @@ layout("/layouts/platform_h5.html"){
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
<span>审核</span> <span>审核</span>
</div> </div>
<div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(item)"> <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
<i class="fa fa-undo"></i> <i class="fa fa-undo"></i>
<span>撤回</span> <span>撤回</span>
</div> </div>
@@ -150,7 +150,7 @@ layout("/layouts/platform_h5.html"){
}) })
}).then((res) => { }).then((res) => {
if (res.code === 0) { if (res.code === 0) {
this.$refs.suggestionBoxInfoRef.onClose() this.$refs.infoRef.onClose()
this.$toast.success(res.msg) this.$toast.success(res.msg)
this.doSearch() this.doSearch()
} }
@@ -165,11 +165,12 @@ layout("/layouts/platform_h5.html"){
// 撤回 // 撤回
onRevoke(row) { onRevoke(row) {
debugger
this.$dialog.confirm({ this.$dialog.confirm({
title: '提示', title: '提示',
message: '您确定要撤回吗？', message: '您确定要撤回吗？',
}).then(() => { }).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) { if (res.code === 0) {
this.$toast.success('撤回成功'); this.$toast.success('撤回成功');
this.doSearch(); this.doSearch();
@@ -206,9 +207,7 @@ layout("/layouts/platform_h5.html"){
v.text = v.name v.text = v.name
v.value = v.id 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) { if (this.unitList && this.unitList.length > 0) {
this.$set(this.pageForm, "unitId", this.unitList[0].value) this.$set(this.pageForm, "unitId", this.unitList[0].value)
} }
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/mine/index.html
+3 -3
View File
@@ -25,14 +25,14 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu> </van-dropdown-menu>
</van-sticky> </van-sticky>
<table-list api="/platform/difficultHelp/branchUnionApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName" @ready="doSearch"> <table-list api="/platform/difficultHelp/mine/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName" @ready="doSearch">
<template v-slot="{index,row}"> <template v-slot="{index,row}">
<table-column label="受助人">{{row.userName + '(' + row.loginName + ')'}}</table-column> <table-column label="受助人">{{row.userName + '(' + row.loginName + ')'}}</table-column>
<table-column label="所属工会">{{row.unionName}}</table-column> <table-column label="所属工会">{{row.unionName}}</table-column>
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="困难类型">{{row.subsidyStandards}}</table-column> <table-column label="困难类型">{{row.subsidyStandards}}</table-column>
<table-column label="填报时间">{{row.applyTime}}</table-column> <table-column label="填报时间">{{row.applyTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
@@ -88,7 +88,7 @@ layout("/layouts/platform_h5.html"){
}, },
onEdit(row) { 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) { onRevoke(row) {
src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/schoolunionapproval/index.html
+1 -1
View File
@@ -37,7 +37,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="困难类型">{{row.subsidyStandards}}</table-column> <table-column label="困难类型">{{row.subsidyStandards}}</table-column>
<table-column label="填报时间">{{row.applyTime}}</table-column> <table-column label="填报时间">{{row.applyTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/branchunionapproval/index.html
+1 -1
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.unionName}}</table-column> <table-column label="所属工会">{{row.unionName}}</table-column>
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="填报时间">{{row.applyDateTime}}</table-column> <table-column label="填报时间">{{row.applyDateTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/mine/index.html
+1 -1
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.unionName}}</table-column> <table-column label="所属工会">{{row.unionName}}</table-column>
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="填报时间">{{row.applyDateTime}}</table-column> <table-column label="填报时间">{{row.applyDateTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">
src/main/resources/views/platform/zhghh5/staffmanage/member/apply/schoolunionapproval/index.html
+1 -1
View File
@@ -24,7 +24,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="所属工会">{{row.unionName}}</table-column> <table-column label="所属工会">{{row.unionName}}</table-column>
<table-column label="工作单位">{{row.unitName}}</table-column> <table-column label="工作单位">{{row.unitName}}</table-column>
<table-column label="填报时间">{{row.applyDateTime}}</table-column> <table-column label="填报时间">{{row.applyDateTime}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column> <table-column label="当前节点">{{row.curTaskName}}</table-column>
</template> </template>
<template #actions="{index,row}"> <template #actions="{index,row}">
<div class="action-btn" @click="onView(row)"> <div class="action-btn" @click="onView(row)">