Merge branch 'dev-heart0629' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-heart0629

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",
@@ -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;
+        },
       },
     };
   },

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,
@@ -335,8 +336,8 @@ export default {
                 label: "以组织名义",
                 optionList: [
                   {
-                    label: agencyId,
-                    value: agencyName,
+                    label: agencyName,
+                    value: agencyId,
                     type: "agency",
                   },
                 ],
@@ -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;
+        },
       },
     };
   },

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;

src/views/modules/cpts/base/index.vue

@@ -93,7 +93,10 @@
         </el-form>
       </div>
 
-      <div class="div_table">
+      <div
+        class="div_table"
+        :style="{ height: maxTableHeight + 130 + 'px' }"
+      >
         <div class="div_btn">
           <el-button
             class="diy-button--add"
@@ -422,8 +425,8 @@ export default {
     maxTableHeight() {
       const { ref_search_height } = this;
       return this.$store.state.inIframe
-        ? this.clientHeight - ref_search_height - 260 + this.iframeHeight
-        : this.clientHeight - ref_search_height - 260;
+        ? this.clientHeight - ref_search_height - 265 + this.iframeHeight
+        : this.clientHeight - ref_search_height - 265;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },