c-hongqw1/zhgh_ypi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2026-07-08 17:09:39 +08:00
parent f76041c608
commit 4d9f22096b
147 changed files with 448 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/flow/service/impl/SchoolOaTodoServiceImpl.java
+11 -2
View File
@@ -37,6 +37,7 @@ import java.util.List;
public class SchoolOaTodoServiceImpl implements SchoolOaTodoService { public class SchoolOaTodoServiceImpl implements SchoolOaTodoService {
private static final String DATE_PATTERN = "yyyy-MM-dd HH:mm:ss"; 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 @Inject
private Dao dao; private Dao dao;
@@ -76,7 +77,7 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService {
} }
String pcUrl = buildTaskUrl(processTask.getFormKey(), processTask); String pcUrl = buildTaskUrl(processTask.getFormKey(), processTask);
String appUrl = buildTaskUrl(processTask.getH5FormKey(), processTask); String appUrl = buildAppTaskUrl(processTask.getH5FormKey(), processTask);
String flowTypeName = getFlowTypeName(define); String flowTypeName = getFlowTypeName(define);
String title = getInstanceTitle(instance, define); String title = getInstanceTitle(instance, define);
String creatorTime = formatTime(instance.getCreatedAt()); String creatorTime = formatTime(instance.getCreatedAt());
@@ -184,7 +185,7 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService {
List<ProcessTaskActor> actors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId())); List<ProcessTaskActor> actors = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "=", task.getId()));
if (!actors.isEmpty()) { if (!actors.isEmpty()) {
String pcUrl = buildTaskUrl(task.getFormKey(), task); String pcUrl = buildTaskUrl(task.getFormKey(), task);
String appUrl = buildTaskUrl(task.getH5FormKey(), task); String appUrl = buildAppTaskUrl(task.getH5FormKey(), task);
String flowTypeName = getFlowTypeName(define); String flowTypeName = getFlowTypeName(define);
String title = getInstanceTitle(instance, define); String title = getInstanceTitle(instance, define);
String creatorTime = formatTime(instance.getCreatedAt()); String creatorTime = formatTime(instance.getCreatedAt());
@@ -353,6 +354,14 @@ public class SchoolOaTodoServiceImpl implements SchoolOaTodoService {
return baseUrl + separator + "taskId=" + task.getId() + "&instanceId=" + task.getProcessInstanceId(); 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) { private String formatTime(Long timestamp) {
if (timestamp == null) { if (timestamp == null) {
throw new BaseException("学校OA待办同步失败：待办时间为空"); throw new BaseException("学校OA待办同步失败：待办时间为空");
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/declare/controller/ActivityDeclareMineController.java
+8 -4
View File
@@ -216,7 +216,8 @@ public class ActivityDeclareMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -232,7 +233,8 @@ public class ActivityDeclareMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xh", approval); docData.put("xh", approval);
@@ -248,7 +250,8 @@ public class ActivityDeclareMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xfzr", approval); docData.put("xfzr", approval);
@@ -264,7 +267,8 @@ public class ActivityDeclareMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xzx", approval); docData.put("xzx", approval);
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
+8 -4
View File
@@ -317,7 +317,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -333,7 +334,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xh", approval); docData.put("xh", approval);
@@ -349,7 +351,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xfzr", approval); docData.put("xfzr", approval);
@@ -365,7 +368,8 @@ public class ActivityReimbursementMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xzx", approval); docData.put("xzx", approval);
src/main/java/com/budwk/app/zhgh/activity/leadthought/controller/LeadThoughtQueryController.java
+2 -1
View File
@@ -224,7 +224,8 @@ public class LeadThoughtQueryController {
resultMap.put("xghOption", taskFormData.getStr("tf_opinion")); resultMap.put("xghOption", taskFormData.getStr("tf_opinion"));
resultMap.put("xghTime", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); resultMap.put("xghTime", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")));
} }
}); });
src/main/java/com/budwk/app/zhgh/democratic/suggestion/service/common/SuggestionCommonServiceImpl.java
+18 -9
View File
@@ -298,7 +298,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
delegationApproval.put("user", v.getActualOwnerUserName()); delegationApproval.put("user", v.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
delegationApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); 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); docData.put("tz", delegationApproval);
}); });
@@ -313,7 +314,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
committeeApproval.put("user", v.getActualOwnerUserName()); committeeApproval.put("user", v.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
committeeApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); 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")); committeeApproval.put("hostUnit", v.getExtVariable().getStr("hostUnit"));
if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) { if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) {
committeeApproval.put("helpUnits", String.join("、", 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<SuggestionInfo>
committeeConfirm.put("user", v.getActualOwnerUserName()); committeeConfirm.put("user", v.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
committeeConfirm.put("opinion", v.getExtVariable().getStr("approvalOpinion")); 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")); committeeConfirm.put("hostUnit", v.getExtVariable().getStr("hostUnit"));
if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) { if (ObjectUtil.isNotEmpty(v.getExtVariable().getBeanList("helpUnits", String.class))) {
committeeConfirm.put("helpUnits", String.join("、", 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<SuggestionInfo>
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion"));
masterUnderTakeReply.put("implementState", v.getExtVariable().getStr("implementState")); 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); docData.put("zbdf", masterUnderTakeReply);
}); });
@@ -373,7 +377,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
if (ObjectUtil.isNotEmpty(v2.getExtVariable())) { if (ObjectUtil.isNotEmpty(v2.getExtVariable())) {
slaveUnderTakeReply.put("opinion", HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(v2.getExtVariable().getStr("approvalOpinion"), ""))); slaveUnderTakeReply.put("opinion", HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(v2.getExtVariable().getStr("approvalOpinion"), "")));
slaveUnderTakeReply.put("implementState", v2.getExtVariable().getStr("implementState")); 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); slaveUnderTakeReplyList.add(slaveUnderTakeReply);
}); });
@@ -391,7 +396,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
masterLeaderApproval.put("user", v.getActualOwnerUserName()); masterLeaderApproval.put("user", v.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
masterLeaderApproval.put("opinion", v.getExtVariable().getStr("approvalOpinion")); 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); docData.put("zbldsp", masterLeaderApproval);
}); });
@@ -410,7 +416,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
slaveLeaderApproval.put("user", v2.getActualOwnerUserName()); slaveLeaderApproval.put("user", v2.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v2.getExtVariable())) { if (ObjectUtil.isNotEmpty(v2.getExtVariable())) {
slaveLeaderApproval.put("opinion", v2.getExtVariable().getStr("approvalOpinion")); 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); slaveLeaderApprovalList.add(slaveLeaderApproval);
}); });
@@ -539,7 +546,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); masterUnderTakeReply.put("opinion", v.getExtVariable().getStr("approvalOpinion"));
masterUnderTakeReply.put("implementState", v.getExtVariable().getStr("implementState")); 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); docData.put("zbdf", masterUnderTakeReply);
}); });
@@ -556,7 +564,8 @@ public class SuggestionCommonServiceImpl extends BaseServiceImpl<SuggestionInfo>
masterUnderTakeLeaderReply.put("user", v.getActualOwnerUserName()); masterUnderTakeLeaderReply.put("user", v.getActualOwnerUserName());
if (ObjectUtil.isNotEmpty(v.getExtVariable())) { if (ObjectUtil.isNotEmpty(v.getExtVariable())) {
masterUnderTakeLeaderReply.put("opinion", v.getExtVariable().getStr("approvalOpinion")); 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); docData.put("zbld", masterUnderTakeLeaderReply);
}); });
src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java
+6 -3
View File
@@ -240,7 +240,8 @@ public class CondolenceMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -255,7 +256,8 @@ public class CondolenceMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("kj", approval); docData.put("kj", approval);
@@ -270,7 +272,8 @@ public class CondolenceMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xgh", approval); docData.put("xgh", approval);
src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveMineController.java
+4 -2
View File
@@ -220,7 +220,8 @@ public class MaternityLeaveMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("fgh", approval); docData.put("fgh", approval);
@@ -235,7 +236,8 @@ public class MaternityLeaveMineController {
approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日")); approval.put("date", DateUtil.format(v.getFinishTime(), "yyyy年MM月dd日"));
approval.put("user", taskFormData.getStr("tf_userName")); approval.put("user", taskFormData.getStr("tf_userName"));
if (StrUtil.isNotBlank(taskFormData.getStr("tf_sign"))) { 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")); approval.put("opinion", taskFormData.getStr("tf_opinion"));
docData.put("xgh", approval); docData.put("xgh", approval);
src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareProjectMangeController.java
+12
View File
@@ -117,6 +117,18 @@ public class WelfareProjectMangeController {
return Result.success(); 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 @At
@SaCheckPermission("welfare.mine") @SaCheckPermission("welfare.mine")
public Result getWelfareList(Integer year) { public Result getWelfareList(Integer year) {
src/main/java/com/budwk/app/zhgh/welfare/service/WelfareProjectService.java
+6
View File
@@ -34,6 +34,12 @@ public interface WelfareProjectService extends BaseService<WelfareProject> {
*/ */
void deleteWelfare(String id); void deleteWelfare(String id);
/**
* 清空指定项目的福利名单和已选择记录
* @param projectId
*/
void clearWelfareList(String projectId);
/** /**
* 创建福利名单 * 创建福利名单
* @param projectId * @param projectId
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java
+12
View File
@@ -17,6 +17,7 @@ import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang; import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -105,6 +106,17 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl<WelfareProject> i
dao().clear(Sys_home_activity.class, Cnd.where("id", "=", id)); 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 @Override
public void createList(String projectId, boolean created) { public void createList(String projectId, boolean created) {
WelfareProject project = projectInfo(projectId); WelfareProject project = projectInfo(projectId);
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java
+12 -10
View File
@@ -12,9 +12,9 @@ import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.service.impl.BaseServiceImpl; import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.PageUtil; 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.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.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.welfare.model.WelfareList; import com.budwk.app.zhgh.welfare.model.WelfareList;
@@ -239,14 +239,16 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
} }
} }
if (map.get("userSign") != null){ if (map.get("userSign") != null){
try { // 系统已取消签字，导出不再渲染签字图片。
Sys_file file = dao().fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", map.getString("userSign"))); map.put("userSign", "");
byte[] userSignBytes = SysFileMinIoUtil.getFileBytes(file.getBucket(), file.getStoragePath()); // try {
map.put("userSign", userSignBytes); // Sys_file file = dao().fetch(Sys_file.class, Cnd.where(Sys_file::getDownloadPath, "=", map.getString("userSign")));
}catch (Exception e){ // byte[] userSignBytes = SysFileMinIoUtil.getFileBytes(file.getBucket(), file.getStoragePath());
e.printStackTrace(); // map.put("userSign", userSignBytes);
log.error("下载图片失败", e); // }catch (Exception e){
} // e.printStackTrace();
// log.error("下载图片失败", e);
// }
} }
} }
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/form.html
+3 -3
View File
@@ -146,9 +146,9 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -177,7 +177,7 @@
budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}], budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}],
clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}], clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{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: [], activityDeclareReimbursementList: [],
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/index.html
+3 -3
View File
@@ -180,9 +180,9 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -218,7 +218,7 @@ layout("/layouts/platform.html"){
budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}], budgets: [{required: true, message: '必填', trigger: ['blur', 'change']}],
clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}], clubId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
mobile: [{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']}], deductionBudgetId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
}, },
activityDeclareReimbursementList: [], activityDeclareReimbursementList: [],
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/apply/view.html
+1 -1
View File
@@ -31,7 +31,7 @@
<span v-else>暂无</span> <span v-else>暂无</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/declare/common/info.js
+1 -1
View File
@@ -43,7 +43,7 @@ const INFO = {
<span v-else>暂无</span> <span v-else>暂无</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/form.html
+2 -2
View File
@@ -152,9 +152,9 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html
+4 -4
View File
@@ -275,9 +275,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item prop="sign" label="签字"> <el-form-item prop="sign" label="签字" v-if="false">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -324,7 +324,7 @@ layout("/layouts/platform.html"){
}, },
formRules: { formRules: {
id: [{required: true, message: "必填", trigger: ['change', 'blur']}], id: [{required: true, message: "必填", trigger: ['change', 'blur']}],
sign: [{required: true, message: "必填", trigger: ['change', 'blur']}] sign: [{required: false, message: "必填", trigger: ['change', 'blur']}]
}, },
activityOptions: [], activityOptions: [],
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/view.html
+1 -1
View File
@@ -53,7 +53,7 @@
<span v-else>暂无</span> <span v-else>暂无</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item label="签字" :span="2" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/branchunion/index.html
+2 -2
View File
@@ -120,9 +120,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/clubprincipal/index.html
+2 -2
View File
@@ -111,9 +111,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js
+2 -2
View File
@@ -85,7 +85,7 @@ const INFO = {
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
@@ -120,7 +120,7 @@ const INFO = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="task.ext.tf_userSign" <el-image v-if="task.ext.tf_userSign"
:src="task.ext.tf_userSign" :src="task.ext.tf_userSign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/deputySchoolUnion/index.html
+2 -2
View File
@@ -124,9 +124,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolFinance/index.html
+2 -2
View File
@@ -124,9 +124,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolprincipal/index.html
+2 -2
View File
@@ -125,9 +125,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/schoolunion/index.html
+2 -2
View File
@@ -123,9 +123,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" <el-form-item v-if="false" label="电子签名" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/benefit/project/index.html
-1
View File
@@ -124,7 +124,6 @@ layout("/layouts/platform.html"){
{ prop: "startChoiceTime", label: "选择开始时间" }, { prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" }, { prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "provideMode", label: "发放形式" }, { prop: "provideMode", label: "发放形式" },
{ prop: "signMode", label: "是否电子签字" }
] ]
} }
}, },
src/main/resources/views/platform/zhgh/benefit/project/projectForm.js
+2 -2
View File
@@ -38,7 +38,7 @@ let BENEFIT_PROJECT_FORM = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否电子签字" span="1.5"> <el-descriptions-item v-if="false" label="是否电子签字" span="1.5">
<el-form-item label="" prop="signMode"> <el-form-item label="" prop="signMode">
<el-radio-group size="medium" v-model="formData.signMode"> <el-radio-group size="medium" v-model="formData.signMode">
<el-radio-button :key="item.code" :label="item.code" <el-radio-button :key="item.code" :label="item.code"
@@ -284,7 +284,7 @@ let BENEFIT_PROJECT_FORM = {
}, },
async open() { async open() {
this.formData = { this.formData = {
signMode: "BENEFIT_SIGN_MODE_ONE", signMode: "BENEFIT_SIGN_MODE_TWO",
provideMode: "BENEFIT_PROVIDE_MODE_ONE", provideMode: "BENEFIT_PROVIDE_MODE_ONE",
benefitGoodsIds: [] benefitGoodsIds: []
} }
src/main/resources/views/platform/zhgh/benefit/project/projectInfo.js
+1 -1
View File
@@ -17,7 +17,7 @@ let BENEFIT_PROJECT_INFO = {
<el-descriptions-item label="选择时间" span="2"> <el-descriptions-item label="选择时间" span="2">
{{viewData.startChoiceTime}}至{{viewData.endChoiceTime}} {{viewData.startChoiceTime}}至{{viewData.endChoiceTime}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否电子签字" span="1.5"> <el-descriptions-item v-if="false" label="是否电子签字" span="1.5">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE" <dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag> :value="viewData.signMode"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
src/main/resources/views/platform/zhgh/benefit/userSelection/index.html
-1
View File
@@ -70,7 +70,6 @@ layout("/layouts/platform.html"){
{ prop: "benefitName", label: "福利名称" }, { prop: "benefitName", label: "福利名称" },
{ prop: "startChoiceTime", label: "选择开始时间" }, { prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" }, { prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "signMode", label: "是否电子签字" },
{ prop: "provideMode", label: "发放形式" }, { prop: "provideMode", label: "发放形式" },
{ prop: "isChoice", label: "是否选择" } { prop: "isChoice", label: "是否选择" }
] ]
src/main/resources/views/platform/zhgh/benefit/userSelection/selectionBefit.js
+8 -17
View File
@@ -25,7 +25,7 @@ let SELECTION_BENEFIT = {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否电子签字"> <el-form-item v-if="false" label="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE" <dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag> :value="viewData.signMode"></dict-tag>
</el-form-item> </el-form-item>
@@ -99,11 +99,10 @@ let SELECTION_BENEFIT = {
</el-col> </el-col>
</el-row> </el-row>
<el-card v-if="viewData.provideMode==='BENEFIT_PROVIDE_MODE_ONE' <el-card v-if="false">
&&viewData.signMode==='BENEFIT_SIGN_MODE_ONE'">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<pc-signature v-model="formData.userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
@@ -199,10 +198,10 @@ let SELECTION_BENEFIT = {
</el-row> </el-row>
</el-card> </el-card>
<el-card v-if="viewData.signMode==='BENEFIT_SIGN_MODE_ONE'"> <el-card v-if="false">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<pc-signature v-model="formData.userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
@@ -248,11 +247,7 @@ let SELECTION_BENEFIT = {
this.$forceUpdate() this.$forceUpdate()
}, },
submit() { submit() {
if (this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE" && !this.formData.userSign) { let flag = false
this.$message.warning("请签字后再提交！")
return
}
let flag = false
let msg = "" let msg = ""
this.formData.benefitGoodsList.some(b => { this.formData.benefitGoodsList.some(b => {
if (b.goodsProvideMode === "GOODS_PROVIDE_MODE_POST" && !b.receiveAddress) { if (b.goodsProvideMode === "GOODS_PROVIDE_MODE_POST" && !b.receiveAddress) {
@@ -346,11 +341,7 @@ let SELECTION_BENEFIT = {
this.addressOptions = resp.data this.addressOptions = resp.data
}, },
provideModeOneDoSubmit() { provideModeOneDoSubmit() {
if (!this.formData.userSign) { this.$confirm("确定要提交吗？", "提示", {
this.$message.warning("请签字后再提交！")
return
}
this.$confirm("确定要提交吗？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
@@ -369,7 +360,7 @@ let SELECTION_BENEFIT = {
}, },
openSubmit() { openSubmit() {
if (this.viewData.provideMode === "BENEFIT_PROVIDE_MODE_ONE" if (this.viewData.provideMode === "BENEFIT_PROVIDE_MODE_ONE"
&& this.viewData.signMode === "BENEFIT_SIGN_MODE_ONE") { && false) {
//如果是统一发放并且需要签字 //如果是统一发放并且需要签字
this.provideModeOneDoSubmit() this.provideModeOneDoSubmit()
return return
src/main/resources/views/platform/zhgh/benefit/userSelectionList/index.html
+1 -1
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
show-overflow-tooltip show-overflow-tooltip
v-if="pageFormProvideMode==='BENEFIT_PROVIDE_MODE_TWO'" v-if="pageFormProvideMode==='BENEFIT_PROVIDE_MODE_TWO'"
></el-table-column> ></el-table-column>
<el-table-column label="签字" prop="userSign" show-overflow-tooltip v-if="pageFormSignMode==='BENEFIT_SIGN_MODE_ONE'"> <el-table-column label="签字" prop="userSign" show-overflow-tooltip v-if="false">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-image :src="row.userSign" fit="cover" style="height: 60px" v-if="row.userSign"></el-image> <el-image :src="row.userSign" fit="cover" style="height: 60px" v-if="row.userSign"></el-image>
<el-tag effect="dark" type="info" v-else>暂无</el-tag> <el-tag effect="dark" type="info" v-else>暂无</el-tag>
src/main/resources/views/platform/zhgh/benefit/userSelectionMine/index.html
-1
View File
@@ -78,7 +78,6 @@ layout("/layouts/platform.html"){
{ prop: "benefitName", label: "福利名称" }, { prop: "benefitName", label: "福利名称" },
{ prop: "startChoiceTime", label: "选择开始时间" }, { prop: "startChoiceTime", label: "选择开始时间" },
{ prop: "endChoiceTime", label: "选择结束时间" }, { prop: "endChoiceTime", label: "选择结束时间" },
{ prop: "signMode", label: "是否电子签字" },
{ prop: "provideMode", label: "发放形式" }, { prop: "provideMode", label: "发放形式" },
{ prop: "giftName", label: "所选礼品" }, { prop: "giftName", label: "所选礼品" },
{ prop: "isChoice", label: "是否选择/签字" } { prop: "isChoice", label: "是否选择/签字" }
src/main/resources/views/platform/zhgh/benefit/userSelectionMine/info.js
+1 -1
View File
@@ -23,7 +23,7 @@ let SELECTION_BENEFIT_INFO = {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="是否电子签字"> <el-form-item v-if="false" label="是否电子签字">
<dict-tag :options="dict.type.BENEFIT_SIGN_MODE" <dict-tag :options="dict.type.BENEFIT_SIGN_MODE"
:value="viewData.signMode"></dict-tag> :value="viewData.signMode"></dict-tag>
</el-form-item> </el-form-item>
src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js
+1 -1
View File
@@ -53,7 +53,7 @@ const clubUserJoin = {
<el-descriptions-item label="照片" :span="3"> <el-descriptions-item label="照片" :span="3">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar"> <img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.signature" <el-image v-if="viewData.signature"
:src="viewData.signature" :src="viewData.signature"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+3 -3
View File
@@ -108,9 +108,9 @@ layout("/layouts/platform.html"){
></file-upload> ></file-upload>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="电子签名" :span="3"> <el-descriptions-item label="电子签名" :span="3" v-if="false">
<el-form-item label="电子签名" prop="signature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="signature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.signature"></pc-signature> <pc-signature v-if="false" v-model="formData.signature"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
src/main/resources/views/platform/zhgh/dayofficework/article/schoolUnionApproval/form.html
+2 -2
View File
@@ -4,8 +4,8 @@
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction" <snaker-flow-task-form-action @task-action="handleTaskAction"
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/common/info.js
+1 -1
View File
@@ -51,7 +51,7 @@ const cadreTrainingInfo = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign" <el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign" v-if="task.ext.tf_userSign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+2 -2
View File
@@ -103,8 +103,8 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/info.js
+1 -1
View File
@@ -82,7 +82,7 @@ const ENROLLMENT_REGISTRATION_INFO = {
task.taskFormData.opinion task.taskFormData.opinion
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3"> <el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px" <el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image> v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item> </el-descriptions-item>
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html
+2 -2
View File
@@ -101,9 +101,9 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
<!-- <!--
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/unionAudit/index.html
+2 -2
View File
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html
+2 -2
View File
@@ -76,9 +76,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/evaluation/common/info.js
+1 -1
View File
@@ -68,7 +68,7 @@ const info = {
task.taskFormData.opinion task.taskFormData.opinion
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3"> <el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px" <el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image> v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item> </el-descriptions-item>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html
+2 -2
View File
@@ -84,9 +84,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/apply/index.html
+3 -3
View File
@@ -114,10 +114,10 @@ layout("/layouts/platform.html"){
upload_result_category="array"></file-upload> upload_result_category="array"></file-upload>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="userSign"> <el-form-item v-if="false" label="签字" prop="userSign">
<pc-signature v-model="formData.userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html
+2 -2
View File
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubZxAudit/index.html
+2 -2
View File
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/info.js
+2 -2
View File
@@ -30,7 +30,7 @@ const OUTLAY_REIMBURSE_INFO = {
<el-descriptions-item label="附件" :span="3"> <el-descriptions-item label="附件" :span="3">
<file-preview :files="viewData.files" complete_result></file-preview> <file-preview :files="viewData.files" complete_result></file-preview>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="viewData.userSign" fit="cover" style="height: 60px" <el-image :src="viewData.userSign" fit="cover" style="height: 60px"
v-if="viewData.userSign"></el-image> v-if="viewData.userSign"></el-image>
</el-descriptions-item> </el-descriptions-item>
@@ -71,7 +71,7 @@ const OUTLAY_REIMBURSE_INFO = {
task.taskFormData.opinion task.taskFormData.opinion
}} }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" v-if="!task.ext.isFirstTaskNode" :span="3"> <el-descriptions-item label="签字" v-if="false" :span="3">
<el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px" <el-image :src="task.ext.tf_userSign" fit="cover" style="height: 60px"
v-if="task.ext.tf_userSign"></el-image> v-if="task.ext.tf_userSign"></el-image>
</el-descriptions-item> </el-descriptions-item>
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html
+2 -2
View File
@@ -99,9 +99,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html
+2 -2
View File
@@ -117,9 +117,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html
+2 -2
View File
@@ -117,9 +117,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/unionAudit/index.html
+2 -2
View File
@@ -85,9 +85,9 @@ layout("/layouts/platform.html"){
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!--:rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
> >
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/apply/index.html
+4 -4
View File
@@ -165,9 +165,9 @@ layout("/layouts/platform.html"){
></file-upload> ></file-upload>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-form-item label="签字" prop="userSign"> <el-form-item v-if="false" label="签字" prop="userSign">
<pc-signature v-model="formData.userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -214,7 +214,7 @@ layout("/layouts/platform.html"){
money: [{ required: true, message: "必填", trigger: ["change", "blur"] }], money: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
mobile: [{ required: true, message: "必填", trigger: ["change", "blur"] }], mobile: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
files: [{ required: true, message: "必填", trigger: ["change", "blur"] }], files: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
userSign: [{ required: true, message: "必填", trigger: ["change", "blur"] }], userSign: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }] certifierUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
}, },
chooseType: {}, chooseType: {},
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/certifierUserSign/index.html
+2 -2
View File
@@ -110,9 +110,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/info.js
+2 -2
View File
@@ -36,7 +36,7 @@ const unionReimburseInfo = {
<el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item> <el-descriptions-item label="报销金额">{{viewData.money}}</el-descriptions-item>
<!-- <el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item>--> <!-- <el-descriptions-item label="发票张数">{{viewData.invoiceNumber}}</el-descriptions-item>-->
<el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item> <el-descriptions-item label="支付内容" :span="2">{{viewData.paymentNotes}}</el-descriptions-item>
<el-descriptions-item label="签字" :span="2"> <el-descriptions-item v-if="false" label="签字" :span="2">
<el-image :src="viewData.userSign" fit="cover" style="height: 60px" <el-image :src="viewData.userSign" fit="cover" style="height: 60px"
v-if="viewData.userSign"></el-image> v-if="viewData.userSign"></el-image>
<span v-else>暂无附件</span> <span v-else>暂无附件</span>
@@ -75,7 +75,7 @@ const unionReimburseInfo = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode" :span="3">{{ <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode" :span="3">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="task.ext.tf_userSign" <el-image v-if="task.ext.tf_userSign"
:src="task.ext.tf_userSign" :src="task.ext.tf_userSign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+2 -2
View File
@@ -110,9 +110,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="签字" prop="tf_userSign" <el-form-item v-if="false" label="签字" prop="tf_userSign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFilingUnit/index.html
+4 -4
View File
@@ -142,8 +142,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
@@ -215,8 +215,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
+2 -2
View File
@@ -123,8 +123,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见" placeholder="请输入初步阅览意见"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
+4 -4
View File
@@ -148,8 +148,8 @@ layout("/layouts/platform.html"){
></file-upload> ></file-upload>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="signature">--> <!-- <el-form-item v-if="false" label="电子签名" prop="signature">-->
<!-- <pc-signature v-model="formData.signature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.signature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
@@ -195,14 +195,14 @@ layout("/layouts/platform.html"){
committeeId: [{required: true, message: "请选择所属委员会", trigger: ["blur", "change"]}], committeeId: [{required: true, message: "请选择所属委员会", trigger: ["blur", "change"]}],
typeId: [{required: true, message: "请选择提案类别", trigger: ["blur", "change"]}], typeId: [{required: true, message: "请选择提案类别", trigger: ["blur", "change"]}],
suggestUnits: [{required: true, message: "请选择建议承办单位", trigger: ["blur", "change"]}], suggestUnits: [{required: true, 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"]}], excerpt: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
researchFindings: [{required: true, message: "请填写", trigger: ["blur", "change"]}], researchFindings: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
brief: [{required: true, message: "请填写", trigger: ["blur", "change"]}], brief: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
measures: [{required: true, message: "请填写", trigger: ["blur", "change"]}], measures: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
unitName: [{required: true, message: "请填写", trigger: ["blur", "change"]}], unitName: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
mobile: [{required: true, message: "请填写", trigger: ["blur", "change"]}], mobile: [{required: true, message: "请填写", trigger: ["blur", "change"]}],
signature: [{required: false, message: "请扫描二维码进行签字", trigger: ["blur", "change"]}] signature: [{required: false, message: "非必填", trigger: ["blur", "change"]}]
}, },
proposalConfig: {}, proposalConfig: {},
noticeDialogVisible: false, noticeDialogVisible: false,
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/common/info.js
+5 -5
View File
@@ -109,7 +109,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">--> <!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -137,7 +137,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template> </template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -184,7 +184,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template> </template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -248,7 +248,7 @@ const SUGGESTION_INFO_COMPONENT = {
<el-descriptions-item label="审批意见" :span="3"> <el-descriptions-item label="审批意见" :span="3">
{{ task.extVariable.approvalOpinion}} {{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -265,7 +265,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFiling/index.html
+4 -4
View File
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
@@ -212,8 +212,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/committeeFilingUnit/index.html
+4 -4
View File
@@ -146,8 +146,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/delegation/index.html
+1 -1
View File
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
<!-- prop="approvalSignature"--> <!-- prop="approvalSignature"-->
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<!-- >--> <!-- >-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/schoolLeaderApproval/index.html
+2 -2
View File
@@ -122,8 +122,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/seconded/index.html
+1 -1
View File
@@ -91,7 +91,7 @@ layout("/layouts/platform.html"){
<!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>--> <!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">--> <!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitRead/index.html
+2 -2
View File
@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见" placeholder="请输入初步阅览意见"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/unitReply/index.html
+2 -2
View File
@@ -144,8 +144,8 @@ layout("/layouts/platform.html"){
<el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<text-editor v-model="formData.approvalOpinion"></text-editor> <text-editor v-model="formData.approvalOpinion"></text-editor>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/tc/transact/write/index.html
+2 -2
View File
@@ -151,13 +151,13 @@ layout("/layouts/platform.html"){
sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }], sessionId: [{ required: true, message: "请选择所属教代会", trigger: ["blur", "change"] }],
typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }], typeId: [{ required: true, message: "请选择意见类别", trigger: ["blur", "change"] }],
implementUnitId: [{ required: false, 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"] }], excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
mobile: [{ 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: {}, suggestionConfig: {},
noticeDialogVisible: false noticeDialogVisible: false
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/common/info.js
+5 -5
View File
@@ -110,7 +110,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">--> <!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -138,7 +138,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template> </template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -187,7 +187,7 @@ const SUGGESTION_INFO_COMPONENT = {
</template> </template>
<el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="审核意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -252,7 +252,7 @@ const SUGGESTION_INFO_COMPONENT = {
<el-descriptions-item label="审批意见" :span="3"> <el-descriptions-item label="审批意见" :span="3">
{{ task.extVariable.approvalOpinion}} {{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
@@ -269,7 +269,7 @@ const SUGGESTION_INFO_COMPONENT = {
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}} <el-descriptions-item label="反馈意见" :span="3">{{ task.extVariable.approvalOpinion}}
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字">--> <!-- <el-descriptions-item v-if="false" label="签字">-->
<!-- <el-image :src="task.extVariable.approvalSignature"--> <!-- <el-image :src="task.extVariable.approvalSignature"-->
<!-- v-if="task.extVariable && task.extVariable.approvalSignature"--> <!-- v-if="task.extVariable && task.extVariable.approvalSignature"-->
<!-- class="signature-image"></el-image>--> <!-- class="signature-image"></el-image>-->
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFiling/index.html
+4 -4
View File
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
@@ -212,8 +212,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!--<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/committeeFilingUnit/index.html
+4 -4
View File
@@ -146,8 +146,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="consolidationFormData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="consolidationFormData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="consolidationFormData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/delegation/index.html
+1 -1
View File
@@ -96,7 +96,7 @@ layout("/layouts/platform.html"){
<!-- prop="approvalSignature"--> <!-- prop="approvalSignature"-->
<!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"--> <!-- :rules="[{required:true,message:'必填',trigger:['change','blur']}]"-->
<!-- >--> <!-- >-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/schoolLeaderApproval/index.html
+2 -2
View File
@@ -122,8 +122,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审批意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!--<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!--<el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/seconded/index.html
+1 -1
View File
@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
<!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>--> <!-- <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">--> <!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]" v-if="formData.processInstanceTaskId !== 'd3a53d97c2ce441083c973fdb798352b' && formData.processInstanceTaskId !== '70989be6710c4a599db297d85dd82928'">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitRead/index.html
+2 -2
View File
@@ -127,8 +127,8 @@ layout("/layouts/platform.html"){
placeholder="请输入初步阅览意见" placeholder="请输入初步阅览意见"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/unitReply/index.html
+2 -2
View File
@@ -144,8 +144,8 @@ layout("/layouts/platform.html"){
<el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="答复内容" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<text-editor v-model="formData.approvalOpinion"></text-editor> <text-editor v-model="formData.approvalOpinion"></text-editor>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item>--> </el-form-item>-->
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/democratic/suggestion/wc/transact/write/index.html
+2 -2
View File
@@ -152,13 +152,13 @@ layout("/layouts/platform.html"){
sessionId: [{ required: true, message: "请选择所属工代会", trigger: ["blur", "change"] }], sessionId: [{ required: true, message: "请选择所属工代会", trigger: ["blur", "change"] }],
typeId: [{ required: true, message: "请选择意见建议类别", trigger: ["blur", "change"] }], typeId: [{ required: true, message: "请选择意见建议类别", trigger: ["blur", "change"] }],
implementUnitId: [{ required: false, 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"] }], excerpt: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], brief: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], measures: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }], unitName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
mobile: [{ 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: {}, suggestionConfig: {},
noticeDialogVisible: false noticeDialogVisible: false
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+4 -4
View File
@@ -232,9 +232,9 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="signature" label="签字"> <el-form-item prop="signature" label="签字" v-if="false">
<pc-signature v-model="formData.signature"></pc-signature> <pc-signature v-if="false" v-model="formData.signature"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -280,7 +280,7 @@ layout("/layouts/platform.html"){
deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}], deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}],
remark: [{required: true, message: "必填", trigger: ["change", "blur"]}], remark: [{required: true, message: "必填", trigger: ["change", "blur"]}],
files: [{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"]}], handlerUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
certifierUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], certifierUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
bankCardNumber: [{required: true, message: "必填", trigger: ["change", "blur"]}], bankCardNumber: [{required: true, message: "必填", trigger: ["change", "blur"]}],
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+2 -2
View File
@@ -81,9 +81,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_sign" <el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js
+2 -2
View File
@@ -37,7 +37,7 @@ const condolenceInfo = {
complete_result></file-preview> complete_result></file-preview>
<span v-else>暂无附件</span> <span v-else>暂无附件</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="viewData.signature" <el-image :src="viewData.signature"
v-if="viewData.signature" v-if="viewData.signature"
class="signature-image"></el-image> class="signature-image"></el-image>
@@ -72,7 +72,7 @@ const condolenceInfo = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.taskFormData.tf_sign" <el-image :src="task.taskFormData.tf_sign"
v-if="task.taskFormData.tf_sign" v-if="task.taskFormData.tf_sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html
+2 -2
View File
@@ -101,9 +101,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_sign" <el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+2 -2
View File
@@ -101,9 +101,9 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_sign" <el-form-item v-if="false" label="电子签名" prop="tf_sign"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_sign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_sign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
+3 -3
View File
@@ -210,9 +210,9 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -253,7 +253,7 @@
officialCapacity: [{required: true, message: '必填', trigger: ['blur', 'change']}], officialCapacity: [{required: true, message: '必填', trigger: ['blur', 'change']}],
subsidyStandards: [{required: true, message: '必填', trigger: ['blur', 'change']}], subsidyStandards: [{required: true, message: '必填', trigger: ['blur', 'change']}],
reason: [{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']}]
}, },
// 替他人申请相关 // 替他人申请相关
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+3 -3
View File
@@ -226,9 +226,9 @@ layout("/layouts/platform.html"){
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -278,7 +278,7 @@ layout("/layouts/platform.html"){
officialCapacity: [{required: true, message: '请填写职务职称', trigger: ['blur', 'change']}], officialCapacity: [{required: true, message: '请填写职务职称', trigger: ['blur', 'change']}],
subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}], subsidyStandards: [{required: true, message: '请选择困难类型', trigger: ['blur', 'change']}],
reason: [{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']}]
}, },
// 替他人申请相关 // 替他人申请相关
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/common/info.js
+1 -1
View File
@@ -49,7 +49,7 @@ const INFO = {
<span v-else>暂无</span> <span v-else>暂无</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/view/index.html
+1 -1
View File
@@ -37,7 +37,7 @@
<span v-else>暂无</span> <span v-else>暂无</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
+3 -3
View File
@@ -138,8 +138,8 @@ layout("/layouts/platform.html"){
complete_result upload_mode="drag" complete_result upload_mode="drag"
upload_result_category="array"></file-upload> upload_result_category="array"></file-upload>
</el-form-item> </el-form-item>
<el-form-item prop="sign" label="签字"> <el-form-item v-if="false" prop="sign" label="签字">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
<el-form-item prop="declarationAgreed"> <el-form-item prop="declarationAgreed">
<el-checkbox v-model="formData.declarationAgreed"> <el-checkbox v-model="formData.declarationAgreed">
@@ -184,7 +184,7 @@ layout("/layouts/platform.html"){
office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }], office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }],
honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }], honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }],
retireFiles: [{ 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] }] declarationAgreed: [{ required: true, message: '请勾选申报理由', trigger: 'change', type: 'enum', enum: [true] }]
}, },
} }
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js
+2 -2
View File
@@ -28,7 +28,7 @@ const DSZNFMTX_INFO = {
<el-descriptions-item :span="3" label="退休证"> <el-descriptions-item :span="3" label="退休证">
<file-preview :files="viewData.retireFiles" complete_result></file-preview> <file-preview :files="viewData.retireFiles" complete_result></file-preview>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
@@ -63,7 +63,7 @@ const DSZNFMTX_INFO = {
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign" <el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign" v-if="task.ext.tf_userSign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html
+2 -2
View File
@@ -89,8 +89,8 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html
+2 -2
View File
@@ -89,8 +89,8 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js
+1 -1
View File
@@ -75,7 +75,7 @@ const maternityLeaveInfo = {
<el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{ <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }} task.taskFormData.opinion }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode"> <el-descriptions-item label="签字" :span="3" v-if="false">
<el-image :src="task.ext.tf_userSign" <el-image :src="task.ext.tf_userSign"
v-if="task.ext.tf_userSign" v-if="task.ext.tf_userSign"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html
+2 -2
View File
@@ -88,8 +88,8 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html
+2 -2
View File
@@ -89,8 +89,8 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.tf_userSign"></pc-signature> <pc-signature v-if="false" v-model="formData.tf_userSign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/apply/index.html
+2 -2
View File
@@ -217,8 +217,8 @@ layout("/layouts/platform.html"){
accept=".doc, .docx, .xls, .xlsx, .pdf, .ppt, .jpg, .jpeg, .png" accept=".doc, .docx, .xls, .xlsx, .pdf, .ppt, .jpg, .jpeg, .png"
complete_result></file-upload> complete_result></file-upload>
</el-form-item> </el-form-item>
<el-form-item prop="sign" label="签字"> <el-form-item prop="sign" label="签字" v-if="false">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/common/userInfo.js
+1 -1
View File
@@ -30,7 +30,7 @@ const userInfo = {
<el-descriptions-item :span="3" label="附件"> <el-descriptions-item :span="3" label="附件">
<file-preview :files="viewData.files" complete_result></file-preview> <file-preview :files="viewData.files" complete_result></file-preview>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" > <el-descriptions-item label="签字" v-if="false">
<el-image v-if="viewData.sign" <el-image v-if="viewData.sign"
:src="viewData.sign" :src="viewData.sign"
class="signature-image" class="signature-image"
src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/memberApplyAuditInfo.js
+2 -2
View File
@@ -49,7 +49,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
<el-tag type="warning" v-else>暂无</el-tag> <el-tag type="warning" v-else>暂无</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字信息" :span="3"> <el-descriptions-item v-if="false" label="签字信息" :span="3">
<el-image v-if="viewData.sign" :src="viewData.sign" <el-image v-if="viewData.sign" :src="viewData.sign"
class="signature-image"></el-image> class="signature-image"></el-image>
<el-tag type="warning" v-else>暂无</el-tag> <el-tag type="warning" v-else>暂无</el-tag>
@@ -90,7 +90,7 @@ const MEMBER_APPLY_AUDIT_INFO = {
{{ task.extVariable.approvalRemark }} {{ task.extVariable.approvalRemark }}
</el-descriptions-item> </el-descriptions-item>
</template> </template>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-image :src="task.extVariable.approvalSignature" <el-image :src="task.extVariable.approvalSignature"
v-if="task.extVariable && task.extVariable.approvalSignature" v-if="task.extVariable && task.extVariable.approvalSignature"
class="signature-image"></el-image> class="signature-image"></el-image>
src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/form.html
+2 -2
View File
@@ -23,8 +23,8 @@
:rules="[{required:true,message:'必填',trigger:['change','blur']}]"> :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<!-- <el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">--> <!-- <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
<!-- <pc-signature v-model="formData.approvalSignature"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction" <snaker-flow-task-form-action @task-action="handleTaskAction"
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/form.html
+3 -3
View File
@@ -186,9 +186,9 @@
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="签字" :span="3"> <el-descriptions-item v-if="false" label="签字" :span="3">
<el-form-item prop="sign"> <el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature> <pc-signature v-if="false" v-model="formData.sign"></pc-signature>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@@ -213,7 +213,7 @@
username: [{required: false, message: "必填", trigger: ["change", "blur"]}], username: [{required: false, message: "必填", trigger: ["change", "blur"]}],
sex: [{required: false, message: "必填", trigger: ["change", "blur"]}], sex: [{required: false, message: "必填", trigger: ["change", "blur"]}],
isVoluntary: [{required: true, 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: [ email: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+3 -3
View File
@@ -219,9 +219,9 @@ layout("/layouts/platform.html"){
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="签字" :span="3">--> <!-- <el-descriptions-item v-if="false" label="签字" :span="3">-->
<!-- <el-form-item prop="sign">--> <!-- <el-form-item prop="sign">-->
<!-- <pc-signature v-model="formData.sign"></pc-signature>--> <!-- <pc-signature v-if="false" v-model="formData.sign"></pc-signature>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-descriptions-item>--> <!-- </el-descriptions-item>-->
</el-descriptions> </el-descriptions>
@@ -251,7 +251,7 @@ layout("/layouts/platform.html"){
username: [{ required: false, message: "必填", trigger: ["change", "blur"] }], username: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
sex: [{ required: false, message: "必填", trigger: ["change", "blur"] }], sex: [{ required: false, message: "必填", trigger: ["change", "blur"] }],
isVoluntary: [{ required: true, 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"] }], homeAddress: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }], personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }], specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
src/main/resources/views/platform/zhgh/staffmanage/member/branch/audit/index.html
+2 -2
View File
@@ -18,8 +18,8 @@ layout("/layouts/platform.html"){
<el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> <el-form-item label="审核意见" prop="approvalOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea> <user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
</el-form-item> </el-form-item>
<el-form-item label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]"> <el-form-item v-if="false" label="电子签名" prop="approvalSignature" :rules="[{required:false,message:'必填',trigger:['change','blur']}]">
<pc-signature v-model="formData.approvalSignature"></pc-signature> <pc-signature v-if="false" v-model="formData.approvalSignature"></pc-signature>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row type="flex" justify="end"> <el-row type="flex" justify="end">

Some files were not shown because too many files have changed in this diff Show More