fix: combinationActivity 调整

src/api/mall/promotion/combination/combinationactivity.ts → src/api/mall/promotion/combination/combinationActivity.ts

 import request from '@/config/axios'
 import request from '@/config/axios'
 import { Sku, Spu } from '@/api/mall/product/spu'
 import { Sku, Spu } from '@/api/mall/product/spu'
 
 
-// TODO @puhui999: combinationActivity.ts
-
 export interface CombinationActivityVO {
 export interface CombinationActivityVO {
   id?: number
   id?: number
   name?: string
   name?: string

src/views/mall/promotion/combination/activity/CombinationActivityForm.vue → src/views/mall/promotion/combination/CombinationActivityForm.vue

@@ -6,6 +6,7 @@
       :is-col="true"
       :is-col="true"
       :rules="rules"
       :rules="rules"
       :schema="allSchemas.formSchema"
       :schema="allSchemas.formSchema"
+      class="mt-10px"
     >
     >
       <template #spuId>
       <template #spuId>
         <el-button @click="spuSelectRef.open()">选择商品</el-button>
         <el-button @click="spuSelectRef.open()">选择商品</el-button>
@@ -37,8 +38,8 @@
   <SpuSelect ref="spuSelectRef" :isSelectSku="true" @confirm="selectSpu" />
   <SpuSelect ref="spuSelectRef" :isSelectSku="true" @confirm="selectSpu" />
 </template>
 </template>
 <script lang="ts" setup>
 <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 { allSchemas, rules } from './combinationActivity.data'
 import { SpuAndSkuList, SpuProperty, SpuSelect } from '@/views/mall/promotion/components'
 import { SpuAndSkuList, SpuProperty, SpuSelect } from '@/views/mall/promotion/components'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'

src/views/mall/promotion/combination/activity/combinationActivity.data.ts → src/views/mall/promotion/combination/combinationActivity.data.ts

 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter, getNowDateTime } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 
 // 表单校验
 // 表单校验
 export const rules = reactive({
 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: {
     search: {
-      show: true,
       component: 'DatePicker',
       component: 'DatePicker',
       componentProps: {
       componentProps: {
-        valueFormat: 'x',
-        type: 'datetimerange',
-        rangeSeparator: '至'
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange'
       }
       }
     },
     },
     form: {
     form: {
       component: 'DatePicker',
       component: 'DatePicker',
       componentProps: {
       componentProps: {
-        valueFormat: 'x',
-        type: 'datetimerange',
-        rangeSeparator: '至'
+        type: 'date',
+        valueFormat: 'x'
+      }
     },
     },
-      value: [getNowDateTime().valueOf(), getNowDateTime().valueOf()],
-      colProps: {
-        span: 24
+    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
     }
     }
   },
   },
   {
   {

src/views/mall/promotion/combination/activity/index.vue → src/views/mall/promotion/combination/index.vue

@@ -63,7 +63,7 @@
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { allSchemas } from './combinationActivity.data'
 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 CombinationActivityForm from './CombinationActivityForm.vue'
 import { cloneDeep } from 'lodash-es'
 import { cloneDeep } from 'lodash-es'
 import { createImageViewer } from '@/components/ImageViewer'
 import { createImageViewer } from '@/components/ImageViewer'