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

提案查看综合问题

Browse Source
This commit is contained in:
c-hongqw1
2026-10-22 14:35:01 +08:00
parent 038bd825bd
commit f2a1825e6a
3 changed files with 127 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java
+2 -1
View File
@@ -104,7 +104,8 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
""").setParam("id", id);
NutMap info = (NutMap) dao().execute(sql.setCallback(Sqls.callback.map())).getResult();
if (StrUtil.isNotBlank(info.getString("suggestUnits"))) {
info.put("suggestUnits", String.join(",", Json.fromJson(ArrayList.class, info.getString("suggestUnits"))));
// 分号仅分隔不同单位，保留每个单位名称内部的顿号等标点。
info.put("suggestUnits", String.join("；", Json.fromJson(ArrayList.class, info.getString("suggestUnits"))));
}
// 并案提案
src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+61 -11
View File
@@ -189,7 +189,7 @@ const PROPOSAL_INFO = {
</el-descriptions-item>
<el-descriptions-item label="主办单位" :span="3">{{task.ext.tf_masterUnitName}}
</el-descriptions-item>
<el-descriptions-item label="协办单位" :span="3">{{task?.ext?.tf_slaveUnitNameStr}}
<el-descriptions-item label="协办单位" :span="3">{{getSlaveUnitNames(task)}}
</el-descriptions-item>
<el-descriptions-item label="指定分管校领导" :span="3" v-if="getBranchSchoolLeaderName(task)">
{{getBranchSchoolLeaderName(task)}}
@@ -222,8 +222,13 @@ const PROPOSAL_INFO = {
<el-descriptions border class="flow-task-form" :column="3" :key="task.id" v-else>
<el-descriptions-item label="承办单位"
v-if="['master_reply','slave_reply'].includes(task.taskName)" :span="3">
{{task.ext.underTakeName}}
v-if="isReplyTask(task)" :span="3">
{{getReplyUnitName(task)}}
</el-descriptions-item>
<el-descriptions-item label="落实情况" v-if="isReplyTask(task)" :span="3">
<dict-tag v-if="task.ext.tf_implementState" :options="dict.type.PROPOSAL_REPLY_IMPLEMENT"
:value="task.ext.tf_implementState"></dict-tag>
<span v-else>未记录</span>
</el-descriptions-item>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
@@ -235,6 +240,9 @@ const PROPOSAL_INFO = {
<dict-tag :options="dict.type.PROPOSAL_FEEDBACK"
:value="task.ext.tf_feedback"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="办理结果" v-else-if="getSchoolLeaderResult(task)">
{{getSchoolLeaderResult(task)}}
</el-descriptions-item>
<el-descriptions-item label="办理结果" v-else>
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
@@ -249,7 +257,7 @@ const PROPOSAL_INFO = {
<slot></slot>
</div>
`,
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK"],
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK", "PROPOSAL_REPLY_IMPLEMENT"],
props: {
hide_slave: false
},
@@ -261,12 +269,18 @@ const PROPOSAL_INFO = {
viewDialogVisible: false,
positiveSecondList: [],
branchSchoolLeaderOptions: [],
detailRequestVersion: 0,
}
},
methods: {
// 打开
onOpen(row) {
this.row = row
// 每次打开递增版本，阻止前一次查看的迟到响应覆盖当前提案（包括 A→B→A）。
this.$set(this, "detailRequestVersion", this.detailRequestVersion + 1)
this.$set(this, "row", row)
this.$set(this, "viewData", {})
this.$set(this, "doneTasks", [])
this.$set(this, "positiveSecondList", [])
this.visible = true
this.getInfo()
this.getDoneTasks()
@@ -276,9 +290,10 @@ const PROPOSAL_INFO = {
// 获取申请信息
getInfo() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/platform/proposal/common/proposalInfo", {id: this.row.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "viewData", res.data)
}
})
},
@@ -293,22 +308,57 @@ const PROPOSAL_INFO = {
// 获取已办任务审批记录
getDoneTasks() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "doneTasks", res.data)
}
})
},
// 获取主动附议信息
listPositiveSeconded() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/platform/proposal/positiveSeconded/listPositiveSeconded", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.positiveSecondList = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "positiveSecondList", res.data)
}
})
},
// task 为主任已办任务；返回分号分隔的单位名称，旧记录仅转换原拼接用的英文逗号，不拆分单位内部顿号。
getSlaveUnitNames(task) {
const ext = task.ext || {}
if (Array.isArray(ext.tf_slaveUnitNames)) {
return ext.tf_slaveUnitNames.join("；")
}
return (ext.tf_slaveUnitNameStr || "").split(",").join("；")
},
// 三类答复节点均展示单位和落实情况，其他节点不能展示继承的答复字段。
isReplyTask(task) {
return ["master_reply", "slave_reply", "opinion_master_reply"].includes(task.taskName)
},
// task 为已办任务；返回单位名称。仅主办允许使用本任务保存的主办名称补齐历史缺失值。
getReplyUnitName(task) {
const ext = task.ext || {}
if (ext.underTakeName) {
return ext.underTakeName
}
return ["master_reply", "opinion_master_reply"].includes(task.taskName)
? (ext.tf_masterUnitName || "未记录") : "未记录"
},
// task 为已办任务；校领导返回实际审批动作文本，其他节点或旧记录缺少动作时返回空串沿用提交结果。
getSchoolLeaderResult(task) {
if (!["school_leader", "school_leader_instruction"].includes(task.taskName)) {
return ""
}
const approval = task.ext?.tf_approval
return approval === "back" ? "退回重新答复" : (approval === "agree" ? "同意" : "")
},
// 查询分管校领导，用于把流程任务中保存的 userId 显示成姓名。
listBranchSchoolLeader() {
if (this.branchSchoolLeaderOptions.length > 0) {
src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+64 -21
View File
@@ -162,7 +162,7 @@ const PROPOSAL_INFO = {
</div>
</van-cell>
<van-cell title="主办单位">{{ task.ext.tf_masterUnitName }}</van-cell>
<van-cell title="协办单位">{{ task?.ext?.tf_slaveUnitNameStr }}</van-cell>
<van-cell title="协办单位">{{ getSlaveUnitNames(task) }}</van-cell>
<van-cell title="指定分管校领导" v-if="getBranchSchoolLeaderName(task)">
{{ getBranchSchoolLeaderName(task) }}
</van-cell>
@@ -191,8 +191,13 @@ const PROPOSAL_INFO = {
</van-cell-group>
<van-cell-group :title="task.displayName" v-else>
<van-cell title="办理单位" v-if="['master_reply','slave_reply'].includes(task.taskName)">
{{task.ext.underTakeName}}
<van-cell title="办理单位" v-if="isReplyTask(task)">
{{getReplyUnitName(task)}}
</van-cell>
<van-cell title="落实情况" v-if="isReplyTask(task)">
<dict-tag v-if="task.ext.tf_implementState" :options="dict.type.PROPOSAL_REPLY_IMPLEMENT"
:value="task.ext.tf_implementState"></dict-tag>
<span v-else>未记录</span>
</van-cell>
<van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
@@ -203,6 +208,9 @@ const PROPOSAL_INFO = {
<dict-tag :options="dict.type.PROPOSAL_FEEDBACK"
:value="task.ext.tf_feedback"></dict-tag>
</van-cell>
<van-cell title="办理结果" v-else-if="getSchoolLeaderResult(task)">
{{getSchoolLeaderResult(task)}}
</van-cell>
<van-cell title="办理结果" v-else>
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
@@ -217,7 +225,7 @@ const PROPOSAL_INFO = {
<slot></slot>
</van-action-sheet>
`,
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK"],
dicts: ["PROPOSAL_TYPE", "PROPOSAL_CASE_FILING_RESULT", "PROPOSAL_SUGGESTION_CASE_FILING_RESULT", "PROPOSAL_CASE_FILING_TYPE", "PROCESS_TASK_SUBMIT_TYPE", "PROPOSAL_FEEDBACK", "PROPOSAL_REPLY_IMPLEMENT"],
data() {
return {
visible:false,
@@ -227,12 +235,18 @@ const PROPOSAL_INFO = {
originalRow: null, // 用于保存原始数据，支持返回功能
positiveSecondList: [],
branchSchoolLeaderOptions: [],
detailRequestVersion: 0,
}
},
methods: {
// 打开
onOpen(row) {
this.row = row
// 每次打开递增版本，阻止前一次查看的迟到响应覆盖当前提案（包括 A→B→A）。
this.$set(this, "detailRequestVersion", this.detailRequestVersion + 1)
this.$set(this, "row", row)
this.$set(this, "viewData", {})
this.$set(this, "doneTasks", [])
this.$set(this, "positiveSecondList", [])
this.visible = true
this.getInfo()
this.getDoneTasks()
@@ -247,9 +261,10 @@ const PROPOSAL_INFO = {
// 获取申请信息
getInfo() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/platform/proposal/common/proposalInfo", {id: this.row.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "viewData", res.data)
}
})
},
@@ -258,16 +273,9 @@ const PROPOSAL_INFO = {
openView(row) {
// 如果传入的是并案对象，则打开新的详情页面
if (row && typeof row === 'object' && row.id) {
// 创建一个新的提案详情组件实例来显示并案详情
this.$nextTick(() => {
// 可以通过事件总线或者其他方式来打开新的详情页面
// 这里暂时使用简单的方式，直接在当前组件中显示
const currentRow = this.row;
this.row = row;
this.getInfo();
// 保存原来的数据，以便返回时恢复
this.originalRow = currentRow;
})
// 并案切换必须同步刷新基础信息、流程记录和主动附议，避免展示原提案的意见。
this.$set(this, "originalRow", this.row)
this.onOpen(row)
} else {
// 原有的逻辑，通过ID查看
this.$nextTick(() => {
@@ -280,22 +288,57 @@ const PROPOSAL_INFO = {
// 获取已办任务审批记录
getDoneTasks() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "doneTasks", res.data)
}
})
},
// 获取主动附议信息
listPositiveSeconded() {
const requestVersion = this.detailRequestVersion
this.$axios.post("/platform/proposal/positiveSeconded/listPositiveSeconded", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.positiveSecondList = res.data
if (res.code === 0 && requestVersion === this.detailRequestVersion) {
this.$set(this, "positiveSecondList", res.data)
}
})
},
// task 为主任已办任务；返回分号分隔的单位名称，旧记录仅转换原拼接用的英文逗号，不拆分单位内部顿号。
getSlaveUnitNames(task) {
const ext = task.ext || {}
if (Array.isArray(ext.tf_slaveUnitNames)) {
return ext.tf_slaveUnitNames.join("；")
}
return (ext.tf_slaveUnitNameStr || "").split(",").join("；")
},
// 三类答复节点均展示单位和落实情况，其他节点不能展示继承的答复字段。
isReplyTask(task) {
return ["master_reply", "slave_reply", "opinion_master_reply"].includes(task.taskName)
},
// task 为已办任务；返回单位名称。仅主办允许使用本任务保存的主办名称补齐历史缺失值。
getReplyUnitName(task) {
const ext = task.ext || {}
if (ext.underTakeName) {
return ext.underTakeName
}
return ["master_reply", "opinion_master_reply"].includes(task.taskName)
? (ext.tf_masterUnitName || "未记录") : "未记录"
},
// task 为已办任务；校领导返回实际审批动作文本，其他节点或旧记录缺少动作时返回空串沿用提交结果。
getSchoolLeaderResult(task) {
if (!["school_leader", "school_leader_instruction"].includes(task.taskName)) {
return ""
}
const approval = task.ext?.tf_approval
return approval === "back" ? "退回重新答复" : (approval === "agree" ? "同意" : "")
},
// 查询分管校领导，用于把流程任务中保存的 userId 显示成姓名。
listBranchSchoolLeader() {
if (this.branchSchoolLeaderOptions.length > 0) {