合并

src/store/modules/activity.js

@@ -43,8 +43,6 @@ export default {
           ...apis.activity.updateActivity,
           data: payload,
         }).then((data) => {
-          window.console.log(data)
-          commit('updateList', { ...data, list: data.records})
           resolve(data)
         }).catch(({ message }) => {
           if (typeof message === 'string') {

src/views/activity/add.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-form ref="form" :model="dynamic" label-width="160px">
-    <el-form-item label="所属项目">
+  <el-form ref="activityQuery" :model="activityQuery" :rules="rules"  label-width="160px">
+    <el-form-item label="所属项目" prop="buildingId">
       <el-select v-model="activityQuery.buildingId" placeholder="请选择">
         <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
       </el-select>
@@ -22,23 +22,18 @@
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <el-input v-model="activityQuery.title"></el-input>
     </el-form-item>
     <el-form-item label="活动时间">
-       <el-date-picker v-model="activityQuery.startDate"  type="datetime" placeholder="选择日期"/>
-       <!-- <el-date-picker
-                  v-model="detail.reportDate"
-                  type="datetime"
-                  placeholder="选择日期时间">
-          </el-date-picker> -->
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate"  type="datetime" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点" prop="address">
       <el-input  v-model="activityQuery.address"></el-input>
     </el-form-item>
-    <el-form-item  label="活动人数">
+    <el-form-item  label="活动人数" prop="personNum">
       <el-input v-model="activityQuery.personNum" ></el-input>
     </el-form-item>
     <!-- <el-form-item label="链接地址">
@@ -51,13 +46,13 @@
        <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
        <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
     </el-form-item>
-    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
-       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+    <el-form-item label="报名时间" v-if="activityQuery.isEnlist == '1'" prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
 
     </el-form-item>
   </el-form>
@@ -77,7 +72,6 @@ export default {
   data () {
     return {
       url:'',
-      buildingId:'',
       upFileUrl: apis.file.upload.url,
       radio:'1',
       imgList: [],
@@ -90,12 +84,40 @@ export default {
        buildingId:'',
        title:'',
        isEnlist:'1',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        personNum:'',
-      }
-      
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择活动区域', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请选择活动资源', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ]
+        }
     }
   },
   computed: {
@@ -164,11 +186,28 @@ export default {
       this.updateDetail({...this.dynamic, imgUrl: res.data})
       this.loading.close()
     },
-    onSubmit () {
-      // if (!this.detail.dynamicId) {
-        // 新增
-        console.log('this.imgList[0]',this.imgList[0])
-        // this.activityQuery.url = this.imgList[0]
+    onSubmit (formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+           // 新增
+      console.log('this.activityQuery.desc',this.activityQuery.desc)
+      const endDate=this.activityQuery.endDate
+      const startDate=this.activityQuery.startDate
+      if( endDate <= startDate){
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return false
+      }
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return false
+      }
+
+      const enlistStart= this.activityQuery.enlistStart
+      const enlistEnd= this.activityQuery.enlistEnd
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return false
+      }
         this.addActivity(
           JSON.stringify(this.activityQuery)
         ).then(() => {
@@ -176,26 +215,23 @@ export default {
           
         })
         this.$router.push({ name: "activity-list" });
-      // } else {
-      //   // 修改
-      //   this.editDynamics({
-      //     detail: JSON.stringify(this.detail)
-      //   }).then(() => {
-      //     this.onCancel()
-      //   })
-      // }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        })
     },
     onCancel () {
       this.$router.push({name: 'dynamiclist'})
-    }
+    },
   },
   mounted () {
     const _that = this
     const phoneEditor = new E('#websiteEditorElem')
     phoneEditor.customConfig.zIndex = 1
     phoneEditor.customConfig.onchange = function (html) {
-      _that.dynamic = {..._that.dynamic, url: html}
-        _that.activityQuery.text =_that.dynamic.url
+      _that.activityQuery = {..._that.activityQuery, desc: html}
+       console.log('that.dynamic.url',_that.activityQuery.desc)
     }
     // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
     // phoneEditor.customConfig.uploadFileName = 'uploadFiles'

src/views/activity/edit.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-form ref="form" label-width="160px">
-    <el-form-item label="所属项目">
-      <el-select v-model="activityQuery.buildingId" placeholder="请选择">
+  <el-form ref="activityQuery" label-width="160px" :rules="rules" :model="activityQuery">
+    <el-form-item label="所属项目" prop="buildingId">
+      <el-select v-model="activityQuery.buildingId"  placeholder="请选择">
         <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
       </el-select>
     </el-form-item>
@@ -15,37 +15,39 @@
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <el-input v-model="activityQuery.title"></el-input>
     </el-form-item>
     <el-form-item label="活动时间">
-       <el-date-picker v-model="activityQuery.startDate" type="date" placeholder="选择日期"/>
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点"  prop="address">
       <el-input  v-model="activityQuery.address"></el-input>
     </el-form-item>
-    <el-form-item label="活动人数">
+    <el-form-item label="活动人数" prop="personNum">
       <el-input v-model="activityQuery.personNum"></el-input>
     </el-form-item>
     <!-- <el-form-item label="链接地址">
       <el-input v-model="dynamic.url"></el-input>
     </el-form-item> -->
     <el-form-item label="活动详情">
-      <div id="websiteEditorElem" style="height: 400px"></div>
+      <div id="desc">
+        <rich-editor v-model="activityQuery.desc" style="height: 400px"/>
+      </div>   
     </el-form-item>
     <el-form-item label="是否需要报名">
        <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
        <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
     </el-form-item>
-    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
-       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'"  prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
       <el-button @click="onCancel">取消</el-button>
     </el-form-item>
   </el-form>
@@ -55,7 +57,7 @@
 import { createNamespacedHelpers } from 'vuex'
 import apis from '../../config/api'
 import E from 'wangeditor'
-
+import dayjs from 'dayjs'
 const { mapState: mapDynamicState, mapActions: mapDynamicActions, mapMutations: mapDynamicMutations } = createNamespacedHelpers('building')
 const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
 const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
@@ -74,19 +76,47 @@ export default {
       dialogImageUrl: "",
       activityQuery: {
        dynamicId:'',
-       buildingId:'',
        url:'',
        startDate:'',
        endDate:'',
        buildingId:'',
        title:'',
        isEnlist:'',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        address:'',
        personNum:''
-      }
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择活动区域', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入活动标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请输入活动地点', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请输入活动人数', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ]
+        }
       
     }
   },
