diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionOfficeAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionOfficeAuditController.java index 88f9d1e9..3a9bc086 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionOfficeAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionOfficeAuditController.java @@ -94,7 +94,7 @@ public class OpinionOfficeAuditController { cnd.andEX("info.sessionId", "=", sessionId); // cnd.and("t.taskName", "=", "office"); cnd.and("t.taskName", "=", "schoolAudit"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); +// cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); if (approval) { cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/models/OpinionInfo.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/models/OpinionInfo.java index 72c5eb1b..0edc7644 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/models/OpinionInfo.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/models/OpinionInfo.java @@ -76,26 +76,26 @@ public class OpinionInfo extends BaseModel { private String delegationId; @Column - @Comment("建议人ID") + @Comment("记录人ID") @ColDefine(type = ColType.VARCHAR, width = 32) private String suggestUserId; @Column - @Comment("建议人name") + @Comment("记录人name") @ColDefine(type = ColType.VARCHAR, width = 100) private String suggestUserName; @Column - @Comment("建议人code") + @Comment("记录人code") @ColDefine(type = ColType.VARCHAR, width = 120) private String suggestUserLoginName; @Column - @Comment("建议人所属代表团ID") + @Comment("记录人所属讨论组ID") private String suggestUserDelegationId; @Column - @Comment("建议人所属代表团名称") + @Comment("记录人所属讨论组名称") private String suggestUserDelegationName; @Column diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/common/info.js b/src/main/resources/views/platform/zhgh/democratic/opinion/common/info.js index 4d9328d4..619c3571 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/common/info.js @@ -12,10 +12,10 @@ const OPINION_INFO = { {{ viewData.code }} - {{viewData.createUserName }} + {{viewData.createUserName }} {{ viewData.createTime }} {{ viewData.sessionName || '暂无' }} - {{ viewData.unitName }} + {{ viewData.unitName }} {{ viewData.delegationName }} {{viewData.typeName}} diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/feedback/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/feedback/index.html index eeafc227..4358e049 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/feedback/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/feedback/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -105,8 +105,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "当前节点", prop: "curTaskName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/mine/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/mine/index.html index 3cb2e7a7..db4d46b8 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/mine/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/mine/index.html @@ -15,8 +15,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -84,11 +84,13 @@ layout("/layouts/platform.html"){ businessNo: null, tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "意见类别", prop: "typeName"}, {label: "届次", prop: "sessionName"}, - {label: "建议人所属代表团", prop: "delegationName"}, {label: "当前节点", prop: "curTaskName"}, {label: "流程状态", prop: "instanceState"} ] diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/office/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/office/index.html index 02a4b717..406cc89e 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/office/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/office/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -25,10 +25,6 @@ layout("/layouts/platform.html"){ - - 已审核 - 未审核 - @@ -129,8 +125,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "当前节点", prop: "curTaskName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html index 681aa35a..d8aa5fa5 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -152,8 +152,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "当前节点", prop: "curTaskName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolSubmit/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolSubmit/index.html index b929dab6..8326a036 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolSubmit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolSubmit/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -81,8 +81,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "当前节点", prop: "curTaskName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html index 2ad9ada4..c081c3ad 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/summary/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -70,8 +70,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "流程状态", prop: "instanceState"} diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/unitReply/index.html index 9d820b95..1201d6c8 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/unitReply/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/unitReply/index.html @@ -13,8 +13,8 @@ layout("/layouts/platform.html"){ v-for="item in sessionOptions"> - - + @@ -111,8 +111,12 @@ layout("/layouts/platform.html"){ return { tableColumns: [ {label: "意见编号", prop: "code"}, - {label: "意见名称", prop: "name", width: "200px"}, + {label: "意见和建议", prop: "name", width: "200px"}, {label: "意见类别", prop: "typeName"}, + {label: "建议人", prop: "createUserName"}, + {label: "建议人所属代表团", prop: "delegationName"}, + {label: "记录人", prop: "suggestUserName"}, + {label: "记录人所属讨论组", prop: "suggestUserDelegationName"}, {label: "届次", prop: "sessionName"}, {label: "代表团", prop: "delegationName"}, {label: "承办单位", prop: "underTakeName"}, diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js index 913007ee..f77a1065 100644 --- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js +++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/write/form.js @@ -87,7 +87,8 @@ const BASIC_FORM = { > - + + - - - - - - + - - - + + @@ -158,10 +153,9 @@ const BASIC_FORM = { sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }], suggestUserId: [{ required: true, message: "请选择建议人", trigger: ["blur", "change"] }], suggestUserDelegationName: [{ required: true, message: "请先选择建议人并自动带出所属代表团", trigger: ["blur", "change"] }], - name: [{ required: true, message: "请输入意见名称", trigger: ["blur", "change"] }], + name: [{ required: true, message: "请输入意见和建议", trigger: ["blur", "change"] }], typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }], suggestUnits: [{ required: true, message: "请选择建议承办单位", trigger: ["blur", "change"] }], - brief: [{ required: true, message: "请输入意见和建议", trigger: ["blur", "change"] }], measures: [{ required: true, message: "请输入工作措施", trigger: ["blur", "change"] }], unitName: [{ required: true, message: "请先选择建议人自动带出单位", trigger: ["blur", "change"] }], mobile: [{ required: true, message: "请输入联系电话", trigger: ["blur", "change"] }] @@ -318,6 +312,18 @@ const BASIC_FORM = { this.formData.createUserName = currentUser.username this.formData.createUserLoginName = currentUser.loginname }, + getObjectValue(data, camelKey, lowerKey) { + if (!data) { + return "" + } + if (data[camelKey] !== undefined && data[camelKey] !== null) { + return data[camelKey] + } + if (data[lowerKey] !== undefined && data[lowerKey] !== null) { + return data[lowerKey] + } + return "" + }, normalizeDetailFormData(data) { // Convert persisted model fields back into the current page layout fields during detail echo. // The detail API may return lower-case keys, so echo must support both camelCase and lower-case names. @@ -404,6 +410,28 @@ const BASIC_FORM = { } }) }, + ensureDiscussionGroupOption(groupId) { + if (!groupId) { + return Promise.resolve() + } + if (this.discussionGroupOptions.find((item) => item.id === groupId)) { + return Promise.resolve() + } + // Keep the current discussion group visible during edit echo even if it is outside the filtered option list. + return this.$axios.post("/platform/opinion/write/discussionGroupDetail", { id: groupId }).then((res) => { + if (res.code !== 0 || !res.data) { + return + } + this.discussionGroupOptions = this.mergeOptions(this.discussionGroupOptions, [{ + id: this.getObjectValue(res.data, "id", "id"), + code: this.getObjectValue(res.data, "code", "code"), + name: this.getObjectValue(res.data, "name", "name"), + recorderUserId: this.getObjectValue(res.data, "recorderUserId", "recorderuserid"), + recorderUserCode: this.getObjectValue(res.data, "recorderUserCode", "recorderusercode"), + recorderUserName: this.getObjectValue(res.data, "recorderUserName", "recorderusername") + }], "id") + }) + }, async meetingChange() { this.formData.delegationId = "" this.fillCurrentRecorder() @@ -446,10 +474,10 @@ const BASIC_FORM = { return this.$axios.post("/platform/opinion/write/discussionGroupDetail", { id: groupId }).then((res) => { const selectedGroup = this.discussionGroupOptions.find((item) => item.id === groupId) || {} const group = res.code === 0 && res.data ? res.data : selectedGroup - this.formData.createUserId = group.recorderUserId || selectedGroup.recorderUserId || "" - this.formData.createUserName = group.recorderUserName || selectedGroup.recorderUserName || "" - this.formData.createUserLoginName = group.recorderUserCode || selectedGroup.recorderUserCode || "" - this.formData.discussionGroupName = group.name || selectedGroup.name || "" + this.formData.createUserId = this.getObjectValue(group, "recorderUserId", "recorderuserid") || this.getObjectValue(selectedGroup, "recorderUserId", "recorderuserid") + this.formData.createUserName = this.getObjectValue(group, "recorderUserName", "recorderusername") || this.getObjectValue(selectedGroup, "recorderUserName", "recorderusername") + this.formData.createUserLoginName = this.getObjectValue(group, "recorderUserCode", "recorderusercode") || this.getObjectValue(selectedGroup, "recorderUserCode", "recorderusercode") + this.formData.discussionGroupName = this.getObjectValue(group, "name", "name") || this.getObjectValue(selectedGroup, "name", "name") this.$nextTick(() => { this.$refs.addForm && this.$refs.addForm.clearValidate(["createUserId"]) }) @@ -524,9 +552,7 @@ const BASIC_FORM = { } await this.listSession(true) await this.listDiscussionGroup() - if (this.discussionGroupOptions.length && !this.discussionGroupOptions.find((item) => item.id === this.formData.delegationId)) { - this.formData.delegationId = this.discussionGroupOptions[0].id - } + await this.ensureDiscussionGroupOption(this.formData.delegationId) if (this.formData.suggestUserId) { this.suggestUserOptions = [{ id: this.formData.suggestUserId, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/discussiongroup/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/discussiongroup/index.html index d9e39cd4..ce949958 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/discussiongroup/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/discussiongroup/index.html @@ -18,11 +18,11 @@ layout("/layouts/platform.html"){ + + + - - - - + @@ -37,7 +37,7 @@ layout("/layouts/platform.html"){ - +