From 9a17513b6145c8509ef848c80750b14d82b174d2 Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Wed, 6 Aug 2025 19:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/activity/components/EditDialog.vue  | 49 ++++++++++++-------
 src/views/pages/user/index.vue                |  2 +-
 src/views/pages/workOrder/orderList/index.vue | 24 +++++----
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/views/pages/activity/components/EditDialog.vue b/src/views/pages/activity/components/EditDialog.vue
index 6cc4558..0035e71 100644
--- a/src/views/pages/activity/components/EditDialog.vue
+++ b/src/views/pages/activity/components/EditDialog.vue
@@ -1,6 +1,6 @@
 <template>
     <a-modal :open="modal.open" :title="modal.title" :width="640" :confirm-loading="modal.confirmLoading"
-        :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel" >
+        :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel">
         <a-spin :spinning="spining">
             <a-form ref="formRef" :model="formData" :rules="formRules">
                 <a-card class="mb-8-2">
@@ -10,7 +10,7 @@
                                 <a-input :placeholder="'请输入活动标题'" v-model:value="formData.title"></a-input>
                             </a-form-item>
                         </a-col>
-                        
+
                         <a-col :span="24">
                             <a-form-item :label="'活动内容'" name="content">
                                 <x-editor v-model="formData.content"></x-editor>
@@ -21,21 +21,34 @@
                                 <a-input v-model:value="formData.openAt" placeholder="请输入活动时间" />
                             </a-form-item>
                         </a-col>
-                         <a-col :span="24">
+                        <a-col :span="24">
+
+                            <a-form-item label="活动开始时间" name="startAt">
+                                <a-date-picker v-model:value="formData.startAt" placeholder="请选择活动开始时间"
+                                    style="width: 100%;" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
+
+                            <a-form-item label="活动结束时间" name="endAt">
+                                <a-date-picker v-model:value="formData.endAt" placeholder="请选择活动结束时间"
+                                    style="width: 100%;" />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :span="24">
                             <a-form-item :label="'状态'" name="status">
-                                <a-radio-group v-model:value="formData.status" :options="activatyStatus.getAll()" disabled></a-radio-group>
+                                <a-radio-group v-model:value="formData.status" :options="activatyStatus.getAll()"
+                                    disabled></a-radio-group>
                             </a-form-item>
                         </a-col>
                         <a-col :span="12">
                             <a-form-item :label="'活动图片'" name="cover">
-                                <gx-upload v-model="formData.cover" accept-types=".jpg,.png,.webp"
-                                    :fileNumber="1" />
+                                <gx-upload v-model="formData.cover" accept-types=".jpg,.png,.webp" :fileNumber="1" />
                             </a-form-item>
                         </a-col>
                         <a-col :span="12">
                             <a-form-item :label="'背景图片'" name="images">
