refactor(promotion): 星期几单开一列_促销计划和任务都有

src/views/promotion/plan/index.vue

@@ -598,6 +598,11 @@ const columns = ref([
     prop: 'date',
     width: 180
   },
+  {
+    label: '星期',
+    prop: 'week',
+    width: 80
+  },
   {
     label: '活动状态',
     prop: 'planStatus',
@@ -707,7 +712,9 @@ const formatter = (row, col, value) => {
   if (col.property === 'planStatus') {
     return value == 0 ? '未执行' : '执行'
   } else if (col.property === 'date') {
-    return parseTime(value, '{y}-{m}-{d} (周{a})')
+    return parseTime(value, '{y}-{m}-{d}')
+  } else if (col.property === 'week') {
+    return parseTime(row['date'], '周{a}')
   } else if (col.property === 'modifyTime') {
     return parseTime(value, '{y}-{m}-{d} {h}:{i}:{s}')
   } else if (col.property === 'clockInTime' || col.property === 'clockOutTime') {

src/views/promotion/task/index.vue

@@ -277,6 +277,11 @@ const columns = ref([
     width: 120,
     fixed: true
   },
+  {
+    label: '星期',
+    prop: 'week',
+    width: 80
+  },
   {
     label: '省份',
     prop: 'province',
@@ -382,6 +387,8 @@ const formatter = (row, columns, value) => {
     return parseTime(value, '{h}:{i}') + '\n' + row['clockDto']['noonClockInAddress']
   } else if (columns.property === 'clockDto.clockOutTime' && value) {
     return parseTime(value, '{h}:{i}') + '\n' + row['clockDto']['clockOutAddress']
+  } else if (columns.property === 'week') {
+    return parseTime(row['createDate'], '周{a}')
   } else if (columns.property === 'approveStatus' && value) {
     const obj = {
       SUBMITTED: '未审批',