@@ -154,29 +184,50 @@ export default {
     },
 
     handleAvatarSuccess (res) {
-      this.activityQuery.url = res.data
-      this.updateDetail({...this.dynamic, imgUrl: res.data})
-      this.loading.close()
+      this.imageUrl = res.data
     },
-    onSubmit () {
-        // 新增
-        console.log('this.imgList[0]',this.imgList[0])
-        // this.activityQuery.url = this.imgList[0]
-        this.updateActivity(
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+      if (valid) {
+           // 新增 
+      const endDate = this.formateDate(this.activityQuery.endDate); 
+      const startDate = this.formateDate(this.activityQuery.startDate);           
+      if( endDate <= startDate){
+           console.log('endDate',endDate)
+           console.log('startDate.desc',startDate)
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return 
+      }
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null|| this.activityQuery.desc ==='<p><br></p>'){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return 
+      }
+      // 报名时间校验
+      const enlistStart = this.formateDate(this.activityQuery.enlistStart); 
+      const enlistEnd = this.formateDate(this.activityQuery.enlistEnd);           
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return 
+      }
+      this.activityQuery.url = this.imageUrl 
+        this.updateActivity(    
            JSON.stringify(this.activityQuery)
-        ).then(() => {
-          this.onCancel()
-          
+        ).then((res) => {
+      this.$router.push({ name: "activity-list" });
+        })
+     
+        } else {
+            console.log('error submit!!');
+            return false;
+          }
         })
-        this.$router.push({ name: "activity-list" });
     },
     onCancel () {
-      this.$router.push({name: 'dynamiclist'})
+      this.$router.push({name: 'activity-list'})
     },
     getDetails(){
       this.activityQuery.dynamicId = this.$route.query.row
         this.activityDetails(this.activityQuery).then((data) => {
-          console.log('55',data)
         this.activityQuery.buildingId = data.buildingId
         this.activityQuery.title = data.title
         this.activityQuery.startDate = data.startDate
@@ -185,52 +236,21 @@ export default {
         this.activityQuery.personNum = data.personNum
         this.imageUrl = data.url
         this.activityQuery.isEnlist = data.isEnlist
+        this.activityQuery.desc = data.desc
         
        
         })
-    }
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
   },
   mounted () {
-    const _that = this
-    const phoneEditor = new E('#websiteEditorElem')
-    phoneEditor.customConfig.zIndex = 1
-    phoneEditor.customConfig.onchange = function (html) {
-      _that.dynamic = {..._that.dynamic, url: html}
-        _that.activityQuery.text =_that.dynamic.url
-    }
-    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
-    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
-
-    phoneEditor.customConfig.customUploadImg = function (files, insert) {
-      _that.uploadImg(files[0]).then(data => {
-        insert(data)
-      })
-    }
-    phoneEditor.customConfig.menus = [
-      'head',  // 标题
-      'bold',  // 粗体
-      'fontSize',  // 字号
-      'fontName',  // 字体
-      'italic',  // 斜体
-      'underline',  // 下划线
-      'strikeThrough',  // 删除线
-      'foreColor',  // 文字颜色
-      'backColor',  // 背景颜色
-      'justify',  // 对齐方式
-      'image',  // 插入图片
-    ]
-    phoneEditor.create()
+    // const editor = new E('#desc')
+    // editor.customConfig.zIndex = 1
+    // editor.create()
     this.getDetails()
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100,
-    }).then(() => {
-      if ((this.$route.query.id || '') !== '') {
-        this.getDetail({id: this.$route.query.id}).then((data) => {
-          phoneEditor.txt.html(data.url)
-        })
-      }
-    })
+    
   }
 }
 </script>