-                                <gx-upload v-model="formData.images" accept-types=".jpg,.png,.webp"
-                                    :fileNumber="1" />
+                                <gx-upload v-model="formData.images" accept-types=".jpg,.png,.webp" :fileNumber="1" />
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -68,9 +81,9 @@ const fileList = ref([])
 formRules.value = {
     title: [{ required: true, message: '请输入活动名称' }],
     openAt: [{ required: true, message: '请输入活动时间' }],
-    cover: [{required: false, message: '请上传图片', trigger: 'change'}],
+    cover: [{ required: false, message: '请上传图片', trigger: 'change' }],
     images: [{ required: false, message: '请上传图片', trigger: 'change' }],
-    activityContent:[{ required: true, message: '请输入活动内容' }]
+    activityContent: [{ required: true, message: '请输入活动内容' }]
 }
 
 onBeforeMount(() => {
@@ -108,13 +121,13 @@ async function handleEdit(record = {}) {
         formData.value = { ...data }
         if (data.images && data.images.length > 0) {
             formData.value.images = data.images.map(item => config('http.apiBasic') + item)
-        }else{
-            formData.value.images=[]
+        } else {
+            formData.value.images = []
         }
-        if(data.cover){
-            formData.value.cover=[config('http.apiBasic')+data.cover]
-        }else{
-            formData.value.cover=[]
+        if (data.cover) {
+            formData.value.cover = [config('http.apiBasic') + data.cover]
+        } else {
+            formData.value.cover = []
         }
     } catch (error) {
         message.error({ content: error.message })
@@ -134,9 +147,9 @@ function handleOk() {
             showLoading()
             const params = {
                 ...values,
-                cover: formData.value.cover?spliceUrl(formData.value.cover[0]):'',
+                cover: formData.value.cover ? spliceUrl(formData.value.cover[0]) : '',
                 images: formData.value.images ? formData.value.images.map(item => spliceUrl(item)) : [],
-                status:1
+                status: 1
             }
             let result = null
             switch (modal.value.type) {
diff --git a/src/views/pages/user/index.vue b/src/views/pages/user/index.vue
index 9ef458d..f0bed7d 100644
--- a/src/views/pages/user/index.vue
+++ b/src/views/pages/user/index.vue
@@ -229,4 +229,4 @@ async function onOk() {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>
\ No newline at end of file
diff --git a/src/views/pages/workOrder/orderList/index.vue b/src/views/pages/workOrder/orderList/index.vue
index 03fbf41..bf2b57a 100644
--- a/src/views/pages/workOrder/orderList/index.vue
+++ b/src/views/pages/workOrder/orderList/index.vue
@@ -12,6 +12,9 @@
                             <a-tag :color="orderStatus.getColor(record.status)">{{
                                 orderStatus.getName(record.status) }}</a-tag>
                         </template>
+                        <template v-if="'createdAt' === column.dataIndex">
+                            {{ dayjs(record.createdAt).format('YYYY-MM-DD') }}
+                        </template>
                         <template v-if="'action' === column.key">
                             <x-action-button @click="auditHandleEdit(record, 'audit')" v-if="record.status === 1">
                                 <a-tooltip>
@@ -80,20 +83,23 @@ import EditDialog from './components/EditDialog.vue'
 import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
 import { useI18n } from 'vue-i18n'
 import { orderStatus } from '@/enums/index.js'
-import { status } from 'nprogress'
+import dayjs from 'dayjs'
 defineOptions({
     name: 'orderList',
 })
 const { t } = useI18n() // 解构出t方法
 const columns = [
-    { title: '用户名称', dataIndex: 'customerName' },
-    { title: '工单分类', dataIndex: 'label' },
-    { title: '工单标题', dataIndex: 'title', ellipsis: true },
-    { title: '工单内容', dataIndex: 'content', ellipsis: true },
-    { title: '图片/视频', dataIndex: 'url', width: 120,align:'center' },
-    { title: '工作地点', dataIndex: 'address', ellipsis: true },
-    { title: '创建时间', dataIndex: 'createAt' },
-    { title: '上门时间', dataIndex: 'startAt' },
+    // { title: '用户名称', dataIndex: 'customerName', width: 100 },
+    { title: '工单分类', dataIndex: 'label', width: 100 },
+    // { title: '工单标题', dataIndex: 'content', ellipsis: true },
+    { title: '工单内容', dataIndex: 'title', ellipsis: true, width: 200 },
+    { title: '图片/视频', dataIndex: 'url', width: 100, align: 'center' },
+
+    { title: '维修地点', dataIndex: 'address', ellipsis: true, width: 200 },
+    { title: '报修人', dataIndex: 'concatName', width: 180 },
+    { title: '联系电话', dataIndex: 'customerPhone', width: 180 },
+    { title: '创建时间', dataIndex: 'createdAt', width: 180 },
+    // { title: '上门时间', dataIndex: 'startAt' },
     { title: '状态', dataIndex: 'status', width: 120, align: 'center' },
     { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' },
 ]