修改

src/views/activityManage/activityList.vue

@@ -25,13 +25,8 @@
 
             <el-table-column align="center" min-width="100px" label="活动名称" prop="title">
             </el-table-column>
-            <!-- <el-table-column align="center" min-width="100px" label="活动开始结束时间">
-                <template slot-scope="props">
-                   {{ props.row.startTime }}~{{ props.row.endTime }}
-                </template>
-            </el-table-column> -->
-            <el-table-column align="center" min-width="150px" label="开始日期cron执行表达式" prop="startCron"/>
-            <el-table-column align="center" min-width="150px" label="结束日期cron执行表达式" prop="endCron"/>
+            <el-table-column align="center" min-width="150px" label="开始日期" prop="startTime"/>
+            <el-table-column align="center" min-width="150px" label="结束日期" prop="endTime"/>
            
             <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
             </el-table-column>
@@ -61,6 +56,14 @@
         <!-- 添加或修改对话框 -->
         <el-dialog :close-on-click-modal="false" :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="70%">
             <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="100px" style='width:700px; margin-left:50px;'>
+                <el-form-item label="活动类型" prop="type">
+                    <el-select v-model="dataForm.type" filterable placeholder="请选择" style="width: 350px"
+                        value-key="value">
+                        <el-option :key="item.dictValue" v-for="item in typeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="活动名称" prop="title">
                     <el-input v-model="dataForm.title" style="width: 350px"></el-input>
                 </el-form-item>
@@ -149,7 +152,7 @@
 <script>
 import { createItem, updateItem, activityList, activityState } from "@/api/activityManage";
 import Crontab from '@/components/Crontab'
-import { allUserList } from "@/api/public";
+import { allUserList,dataTypeList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -183,6 +186,7 @@ export default {
                 createTime: '',
             },
             dataForm: {
+                type:'',
                 title: '',
                 imgUrl: '',
                 activityUrl: '',
@@ -199,6 +203,7 @@ export default {
                 create: "创建",
             },
             rules: {
+                type: [{ required: true, message: "请选择活动类型", trigger: "blur" }],
                 title: [{ required: true, message: "请填写活动名称", trigger: "blur" }],
                 imgUrl: [{ required: true, message: "图片不能为空", trigger: "blur" }],
                 startTime: [
@@ -218,13 +223,20 @@ export default {
                 ]
             },
             fileImgUrl: this.upLoadUrl,
+            typeList:[],
         }
     },
     created() {
+        this.getTypeList();
         this.getAllUserList(); 
         this.getList();
     },
     methods: {
+        getTypeList(){
+            dataTypeList({dictType:'act_type'}).then(response => {
+                this.typeList = response.data.data;
+            }).catch(() => {});
+        },
           /** cron表达式按钮操作 */
         handleShowCronStart() {
             this.expressionStart = this.dataForm.startCron;
@@ -310,6 +322,7 @@ export default {
         },
         resetForm() {
             this.dataForm = {
+                type:'',
                 title: '',
                 imgUrl: '',
                 activityUrl: '',