From 4d9f22096b5ad0bc19d5bba0bb4989e6a255953e Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 8 Jul 2026 17:09:39 +0800 Subject: [PATCH] commit --- .../service/impl/SchoolOaTodoServiceImpl.java | 13 +++++++-- .../ActivityDeclareMineController.java | 12 ++++++--- .../ActivityReimbursementMineController.java | 12 ++++++--- .../LeadThoughtQueryController.java | 3 ++- .../common/SuggestionCommonServiceImpl.java | 27 ++++++++++++------- .../controller/CondolenceMineController.java | 9 ++++--- .../MaternityLeaveMineController.java | 6 +++-- .../WelfareProjectMangeController.java | 12 +++++++++ .../service/WelfareProjectService.java | 6 +++++ .../impl/WelfareProjectServiceImpl.java | 12 +++++++++ .../WelfareSelectionSituationServiceImpl.java | 22 ++++++++------- .../declare/apply/form.html | 6 ++--- .../declare/apply/index.html | 6 ++--- .../declare/apply/view.html | 2 +- .../declare/common/info.js | 2 +- .../reimbursement/apply/form.html | 4 +-- .../reimbursement/apply/index.html | 8 +++--- .../reimbursement/apply/view.html | 2 +- .../reimbursement/branchunion/index.html | 4 +-- .../reimbursement/clubprincipal/index.html | 4 +-- .../reimbursement/common/info.js | 4 +-- .../deputySchoolUnion/index.html | 4 +-- .../reimbursement/schoolFinance/index.html | 4 +-- .../reimbursement/schoolprincipal/index.html | 4 +-- .../reimbursement/schoolunion/index.html | 4 +-- .../platform/zhgh/benefit/project/index.html | 1 - .../zhgh/benefit/project/projectForm.js | 4 +-- .../zhgh/benefit/project/projectInfo.js | 2 +- .../zhgh/benefit/userSelection/index.html | 1 - .../benefit/userSelection/selectionBefit.js | 25 ++++++----------- .../zhgh/benefit/userSelectionList/index.html | 2 +- .../zhgh/benefit/userSelectionMine/index.html | 1 - .../zhgh/benefit/userSelectionMine/info.js | 2 +- .../platform/zhgh/club/common/clubUserJoin.js | 2 +- .../platform/zhgh/club/join/apply/index.html | 6 ++--- .../article/schoolUnionApproval/form.html | 4 +-- .../cadreTraining/common/info.js | 2 +- .../cadreTraining/schoolAudit/index.html | 4 +-- .../enrollmentRegistration/info.js | 2 +- .../schoolAudit/index.html | 4 +-- .../unionAudit/index.html | 4 +-- .../evaluation/branchUnionApproval/index.html | 4 +-- .../dayofficework/evaluation/common/info.js | 2 +- .../evaluation/schoolUnionApproval/index.html | 4 +-- .../outlay/outlayReimburse/apply/index.html | 6 ++--- .../outlayReimburse/clubAudit/index.html | 4 +-- .../outlayReimburse/clubZxAudit/index.html | 4 +-- .../outlay/outlayReimburse/info.js | 4 +-- .../outlayReimburse/schoolCnAudit/index.html | 4 +-- .../outlayReimburse/schoolKjAudit/index.html | 4 +-- .../outlayReimburse/schoolZxAudit/index.html | 4 +-- .../outlayReimburse/unionAudit/index.html | 4 +-- .../unionReimburse/apply/index.html | 8 +++--- .../certifierUserSign/index.html | 4 +-- .../zhgh/dayofficework/unionReimburse/info.js | 4 +-- .../unionReimburse/review/index.html | 4 +-- .../transact/committeeFilingUnit/index.html | 8 +++--- .../proposal/transact/unitRead/index.html | 4 +-- .../proposal/transact/write/index.html | 8 +++--- .../democratic/suggestion/tc/common/info.js | 10 +++---- .../tc/transact/committeeFiling/index.html | 8 +++--- .../transact/committeeFilingUnit/index.html | 8 +++--- .../tc/transact/delegation/index.html | 2 +- .../transact/schoolLeaderApproval/index.html | 4 +-- .../tc/transact/seconded/index.html | 2 +- .../tc/transact/unitRead/index.html | 4 +-- .../tc/transact/unitReply/index.html | 4 +-- .../suggestion/tc/transact/write/index.html | 4 +-- .../democratic/suggestion/wc/common/info.js | 10 +++---- .../wc/transact/committeeFiling/index.html | 8 +++--- .../transact/committeeFilingUnit/index.html | 8 +++--- .../wc/transact/delegation/index.html | 2 +- .../transact/schoolLeaderApproval/index.html | 4 +-- .../wc/transact/seconded/index.html | 2 +- .../wc/transact/unitRead/index.html | 4 +-- .../wc/transact/unitReply/index.html | 4 +-- .../suggestion/wc/transact/write/index.html | 4 +-- .../staffbenefit/condolence/apply/index.html | 8 +++--- .../condolence/branchUnionApproval/index.html | 4 +-- .../staffbenefit/condolence/common/info.js | 4 +-- .../schoolPrincipalApproval/index.html | 4 +-- .../condolence/schoolUnionApproval/index.html | 4 +-- .../difficulthelp/apply/form.html | 6 ++--- .../difficulthelp/apply/index.html | 6 ++--- .../staffbenefit/difficulthelp/common/info.js | 2 +- .../difficulthelp/view/index.html | 2 +- .../staffbenefit/dsznfmtx/apply/index.html | 6 ++--- .../zhgh/staffbenefit/dsznfmtx/common/info.js | 4 +-- .../dsznfmtx/schoolAudit/index.html | 4 +-- .../dsznfmtx/unionAudit/index.html | 4 +-- .../maternityLeave/common/info.js | 2 +- .../maternityLeave/schoolAudit/index.html | 4 +-- .../maternityLeave/unionAudit/index.html | 4 +-- .../mutualInsurance/apply/index.html | 4 +-- .../mutualInsurance/common/userInfo.js | 2 +- .../apply/common/memberApplyAuditInfo.js | 4 +-- .../apply/schoolunionapproval/form.html | 4 +-- .../staffmanage/member/apply/submit/form.html | 6 ++--- .../member/apply/submit/index.html | 6 ++--- .../member/branch/audit/index.html | 4 +-- .../member/school/audit/index.html | 4 +-- .../zhgh/welfare/projectMange/index.html | 25 +++++++++++++++++ .../zhgh/welfare/select/optionSelect.js | 11 +++----- .../zhgh/welfare/userChoose/chooseWelfare.js | 12 +++------ .../benefit/userSelection/goodsSelection.html | 22 +++++++-------- .../benefit/userSelectionMine/index.html | 4 +-- .../platform/zhghh5/club/apply/index.html | 6 ++--- .../zhghh5/club/common/clubUserJoin.js | 2 +- .../enrollmentRegistration/info.js | 2 +- .../schoolAudit/index.html | 6 ++--- .../unionAudit/index.html | 6 ++--- .../outlayReimburse/apply/index.html | 6 ++--- .../outlayReimburse/clubAudit/index.html | 4 +-- .../outlayReimburse/clubZxAudit/index.html | 4 +-- .../dayofficework/outlayReimburse/info.js | 4 +-- .../outlayReimburse/schoolCnAudit/index.html | 4 +-- .../outlayReimburse/schoolKjAudit/index.html | 4 +-- .../outlayReimburse/schoolZxAudit/index.html | 4 +-- .../outlayReimburse/unionAudit/index.html | 4 +-- .../unionReimburse/apply/index.html | 18 ++++--------- .../certifierUserSign/index.html | 12 +++------ .../dayofficework/unionReimburse/info.js | 4 +-- .../unionReimburse/review/index.html | 8 +++--- .../transact/positiveSeconded/index.html | 2 +- .../proposal/transact/seconded/index.html | 6 ++--- .../democratic/suggestion/tc/common/info.js | 12 ++++----- .../tc/transact/delegation/index.html | 2 +- .../tc/transact/seconded/index.html | 6 ++--- .../democratic/suggestion/wc/common/info.js | 12 ++++----- .../wc/transact/delegation/index.html | 2 +- .../wc/transact/seconded/index.html | 6 ++--- .../staffbenefit/condolence/apply/index.html | 6 ++--- .../condolence/branchUnionApproval/index.html | 6 ++--- .../staffbenefit/condolence/common/info.js | 4 +-- .../schoolPrincipalApproval/index.html | 6 ++--- .../condolence/schoolUnionApproval/index.html | 6 ++--- .../difficulthelp/apply/index.html | 6 ++--- .../staffbenefit/difficulthelp/common/info.js | 2 +- .../staffbenefit/dsznfmtx/apply/index.html | 6 ++--- .../staffbenefit/dsznfmtx/common/info.js | 4 +-- .../dsznfmtx/schoolAudit/index.html | 6 ++--- .../dsznfmtx/unionAudit/index.html | 6 ++--- .../maternityLeave/common/info.js | 2 +- .../maternityLeave/schoolAudit/index.html | 6 ++--- .../maternityLeave/unionAudit/index.html | 6 ++--- .../platform/zhghh5/welfare/select/index.html | 13 +++------ .../zhghh5/welfare/userChoose/index.html | 12 +++------ 147 files changed, 448 insertions(+), 405 deletions(-) diff --git a/src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java b/src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java index d3c5f03..b7ae09c 100644 --- a/src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java +++ b/src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java @@ -37,6 +37,7 @@ import java.util.List; public class SchoolOaTodoServiceImpl implements SchoolOaTodoService { private static final String DATE_PATTERN = "yyyy-MM-dd HH:mm:ss"; + private static final String DEFAULT_APP_TODO_URL = "zhgh.ypi.edu.cn"; @Inject private Dao dao; @@ -76,7 +77,7 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService { } String pcUrl = buildTaskUrl(processTask.getFormKey(), processTask); - String appUrl = buildTaskUrl(processTask.getH5FormKey(), processTask); + String appUrl = buildAppTaskUrl(processTask.getH5FormKey(), processTask); String flowTypeName = getFlowTypeName(define); String title = getInstanceTitle(instance, define); String creatorTime = formatTime(instance.getCreatedAt()); @@ -184,7 +185,7 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService { List actors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId())); if (!actors.isEmpty()) { String pcUrl = buildTaskUrl(task.getFormKey(), task); - String appUrl = buildTaskUrl(task.getH5FormKey(), task); + String appUrl = buildAppTaskUrl(task.getH5FormKey(), task); String flowTypeName = getFlowTypeName(define); String title = getInstanceTitle(instance, define); String creatorTime = formatTime(instance.getCreatedAt()); @@ -353,6 +354,14 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService { return baseUrl + separator + "taskId=" + task.getId() + "&instanceId=" + task.getProcessInstanceId(); } + private String buildAppTaskUrl(String h5FormKey, ProcessTask task) { + // 部分流程没有配置 H5 审核页，学校 OA 的移动端地址为空时按要求传固定域名兜底。 + if (StrUtil.isBlank(h5FormKey)) { + return DEFAULT_APP_TODO_URL; + } + return buildTaskUrl(h5FormKey, task); + } + private String formatTime(Long timestamp) { if (timestamp == null) { throw new BaseException("学校OA待办同步失败：待办时间为空"); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java index 54d0158..05a5f83 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java @@ -216,7 +216,8 @@ public class ActivityDeclareMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("fgh", approval); @@ -232,7 +233,8 @@ public class ActivityDeclareMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xh", approval); @@ -248,7 +250,8 @@ public class ActivityDeclareMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xfzr", approval); @@ -264,7 +267,8 @@ public class ActivityDeclareMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xzx", approval); diff --git a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java index 6430669..168efb2 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java @@ -317,7 +317,8 @@ public class ActivityReimbursementMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("fgh", approval); @@ -333,7 +334,8 @@ public class ActivityReimbursementMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xh", approval); @@ -349,7 +351,8 @@ public class ActivityReimbursementMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xfzr", approval); @@ -365,7 +368,8 @@ public class ActivityReimbursementMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xzx", approval); diff --git a/src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java b/src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java index fa9a21d..2ded234 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java @@ -224,7 +224,8 @@ public class LeadThoughtQueryController { resultMap.put("xghOption", taskFormData.getStr("tf_opinion")); resultMap.put("xghTime", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - resultMap.put("xqz", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // resultMap.put("xqz", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } }); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/suggestion/service/common/SuggestionCommonServiceImpl.java b/src/main/java/com/budwk/app/zhgh/democratic/suggestion/service/common/SuggestionCommonServiceImpl.java index 350fecb..f9bc5f5 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/suggestion/service/common/SuggestionCommonServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/suggestion/service/common/SuggestionCommonServiceImpl.java @@ -298,7 +298,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl delegationApproval.put("user", v.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v.getExtVariable())) { delegationApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); - delegationApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // delegationApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); } docData.put("tz", delegationApproval); }); @@ -313,7 +314,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl committeeApproval.put("user", v.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v.getExtVariable())) { committeeApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); - committeeApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // committeeApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); committeeApproval.put("hostUnit", v.getExtVariable().getStr("hostUnit")); if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) { committeeApproval.put("helpUnits", String.join("、", v.getExtVariable().getBeanList("helpUnits", String.class))); @@ -332,7 +334,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl committeeConfirm.put("user", v.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v.getExtVariable())) { committeeConfirm.put("opinion", v.getExtVariable().getStr("approvalOpinion")); - committeeConfirm.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // committeeConfirm.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); committeeConfirm.put("hostUnit", v.getExtVariable().getStr("hostUnit")); if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) { committeeConfirm.put("helpUnits", String.join("、", v.getExtVariable().getBeanList("helpUnits", String.class))); @@ -354,7 +357,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl if (ObjectUtil.isNotEmpty(v.getExtVariable())) { masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); masterUnderTakeReply.put("implementState", v.getExtVariable().getStr("implementState")); - masterUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // masterUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); } docData.put("zbdf", masterUnderTakeReply); }); @@ -373,7 +377,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl if (ObjectUtil.isNotEmpty(v2.getExtVariable())) { slaveUnderTakeReply.put("opinion", HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(v2.getExtVariable().getStr("approvalOpinion"), ""))); slaveUnderTakeReply.put("implementState", v2.getExtVariable().getStr("implementState")); - slaveUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v2.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // slaveUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v2.getExtVariable().getStr("approvalSignature"))); } slaveUnderTakeReplyList.add(slaveUnderTakeReply); }); @@ -391,7 +396,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl masterLeaderApproval.put("user", v.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v.getExtVariable())) { masterLeaderApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); - masterLeaderApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // masterLeaderApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); } docData.put("zbldsp", masterLeaderApproval); }); @@ -410,7 +416,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl slaveLeaderApproval.put("user", v2.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v2.getExtVariable())) { slaveLeaderApproval.put("opinion", v2.getExtVariable().getStr("approvalOpinion")); - slaveLeaderApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v2.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // slaveLeaderApproval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v2.getExtVariable().getStr("approvalSignature"))); } slaveLeaderApprovalList.add(slaveLeaderApproval); }); @@ -539,7 +546,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl if (ObjectUtil.isNotEmpty(v.getExtVariable())) { masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); masterUnderTakeReply.put("implementState", v.getExtVariable().getStr("implementState")); - masterUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // masterUnderTakeReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); } docData.put("zbdf", masterUnderTakeReply); }); @@ -556,7 +564,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl masterUnderTakeLeaderReply.put("user", v.getActualOwnerUserName()); if (ObjectUtil.isNotEmpty(v.getExtVariable())) { masterUnderTakeLeaderReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); - masterUnderTakeLeaderReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); + // 系统已取消签字，导出不再渲染签字图片。 + // masterUnderTakeLeaderReply.put("sign", sysOfficeTemplateUtil.createPictureRenderData(v.getExtVariable().getStr("approvalSignature"))); } docData.put("zbld", masterUnderTakeLeaderReply); }); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index 7a86559..08eeef6 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -240,7 +240,8 @@ public class CondolenceMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("fgh", approval); @@ -255,7 +256,8 @@ public class CondolenceMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("kj", approval); @@ -270,7 +272,8 @@ public class CondolenceMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xgh", approval); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java index c62d770..8fe9f8c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java @@ -220,7 +220,8 @@ public class MaternityLeaveMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("fgh", approval); @@ -235,7 +236,8 @@ public class MaternityLeaveMineController { approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("user", taskFormData.getStr("tf_userName")); if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { - approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); + // 系统已取消签字，导出不再渲染签字图片。 + // approval.put("sign", sysOfficeTemplateUtil.createPictureRenderData(taskFormData.getStr("tf_sign"))); } approval.put("opinion", taskFormData.getStr("tf_opinion")); docData.put("xgh", approval); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java index 6fad271..1ac983f 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java @@ -117,6 +117,18 @@ public class WelfareProjectMangeController { return Result.success(); } + /** + * 清空福利名单 + */ + @At + @SaCheckPermission("welfare.project.mange") + @Aop(TransAop.READ_COMMITTED) + @SLog(tag = "福利", msg = "清空福利名单:${id}") + public Result clearWelfareList(String id) { + projectService.clearWelfareList(id); + return Result.success(); + } + @At @SaCheckPermission("welfare.mine") public Result getWelfareList(Integer year) { diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java index ed9263d..a480d12 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java @@ -34,6 +34,12 @@ public interface WelfareProjectService extends BaseService { */ void deleteWelfare(String id); + /** + * 清空指定项目的福利名单和已选择记录 + * @param projectId + */ + void clearWelfareList(String projectId); + /** * 创建福利名单 * @param projectId diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index 25f5734..b558b1c 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -17,6 +17,7 @@ import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.lang.Lang; +import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -105,6 +106,17 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i dao().clear(Sys_home_activity.class, Cnd.where("id", "=", id)); } + @Override + @Aop(TransAop.READ_COMMITTED) + public void clearWelfareList(String projectId) { + if (Strings.isBlank(projectId)) { + throw Lang.makeThrow("项目ID不能为空"); + } + // 清空名单时同步删除用户已选择记录，避免重新生成名单后残留旧选择。 + dao().clear(WelfareUserSelection.class, Cnd.where(WelfareUserSelection::getWelfareId, "=", projectId)); + dao().clear(WelfareList.class, Cnd.where(WelfareList::getProjectId, "=", projectId)); + } + @Override public void createList(String projectId, boolean created) { WelfareProject project = projectInfo(projectId); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java index d1a4d94..81a412c 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java @@ -12,9 +12,9 @@ import com.budwk.app.base.page.Pagination; import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.sys.models.Sys_file; +//import com.budwk.app.sys.models.Sys_file; import com.budwk.app.sys.services.SysFileService; -import com.budwk.app.sys.utils.SysFileMinIoUtil; +//import com.budwk.app.sys.utils.SysFileMinIoUtil; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; @@ -239,14 +239,16 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl - + - + @@ -177,7 +177,7 @@ budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}], clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}], mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}], - sign: [{required: true, message: '必填', trigger: ['blur', 'change']}], + sign: [{required: false, message: '必填', trigger: ['blur', 'change']}], }, activityDeclareReimbursementList: [], diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html index 26b144d..27efb84 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html @@ -180,9 +180,9 @@ layout("/layouts/platform.html"){ - + - + @@ -218,7 +218,7 @@ layout("/layouts/platform.html"){ budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}], clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}], mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}], - // sign: [{required: true, message: '必填', trigger: ['blur', 'change']}], + // sign: [{required: false, message: '必填', trigger: ['blur', 'change']}], deductionBudgetId: [{required: true, message: '必填', trigger: ['blur', 'change']}], }, activityDeclareReimbursementList: [], diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html index 4ed47b4..d927b96 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html @@ -31,7 +31,7 @@ 暂无 - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js index d0951bf..418f9d8 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js @@ -43,7 +43,7 @@ const INFO = { 暂无 - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html index ce34157..f6f9c10 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html @@ -152,9 +152,9 @@ - + - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html index 7d17f21..e8291e1 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html @@ -275,9 +275,9 @@ layout("/layouts/platform.html"){ - - - + + + @@ -324,7 +324,7 @@ layout("/layouts/platform.html"){ }, formRules: { id: [{required: true, message: "必填", trigger: ['change', 'blur']}], - sign: [{required: true, message: "必填", trigger: ['change', 'blur']}] + sign: [{required: false, message: "必填", trigger: ['change', 'blur']}] }, activityOptions: [], diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html index 39958a6..bbae7db 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html @@ -53,7 +53,7 @@ 暂无 - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html index 9a3f4dc..d1fde32 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html @@ -120,9 +120,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html index cb8e936..7713e31 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html @@ -111,9 +111,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js index 9c589ff..8b51e35 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js @@ -85,7 +85,7 @@ const INFO = { - + @@ -120,7 +120,7 @@ const INFO = { {{ task.taskFormData.opinion }} - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html index d7a1091..f65fdf2 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html @@ -124,9 +124,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html index 568f41b..80e41dc 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html @@ -124,9 +124,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html index 641c9c8..5a1f79d 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html @@ -125,9 +125,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html index 8251b32..1ac5eea 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html @@ -123,9 +123,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/benefit/project/index.html b/src/main/resources/views/platform/zhgh/benefit/project/index.html index 0651704..59caa1b 100644 --- a/src/main/resources/views/platform/zhgh/benefit/project/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/project/index.html @@ -124,7 +124,6 @@ layout("/layouts/platform.html"){ { prop: "startChoiceTime", label: "选择开始时间" }, { prop: "endChoiceTime", label: "选择结束时间" }, { prop: "provideMode", label: "发放形式" }, - { prop: "signMode", label: "是否电子签字" } ] } }, diff --git a/src/main/resources/views/platform/zhgh/benefit/project/projectForm.js b/src/main/resources/views/platform/zhgh/benefit/project/projectForm.js index 2faa0df..974f3f7 100644 --- a/src/main/resources/views/platform/zhgh/benefit/project/projectForm.js +++ b/src/main/resources/views/platform/zhgh/benefit/project/projectForm.js @@ -38,7 +38,7 @@ let BENEFIT_PROJECT_FORM = { - + {{viewData.startChoiceTime}}至{{viewData.endChoiceTime}} - + diff --git a/src/main/resources/views/platform/zhgh/benefit/userSelection/index.html b/src/main/resources/views/platform/zhgh/benefit/userSelection/index.html index 3cc6bd4..5eea263 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelection/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userSelection/index.html @@ -70,7 +70,6 @@ layout("/layouts/platform.html"){ { prop: "benefitName", label: "福利名称" }, { prop: "startChoiceTime", label: "选择开始时间" }, { prop: "endChoiceTime", label: "选择结束时间" }, - { prop: "signMode", label: "是否电子签字" }, { prop: "provideMode", label: "发放形式" }, { prop: "isChoice", label: "是否选择" } ] diff --git a/src/main/resources/views/platform/zhgh/benefit/userSelection/selectionBefit.js b/src/main/resources/views/platform/zhgh/benefit/userSelection/selectionBefit.js index 4a8f357..ead598c 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelection/selectionBefit.js +++ b/src/main/resources/views/platform/zhgh/benefit/userSelection/selectionBefit.js @@ -25,7 +25,7 @@ let SELECTION_BENEFIT = { - + @@ -99,11 +99,10 @@ let SELECTION_BENEFIT = { - + - + @@ -199,10 +198,10 @@ let SELECTION_BENEFIT = { - + - + @@ -248,11 +247,7 @@ let SELECTION_BENEFIT = { this.$forceUpdate() }, submit() { - if (this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE" && !this.formData.userSign) { - this.$message.warning("请签字后再提交！") - return - } - let flag = false +let flag = false let msg = "" this.formData.benefitGoodsList.some(b => { if (b.goodsProvideMode === "GOODS_PROVIDE_MODE_POST" && !b.receiveAddress) { @@ -346,11 +341,7 @@ let SELECTION_BENEFIT = { this.addressOptions = resp.data }, provideModeOneDoSubmit() { - if (!this.formData.userSign) { - this.$message.warning("请签字后再提交！") - return - } - this.$confirm("确定要提交吗？", "提示", { +this.$confirm("确定要提交吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" @@ -369,7 +360,7 @@ let SELECTION_BENEFIT = { }, openSubmit() { if (this.viewData.provideMode === "BENEFIT_PROVIDE_MODE_ONE" - && this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE") { + && false) { //如果是统一发放并且需要签字 this.provideModeOneDoSubmit() return diff --git a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html index 4c898d4..38b4f37 100644 --- a/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html +++ b/src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html @@ -113,7 +113,7 @@ layout("/layouts/platform.html"){ show-overflow-tooltip v-if="pageFormProvideMode==='BENEFIT_PROVIDE_MODE_TWO'" > - + {{ task.extVariable.approvalOpinion}} - + @@ -184,7 +184,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -248,7 +248,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -265,7 +265,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html index 1c9a556..9b4a2a0 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html @@ -138,8 +138,8 @@ layout("/layouts/platform.html"){ - - + + @@ -212,8 +212,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html index 9214437..a8517c4 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html @@ -146,8 +146,8 @@ layout("/layouts/platform.html"){ - - + + @@ -219,8 +219,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html index 44f5d0b..414de3d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html @@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html index 50577e9..231c5dc 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html @@ -122,8 +122,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html index 3ea9831..c63e1ef 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html @@ -91,7 +91,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html index f0a52dc..16b424d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html @@ -127,8 +127,8 @@ layout("/layouts/platform.html"){ placeholder="请输入初步阅览意见" > - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html index ed7793e..8352cc1 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html @@ -144,8 +144,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html index 8c34f16..448a553 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html @@ -151,13 +151,13 @@ layout("/layouts/platform.html"){ sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }], typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }], implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }], - sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }], + sign: [{ required: false, message: "非必填", trigger: ["blur", "change"] }], excerpt: [{ 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"] }], - signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }] + signature: [{ required: false, message: "非必填", trigger: ["blur", "change"] }] }, suggestionConfig: {}, noticeDialogVisible: false diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js index 3c813d6..d5a76e0 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js @@ -110,7 +110,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -138,7 +138,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -187,7 +187,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -252,7 +252,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -269,7 +269,7 @@ const SUGGESTION_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html index e8b8d8b..74d4246 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html @@ -138,8 +138,8 @@ layout("/layouts/platform.html"){ - @@ -212,8 +212,8 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html index 8be8d80..f21f5a8 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html @@ -146,8 +146,8 @@ layout("/layouts/platform.html"){ - @@ -219,8 +219,8 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html index f738d23..8613a94 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html @@ -96,7 +96,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html index 72ee58a..7163912 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html @@ -122,8 +122,8 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html index ced43d5..702eb26 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html @@ -90,7 +90,7 @@ layout("/layouts/platform.html"){ - + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html index bc9cd85..feaf7e0 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html @@ -127,8 +127,8 @@ layout("/layouts/platform.html"){ placeholder="请输入初步阅览意见" > - - + + diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html index 0d3c5e4..524cd4c 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html @@ -144,8 +144,8 @@ layout("/layouts/platform.html"){ - diff --git a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html index c255d75..5cbe9b5 100644 --- a/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html @@ -152,13 +152,13 @@ layout("/layouts/platform.html"){ sessionId: [{ required: true, message: "请选择所属工代会", trigger: ["blur", "change"] }], typeId: [{ required: true, message: "请选择意见建议类别", trigger: ["blur", "change"] }], implementUnitId: [{ required: false, message: "请选择建以落实部门", trigger: ["blur", "change"] }], - sign: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }], + sign: [{ required: false, message: "非必填", trigger: ["blur", "change"] }], excerpt: [{ 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"] }], - signature: [{ required: true, message: "请扫描二维码进行签字", trigger: ["blur", "change"] }] + signature: [{ required: false, message: "非必填", trigger: ["blur", "change"] }] }, suggestionConfig: {}, noticeDialogVisible: false diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html index 0e7a5d3..fbd20a8 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html @@ -232,9 +232,9 @@ layout("/layouts/platform.html"){ - - - + + + @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}], remark: [{required: true, message: "必填", trigger: ["change", "blur"]}], files: [{required: true, message: "必填", trigger: ["change", "blur"]}], - signature: [{required: true, message: "必填", trigger: ["change", "blur"]}], + signature: [{required: false, message: "必填", trigger: ["change", "blur"]}], handlerUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], certifierUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], bankCardNumber: [{required: true, message: "必填", trigger: ["change", "blur"]}], diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html index 51ea55e..64923a2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html @@ -81,9 +81,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js index 812ed68..7919484 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js @@ -37,7 +37,7 @@ const condolenceInfo = { complete_result> 暂无附件 - + @@ -72,7 +72,7 @@ const condolenceInfo = { {{ task.taskFormData.opinion }} - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html index e02c936..ffb54a7 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html @@ -101,9 +101,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html index e02c936..ffb54a7 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html @@ -101,9 +101,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html index e2a24d1..82b213a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html @@ -210,9 +210,9 @@ - + - + @@ -253,7 +253,7 @@ officialCapacity: [{required: true, message: '必填', trigger: ['blur', 'change']}], subsidyStandards: [{required: true, message: '必填', trigger: ['blur', 'change']}], reason: [{required: true, message: '必填', trigger: ['blur', 'change']}], - sign: [{required: true, message: '必填', trigger: ['blur', 'change']}] + sign: [{required: false, message: '必填', trigger: ['blur', 'change']}] }, // 替他人申请相关 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html index 3f2e41b..cbb6441 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html @@ -226,9 +226,9 @@ layout("/layouts/platform.html"){ - + - + @@ -278,7 +278,7 @@ layout("/layouts/platform.html"){ officialCapacity: [{required: true, message: '请填写职务职称', trigger: ['blur', 'change']}], subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}], reason: [{required: true, message: '请填写申请原因', trigger: ['blur', 'change']}], - sign: [{required: true, message: '请签字', trigger: ['blur', 'change']}] + sign: [{required: false, message: '非必填', trigger: ['blur', 'change']}] }, // 替他人申请相关 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js index b3caecf..cd04823 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js @@ -49,7 +49,7 @@ const INFO = { 暂无 - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html index d1b2f96..c811d59 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html @@ -37,7 +37,7 @@ 暂无 - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html index 791ca84..2ee3c41 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html @@ -138,8 +138,8 @@ layout("/layouts/platform.html"){ complete_result upload_mode="drag" upload_result_category="array"> - - + + @@ -184,7 +184,7 @@ layout("/layouts/platform.html"){ office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }], honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }], retireFiles: [{ required: true, message: '请上传退休证', trigger: 'change' }], - //sign: [{ required: true, message: '请签字', trigger: 'change' }], + //sign: [{ required: false, message: '非必填', trigger: 'change' }], declarationAgreed: [{ required: true, message: '请勾选申报理由', trigger: 'change', type: 'enum', enum: [true] }] }, } diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js index 7e9070b..3abfe27 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js @@ -28,7 +28,7 @@ const DSZNFMTX_INFO = { - + @@ -63,7 +63,7 @@ const DSZNFMTX_INFO = { {{ task.taskFormData.opinion }} - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html index 64a693c..579d453 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html @@ -89,8 +89,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html index 1ee99e8..793955e 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html @@ -89,8 +89,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js index fd48b9d..155fbb9 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js @@ -75,7 +75,7 @@ const maternityLeaveInfo = { {{ task.taskFormData.opinion }} - + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html index 9a0d282..78b0b2c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html @@ -88,8 +88,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html index dbf3fd5..5bbc9e6 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html @@ -89,8 +89,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html index c1e202f..6e2ffd5 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html @@ -217,8 +217,8 @@ layout("/layouts/platform.html"){ accept=".doc, .docx, .xls, .xlsx, .pdf, .ppt, .jpg, .jpeg, .png" complete_result> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/common/userInfo.js b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/common/userInfo.js index d53cfde..4f6c366 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/common/userInfo.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/common/userInfo.js @@ -30,7 +30,7 @@ const userInfo = { - + 暂无 - + 暂无 @@ -90,7 +90,7 @@ const MEMBER_APPLY_AUDIT_INFO = { {{ task.extVariable.approvalRemark }} - + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html index ddde5df..68165b7 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html @@ -23,8 +23,8 @@ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + - + - + @@ -213,7 +213,7 @@ username: [{required: false, message: "必填", trigger: ["change", "blur"]}], sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], isVoluntary: [{required: true, message: "必填", trigger: ["change", "blur"]}], - sign: [{required: true, message: "必填", trigger: ["change", "blur"]}], + sign: [{required: false, message: "必填", trigger: ["change", "blur"]}], email: [ { validator: (rule, value, callback) => { diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html index c902dba..c1acac4 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html @@ -219,9 +219,9 @@ layout("/layouts/platform.html"){ - + - + @@ -251,7 +251,7 @@ layout("/layouts/platform.html"){ username: [{ required: false, message: "必填", trigger: ["change", "blur"] }], sex: [{ required: false, message: "必填", trigger: ["change", "blur"] }], isVoluntary: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - sign: [{ required: true, message: "必填", trigger: ["change", "blur"] }], + sign: [{ required: false, message: "必填", trigger: ["change", "blur"] }], homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }], personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }], specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }], diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/audit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/audit/index.html index 030ea8e..4ae4ee4 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/branch/audit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/branch/audit/index.html @@ -18,8 +18,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/school/audit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/school/audit/index.html index 240a5c9..4f87da4 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/school/audit/index.html +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/school/audit/index.html @@ -21,8 +21,8 @@ layout("/layouts/platform.html"){ - - + + diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html index ce5a8d5..eadeb8c 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html @@ -75,6 +75,7 @@ layout("/layouts/platform.html"){ 生成福利名单 + 清空福利名单 编辑 删除 @@ -290,6 +291,8 @@ layout("/layouts/platform.html"){ this.doDelete(data.id) } else if (type === "createList") { this.$refs.filterUserRef.onOpen(data.id) + } else if (type === "clearList") { + this.clearWelfareList(data) } else if (type === "status") { this.projectStatusChange(data) } else if (type === "sendMsg") { @@ -420,6 +423,28 @@ layout("/layouts/platform.html"){ } this.submitLoading = false }) + }, + clearWelfareList(row) { + this.$confirm("确定要清空该项目的福利名单和已选择记录吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(async () => { + this.submitLoading = true + try { + const resp = await this.$axios.post(loc() + "/clearWelfareList", { id: row.id }) + if (resp.code === 0) { + this.doSearch() + this.$message.success(resp.msg) + } else { + this.notifyWarning(resp.msg) + } + } catch (e) { + this.notifyWarning(e.status) + } finally { + this.submitLoading = false + } + }) } }, async created() { diff --git a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js index 3327c49..38ede11 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js +++ b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js @@ -180,8 +180,8 @@ const optionSelect = { - - + + @@ -498,12 +498,7 @@ const optionSelect = { return } // 仅“需要签字”时校验签字，避免默认“不签字”的项目仍展示或提交签字字段 - if (this.projectInfo.signMode === 2 && !this.contactForm.userSign) { - this.$message.warning("请签字") - return - } - - if (this.isSubmitting) return +if (this.isSubmitting) return this.isSubmitting = true let selections = [] diff --git a/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js b/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js index 2288d5d..87c7d9f 100644 --- a/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js +++ b/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js @@ -154,10 +154,10 @@ let CHOOSE_WELFARE = { - + - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/info.js b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/info.js index 4582f9c..1a93bc2 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/info.js +++ b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/info.js @@ -110,7 +110,7 @@ const H5_ENROLLMENT_REGISTRATION_INFO = { }} - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html index 102702b..6df380c 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/schoolAudit/index.html @@ -71,10 +71,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html index e510de6..d5a0fdc 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/enrollmentRegistration/unionAudit/index.html @@ -73,10 +73,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html index 5667f85..6a6424b 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/apply/index.html @@ -166,13 +166,13 @@ layout("/layouts/platform_h5.html"){ - - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html index 89ec1d1..8b7783e 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubAudit/index.html @@ -71,9 +71,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html index 7a55ae6..d12c3c7 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/clubZxAudit/index.html @@ -71,9 +71,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/info.js b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/info.js index 1403160..515ad76 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/info.js +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/info.js @@ -42,7 +42,7 @@ const H5_OUTLAY_REIMBURSE_INFO = { - + @@ -83,7 +83,7 @@ const H5_OUTLAY_REIMBURSE_INFO = { }} - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html index 56df2d9..da261bf 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolCnAudit/index.html @@ -71,9 +71,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html index 003a9eb..0ee6ca5 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolKjAudit/index.html @@ -72,9 +72,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html index 1e04e8f..08c0846 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/schoolZxAudit/index.html @@ -71,9 +71,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html index a2419eb..85b265b 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/outlayReimburse/unionAudit/index.html @@ -71,9 +71,9 @@ layout("/layouts/platform_h5.html"){ autosize placeholder="请填审批意见"> - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html index 6517606..98ea407 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/apply/index.html @@ -183,10 +183,10 @@ layout("/layouts/platform_h5.html"){ - - + + @@ -380,11 +380,7 @@ layout("/layouts/platform_h5.html"){ async onSubmit() { this.$refs.formRef.validate().then(() => { - if (!this.formData.userSign) { - this.$toast.fail("请签名") - return - } - this.$dialog.confirm({ +this.$dialog.confirm({ title: "温馨提示", message: "您确定要提交吗？" }).then(() => { @@ -409,11 +405,7 @@ layout("/layouts/platform_h5.html"){ async onSubmitAgain() { this.$refs.formRef.validate().then(() => { - if (!this.formData.userSign) { - this.$toast.fail("请签名") - return - } - this.$dialog.confirm({ +this.$dialog.confirm({ title: "温馨提示", message: "您确定要提交吗？" }).then(() => { diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html index 6de5765..a5a2e75 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/certifierUserSign/index.html @@ -74,10 +74,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + @@ -135,11 +135,7 @@ layout("/layouts/platform_h5.html"){ }) }, handleTaskAction(val) { - if (!this.formData.tf_userSign) { - this.$toast.fail("请签名") - return - } - this.$refs.formRef.validate().then(() => { +this.$refs.formRef.validate().then(() => { this.$dialog.confirm({ title: "温馨提示", message: "您确定要提交吗？" diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js index 07c6bd4..ec63d08 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/info.js @@ -40,7 +40,7 @@ const UNION_REIMBURSE_INFO = { {{ viewData.paymentNotes }} - + - + diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html index 1d91bdc..974f48b 100644 --- a/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html +++ b/src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html @@ -76,11 +76,11 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/positiveSeconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/positiveSeconded/index.html index dea0155..6da1baf 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/positiveSeconded/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/positiveSeconded/index.html @@ -102,7 +102,7 @@ layout("/layouts/platform_h5.html"){ formData: {}, showApprovalForm: false, rules: { - approvalSignature: [{required: true, message: "请签字"}] + approvalSignature: [{required: false, message: "非必填"}] }, row: {}, } diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html index 63c1a09..c9f47c9 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html @@ -74,8 +74,8 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > - - + +
@@ -116,7 +116,7 @@ layout("/layouts/platform_h5.html"){ formData: {}, showApprovalForm: false, rules: { - approvalSignature: [{required: true, message: "请签字"}] + approvalSignature: [{required: false, message: "非必填"}] }, row: {}, } diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/common/info.js index 9fb6474..e147381 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/common/info.js +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/common/info.js @@ -25,7 +25,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = { {{viewData.files}}
- + @@ -88,7 +88,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -120,7 +120,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -140,7 +140,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = {
- + @@ -170,7 +170,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -191,7 +191,7 @@ const H5_SUGGESTION_TC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/delegation/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/delegation/index.html index b643159..d26a2ad 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/delegation/index.html @@ -116,7 +116,7 @@ layout("/layouts/platform_h5.html"){ formData: {}, showApprovalForm: false, rules: { - approvalSignature: [{ required: true, message: "请签字" }] + approvalSignature: [{ required: false, message: "非必填" }] } } }, diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/seconded/index.html index efd900b..e5444f9 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/tc/transact/seconded/index.html @@ -54,8 +54,8 @@ layout("/layouts/platform_h5.html"){
{{formData.processInstanceNodeName}}
- - + +
@@ -98,7 +98,7 @@ layout("/layouts/platform_h5.html"){ formData: {}, showApprovalForm: false, rules: { - approvalSignature: [{ required: true, message: "请签字" }] + approvalSignature: [{ required: false, message: "非必填" }] } } }, diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/common/info.js b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/common/info.js index e11861f..c0fb380 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/common/info.js +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/common/info.js @@ -25,7 +25,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = { {{viewData.files}}
- + @@ -88,7 +88,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}}
- + @@ -120,7 +120,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -140,7 +140,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = {
- + @@ -170,7 +170,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + @@ -191,7 +191,7 @@ const H5_SUGGESTION_WC_INFO_COMPONENT = { {{ task.extVariable.approvalOpinion}} - + diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/delegation/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/delegation/index.html index 460f97b..e70ba00 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/delegation/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/delegation/index.html @@ -116,7 +116,7 @@ layout("/layouts/platform_h5.html"){ formData: {}, showApprovalForm: false, rules: { - approvalSignature: [{ required: true, message: "请签字" }] + approvalSignature: [{ required: false, message: "非必填" }] } } }, diff --git a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/seconded/index.html b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/seconded/index.html index 27161ea..6707288 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/seconded/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/suggestion/wc/transact/seconded/index.html @@ -58,15 +58,15 @@ layout("/layouts/platform_h5.html"){
{{formData.processInstanceNodeName}}
- - +
diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html index 4a803c9..db65285 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -367,10 +367,10 @@ layout("/layouts/platform_h5.html"){ - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html index a052e49..17b92e5 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html @@ -70,10 +70,10 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js index 5b39a03..5090cb9 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/common/info.js @@ -34,7 +34,7 @@ const condolenceInfo = { - + 暂无签字 @@ -61,7 +61,7 @@ const condolenceInfo = {
- + 暂无签字 diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html index e73ab36..7a964cf 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html @@ -70,10 +70,10 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html index 99c6a39..71cd1ae 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html @@ -70,10 +70,10 @@ layout("/layouts/platform_h5.html"){ maxlength="100" show-word-limit > - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html index 3760916..6b2949b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html @@ -229,10 +229,10 @@ layout("/layouts/platform_h5.html"){ - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js index b069b2b..abf9f1b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/common/info.js @@ -29,7 +29,7 @@ const INFO = { - + 暂无 diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html index 31f4fc5..d451e60 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html @@ -101,9 +101,9 @@ layout("/layouts/platform_h5.html"){ > - + @@ -268,7 +268,7 @@ layout("/layouts/platform_h5.html"){ errors.push('请上传退休证'); } // if (!this.formData.sign) { - // errors.push('请签字'); + // errors.push('非必填'); // } if (!this.formData.declarationAgreed) { errors.push('请阅读并同意声明'); diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js index 28ab8b7..17eada5 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js @@ -24,7 +24,7 @@ const DSZNFMTX_INFO = { - + @@ -64,7 +64,7 @@ const DSZNFMTX_INFO = { }} - + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html index dc983d5..5061403 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html @@ -67,10 +67,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html index a396690..e5ed360 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html @@ -67,10 +67,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js index 48c18ae..0f4acbc 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js @@ -67,7 +67,7 @@ const MATERNITY_LEAVE_INFO = { }} - + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html index b02fe11..a2ff5d3 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html @@ -67,10 +67,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html index b60fbff..885d375 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html @@ -67,10 +67,10 @@ layout("/layouts/platform_h5.html"){ class="more-text" placeholder="请填审批意见"> - - + + diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/index.html b/src/main/resources/views/platform/zhghh5/welfare/select/index.html index 6c561fb..a82632b 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/select/index.html +++ b/src/main/resources/views/platform/zhghh5/welfare/select/index.html @@ -745,9 +745,9 @@ layout("/layouts/platform_h5.html"){
-
-
请签字(下滑此页面打开签字版签字)
- +
+
非必填
+
{{ formData.userSign ? '您已完成签名' : '请在上方空白区域完成签名' }}
@@ -1029,12 +1029,7 @@ layout("/layouts/platform_h5.html"){ } // 如果需要签字，验证签名 - if (this.projectInfo.signMode === 2 && !this.formData.userSign) { - this.$toast.fail("请完成签名确认") - return - } - - // 如果需要邮寄 +// 如果需要邮寄 if (this.projectInfo.provideMode === 3 && !this.formData.receiveAddress) { this.$toast.fail("请填写邮寄地址") return diff --git a/src/main/resources/views/platform/zhghh5/welfare/userChoose/index.html b/src/main/resources/views/platform/zhghh5/welfare/userChoose/index.html index b02454a..521b691 100644 --- a/src/main/resources/views/platform/zhghh5/welfare/userChoose/index.html +++ b/src/main/resources/views/platform/zhghh5/welfare/userChoose/index.html @@ -234,11 +234,11 @@ layout("/layouts/platform_h5.html"){ - + -
电子签名
+
电子签名
 @@ -469,11 +469,7 @@ layout("/layouts/platform_h5.html"){ } } if (this.projectInfo.signMode === 2) { - if (this.userSign == null || this.userSign === "") { - this.$toast("请签名") - return - } - } +} const loading = this.$toast.loading({ message: "提交中...", forbidClick: true,