update: ecm操作日志

src/views/ecm/marketing-event/index.vue

@@ -70,7 +70,7 @@ import libQfxx from './components/lib-qfxx';
 
 // 全部的操作项
 // eslint-disable-next-line
-let allOptions = [{ name: '企微任务', value: 'qywx', key: 10, img: require('./assets/img/qywx.svg'), hoverImg: require('./assets/img/qywx-1.svg'), show: true }, { name: '群发任务', value: 'qfxx', key: 11, img: require('./assets/img/qfxx.svg'), hoverImg: require('./assets/img/qfxx-1.svg'), disabledImg: require('./assets/img/qfxx-2.svg'), show: false, disabled: false }, { name: '图文', value: 'teletext', key: 1, img: require('./assets/img/teletext.svg'), hoverImg: require('./assets/img/teletext-1.svg'), show: true }, { name: '文本', value: 'text', key: 2, img: require('./assets/img/text.svg'), hoverImg: require('./assets/img/text-1.svg'), show: true }, { name: '小程序', value: 'wxa', key: 3, img: require('./assets/img/wxa.svg'), hoverImg: require('./assets/img/wxa-1.svg'), show: true }, { name: '图片', value: 'image', key: 4, img: require('./assets/img/image.svg'), hoverImg: require('./assets/img/image-1.svg'), show: true }, { name: '卡券', value: 'card', key: 5, img: require('./assets/img/card.svg'), hoverImg: require('./assets/img/card-1.svg'), show: true }, { name: '短信', value: 'message', key: 6, img: require('./assets/img/message.svg'), hoverImg: require('./assets/img/message-1.svg'), show: true }, { name: '话务', value: 'teltask', key: 7, img: require('./assets/img/teltask.svg'), hoverImg: require('./assets/img/teltask-1.svg'), show: true }, { name: '积分', value: 'integral', key: 8, img: require('./assets/img/integral.svg'), hoverImg: require('./assets/img/integral-1.svg'), show: true },{ name: '会员卡升级', value: 'grade', key: 9, img: require('./assets/img/grade.svg'), hoverImg: require('./assets/img/grade-1.svg'), disabledImg: require('./assets/img/grade-2.svg'), show: false, disabled: false }];
+let allOptions = [{ name: '企微任务', value: 'qywx', key: 10, img: require('./assets/img/qywx.svg'), hoverImg: require('./assets/img/qywx-1.svg'), show: true }, { name: '群发消息', value: 'qfxx', key: 11, img: require('./assets/img/qfxx.svg'), hoverImg: require('./assets/img/qfxx-1.svg'), disabledImg: require('./assets/img/qfxx-2.svg'), show: false, disabled: false }, { name: '图文', value: 'teletext', key: 1, img: require('./assets/img/teletext.svg'), hoverImg: require('./assets/img/teletext-1.svg'), show: true }, { name: '文本', value: 'text', key: 2, img: require('./assets/img/text.svg'), hoverImg: require('./assets/img/text-1.svg'), show: true }, { name: '小程序', value: 'wxa', key: 3, img: require('./assets/img/wxa.svg'), hoverImg: require('./assets/img/wxa-1.svg'), show: true }, { name: '图片', value: 'image', key: 4, img: require('./assets/img/image.svg'), hoverImg: require('./assets/img/image-1.svg'), show: true }, { name: '卡券', value: 'card', key: 5, img: require('./assets/img/card.svg'), hoverImg: require('./assets/img/card-1.svg'), show: true }, { name: '短信', value: 'message', key: 6, img: require('./assets/img/message.svg'), hoverImg: require('./assets/img/message-1.svg'), show: true }, { name: '话务', value: 'teltask', key: 7, img: require('./assets/img/teltask.svg'), hoverImg: require('./assets/img/teltask-1.svg'), show: true }, { name: '积分', value: 'integral', key: 8, img: require('./assets/img/integral.svg'), hoverImg: require('./assets/img/integral-1.svg'), show: true },{ name: '会员卡升级', value: 'grade', key: 9, img: require('./assets/img/grade.svg'), hoverImg: require('./assets/img/grade-1.svg'), disabledImg: require('./assets/img/grade-2.svg'), show: false, disabled: false }];
 export default {
   name: 'vue-gic-marketing-event',
   components: {

src/views/ecm/operator-log.vue

@@ -4,13 +4,20 @@
       <el-input class="w300" v-model="listParams.search" placeholder="请输入操作对象/操作内容" clearable @change="onSearch">
         <i slot="prefix" class="el-input__icon el-icon-search"></i>
       </el-input>
-      <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onSearch"></el-date-picker>
+      <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onSearch"></el-date-picker>
     </el-row>
-    <el-table class="mt20" :data="list">
-      <el-table-column prop="prop" label="操作人" width="width"></el-table-column>
-      <el-table-column prop="prop" label="操作对象" width="width"></el-table-column>
-      <el-table-column prop="prop" label="操作时间" width="width"></el-table-column>
-      <el-table-column prop="prop" label="操作内容" width="width"></el-table-column>
+    <el-table class="mt20" :data="tableList">
+      <el-table-column prop="operatorName" label="操作人"></el-table-column>
+      <el-table-column prop="ecmPlanName" label="操作对象"></el-table-column>
+      <el-table-column label="操作时间">
+        <template slot-scope="{ row }">
+          <p class="cell-time">
+            {{ formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
+            <span>{{ formatDateTimeByType(row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column prop="context" label="操作内容" width="width"></el-table-column>
     </el-table>
     <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
   </div>
@@ -18,14 +25,15 @@
 
 <script>
 import { getEcmLog } from '@/service/api/ecmApi.js';
+import { formatDateTimeByType } from '@/utils/index.js';
 export default {
   name: 'ecm-operator-Log',
   data() {
     return {
+      formatDateTimeByType,
       loading: false,
       tableList: [],
       total: 0,
-      dateRange: [],
       listParams: {
         pageSize: 20,
         currentPage: 1,
@@ -51,7 +59,8 @@ export default {
       this.loading = true;
       const { errorCode, result, message } = await getEcmLog(this.listParams).finally(() => (this.loading = false));
       if (errorCode == 0) {
-        this.tableList = result || [];
+        this.tableList = result.result || [];
+        this.total = result.totalCount;
       } else {
         this.$message.warning(message);
       }
@@ -61,14 +70,19 @@ export default {
       this.getList();
     }
   },
-  watch: {
-    dateRange(val) {
-      if (val) {
-        this.listParams.beginTime = val[0];
-        this.listParams.endTime = val[1];
-      } else {
-        this.listParams.beginTime = '';
-        this.listParams.endTime = '';
+  computed: {
+    dateRange: {
+      set(val) {
+        if (val) {
+          this.listParams.beginTime = val[0];
+          this.listParams.endTime = val[1];
+        } else {
+          this.listParams.beginTime = '';
+          this.listParams.endTime = '';
+        }
+      },
+      get() {
+        return [this.listParams.beginTime, this.listParams.endTime];
       }
     }
   }