Merge branch 'release' into dev

src/views/promotion/components/CommonPlan/index.vue

@@ -27,6 +27,7 @@
         :label="col.label"
         :key="col.prop"
         align="center"
+        :show-overflow-tooltip="col.showOverflowTooltip"
         class-name="column-style"
         :width="col.width"
         :fixed="operation === '填报模式' && col.fixed">

src/views/promotion/display_schedule/tabs/display.vue

@@ -94,6 +94,7 @@
         },
         {
           label: "经销商-类型",
+          showOverflowTooltip: true,
           prop: "dealerType",
           visible: true,
           type: 'string',
@@ -142,10 +143,11 @@
         },
         {
           label: "门店名称",
-          prop: "storeNameCodeDealerName", // 新增动态列（只在填报列显示）
+          prop: "storeNameCodeDealerName", //d 新增动态列（只在填报列显示）
           visible: true,
           type: 'string',
           fill: true,
+          showOverflowTooltip: true,
           onlyFill: true,// 仅仅在填报模式下生效
           fixed: 'left',
           width: 215,
@@ -173,6 +175,7 @@
         {
           label: "门店名称",
           prop: "storeName",
+          showOverflowTooltip: true,
           visible: true,
           type: 'string',
           fill: false,
@@ -274,6 +277,7 @@
           label: "门店分级（销量坎级）",
           prop: "storeLevel",
           visible: true,
+          showOverflowTooltip: true,
           type: 'string',
           fill: false,
           width: 165
@@ -281,6 +285,7 @@
         {
           label: "门店地址",
           prop: "storeAddress",
+          showOverflowTooltip: true,
           visible: true,
           type: 'string',
           fill: false,
@@ -850,7 +855,7 @@
           visible: true,
           type: 'string',
           fill: false,
-          width: 140
+          width: 180
         }
       ],
       visible: true
@@ -985,6 +990,9 @@
       item.openingDate = parseTime(item.openingDate, '{y}-{m}-{d}')
       // 闭户日期
       item.closingDate = parseTime(item.closingDate, '{y}-{m}-{d}')
+      // 修改时间
+      item.updateTime = parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}:{s}')
+      
       // 动态新增列：门店名称+门店编码+经销山名称（填报模式下，合并到一起）
       item.storeNameCodeDealerName = item.storeName + '\n(' + item.storeCode + ')' + '\n(' + item.dealerName + ')'
     })

src/views/promotion/display_schedule/tabs/schedule.vue

@@ -99,6 +99,7 @@
           label: "经销商名称",
           prop: "dealerName",
           visible: true,
+          showOverflowTooltip: true,
           type: "string",
           fill: true,
           fixed: 'left',
@@ -108,6 +109,7 @@
           label: "经销商类型",
           prop: "dealerType",
           visible: true,
+          showOverflowTooltip: true,
           type: "string",
           fill: false,
           width: 115
@@ -227,6 +229,7 @@
         {
           label: "档期计划-促销口味",
           prop: "plannedPromotionFlavor",
+          showOverflowTooltip: true,
           visible: true,
           type: "string",
           fill: false,
@@ -987,7 +990,7 @@
           visible: true,
           type: 'string',
           fill: false,
-          width: 140
+          width: 180
         }
       ],
       visible: true
@@ -1006,7 +1009,7 @@
       chooseColumns.value = baseColumns.value
       tableColumns.value = baseColumns.value.flatMap(item => {
         if (item.children) {
-          return item.children.filter(child => child);
+          return item.children.filter(child => !child.onlyFill);
         }
         return [];
       });
@@ -1087,6 +1090,8 @@
       item.actualPromotionEndDate = parseTime(item.actualPromotionEndDate, '{y}-{m}-{d}')
       item.totalCostRate = item.totalCostRate ? `${(item.totalCostRate).toFixed(2)}%` : '-'
       item.adjustmentCostRatio = item.adjustmentCostRatio ? `${(item.adjustmentCostRatio).toFixed(2)}%` : '-'
+      // 修改时间
+      item.updateTime = parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}:{s}')
     })
     tableData.value = res.data.rows
     total.value = res.data.total

