refactor(promotion): 修改：促销计划中新增修改计划上传时如果没有错误信息，则不显示错误信息列

src/hooks/promotion/index.js

@@ -34,7 +34,6 @@ export const checkPlanExpire = (row) => {
 export const checkPlanChangeExpire = (row) => {
   const date = new Date()
   const rowDate = new Date(row.date)
-  console.log('今日', !(rowDate <= date))
   return !(rowDate <= date)
 }
 

src/views/promotion/plan/effectivePlan.vue

@@ -103,7 +103,8 @@
     v-model="uploadPlanDialogVisible"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
-    draggable overflow>
+    draggable
+    overflow>
     <div>
       <!-- 计划表格 -->
       <el-table :data="planTableList"
@@ -111,6 +112,10 @@
         style="width: 100%"
         show-overflow-tooltip
         :row-class-name="tableRowClassName">
+        <el-table-column prop="errorMsg"
+          label="错误信息"
+          width="450"
+          v-if="isHaveErrPlan" />
         <el-table-column v-for="item in confirmTableColumns"
           :key="item.label"
           :prop="item.prop"
@@ -136,7 +141,8 @@
     :title="(addOrEditPlanForm.id ? '修改' : '新增') + '计划'"
     v-model="addOrEditPlanVisible"
     width="60%"
-    draggable overflow>
+    draggable
+    overflow>
     <!-- 表单 -->
     <el-form :model="addOrEditPlanForm"
       label-width="150px"
@@ -280,7 +286,8 @@
   <el-dialog title="修改计划归属人"
     v-model="editPlanEmpVisible"
     width="60%"
-    draggable overflow>
+    draggable
+    overflow>
     <!-- 表单 -->
     <el-form :model="editPlanEmpForm"
       label-width="150px"
@@ -362,6 +369,7 @@ const deletePlane = (row) => {
 }
 
 /*************** 新增计划 ***************/
+const isHaveErrPlan = ref(false) // 上传表格计划中有无错误
 // 批量
 const uploadPlanFile = async (file) => { // 上传计划表格
   proxy.$modal.loading("正在上传数据，请稍后...");
@@ -373,6 +381,7 @@ const uploadPlanFile = async (file) => { // 上传计划表格
       "employeeNo": empInfo.empNo
     })
     planTableList.value = res.data.table
+    isHaveErrPlan.value = !!res.data.table[0].errorMsg
     confirmExcelUUID.value = res.data.uuid
     uploadPlanDialogVisible.value = true
   } finally {
@@ -400,6 +409,7 @@ const uploadChangeFile = async (file) => {
       "employeeNo": empInfo.empNo
     })
     planTableList.value = res.data.table
+    isHaveErrPlan.value = !!res.data.table[0].errorMsg
     confirmExcelUUID.value = res.data.uuid
     uploadPlanDialogVisible.value = true
   } finally {
@@ -873,12 +883,7 @@ getBelongPerList()
 const uploadPlanDialogVisible = ref(false)
 const planTableList = ref([])
 const confirmExcelUUID = ref('')
-const confirmTableColumns = [
-  {
-    label: '错误消息',
-    prop: 'errorMsg',
-    width: 450
-  },
+const confirmTableColumns = ref([
   {
     label: '归属人',
     prop: 'employeeName',
@@ -991,7 +996,7 @@ const confirmTableColumns = [
     prop: 'modifyTime',
     width: 250
   }
-]
+])
 const tableRowClassName = ({ row }) => {
   if (row.errorMsg) {
     return 'error-row'