refactor(promotion): 促销表格改变顺序_强制一行显示超出浮窗_活动日期加周几

src/mobile_views/promotion/detail/index.vue

@@ -14,7 +14,7 @@
             v-if="planDetail.planStatus === 0">未执行</p>
           <p v-else
             class="employee plan-go">执行</p>
-          <p class="employee">活动日期：&emsp;{{ parseTime(planDetail.date, '{y}-{m}-{d}') }}</p>
+          <p class="employee">活动日期：&emsp;{{ parseTime(planDetail.date, '{y}-{m}-{d} (周{a})') }}</p>
           <p class="employee">归属人：&emsp;&emsp;{{ planDetail.employeeName }}（{{ planDetail.employeeNo }}）</p>
           <p class="employee">战区：&emsp;&emsp;&emsp;{{ planDetail.orgName }}</p>
           

src/mobile_views/promotion/promotion.vue

@@ -27,7 +27,7 @@
             </template>
             <template #value>
               <span>{{ item.pattern }}</span>
-              <p>{{ parseTime(item.date, '{y}-{m}-{d}') }}</p>
+              <p>{{ parseTime(item.date, '{y}-{m}-{d} (周{a})') }}</p>
             </template>
           </van-cell>
         </van-cell-group>

src/views/promotion/plan/index.vue

@@ -190,7 +190,8 @@
           :label="item.label"
           :width="item.width"
           :formatter="formatter"
-          :fixed="item.fixed" />
+          :fixed="item.fixed"
+          :show-overflow-tooltip="true" />
         <el-table-column label="操作"
           width="150"
           fixed="right">
@@ -570,67 +571,68 @@ const tableList = ref([])
 const total = ref(0)
 const multiple = ref(true)
 const columns = ref([
-  {
-    label: '活动 ID',
-    prop: 'id',
-    width: 90,
-    // fixed: true
-  },
+
   {
     label: '归属人',
     prop: 'employeeName',
-    width: 90,
+    width: 150,
     fixed: true
   },
+  // {
+  //   label: '归属人工号',
+  //   prop: 'employeeNo',
+  //   width: 140
+  // },
+
   {
-    label: '归属人工号',
-    prop: 'employeeNo',
-    width: 140
+    label: '活动状态',
+    prop: 'planStatus',
+    width: 100
   },
   {
-    label: '经销商 ID',
-    prop: 'dealerId',
-    width: 120
+    label: '活动模式',
+    prop: 'pattern',
+    width: 100
   },
   {
-    label: '经销商',
-    prop: 'dealerName',
-    width: 220
+    label: '活动日期',
+    prop: 'date',
+    width: 180
   },
   {
     label: '系统名称',
     prop: 'lineName',
-    width: 100
+    width: 150
   },
   {
-    label: '店铺编码',
-    prop: 'storeCode',
-    width: 160
+    label: '战区',
+    prop: 'orgName',
+    width: 150
   },
   {
     label: '店铺名称',
     prop: 'storeName',
-    width: 200
+    width: 150
   },
   {
-    label: '活动日期',
-    prop: 'date',
-    width: 180
+    label: '店铺编码',
+    prop: 'storeCode',
+    width: 160
   },
   {
-    label: '活动状态',
-    prop: 'planStatus',
-    width: 100
+    label: '经销商',
+    prop: 'dealerName',
+    width: 220
   },
   {
-    label: '活动模式',
-    prop: 'pattern',
-    width: 100
+    label: '经销商 ID',
+    prop: 'dealerId',
+    width: 120
   },
   {
     label: '省份',
     prop: 'province',
-    width: 100
+    width: 130
   },
   {
     label: '地址',
@@ -657,11 +659,7 @@ const columns = ref([
     prop: 'incidentals',
     width: 100
   },
-  {
-    label: '战区',
-    prop: 'orgName',
-    width: 150
-  },
+
   // {
   //   label: '城市',
   //   prop: 'city',
@@ -670,7 +668,7 @@ const columns = ref([
   {
     label: '创建人',
     prop: 'createBy',
-    width: 100
+    width: 120
   },
   {
     label: '最近修改人',
@@ -681,6 +679,12 @@ const columns = ref([
     label: '最后修改时间',
     prop: 'modifyTime',
     width: 250
+  },
+  {
+    label: '活动 ID',
+    prop: 'id',
+    width: 90,
+    // fixed: true
   }
 ])
 const getPlanList = async () => {
@@ -704,11 +708,22 @@ const formatter = (row, col, value) => {
   if (col.property === 'planStatus') {
     return value == 0 ? '未执行' : '执行'
   } else if (col.property === 'date') {
-    return parseTime(value, '{y}-{m}-{d}')
+    return parseTime(value, '{y}-{m}-{d} (周{a})')
   } else if (col.property === 'modifyTime') {
     return parseTime(value, '{y}-{m}-{d} {h}:{i}:{s}')
   } else if (col.property === 'clockInTime' || col.property === 'clockOutTime') {
     return parseTime(value)
+  } else if (col.property === 'employeeName') {
+    // 判断名字小于 4 个字，少于几个就加几个空格
+    if (value.length === 2) {
+      return value + '　　' + '(' + row.employeeNo + ')'
+    } else if (value.length === 3) {
+      return value + '　' + '(' + row.employeeNo + ')'
+    } else {
+      return value + '(' + row.employeeNo + ')'
+    }
+  } else if (col.property === 'salary' || col.property === 'incidentals') {
+    return '¥ ' + value + ' 元'
   } else {
     return value
   }
@@ -1236,7 +1251,7 @@ const uploadChangeFile = async (file) => {
   }
 
   .container .el-table ::v-deep(.cell) {
-    white-space: pre-line;
+    /* white-space: pre-line; */
     /* 强制显示 2 行，超出的省略号 */
     /* overflow: hidden;
     text-overflow: ellipsis;