Merge branch 'ap' into dev

src/api/promotion/display_schedule.js

@@ -158,3 +158,13 @@ export function submitSixLittleDiamondsPlan(data) {
     }
   });
 }
+
+
+// 下载表格
+export function downloadDisplayScheduleTable(params) {
+  return request({
+    url: '/operation/sales/export/download',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file

src/views/mobile/pages/storeExecution/dashboard/index.vue

@@ -4,7 +4,7 @@
       <van-nav-bar fixed
         left-arrow
         @click-left="router.back()"
-        title="店内执行上报浏览" />
+        title="店内执行上报看板" />
       <el-tabs v-model="activeName"
         class="demo-tabs"
         @tab-click="handleClickTabs">

src/views/mobile/pages/storeExecution/report/components/Table/index.vue

@@ -14,7 +14,7 @@
         :class="{ 'cell-no-padding': operation === '填报模式' }"
         :row-style="tableRowStyle">
         <template v-for="col in tableColumns">
-          <el-table-column v-if="col.visible"
+          <el-table-column v-if="col.fill"
             :label="col.label"
             :prop="col.prop"
             :key="col.prop"

src/views/mobile/pages/storeExecution/report/index.vue

@@ -64,7 +64,7 @@ const handleClickRight = () => {
 
 const params = ref({
   pageNum: 1,
-  pageSize: 50,
+  pageSize: 20,
   salesMonth: new Date(),
   deptName: '',
   dealerCN: '',

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

@@ -29,6 +29,22 @@
               icon="Rank"
               @click="openTableDialog" />
           </el-tooltip>
+          <el-tooltip class="item"
+            effect="dark"
+            content="下载表格"
+            placement="top">
+            <el-button @click="downloadTable" type="primary">
+              下载表格
+            </el-button>
+          </el-tooltip>
+          <el-tooltip class="item"
+            effect="dark"
+            content="上传表格"
+            placement="top">
+            <el-button @click="openTableDialog" type="success">
+              上传表格
+            </el-button>
+          </el-tooltip>
         </template>
       </right-toolbar>
     </el-row>
@@ -114,6 +130,8 @@
 <script setup>
 import { h } from 'vue'
 import userStore from '@/store/modules/user'
+
+
 const props = defineProps({
   tableData: { // 数据源
     type: Array,
@@ -143,7 +161,7 @@ const props = defineProps({
     default: (row, col, cellValue) => cellValue
   }
 })
-const emit = defineEmits(['getTableList', 'updateShowSearch'])
+const emit = defineEmits(['getTableList', 'updateShowSearch', 'downloadTable'])
 
 /*************** 工具栏 ***************/
 const showFill = userStore().hasQcMarketEmpInfo // 是否启用填报模式
@@ -208,6 +226,11 @@ const getTableList = () => {
   emit('getTableList')
 }
 
+// 下载表格
+const downloadTable = () => {
+  emit('downloadTable')
+}
+
 /************** 弹框控制 ***************/
 // 控制表格弹框显隐
 const tableContainer = ref(null) // 原始表格容器引用

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

@@ -9,6 +9,7 @@
     :params="params"
     :isLoading="isLoading"
     @getTableList="getTableList"
+    @downloadTable="downloadTable"
     @updateShowSearch="v => showSearch.value = v" />
 </template>
 
@@ -16,9 +17,10 @@
   lang="jsx">
   import CustomTable from '../components/Table'
   import SearchList from '../components/SearchList'
-  import { getDisplayList, submitDisplayPlan } from '@/api'
+  import { getDisplayList, submitDisplayPlan, downloadDisplayScheduleTable } from '@/api'
   import { parseTime } from '@/utils'
   import { getDisplayConfig } from './data.jsx'
+  import { saveAs } from 'file-saver'
 
   /*************** 表格操作相关 ***************/
 
@@ -111,6 +113,15 @@
 
   /*************** 筛选 ***************/
   const showSearch = ref(true)
+
+  /*************** 下载表格 ***************/
+  const downloadTable = async () => {
+    const res = await downloadDisplayScheduleTable({
+      ...params.value,
+      pageType: 'NORMAL_DISPLAY_EXPORT'
+    })
+    saveAs(res, '陈列计划.xlsx')
+  }
 </script>
 
 <style lang="scss">