From 5340d45346d0bc8b58e973f2a6b98c13990f71a1 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Sat, 7 Dec 2019 16:58:18 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=EF=BC=8C=E9=80=9A=E7=9F=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/notice-add-or-update.vue     | 49 ++++---------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index 9095b697..05d03f6c 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -7,7 +7,7 @@
              :rules="dataRule"
              ref="dataForm"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="所属机构">
+      <el-form-item label="所属机构"  prop="allDeptIdsShow">
         <el-cascader
                 v-model="dataForm.allDeptIdsShow"
                 :options="options"
@@ -15,42 +15,6 @@
                 clearable
         ></el-cascader>
       </el-form-item>
-      <!--<el-form-item label="所属街道"
-                    prop="streetId">
-        <el-select v-model="dataForm.streetId"
-                   @change="changeStreet"
-                   placeholder="所属街道">
-          <el-option v-for="item in streetList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属社区"
-                    prop="communityId">
-        <el-select v-model="dataForm.communityId"
-                   @change="changeCommunity"
-                   placeholder="所属社区">
-          <el-option v-for="item in communityList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属网格"
-                    prop="gridId">
-        <el-select v-model="value"
-                   @change="changeGrid"
-                   placeholder="所属网格">
-          <el-option v-for="item in gridList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="通知标题"
                     prop="noticeTitle">
         <el-input v-model="dataForm.noticeTitle"
@@ -137,6 +101,9 @@ export default {
         streetId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        allDeptIdsShow: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         noticeTitle: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -240,9 +207,11 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      if ((this.dataForm.noticeContent).length > 10000) {
-        return this.$message.error('您输入的的内容已超过字数不能提交')
-      }
+      if(this.dataForm.noticeContent != null && this.dataForm.noticeContent != undefined ){
+        if ((this.dataForm.noticeContent).length > 10000) {
+          return this.$message.error('您输入的的内容已超过字数不能提交')
+        }
+      }      
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false