Merge branch 'ap' into dev

src/main.js

@@ -69,7 +69,7 @@ import VConsole from 'vconsole'
 
 // 创建vConsole实例
 // 生产环境不加载
-if (import.meta.env.VITE_APP_ENV === 'staging') {
+if (import.meta.env.VITE_APP_ENV !== 'production') {
   new VConsole()
 }
 

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

@@ -24,7 +24,7 @@
           is-link
           @click="showMonthPicker = true">
           <template #input>
-            <span>{{ queryParams.salesMonth || '请选择' }}</span>
+            <span>{{ parseTime(queryParams.salesMonth, '{y}-{m}') || '请选择' }}</span>
           </template>
         </van-field>
 
@@ -166,7 +166,7 @@ const confirmMonth = ({ selectedValues: value }) => {
   // value 是 [2025, 2] 这种格式
   const year = value[0]
   const month = String(value[1]).padStart(2, '0')
-  props.queryParams.salesMonth = `${year}-${month}`
+  props.queryParams.salesMonth = new Date(`${year}-${month}-01`)
   showMonthPicker.value = false
   handleChange()
 }
@@ -211,15 +211,13 @@ watch(() => props.showSearch, (newVal) => {
     // 打开抽屉时初始化当前月份
     if (props.queryParams.salesMonth) {
       // 如果是日期类型转成字符串
-      if (props.queryParams.salesMonth instanceof Date) {
-        props.queryParams.salesMonth = props.queryParams.salesMonth.toISOString().split('T')[0].substring(0, 7)
-      }
-      const [year, month] = props.queryParams.salesMonth.split('-')
+      const [year, month] = props.queryParams.salesMonth.toISOString().split('T')[0].substring(0, 7).split('-')
       // currentMonth = [2025, 02] 这种格式
       currentMonth.value = [parseInt(year), parseInt(month)]
     } else {
-      // 当前年月日
-      currentMonth.value = [new Date().getFullYear(), new Date().getMonth()]
+      // 当前年月日，注意：getMonth()返回0-11，需要+1变成1-12
+      const now = new Date()
+      currentMonth.value = [now.getFullYear(), now.getMonth() + 1]
     }
   }
 })

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

@@ -116,8 +116,10 @@
 
   /*************** 下载表格 ***************/
   const downloadTable = async () => {
+    console.log(params.value, '1')
     const res = await downloadDisplayScheduleTable({
       ...params.value,
+      salesMonth: parseTime(params.value.salesMonth, '{y}-{m}'),
       pageType: 'NORMAL_DISPLAY_EXPORT'
     })
     saveAs(res, '陈列计划.xlsx')