feat(promotion): 新增：促销计划把促销员薪资和杂费改为是否有促销台和活动品项，新增促销员午休开始和结束时间

src/views/promotion/plan/effectivePlan.vue

@@ -751,19 +751,39 @@ const columns = ref([
     prop: 'clockInTime',
     width: 180
   },
+  {
+    label: '午休开始时间',
+    prop: 'noonClockOutTime',
+    width: 180
+  },
+  {
+    label: '午休结束时间',
+    prop: 'noonClockInTime',
+    width: 180
+  },
   {
     label: '下班时间',
     prop: 'clockOutTime',
     width: 180
   },
+  // {
+  //   label: '促销员薪资',
+  //   prop: 'salary',
+  //   width: 100
+  // },
+  // {
+  //   label: '杂费',
+  //   prop: 'incidentals',
+  //   width: 100
+  // },
   {
-    label: '促销员薪资',
-    prop: 'salary',
-    width: 100
+    label: "是否有促销台",
+    prop: "temWlSct",
+    width: 120
   },
   {
-    label: '杂费',
-    prop: 'incidentals',
+    label: "活动品项",
+    prop: "prdClass",
     width: 100
   },
   {
@@ -797,7 +817,7 @@ const formatter = (row, col, value) => {
     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') {
+  } else if (col.property === 'clockInTime' || col.property === 'clockOutTime' || col.property === 'noonClockOutTime' || col.property === 'noonClockInTime') {
     return parseTime(value)
   } else if (col.property === 'employeeName') {
     // 判断归属人名字小于 4 个字，少于几个就加几个空格
@@ -808,9 +828,11 @@ const formatter = (row, col, value) => {
     } else {
       return value + '(' + row.employeeNo + ')'
     }
-  } else if (col.property === 'salary' || col.property === 'incidentals') {
-    return '¥ ' + value + ' 元'
-  } else {
+  }
+  // else if (col.property === 'salary' || col.property === 'incidentals') {
+  //   return '¥ ' + value + ' 元'
+  // }
+  else {
     return value
   }
 }
@@ -920,19 +942,39 @@ const confirmTableColumns = ref([
     prop: 'clockInTime',
     width: 180
   },
+  {
+    label: '午休开始时间',
+    prop: 'noonClockOutTime',
+    width: 180
+  },
+  {
+    label: '午休结束时间',
+    prop: 'noonClockInTime',
+    width: 180
+  },
   {
     label: '下班时间',
     prop: 'clockOutTime',
     width: 180
   },
+  // {
+  //   label: '促销员薪资',
+  //   prop: 'salary',
+  //   width: 100
+  // },
+  // {
+  //   label: '杂费',
+  //   prop: 'incidentals',
+  //   width: 100
+  // },
   {
-    label: '促销员薪资',
-    prop: 'salary',
-    width: 100
+    label: "是否有促销台",
+    prop: "temWlSct",
+    width: 120
   },
   {
-    label: '杂费',
-    prop: 'incidentals',
+    label: "活动品项",
+    prop: "prdClass",
     width: 100
   },
   // {