diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java
index 43f7496..b147116 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/common/ProposalCommonController.java
@@ -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("提案配置")
diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
index 8dab39f..abf0a1f 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js
@@ -191,6 +191,28 @@ const PROPOSAL_INFO = {
{{task?.ext?.tf_slaveUnitNameStr}}
+
+ {{getBranchSchoolLeaderName(task)}}
+
+
+
+
+
+
+
+
+ {{ task.taskFormData.userName
+ }}({{task.taskFormData.loginName}})
+
+ {{ task.finishTime }}
+
+
+
+
+ {{getBranchSchoolLeaderName(task)}}
+
@@ -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*/
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
index e66ea7e..7d48078 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/common/info.js
@@ -163,6 +163,29 @@ const PROPOSAL_INFO = {
{{ task.ext.tf_masterUnitName }}
{{ task?.ext?.tf_slaveUnitNameStr }}
+
+ {{ getBranchSchoolLeaderName(task) }}
+
+
+
+
+
+
+
+ {{ task.taskFormData.userName }}({{task.taskFormData.loginName}})
+
+ {{ task.finishTime }}
+
+
+
+
+ {{ getBranchSchoolLeaderName(task) }}
+
+
+
+
@@ -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
+ },
}
};