diff --git a/src/main/java/com/budwk/app/zhgh/democratic/appeal/models/AppealInfo.java b/src/main/java/com/budwk/app/zhgh/democratic/appeal/models/AppealInfo.java index bce42e8..0222c74 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/appeal/models/AppealInfo.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/appeal/models/AppealInfo.java @@ -135,7 +135,7 @@ public class AppealInfo extends BaseModel { @Column @Comment("申诉人签名") - @ColDefine(type = ColType.VARCHAR, width = 100) + @ColDefine(type = ColType.VARCHAR, width = 255) private String signature; @Column diff --git a/src/main/resources/views/platform/zhgh/democratic/appeal/accept/index.html b/src/main/resources/views/platform/zhgh/democratic/appeal/accept/index.html index b0010e3..f250422 100644 --- a/src/main/resources/views/platform/zhgh/democratic/appeal/accept/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/appeal/accept/index.html @@ -78,11 +78,11 @@ layout("/layouts/platform.html"){ - - + + - - + + @@ -157,9 +157,8 @@ layout("/layouts/platform.html"){ submit() } }, - validateRichText(rule, value, callback) { - const text = (value || "").replace(/<[^>]+>/g, "").replace(/ /g, "").trim() - if (!text) { + validateText(rule, value, callback) { + if (!(value || "").trim()) { callback(new Error(rule.message)) return } diff --git a/src/main/resources/views/platform/zhgh/democratic/appeal/common/info.js b/src/main/resources/views/platform/zhgh/democratic/appeal/common/info.js index 33f287c..f9878ea 100644 --- a/src/main/resources/views/platform/zhgh/democratic/appeal/common/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/appeal/common/info.js @@ -24,13 +24,13 @@ const APPEAL_INFO = { {{ text(viewData.defendantAddress) }} {{ text(viewData.defendantContact) }} -
+
-
+
-
+
@@ -48,10 +48,10 @@ const APPEAL_INFO = { {{ decisionTypeText(viewData.decisionType) }} {{ viewData.decisionDate }} -
+
-
+
@@ -64,7 +64,7 @@ const APPEAL_INFO = { {{ viewData.executeTime }} {{ viewData.state }} -
+
@@ -124,6 +124,14 @@ const APPEAL_INFO = { }, text(value) { return value || "-" + }, + plainText(value) { + return (value || "") + .replace(//gi, "\n") + .replace(/<\/p>/gi, "\n") + .replace(/<[^>]+>/g, "") + .replace(/ /g, " ") + .trim() || "-" } } } diff --git a/src/main/resources/views/platform/zhgh/democratic/appeal/execute/index.html b/src/main/resources/views/platform/zhgh/democratic/appeal/execute/index.html index 2f45ea5..5cb765a 100644 --- a/src/main/resources/views/platform/zhgh/democratic/appeal/execute/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/appeal/execute/index.html @@ -61,8 +61,8 @@ layout("/layouts/platform.html"){ - - + + @@ -125,9 +125,8 @@ layout("/layouts/platform.html"){ }) }) }, - validateRichText(rule, value, callback) { - const text = (value || "").replace(/<[^>]+>/g, "").replace(/ /g, "").trim() - if (!text) { + validateText(rule, value, callback) { + if (!(value || "").trim()) { callback(new Error(rule.message)) return } diff --git a/src/main/resources/views/platform/zhgh/democratic/appeal/write/index.html b/src/main/resources/views/platform/zhgh/democratic/appeal/write/index.html index 9299c8e..5ad496f 100644 --- a/src/main/resources/views/platform/zhgh/democratic/appeal/write/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/appeal/write/index.html @@ -48,7 +48,7 @@ layout("/layouts/platform.html"){ - + @@ -89,18 +89,18 @@ layout("/layouts/platform.html"){ - + - + - + - + @@ -145,9 +145,9 @@ layout("/layouts/platform.html"){ {validator: this.validatePhone, trigger: "blur"} ], title: [{required: true, message: "请输入申诉标题", trigger: "blur"}], - appealMatter: [{required: true, validator: this.validateRichText, message: "请输入申诉事项", trigger: ["blur", "change"]}], - reason: [{required: true, validator: this.validateRichText, message: "请输入申诉理由", trigger: ["blur", "change"]}], - request: [{required: true, validator: this.validateRichText, message: "请输入申诉要求", trigger: ["blur", "change"]}], + appealMatter: [{required: true, validator: this.validateText, message: "请输入申诉事项", trigger: ["blur", "change"]}], + reason: [{required: true, validator: this.validateText, message: "请输入申诉理由", trigger: ["blur", "change"]}], + request: [{required: true, validator: this.validateText, message: "请输入申诉要求", trigger: ["blur", "change"]}], signature: [{required: true, message: "请完成申诉人签名", trigger: ["blur", "change"]}], files: [{required: true, validator: this.validateFiles, message: "请上传申诉材料附件", trigger: "change"}] } @@ -166,9 +166,8 @@ layout("/layouts/platform.html"){ } callback() }, - validateRichText(rule, value, callback) { - const text = (value || "").replace(/<[^>]+>/g, "").replace(/ /g, "").trim() - if (!text) { + validateText(rule, value, callback) { + if (!(value || "").trim()) { callback(new Error(rule.message)) return }