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

commit

Browse Source
This commit is contained in:
=
2026-05-26 08:52:10 +08:00
parent 304b1004ec
commit e139b99c9a
3 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java
+10
View File
@@ -8,6 +8,7 @@ import com.budwk.app.base.result.Result;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalType;
import com.budwk.app.zhgh.democratic.proposal.models.ProposalUndertake;
import com.budwk.app.zhgh.democratic.proposal.service.ProposalCommitteeFilingService;
import com.budwk.app.zhgh.democratic.proposal.service.common.ProposalCommonService;
import com.budwk.app.zhgh.democratic.teachercongress.delegation.models.Teacher_congress_delegation;
import com.budwk.app.zhgh.democratic.teachercongress.prepare.models.Teacher_congress_session;
@@ -32,6 +33,8 @@ public class ProposalCommonController {
private Dao dao;
@Inject
private ProposalCommonService proposalCommonService;
@Inject
private ProposalCommitteeFilingService proposalCommitteeFilingService;
@At
@SaCheckPermission(value = {"proposal", "h5.proposal"}, mode = SaMode.OR)
@@ -91,6 +94,13 @@ public class ProposalCommonController {
return Result.success(list);
}
@At
@SaCheckLogin
@ApiOperation("查询提案分管校领导")
public Result listBranchSchoolLeader() {
return Result.success(proposalCommitteeFilingService.listBranchSchoolLeader(""));
}
@At
@SaCheckPermission("proposal")
@ApiOperation("提案配置")
src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+45
View File
@@ -191,6 +191,28 @@ const PROPOSAL_INFO = {
</el-descriptions-item>
<el-descriptions-item label="协办单位" :span="3">{{task?.ext?.tf_slaveUnitNameStr}}
</el-descriptions-item>
<el-descriptions-item label="指定分管校领导" :span="3" v-if="getBranchSchoolLeaderName(task)">
{{getBranchSchoolLeaderName(task)}}
</el-descriptions-item>
<el-descriptions-item label="办理意见" :span="3">
<div v-html="task.taskFormData.tf_opinion"></div>
</el-descriptions-item>
</el-descriptions>
<!--提案委主任审核-->
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
v-else-if="task.taskName === 'committee_director_opinion'">
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="指定分管校领导" :span="3" v-if="getBranchSchoolLeaderName(task)">
{{getBranchSchoolLeaderName(task)}}
</el-descriptions-item>
<el-descriptions-item label="办理意见" :span="3">
<div v-html="task.taskFormData.tf_opinion"></div>
</el-descriptions-item>
@@ -236,6 +258,7 @@ const PROPOSAL_INFO = {
row: null,
viewDialogVisible: false,
positiveSecondList: [],
branchSchoolLeaderOptions: [],
}
},
methods: {
@@ -246,6 +269,7 @@ const PROPOSAL_INFO = {
this.getInfo()
this.getDoneTasks()
this.listPositiveSeconded()
this.listBranchSchoolLeader()
},
// 获取申请信息
@@ -283,6 +307,27 @@ const PROPOSAL_INFO = {
})
},
// 查询分管校领导，用于把流程任务中保存的 userId 显示成姓名。
listBranchSchoolLeader() {
if (this.branchSchoolLeaderOptions.length > 0) {
return
}
this.$axios.post("/platform/proposal/common/listBranchSchoolLeader").then((res) => {
if (res.code === 0) {
this.$set(this, "branchSchoolLeaderOptions", res.data)
}
})
},
getBranchSchoolLeaderName(task) {
const userId = task?.ext?.userId || task?.taskFormData?.userId || task?.ext?.tf_userId
if (!userId) {
return ""
}
const user = this.branchSchoolLeaderOptions.find(item => String(item.id) === String(userId))
return user ? user.label : userId
},
},
style:
/*language=CSS*/
src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+46
View File
@@ -163,6 +163,29 @@ const PROPOSAL_INFO = {
</van-cell>
<van-cell title="主办单位">{{ task.ext.tf_masterUnitName }}</van-cell>
<van-cell title="协办单位">{{ task?.ext?.tf_slaveUnitNameStr }}</van-cell>
<van-cell title="指定分管校领导" v-if="getBranchSchoolLeaderName(task)">
{{ getBranchSchoolLeaderName(task) }}
</van-cell>
<van-cell title="办理意见" class="direction-column-cell">
<div v-html="task.taskFormData.tf_opinion"></div>
</van-cell>
</van-cell-group>
<van-cell-group :title="task.displayName"
v-else-if="task.taskName === 'committee_director_opinion'">
<van-cell title="办理用户">{{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
</van-cell>
<van-cell title="办理时间">{{ task.finishTime }}</van-cell>
<van-cell title="办理结果">
<dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>
</van-cell>
<van-cell title="指定分管校领导" v-if="getBranchSchoolLeaderName(task)">
{{ getBranchSchoolLeaderName(task) }}
</van-cell>
<van-cell title="办理意见" class="direction-column-cell">
<div v-html="task.taskFormData.tf_opinion"></div>
</van-cell>
</van-cell-group>
<van-cell-group :title="task.displayName" v-else>
@@ -201,6 +224,7 @@ const PROPOSAL_INFO = {
row: null,
originalRow: null, // 用于保存原始数据，支持返回功能
positiveSecondList: [],
branchSchoolLeaderOptions: [],
}
},
methods: {
@@ -211,6 +235,7 @@ const PROPOSAL_INFO = {
this.getInfo()
this.getDoneTasks()
this.listPositiveSeconded()
this.listBranchSchoolLeader()
},
// 关闭
@@ -268,5 +293,26 @@ const PROPOSAL_INFO = {
}
})
},
// 查询分管校领导，用于把流程任务中保存的 userId 显示成姓名。
listBranchSchoolLeader() {
if (this.branchSchoolLeaderOptions.length > 0) {
return
}
this.$axios.post("/platform/proposal/common/listBranchSchoolLeader").then((res) => {
if (res.code === 0) {
this.$set(this, "branchSchoolLeaderOptions", res.data)
}
})
},
getBranchSchoolLeaderName(task) {
const userId = task?.ext?.userId || task?.taskFormData?.userId || task?.ext?.tf_userId
if (!userId) {
return ""
}
const user = this.branchSchoolLeaderOptions.find(item => String(item.id) === String(userId))
return user ? user.label : userId
},
}
};