src/views/promotion/display_schedule/tabs/schedule_dis.vue

@@ -90,11 +90,13 @@
           "type": "string",
           "fill": true,
           "width": 200,
+          showOverflowTooltip: true,
           fixed: 'left'
         },
         {
           "label": "经销商类型",
           "prop": "dealerType",
+          showOverflowTooltip: true,
           "visible": true,
           "type": "string",
           "fill": false,
@@ -215,6 +217,7 @@
         {
           "label": "档期计划 - 促销口味",
           "prop": "plannedPromotionFlavor",
+          showOverflowTooltip: true,
           "visible": true,
           "type": "string",
           "fill": false,
@@ -312,6 +315,7 @@
           "prop": "storeCode",
           "visible": true,
           "type": "string",
+          showOverflowTooltip: true,
           "fill": false,
           "width": 120
         },
@@ -320,6 +324,7 @@
           "prop": "storeName",
           "visible": true,
           "type": "string",
+          showOverflowTooltip: true,
           "fill": false,
           "width": 170
         },
@@ -342,6 +347,7 @@
         {
           "label": "门店地址",
           "prop": "storeAddress",
+          showOverflowTooltip: true,
           "visible": true,
           "type": "string",
           "fill": false,
@@ -647,6 +653,22 @@
           "type": "string",
           "fill": false,
           "width": 160
+        },
+        {
+          label: '修改人',
+          prop: 'updateBy',
+          visible: true,
+          type: 'string',
+          fill: false,
+          width: 120
+        },
+        {
+          label: '修改时间',
+          prop: 'updateTime',
+          visible: true,
+          type: 'string',
+          fill: false,
+          width: 180
         }
       ],
       visible: true
@@ -753,6 +775,8 @@
       item.plannedPromotionDisplayStartDate = parseTime(item.plannedPromotionDisplayStartDate, '{y}-{m}-{d}')
       // 计划 - 档期陈列结束时间
       item.plannedPromotionDisplayEndDate = parseTime(item.plannedPromotionDisplayEndDate, '{y}-{m}-{d}')
+      // 修改时间
+      item.updateTime = parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}:{s}')
     })
     tableData.value = res.data.rows
     total.value = res.data.total

src/views/promotion/display_schedule/tabs/snack.vue

@@ -86,6 +86,7 @@
           "label": "经销商名称",
           "prop": "dealerName",
           "visible": true,
+          showOverflowTooltip: true,
           "type": "string",
           "fill": true,
           "width": 200,
@@ -95,6 +96,7 @@
           "label": "经销商类型",
           "prop": "dealerType",
           "visible": true,
+          showOverflowTooltip: true,
           "type": "string",
           "fill": false,
           "width": 150
@@ -208,6 +210,7 @@
           "prop": "storeName",
           "visible": true,
           "type": "string",
+          showOverflowTooltip: true,
           "fill": false,
           "width": 180
         },
@@ -223,6 +226,7 @@
           "label": "门店地址",
           "prop": "storeAddress",
           "visible": true,
+          showOverflowTooltip: true,
           "type": "string",
           "fill": false,
           "width": 280
@@ -401,6 +405,22 @@
           "type": "string",
           "fill": false,
           "width": 150
+        },
+        {
+          label: '修改人',
+          prop: 'updateBy',
+          visible: true,
+          type: 'string',
+          fill: false,
+          width: 120
+        },
+        {
+          label: '修改时间',
+          prop: 'updateTime',
+          visible: true,
+          type: 'string',
+          fill: false,
+          width: 180
         }
       ],
       prop: 'snackColumns',
@@ -533,6 +553,8 @@
       item.openingDate = parseTime(item.openingDate, '{y}-{m}-{d}')
       // 闭户日期
       item.closingDate = parseTime(item.closingDate, '{y}-{m}-{d}')
+      // 修改时间
+      item.updateTime = parseTime(item.updateTime, '{y}-{m}-{d} {h}:{i}:{s}')
     })
     tableData.value = res.data.rows
     total.value = res.data.total