From b721d62dd14619339cadb7bf4b3280e4dad44d19 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 10 Dec 2025 15:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BB=A3=E4=BC=9A?= =?UTF-8?q?=E5=A7=94=E5=91=98=E4=BC=9A=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/flow/enums/ProcessSubmitTypeEnum.java | 2 + ...ngressDelegatePushDwSjAuditController.java | 8 +- ...erCongressDelegatePushWriteController.java | 13 + ...eacherCongressDelegatePushServiceImpl.java | 9 +- .../delegate/push/auditInfo.js | 111 +++++ .../delegate/push/dwSjAudit.html | 278 ++++++++++++ .../teachercongress/delegate/push/index.html | 416 +++++++++--------- .../delegate/push/push-progress.js | 106 ++--- .../teachercongress/delegate/push/write.js | 361 ++++++++------- .../delegate/push/zcAudit.html | 17 +- 10 files changed, 876 insertions(+), 445 deletions(-) create mode 100644 src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/auditInfo.js create mode 100644 src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html diff --git a/src/main/java/com/budwk/app/flow/enums/ProcessSubmitTypeEnum.java b/src/main/java/com/budwk/app/flow/enums/ProcessSubmitTypeEnum.java index afdb4bf5..484fa0b1 100644 --- a/src/main/java/com/budwk/app/flow/enums/ProcessSubmitTypeEnum.java +++ b/src/main/java/com/budwk/app/flow/enums/ProcessSubmitTypeEnum.java @@ -1,5 +1,6 @@ package com.budwk.app.flow.enums; +import com.budwk.app.base.annotation.DictEnum; import lombok.Getter; /** @@ -9,6 +10,7 @@ import lombok.Getter; * @date 2023/10/7 */ @Getter +@DictEnum(key = "ProcessSubmitTypeEnum", name = "流程提交类型（操作类型）") public enum ProcessSubmitTypeEnum { APPLY(0, "发起申请"), AGREE(1, "同意"), diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushDwSjAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushDwSjAuditController.java index 1cbd2f8c..ddb827ca 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushDwSjAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushDwSjAuditController.java @@ -104,7 +104,7 @@ public class TeacherCongressDelegatePushDwSjAuditController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "tcDelegatePushDwSj"); + cnd.and("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62"); if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) { cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); } @@ -142,11 +142,11 @@ public class TeacherCongressDelegatePushDwSjAuditController { @SaCheckPermission("tc.delegate.push.dwSjAudit") public Result batchSubmit(String sessionId) { - String str = teacherCongressDelegatePushService.batchSubmitWhere(sessionId, null); + /* String str = teacherCongressDelegatePushService.batchSubmitWhere(sessionId, null); if (StrUtil.isNotBlank(str)) { return Result.error(str); - } - teacherCongressDelegatePushService.batchSubmit("", sessionId); + }*/ + teacherCongressDelegatePushService.batchSubmit(SecurityUtil.getUnionId(), sessionId); return Result.success(); } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushWriteController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushWriteController.java index 198fff14..db8b9076 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushWriteController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushWriteController.java @@ -14,10 +14,12 @@ import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.democratic.teachercongress.delegate.models.TeacherCongressDelegatePush; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.util.NutMap; @@ -124,4 +126,15 @@ public class TeacherCongressDelegatePushWriteController { } + + @At + @ApiOperation("代表信息填写的信息") + @SaCheckLogin + @Aop(TransAop.READ_COMMITTED) + public Result finOne(String id){ + TeacherCongressDelegatePush delegatePush = baseService.dao().fetch(TeacherCongressDelegatePush.class, Cnd.where("id", "=", id)); + return Result.success(delegatePush); + } + + } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java index 4dad6b5a..a0bffdb9 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java @@ -1,6 +1,5 @@ package com.budwk.app.zhgh.democratic.teachercongress.delegate.service; -import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.service.impl.BaseServiceImpl; @@ -107,8 +106,8 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl +
+ 基础信息 + 点击查看流程图 +
+ + {{ viewData.userName }} + {{viewData.loginName }} + {{viewData.sex }} + {{$moment(viewData.birthday).format("YYYY-MM-DD") }} + + {{viewData.mobile }} + {{viewData.nation }} + {{viewData.political }} + {{viewData.unionName }} + {{viewData.unitName }} + {{viewData.education }} + {{viewData.position }} + {{viewData.professionalTitle }} + {{viewData.seniorTeacher?'是':'否' }} + + {{viewData.intermediateBelow?'是':'否' }} + + {{viewData.cadre?'是':'否' }} + {{viewData.worker?'是':'否' }} + {{viewData.schoolLeader?'是':'否' }} + {{viewData.middleLevelLeader?'是':'否' }} + + + + + + + + + + + `, + dicts: ["PROCESS_TASK_SUBMIT_TYPE"], + data() { + return { + visible: false, + userData: [], + viewData: {}, + row: null, + doneTasks: [], + loading: true, + search: "", + tableKey: "", + activeName: "1", + processSubmitTypeEnums:[] + } + }, + methods: { + findOne() { + this.$axios.post("/platform/teacherCongress/delegate/push/write/finOne", {id: this.row.id}).then(resp => { + if (resp.code === 0) { + this.viewData = resp.data + } + }) + }, + // 打开 + onOpen(row) { + this.row = row; + this.visible = true; + this.findOne(); + this.getDoneTasks(); + this.getEnumOptions() + }, + // 获取已办任务审批记录 + getDoneTasks() { + this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => { + if (res.code === 0) { + this.doneTasks = res.data + } + }) + }, + async getEnumOptions() { + const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" }) + this.processSubmitTypeEnums=resp.data + }, + // 查看流程图 + openChart() { + this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId) + } + } +} diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html new file mode 100644 index 00000000..9665e327 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html @@ -0,0 +1,278 @@ + +
+ + + + + + + + + + + + + + + + + + + + + 正式代表提交上报 + + + + + + + + 已审核 + 未审核 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index 3ed0a76a..8784c6f2 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -2,200 +2,209 @@ layout("/layouts/platform.html"){ #-->
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - 正式代表预选 - - 列席代表预选 - - + + + 正式代表预选 + + 列席代表预选 + + - 正式代表提交上报 - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -222,6 +231,7 @@ layout("/layouts/platform.html"){ + new Vue({ el: '#app', mixins: [initTableMixins], @@ -229,7 +239,8 @@ layout("/layouts/platform.html"){ 'push-progress': pushProgress, 'push-formal-dialog': pushFormalDialog, 'push-attendance-dialog': pushAttendanceDialog, - 'formal-write': write + 'formal-write': write, + 'audit-info': auditInfo }, data() { return { @@ -252,9 +263,9 @@ layout("/layouts/platform.html"){ this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId) }, onView(row) { - this.writeDialog = true - this.userId = row.userId - this.isRead = true + this.$refs.guava.view(() => { + this.$refs.auditInfoRef.onOpen(row) + }) }, onEdit(row) { this.writeDialog = true @@ -277,33 +288,6 @@ layout("/layouts/platform.html"){ }, doExport() { }, - onBatchSubmit() { - const selection = this.$refs.tableRef.selection - /*if (selection.length === 0){ - this.$message.warning('请选择要上报的记录') - return - }*/ - this.$confirm('您确定要上报吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(async () => { - const loading = createLoading('正在提交中') - this.$axios.post('/platform/teacherCongress/delegate/push/batchSubmit', { - ids: JSON.stringify(selection.map(v => v.id)), - sessionId: this.pageForm.sessionId - }).then(resp => { - if (resp.code === 0) { - this.$message.success(resp.msg) - this.doSearch() - this.$refs.tableRef.clearSelection() - } - }).finally(() => { - loading.close() - }) - - }) - }, listUnion() { this.$businessTool.listUnion().then((res) => { this.unionOptions = res diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js index 0b51c15a..665c1ace 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js @@ -450,76 +450,76 @@ const pushProgress = { return { metrics: { total: { - current: 15, - target: 15, - progress: 100, + current: 0, + target: 0, + progress: 0, remaining: 0 }, female: { - current: 3, - target: 5, - progress: 60, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, seniorTeacher: { - current: 4, - target: 6, - progress: 66.7, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, intermediateBelow: { - current: 4, - target: 6, - progress: 66.7, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, cadre: { - current: 4, - target: 6, - progress: 66.7, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, worker: { - current: 4, - target: 6, - progress: 66.7, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, ordinaryTeacher: { - current: 8, - target: 10, - progress: 80, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 }, under45: { - current: 5, - target: 7, - progress: 71.4, - remaining: 2 + current: 0, + target: 0, + progress: 0, + remaining: 0 + }, + ethnicMinority: { + current: 0, + target: 0, + progress: 0, + remaining: 0 + }, + schoolLeader: { + current: 0, + target: 0, + progress: 0, + remaining: 0 + }, + middleLevelLeader: { + current: 0, + target: 0, + progress: 0, + remaining: 0 }, employ: { - current: 5, - target: 7, - progress: 71.4, - remaining: 2 - }, - ethnicMinority:{ - current: 1, - target: 2, - progress: 50, - remaining: 1 - }, - schoolLeader:{ - current: 2, - target: 3, - progress: 66.7, - remaining: 1 - }, - middleLevelLeader:{ - current: 1, - target: 2, - progress: 33.3, - remaining: 1 + current: 0, + target: 0, + progress: 0, + remaining: 0 } }, teacherMeetName: null diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js index 4b998990..0365d5a6 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js @@ -47,172 +47,191 @@ const write = {
- -
-

基本信息

-
- - - - - - - - - - - - - - - 男 - 女 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 是 - 否 - + + + +
+

基本信息

+
+ + + + + + + + + + + + + + + 男 + 女 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + + + + 是 + 否 + + + + + + + 是 + 否 + + + + + + + 是 + 否 + + + + + + + + 是 + 否 + + + + + + + + 是 + 否 + + + + + + + +
+
+ + + - - - - - 是 - 否 - - - - - - - 是 - 否 - - - - - - - 是 - 否 - - - - - - - - 是 - 否 - - - - - - - - 是 - 否 - - - - - + +
+
- - +
+ 保存草稿 + 提交信息 +
+ + + + + + +
@@ -247,6 +266,9 @@ const write = { }, data() { return { + doneTasks: [], + activeName: "one", + processSubmitTypeEnums:[], isSelected: true, formData: { teacherMeetId: null @@ -300,6 +322,14 @@ const write = { } }, methods: { + // 获取已办任务审批记录 + getDoneTasks() { + this.$axios.post("/flow/common/doneTasks", {bizId: this.formData.id}).then((res) => { + if (res.code === 0) { + this.doneTasks = res.data + } + }) + }, async listSession() { const res = await this.$axios.post("/platform/teacherCongress/common/listSession") if (res.code === 0) { @@ -321,7 +351,10 @@ const write = { } } }, - + async getEnumOptions() { + const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" }) + this.processSubmitTypeEnums=resp.data + }, async initInfo() { const {code, data} = await $.get('/platform/teacherCongress/delegate/push/write/info', { sessionId: this.formData.sessionId @@ -330,6 +363,8 @@ const write = { this.isSelected = data.isSelected if (this.isSelected) { this.formData = data.delegate + this.getDoneTasks() + this.getEnumOptions() } } }, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html index 51d4fe8a..eeaa6fcb 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html @@ -2,6 +2,7 @@ layout("/layouts/platform.html"){ #-->
+ @@ -115,6 +116,11 @@ layout("/layouts/platform.html"){ + + + new Vue({ el: '#app', mixins: [initTableMixins], components: { - 'formal-write': write + 'formal-write': write, + 'audit-info': auditInfo }, data() { return { @@ -161,9 +169,10 @@ layout("/layouts/platform.html"){ this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm) }, onView(row) { - this.writeDialog = true - this.userId = row.userId - this.isRead = true + this.$refs.guava.edit(() => { + this.showApprovalForm = false + this.$refs.auditInfoRef.onOpen(row) + }) }, handleTaskAction(row, submitType) { this.$confirm("您确定要提交吗？", "提示", {