From bde0d79afee747958e53c351ead9be40408d1ba5 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 5 Jul 2022 09:27:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=8D=95=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 23ccd330..2ec611ec 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -335,8 +335,8 @@ export default { label: "以组织名义", optionList: [ { - label: agencyId, - value: agencyName, + label: agencyName, + value: agencyId, type: "agency", }, ], From cf057c1ab1c2c3996697d945b1657f8643707b88 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 5 Jul 2022 14:10:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=AE=B1=E2=80=9C=E6=96=B0=E5=A2=9E=E2=80=9D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/drafts.vue | 2 +- src/views/modules/cpts/base/index.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index 69582150..f2a12978 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -71,7 +71,7 @@ export default { importUrl: "", exportUrl: "", - addUrl: "/gov/voice/article/addOrSaveDraft", + addUrl: "", editUrl: "/gov/voice/article/addOrSaveDraft", infoUrl: "/gov/voice/draft/detailV2", delUrl: "/gov/voice/draft/deletedraft", diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 79bed9c6..896153ac 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -93,7 +93,10 @@ -
+
Date: Tue, 5 Jul 2022 15:58:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/article/drafts.vue | 13 +++++++++++++ .../modules/communityParty/article/index.vue | 17 +++++++++++++---- src/views/modules/cpts/base/cpts/edit.vue | 19 +++++++++++++++++-- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index f2a12978..d134279b 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -186,6 +186,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -335,6 +340,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 2ec611ec..18c6f8db 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -110,10 +110,6 @@ export default { optionUrl: "", optionUrlParams: {}, optionList: [ - { - label: "全部", - value: "", - }, { label: "已发布", value: "published", @@ -309,6 +305,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -458,6 +459,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index d451ecc2..9a2226ef 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -81,6 +81,7 @@ formType == 'add' || (formType == 'edit' && !item.editDisable) " v-model="fmData[item.keyName]" + :picker-options="item.pickerOptions" class="item-input" size="small" clearable @@ -771,10 +772,18 @@ export default { }, async submit() { + const { editConfig, fmData, formType, editFixedParams } = this; + if ( + typeof editConfig.beforeSubmit == "function" && + !editConfig.beforeSubmit(formType, fmData, this) + ) { + return; + } + let url = ""; let params = { - ...this.fmData, - ...this.editFixedParams, + ...fmData, + ...editFixedParams, // serviceType: this.fmData.serviceTypeArr.join(","), }; @@ -823,6 +832,12 @@ export default { .item-rich-text { width: 817px; + max-height: 500px; + overflow: auto; + + img { + max-width: 100%; + } &.z-show { box-sizing: border-box; padding: 15px;