From efad953710ed5f09b44dc816e1b286cf188126ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Fri, 30 Oct 2026 19:35:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=B9=E6=AE=8A=E6=85=B0=E9=97=AE?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CondolenceReadController.java | 11 ++-- .../SpecialCondolenceReadController.java | 12 ++-- .../model/SpecialCondolence.java | 6 ++ .../service/SpecialCondolenceRecipients.java | 2 + .../20261030/特殊慰问_模块菜单及流程.sql | 1 + .../specialcondolence/apply/config.html | 17 ++++++ .../specialcondolence/apply/index.html | 43 +++++++++---- .../specialcondolence/apply/recipients.css | 6 +- .../specialcondolence/apply/recipients.html | 27 +------- .../specialcondolence/apply/recipients.js | 12 +++- .../specialcondolence/common/info.js | 61 +++++++++++++------ .../fourthApproval/index.html | 2 +- .../specialcondolence/mine/index.html | 2 +- .../specialcondolence/read/index.html | 3 +- .../schoolPrincipalApproval/index.html | 2 +- .../schoolUnionApproval/index.html | 2 +- .../specialcondolence/apply/index.html | 40 +++++++----- .../specialcondolence/common/info.js | 52 ++++++++++------ .../fourthApproval/index.html | 3 +- .../specialcondolence/mine/index.html | 3 +- .../schoolPrincipalApproval/index.html | 3 +- .../schoolUnionApproval/index.html | 3 +- 22 files changed, 196 insertions(+), 117 deletions(-) create mode 100644 src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/config.html diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java index 03c0f88..718f61a 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceReadController.java @@ -13,7 +13,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.entity.ProcessInstance; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.sys.param.SysMsgSummaryPageForm; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; @@ -94,6 +94,7 @@ public class CondolenceReadController { $condition """); Cnd cnd = Cnd.NEW(); + cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); cnd.andEX("info.type", "=", type); cnd.andEX("YEAR(info.createTime)", "=", year); cnd.andEX("info.applyUnionId", "=", unionId); @@ -142,15 +143,15 @@ public class CondolenceReadController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and(ProcessInstance::getState, "=", ProcessTaskStateEnum.FINISHED.getCode()); + cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); cnd.andEX("con.type", "=", type); - cnd.andEX("YEAR(info.createTime)", "=", year); + cnd.andEX("YEAR(con.createTime)", "=", year); cnd.andEX("con.applyUnionId", "=", unionId); cnd.andEX("con.applyUnitId", "=", unitId); if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.or("info.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%"); - seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("con.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("con.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); cnd.and(seg); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) { diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceReadController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceReadController.java index 8bc164d..dc04eb5 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceReadController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/controller/SpecialCondolenceReadController.java @@ -13,7 +13,7 @@ import com.budwk.app.base.result.Result; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.entity.ProcessInstance; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; +import com.budwk.app.flow.enums.ProcessInstanceStateEnum; import com.budwk.app.sys.param.SysMsgSummaryPageForm; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; @@ -94,6 +94,7 @@ public class SpecialCondolenceReadController { $condition """); Cnd cnd = Cnd.NEW(); + cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); cnd.andEX("info.type", "=", type); cnd.andEX("YEAR(info.createTime)", "=", year); cnd.andEX("info.applyUnionId", "=", unionId); @@ -142,15 +143,15 @@ public class SpecialCondolenceReadController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.and(ProcessInstance::getState, "=", ProcessTaskStateEnum.FINISHED.getCode()); + cnd.and("ins.state", "=", ProcessInstanceStateEnum.FINISHED.getCode()); cnd.andEX("con.type", "=", type); - cnd.andEX("YEAR(info.createTime)", "=", year); + cnd.andEX("YEAR(con.createTime)", "=", year); cnd.andEX("con.applyUnionId", "=", unionId); cnd.andEX("con.applyUnitId", "=", unitId); if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.or("info.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%"); - seg.or("info.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("con.helpUserName", "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or("con.helpLoginName", "like", "%" + pageForm.getSearchKeyword() + "%"); cnd.and(seg); } if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) { @@ -160,6 +161,7 @@ public class SpecialCondolenceReadController { List list = specialcondolenceService.listMap(sql); List exportEntities = new ArrayList<>(); + exportEntities.add(new ExcelExportEntity("事项", "subject", 30)); exportEntities.add(new ExcelExportEntity("慰问对象", "helpUserName", 20)); exportEntities.add(new ExcelExportEntity("慰问对象工号", "helpLoginName", 20)); exportEntities.add(new ExcelExportEntity("申请人", "applyUserName", 20)); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolence.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolence.java index d7b7f31..21eaf2a 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolence.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/model/SpecialCondolence.java @@ -30,6 +30,12 @@ public class SpecialCondolence extends BaseModel { @PrevInsert(uu32 = true) private String id; + @Column + @Comment("事项") + @ColDefine(type = ColType.VARCHAR, width = 200) + private String subject; + + @Column @Comment("申请人ID") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceRecipients.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceRecipients.java index bafcd7b..7112600 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceRecipients.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/specialcondolence/service/SpecialCondolenceRecipients.java @@ -14,6 +14,8 @@ public final class SpecialCondolenceRecipients { private SpecialCondolenceRecipients() {} public static void prepare(SpecialCondolence info, Dao dao) { + if (info.getSubject() == null || info.getSubject().trim().isEmpty() || info.getSubject().trim().length() > 200) throw new BaseException("请填写200字以内的事项"); + info.setSubject(info.getSubject().trim()); List rows = info.getRecipients(); if (rows == null || rows.isEmpty()) throw new BaseException("请添加慰问对象"); if (rows.size() > 1000) throw new BaseException("每次申请最多1000人"); diff --git a/src/main/resources/db/script/20261030/特殊慰问_模块菜单及流程.sql b/src/main/resources/db/script/20261030/特殊慰问_模块菜单及流程.sql index 1b37976..757d94f 100644 --- a/src/main/resources/db/script/20261030/特殊慰问_模块菜单及流程.sql +++ b/src/main/resources/db/script/20261030/特殊慰问_模块菜单及流程.sql @@ -2,6 +2,7 @@ -- 表已存在时不执行本文件中的建表语句；本文件不复制数据、不配置角色授权和工作流。 CREATE TABLE `special_condolence` ( `id` varchar(32) NOT NULL COMMENT 'ID', + `subject` varchar(255) DEFAULT NULL COMMENT '事项', `applyUserId` varchar(32) DEFAULT NULL COMMENT '申请人ID', `applyUserName` varchar(100) DEFAULT NULL COMMENT '申请人姓名', `applyLoginName` varchar(120) DEFAULT NULL COMMENT '申请人工号', diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/config.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/config.html new file mode 100644 index 0000000..d4cd800 --- /dev/null +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/config.html @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/index.html index eb60836..fc2da6c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/index.html @@ -10,17 +10,18 @@ layout("/layouts/platform.html"){ -
申请人信息
- + + + + + {{formData.applyUserName}} {{formData.applyLoginName}} - {{formData.applyUnitName}} + {{formData.applyUnitName}} {{formData.applyUnionName}} - - -
申请说明与签字
- + + + + + + + 保存申请 @@ -84,7 +90,8 @@ layout("/layouts/platform.html"){ taskId: GetQueryString("taskId"), formData: { recipients: [] }, formRules: { - recipients: [{ validator: (rule, value, callback) => callback(value && value.length ? undefined : new Error("请添加慰问对象")), trigger: "change" }], + subject: [{ required: true, whitespace: true, message: "请填写事项", trigger: ["blur", "change"] }, { max: 200, message: "事项最多200字", trigger: "blur" }], + recipients: [{ validator: (rule, value, callback) => callback(Array.isArray(value) && value.length > 0 ? undefined : new Error("请至少添加一位慰问对象")), trigger: "change" }], helpUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], payUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], type: [{ required: true, message: "必填", trigger: ["change", "blur"] }], @@ -197,8 +204,8 @@ layout("/layouts/platform.html"){ } }, onSave() { - this.$refs.formRef.validate((valid) => { - if (!valid) return + this.$refs.formRef.validate((valid, invalidFields) => { + if (!valid) { this.showInvalidApplicationTab(invalidFields); return } this.$confirm("您确定保存吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -214,7 +221,13 @@ layout("/layouts/platform.html"){ }) }, onSubmit() { - this.$refs.formRef.validate((valid) => { + if (!Array.isArray(this.formData.recipients) || this.formData.recipients.length === 0) { + this.activeApplicationTab = 'recipients' + this.$message.error('请至少添加一位慰问对象') + return + } + this.$refs.formRef.validate((valid, invalidFields) => { + if (!valid) { this.showInvalidApplicationTab(invalidFields); return } if (valid) { this.$confirm("您确定要提交吗？", "提示", { confirmButtonText: "确定", @@ -234,7 +247,13 @@ layout("/layouts/platform.html"){ }) }, onFinishTask() { - this.$refs.formRef.validate((valid) => { + if (!Array.isArray(this.formData.recipients) || this.formData.recipients.length === 0) { + this.activeApplicationTab = 'recipients' + this.$message.error('请至少添加一位慰问对象') + return + } + this.$refs.formRef.validate((valid, invalidFields) => { + if (!valid) { this.showInvalidApplicationTab(invalidFields); return } if (valid) { this.$confirm("您确定要提交吗？", "提示", { confirmButtonText: "确定", diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.css b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.css index a50036b..31fb55e 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.css +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.css @@ -12,8 +12,8 @@ .special-condolence-apply .el-descriptions .el-textarea__inner { font-size: 14px; line-height: 22px; } .special-condolence-apply .el-descriptions-item__label { width: 130px; color: #606266; background: #f7f9fc; } -.special-condolence-apply .special-condolence-recipients { margin: 28px 0; border: 1px solid #e4e7ed; border-radius: 6px; overflow: hidden; } -.special-condolence-apply .special-condolence-toolbar { display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 14px; padding: 18px 20px; } +.special-condolence-apply .special-condolence-recipients { margin: 0; } +.special-condolence-apply .special-condolence-toolbar { display: flex; justify-content: flex-end; align-items: center; flex-wrap: wrap; gap: 14px; padding: 0 0 12px; } .special-condolence-apply .special-condolence-toolbar .special-condolence-section-title { margin: 0 0 4px; } .special-condolence-hint { color: #606266; font-size: 12px; line-height: 20px; } .special-condolence-apply .special-condolence-toolbar-buttons { display: flex; flex-wrap: wrap; gap: 8px; } @@ -28,7 +28,7 @@ .special-condolence-apply .special-condolence-table-item .el-date-editor { width: 100%; } .special-condolence-apply .special-condolence-table-item .el-input-number .el-input__inner { text-align: right; } .special-condolence-apply .special-condolence-delete { color: #d64040; } -.special-condolence-apply .special-condolence-table-footer { display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 10px; padding: 10px 20px; background: #fafbfd; } +.special-condolence-apply .special-condolence-table-footer { display: flex; justify-content: flex-end; align-items: center; flex-wrap: wrap; gap: 10px; padding: 10px 20px; background: #fafbfd; } .special-condolence-apply .special-condolence-total { display: flex; align-items: baseline; gap: 6px; color: #606266; font-size: 13px; font-variant-numeric: tabular-nums; } .special-condolence-apply .special-condolence-total > span { margin-left: 18px; } .special-condolence-apply .special-condolence-total-amount { color: #303133; font-size: 20px; } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.html index d5a46be..6846e35 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.html @@ -1,36 +1,12 @@ -
统一慰问配置
- - - - - - - - - - - - - - - - - - -
-
-
慰问对象明细 {{ recipientCount }} 人
-
一行填写一位慰问对象，所有人员随本申请统一审批。
-
Excel 导入 新增慰问对象
- + @@ -42,7 +18,6 @@
- 继续添加一行
共 {{ recipientCount }} 人慰问金额合计¥ {{ recipientTotal }}
diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.js b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.js index ef5b1b1..e6b7bca 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/apply/recipients.js @@ -1,6 +1,6 @@ const specialCondolenceRecipients = { data() { - return { recipientRules: this.createRecipientRules(), importVisible: false, importLoading: false } + return { activeApplicationTab: 'form', recipientRules: this.createRecipientRules(), importVisible: false, importLoading: false } }, computed: { recipientCount() { @@ -13,10 +13,20 @@ const specialCondolenceRecipients = { } }, watch: { + activeApplicationTab() { + this.$nextTick(() => { + if (this.$refs.recipientTableRef) this.$refs.recipientTableRef.doLayout() + }) + }, typeOptions() { this.chooseType = this.typeOptions.find(t => t.id === this.formData.type) || {} }, 'formData.type'(value) { this.chooseType = this.typeOptions.find(t => t.id === value) || {} } }, methods: { + showInvalidApplicationTab(errors) { + const fields = Array.isArray(errors) ? errors.map(error => error.name || '') : Object.keys(errors || {}) + if (!fields.length) return + this.activeApplicationTab = fields.some(field => !field.startsWith('recipients')) ? 'form' : 'recipients' + }, createRecipientRules() { const required = label => ({ required: true, whitespace: true, message: '请填写' + label, trigger: ['blur', 'change'] }) return { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/common/info.js index 23ccd0f..06c828a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/common/info.js @@ -1,11 +1,14 @@ const specialcondolenceInfo = { template: /*language=HTML*/ `
+ +
申请信息 点击查看流程图
+ {{ viewData.subject || '--' }} {{ viewData.applyUserName }} {{ viewData.applyLoginName }} {{ viewData.applyUnitName }} @@ -15,23 +18,6 @@ const specialcondolenceInfo = { {{ viewData.perMoney }} 元 {{ viewData.occurTime }} -
{{ viewData.remark }}
 @@ -48,11 +34,34 @@ const specialcondolenceInfo = { + + + + + + +
- 慰问对象明细 {{ viewData.recipients.length }} 人 + 慰问对象明细 慰问金额合计：¥ {{ detailTotal }}
- + @@ -61,6 +70,9 @@ const specialcondolenceInfo = { + + +
暂无审核记录
+ +
@@ -102,12 +116,20 @@ const specialcondolenceInfo = { dicts: ["PROCESS_TASK_SUBMIT_TYPE"], data() { return { + activeInfoTab: 'form', visible: false, viewData: {}, doneTasks: [], row: null } }, + watch: { + activeInfoTab() { + this.$nextTick(() => { + if (this.$refs.recipientInfoTableRef) this.$refs.recipientInfoTableRef.doLayout() + }) + } + }, computed: { detailTotal() { const cents = (this.viewData.recipients || []).reduce((sum, row) => { @@ -119,6 +141,7 @@ const specialcondolenceInfo = { }, methods: { onOpen(row) { + this.activeInfoTab = 'form' this.row = row this.visible = true this.getInfo() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html index 1f8a964..9c2d37a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/fourthApproval/index.html @@ -134,7 +134,7 @@ layout("/layouts/platform.html"){ }, typeOptions: [], tableColumns: [ - {prop: 'helpUserName', label: '慰问对象'}, + {prop: 'subject', label: '事项'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/mine/index.html index c5ca723..996b77a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/mine/index.html @@ -92,7 +92,7 @@ layout("/layouts/platform.html"){ typeOptions: [], pageDataUrl: "/platform/special_condolence/mine/pageData", tableColumns: [ - {prop: 'helpUserName', label: '慰问对象'}, + {prop: 'subject', label: '事项'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/read/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/read/index.html index a58a6b9..e88ea1c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/read/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/read/index.html @@ -105,8 +105,7 @@ layout("/layouts/platform.html"){ return { typeOptions: [], tableColumns: [ - {prop: 'helpUserName', label: '慰问对象'}, - {prop: 'helpLoginName', label: '慰问对象工号'}, + {prop: 'subject', label: '事项'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html index 1f8a964..9c2d37a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolPrincipalApproval/index.html @@ -134,7 +134,7 @@ layout("/layouts/platform.html"){ }, typeOptions: [], tableColumns: [ - {prop: 'helpUserName', label: '慰问对象'}, + {prop: 'subject', label: '事项'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html index 1f8a964..9c2d37a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/specialcondolence/schoolUnionApproval/index.html @@ -134,7 +134,7 @@ layout("/layouts/platform.html"){ }, typeOptions: [], tableColumns: [ - {prop: 'helpUserName', label: '慰问对象'}, + {prop: 'subject', label: '事项'}, {prop: 'applyUserName', label: '申请人'}, {prop: 'applyUnionName', label: '所属工会'}, {prop: 'applyUnitName', label: '所属单位'}, diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/apply/index.html index 368ec7a..5ef7554 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/apply/index.html @@ -175,10 +175,13 @@ layout("/layouts/platform_h5.html"){ + +

基本信息

+ -
- 删除 - - - - - - -
- -
+ + +
+

慰问对象

+ +
+ 删除 + + + + + + +
+ + + +
+ +
保存申请 @@ -443,7 +455,7 @@ layout("/layouts/platform_h5.html"){ } }) }) - }).catch(() => {}) + }).catch(errors => this.showInvalidApplicationTab(errors)) }, async onSubmit() { this.$refs.formRef.validate().then(() => { @@ -462,7 +474,7 @@ layout("/layouts/platform_h5.html"){ } }) }) - }) + }).catch(errors => this.showInvalidApplicationTab(errors)) }, async onFinishTask() { this.$refs.formRef.validate().then(() => { @@ -484,7 +496,7 @@ layout("/layouts/platform_h5.html"){ } }) }) - }) + }).catch(errors => this.showInvalidApplicationTab(errors)) }, init() { if (this.bizId) { diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/common/info.js index 81cd59f..664cd9b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/common/info.js @@ -17,9 +17,12 @@ const specialcondolenceInfo = { >
+ +

基本信息

+ {{ viewData.subject || '--' }} {{ viewData.applyUserName || '--' }} {{ viewData.applyLoginName || '--' }} {{ viewData.applyUnitName || '--' }} @@ -29,6 +32,28 @@ const specialcondolenceInfo = { + {{ viewData.remark || '暂无' }} + + + + + + 暂无签字 + + +
+ + + + +
+

慰问对象

+ - - {{ viewData.remark || '暂无' }} - - - - - - - 暂无签字 - - -
- + + + + +
+ +
@@ -125,6 +139,7 @@ const specialcondolenceInfo = { }, data() { return { + activeInfoTab: 'form', visible: false, popupTitle: "慰问详情", viewData: {}, @@ -144,6 +159,7 @@ const specialcondolenceInfo = { * row 传列表当前行，title 传顶部导航标题；无返回值。 */ onOpen(row, title = "慰问详情") { + this.activeInfoTab = 'form' this.$set(this, "row", row) this.$set(this, "popupTitle", title) this.$set(this, "viewData", {}) diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html index d529981..74e9a7a 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/specialcondolence/fourthApproval/index.html @@ -90,14 +90,13 @@ layout("/layouts/platform_h5.html"){