Merge branch 'ap' into dev

src/assets/styles/element-ui.scss

@@ -212,4 +212,9 @@ html.dark {
   .popup-result .title {
     background: var(--cron-border);
   }
+}
+
+// messageBox 样式
+.is-message-box{
+  z-index: 10000 !important;
 }
\ No newline at end of file

src/utils/upload.js

@@ -19,6 +19,7 @@ export const chooseFile = ({ accept, id = 'fileInput' }) => {
     // 关闭窗口没选择文件
     window.addEventListener('cancel', () => {
       document.body.removeChild(fileInput)
+      reject('请选择文件')
     })
     document.body.appendChild(fileInput)
     fileInput.click()

src/views/promotion/display_schedule/components/Table/index.vue

@@ -32,20 +32,20 @@
           <el-tooltip class="item"
             effect="dark"
             content="下载表格"
-            placement="top"
-            v-if="tabsType === '常规陈列'">
+            placement="top">
             <el-button @click="downloadTable"
-              type="primary">
+              type="primary"
+              v-hasPermi="['display_downExcel']">
               下载表格
             </el-button>
           </el-tooltip>
           <el-tooltip class="item"
             effect="dark"
             content="上传表格"
-            placement="top"
-            v-if="tabsType === '常规陈列'">
+            placement="top">
             <el-button @click="uploadExcel"
-              type="success">
+              type="success"
+              v-hasPermi="['display_upExcel']">
               上传表格
             </el-button>
           </el-tooltip>
@@ -138,10 +138,11 @@
     draggable
     overflow
     @close="handleDialogCloseUpload">
-    <div>
+    <div class="table-container">
       <!-- 计划表格 -->
       <el-table :data="planTableList"
         border
+        class="auto-fit-header-table"
         style="width: 100%"
         show-overflow-tooltip
         :row-class-name="tableRowClassName">
@@ -153,7 +154,17 @@
           :key="item.label"
           :prop="item.prop"
           :label="item.label"
-          :width="item.width" />
+          :width="item.width"
+          class-name="column-style">
+          <template #header="{ column }">
+            <span class="formula-column">
+              <div class="column">
+                <p>{{ item.label }}</p>
+                <p v-if="item.subLabel">{{ item.subLabel }}</p>
+              </div>
+            </span>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <template #footer>
@@ -289,22 +300,36 @@ const typeObj = {
 }
 const downloadTable = async () => {
   proxy.$modal.loading('正在下载表格，请稍候...')
-  const res = await downloadDisplayScheduleTable({
-    ...props.params,
-    salesMonth: parseTime(props.params.salesMonth, '{y}-{m}'),
-    pageNum: null,
-    pageSize: null,
-    pageType: typeObj[props.tabsType]
-  })
-  // 如果 salesMonth 为空，默认当前月
-  if (props.params.salesMonth) {
-    saveAs(res, `${props.tabsType}计划${parseTime(props.params.salesMonth, '{y}-{m}')}.xlsx`)
-  } else {
-    saveAs(res, `${props.tabsType}计划.xlsx`)
-  }
+  try {
+    const res = await downloadDisplayScheduleTable({
+      ...props.params,
+      salesMonth: parseTime(props.params.salesMonth, '{y}-{m}'),
+      pageNum: null,
+      pageSize: null,
+      pageType: typeObj[props.tabsType]
+    })
+    if (res.type === 'application/json') {
+      // 本次返回的不是二进制，而是 JSON 被转成了 Blob
+      const result = await res.text()
+      const response = JSON.parse(result)
+      if (response.code === 910) {
+        proxy.$modal.closeLoading()
+        proxy.$modal.msgError(response.msg || '下载表格失败')
+        return
+      }
+    }
 
-  // 下载完成后，执行回调函数
-  proxy.$modal.closeLoading()
+    // 如果 salesMonth 为空，默认当前月
+    if (props.params.salesMonth) {
+      saveAs(res, `${props.tabsType}计划${parseTime(new Date(), '{y}-{m}-{d} {h}-{i}-{s}')}.xlsx`)
+    } else {
+      saveAs(res, `${props.tabsType}计划${parseTime(new Date(), '{y}-{m}-{d} {h}-{i}-{s}')}.xlsx`)
+    }
+    // 下载完成后，执行回调函数
+    proxy.$modal.closeLoading()
+  } catch (error) {
+    proxy.$modal.closeLoading()
+  }
 }
 
 // 上传表格

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

@@ -10,8 +10,7 @@
     :isLoading="isLoading"
     tabsType="常规陈列"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" 
-    />
+    @updateShowSearch="v => showSearch = v" />
 </template>
 
 <script setup
@@ -116,7 +115,7 @@
   /*************** 筛选 ***************/
   const showSearch = ref(true)
 
-  
+
 </script>
 
 <style lang="scss">

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

@@ -13,7 +13,7 @@
     :formatter="formatterFn"
     tabsType="档期计划"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" />
+    @updateShowSearch="v => showSearch = v" />
   <!-- 弹窗：实际与计划不一致，让用户补充实际内容 -->
   <el-dialog v-model="showPromotionDialog"
     title="请输入实际促销机制内容"

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

@@ -10,7 +10,7 @@
     :isLoading="isLoading"
     tabsType="档期陈列"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" />
+    @updateShowSearch="v => showSearch = v" />
 </template>
 
 <script setup
@@ -52,6 +52,8 @@
       actualEndCapQty: row.actualEndCapQty || 0,
       // 地堆平米数实际
       actualFloorStackArea: row.actualFloorStackArea || 0,
+      // 地堆数量实际（后台要数值）
+      actualFloorStackQty: row.actualFloorStackQty * 1 || 0,
     })
   }
   // 全部列

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

@@ -10,7 +10,7 @@
     :isLoading="isLoading"
     tabsType="六小金刚"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" />
+    @updateShowSearch="v => showSearch = v" />
 </template>
 
 <script setup

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

@@ -10,7 +10,7 @@
     :isLoading="isLoading"
     tabsType="零食陈列"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" />
+    @updateShowSearch="v => showSearch = v" />
 </template>
 
 <script setup

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

@@ -10,7 +10,7 @@
     :isLoading="isLoading"
     tabsType="三米两秒"
     @getTableList="getTableList"
-    @updateShowSearch="v => showSearch.value = v" />
+    @updateShowSearch="v => showSearch = v" />
 </template>
 
 <script setup

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

@@ -78,7 +78,6 @@
     '经销商-分析': getDisplayScheduleDashboardListStore,
   }
   const getTableList = async () => {
-    console.log('走了吗？')
     isLoading.value = true
     const res = await apiObj[queryParams.operation]({
       ...queryParams,