From c327f79177f000edab15c8304d73ed5bc7c910bd Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 2 Aug 2023 23:58:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20combinationActivity=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tionactivity.ts => combinationActivity.ts} |  2 -
 .../CombinationActivityForm.vue               |  5 +-
 .../combinationActivity.data.ts               | 50 +++++++++++++------
 .../combination/{activity => }/index.vue      | 10 ++--
 4 files changed, 43 insertions(+), 24 deletions(-)
 rename src/api/mall/promotion/combination/{combinationactivity.ts => combinationActivity.ts} (97%)
 rename src/views/mall/promotion/combination/{activity => }/CombinationActivityForm.vue (98%)
 rename src/views/mall/promotion/combination/{activity => }/combinationActivity.data.ts (75%)
 rename src/views/mall/promotion/combination/{activity => }/index.vue (89%)

diff --git a/src/api/mall/promotion/combination/combinationactivity.ts b/src/api/mall/promotion/combination/combinationActivity.ts
similarity index 97%
rename from src/api/mall/promotion/combination/combinationactivity.ts
rename to src/api/mall/promotion/combination/combinationActivity.ts
index 71d5d2a4..1e211c86 100644
--- a/src/api/mall/promotion/combination/combinationactivity.ts
+++ b/src/api/mall/promotion/combination/combinationActivity.ts
@@ -1,8 +1,6 @@
 import request from '@/config/axios'
 import { Sku, Spu } from '@/api/mall/product/spu'
 
-// TODO @puhui999: combinationActivity.ts
-
 export interface CombinationActivityVO {
   id?: number
   name?: string
diff --git a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue b/src/views/mall/promotion/combination/CombinationActivityForm.vue
similarity index 98%
rename from src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
rename to src/views/mall/promotion/combination/CombinationActivityForm.vue
index 115f8fd4..265eb98e 100644
--- a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
+++ b/src/views/mall/promotion/combination/CombinationActivityForm.vue
@@ -6,6 +6,7 @@
       :is-col="true"
       :rules="rules"
       :schema="allSchemas.formSchema"
+      class="mt-10px"
     >
       <template #spuId>
         <el-button @click="spuSelectRef.open()">选择商品</el-button>
@@ -37,8 +38,8 @@
   <SpuSelect ref="spuSelectRef" :isSelectSku="true" @confirm="selectSpu" />
 </template>
 <script lang="ts" setup>
-import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationactivity'
-import { CombinationProductVO } from '@/api/mall/promotion/combination/combinationactivity'
+import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
+import { CombinationProductVO } from '@/api/mall/promotion/combination/combinationActivity'
 import { allSchemas, rules } from './combinationActivity.data'
 import { SpuAndSkuList, SpuProperty, SpuSelect } from '@/views/mall/promotion/components'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
diff --git a/src/views/mall/promotion/combination/activity/combinationActivity.data.ts b/src/views/mall/promotion/combination/combinationActivity.data.ts
similarity index 75%
rename from src/views/mall/promotion/combination/activity/combinationActivity.data.ts
rename to src/views/mall/promotion/combination/combinationActivity.data.ts
index b426649d..4da563b7 100644
--- a/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
+++ b/src/views/mall/promotion/combination/combinationActivity.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter, getNowDateTime } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const rules = reactive({
@@ -26,29 +26,49 @@ const crudSchemas = reactive<CrudSchema[]>([
     }
   },
   {
-    label: '活动时间',
-    field: 'activityTime',
-    formatter: dateFormatter,
+    label: '活动开始时间',
+    field: 'startTime',
+    formatter: dateFormatter2,
+    isSearch: true,
     search: {
-      show: true,
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'x',
-        type: 'datetimerange',
-        rangeSeparator: '至'
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange'
       }
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'x',
-        type: 'datetimerange',
-        rangeSeparator: '至'
-      },
-      value: [getNowDateTime().valueOf(), getNowDateTime().valueOf()],
-      colProps: {
-        span: 24
+        type: 'date',
+        valueFormat: 'x'
       }
+    },
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '活动结束时间',
+    field: 'endTime',
+    formatter: dateFormatter2,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange'
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'date',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 120
     }
   },
   {
diff --git a/src/views/mall/promotion/combination/activity/index.vue b/src/views/mall/promotion/combination/index.vue
similarity index 89%
rename from src/views/mall/promotion/combination/activity/index.vue
rename to src/views/mall/promotion/combination/index.vue
index c76f1787..db231d70 100644
--- a/src/views/mall/promotion/combination/activity/index.vue
+++ b/src/views/mall/promotion/combination/index.vue
@@ -63,7 +63,7 @@
 </template>
 <script lang="ts" setup>
 import { allSchemas } from './combinationActivity.data'
-import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationactivity'
+import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
 import CombinationActivityForm from './CombinationActivityForm.vue'
 import { cloneDeep } from 'lodash-es'
 import { createImageViewer } from '@/components/ImageViewer'
@@ -102,10 +102,10 @@ const handleDelete = (id: number) => {
 /** 初始化 **/
 onMounted(() => {
   /**
- TODO
- 后面准备封装成一个函数来操作 tableColumns 重新排列：比如说需求是表单上商品选择是在后面的而列表展示的时候需要调到位置。
- 封装效果支持批量操作，给出 field 和需要插入的位置，例：[{field:'spuId',index: 1}] 效果为把 field 为 spuId 的 column 移动到第一个位置
- */
+   TODO
+   后面准备封装成一个函数来操作 tableColumns 重新排列：比如说需求是表单上商品选择是在后面的而列表展示的时候需要调到位置。
+   封装效果支持批量操作，给出 field 和需要插入的位置，例：[{field:'spuId',index: 1}] 效果为把 field 为 spuId 的 column 移动到第一个位置
+   */
   // 处理一下表格列让商品往前
   const index = allSchemas.tableColumns.findIndex((item) => item.field === 'spuId')
   const column = cloneDeep(allSchemas.tableColumns[index])