合并

src/store/modules/activity.js

@@ -67,8 +67,6 @@ export default {
           ...apis.activity.finishActivity,
           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

@@ -26,9 +26,14 @@
       <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="选择日期"/>
+       <!-- <el-date-picker
+                  v-model="detail.reportDate"
+                  type="datetime"
+                  placeholder="选择日期时间">
+          </el-date-picker> -->
         <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-input  v-model="activityQuery.address"></el-input>

src/views/activity/edit.vue

@@ -80,7 +80,7 @@ export default {
        endDate:'',
        buildingId:'',
        title:'',
-       isEnlist:'1',
+       isEnlist:'',
        text:'',
        enlistStart:'',
        enlistEnd:'',
@@ -184,6 +184,8 @@ export default {
         this.activityQuery.address = data.address
         this.activityQuery.personNum = data.personNum
         this.imageUrl = data.url
+        this.activityQuery.isEnlist = data.isEnlist
+        
        
         })
     }

src/views/activity/list.vue

@@ -30,7 +30,7 @@
       prop="tel"
       label="活动时间">
      <template slot-scope="scope">
-        <span>{{scope.row.startDate}} ~ {{scope.row.startDate}}</span>
+        <span>{{ formateDate(scope.row.startDate)}} ~ {{ formateDate(scope.row.startDate)}}</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -55,7 +55,9 @@
     </el-table-column>
     <el-table-column   label="状态">
       <template slot-scope="scope">
-        <span :style="{color:(scope.row.status == 1?'':'red')}" >{{scope.row.status == 1 ? '启用' : '禁用'}}</span>
+      <span v-if="scope.row.isEnlist == '0'">未开始</span>
+      <span v-if="scope.row.isEnlist == '1'">进行中</span>
+      <span v-if="scope.row.isEnlist == '2'">已结束</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -63,9 +65,9 @@
       label="操作">
       <template slot-scope="scope">
         <!-- <el-button type="text" @click="toDetail(scope.row)" size="small">{{scope.row.status == 1?'停用':'启用'}}</el-button> -->
-         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small">报名记录</el-button>
-        <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small">编辑</el-button>
-        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small">结束活动</el-button>
+         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
+         <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '0'">编辑</el-button>
+        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1'">结束活动</el-button>
         <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button>
       </template>
     </el-table-column>
@@ -84,6 +86,7 @@
 </template>
 
 <script>
+import dayjs from 'dayjs'
 import { createNamespacedHelpers } from "vuex";
 const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
 const { mapActions: mapActivity } = createNamespacedHelpers("activity");
@@ -142,18 +145,21 @@ export default {
       this.filterData.dynamicId = id
           this.finishActivity(
           JSON.stringify(this.filterData)
-        ) 
-          this.getList();
+        ).then((res) => {
+           this.getList();
           this.getBuildList()   
+        })
+       
     },
     top(id){
           this.filterData.dynamicId = id
           this.filterData.top = 1
           this.finishActivity(
           JSON.stringify(this.filterData)
-        ) 
-          this.getList();
+        ).then((res) => {
+           this.getList();
           this.getBuildList()   
+        })  
     },
     addDynamic() {
       this.$router.push({ name: "activity-add" });
@@ -179,7 +185,10 @@ export default {
     },
     getSignList(id){
       this.$router.push({ name: "activity-signList",query: { id } }); 
-    }
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
   },
   created() {
     this.pageNavi.current = this.$route.query.page || 1;

src/views/activity/signList.vue

@@ -22,6 +22,9 @@
     <el-table-column
       prop="createDate"
       label="报名时间">
+      <template slot-scope="scope">
+        <span>{{ formateDate(scope.row.createDate)}}</span>
+      </template>
     </el-table-column>
   </el-table>
   <el-pagination
@@ -37,6 +40,7 @@
 </template>
 
 <script>
+import dayjs from 'dayjs'
 import { createNamespacedHelpers } from "vuex";
 const { mapActions: mapActivity } = createNamespacedHelpers("activity");
 
@@ -77,7 +81,10 @@ export default {
     },
     getPageList(){
        this.getList();
-    }
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
   },
   created() {
     this.filterData.dynamicId = this.$route.query.id