.env.production

@@ -39,4 +39,4 @@ VITE_APP_PLATFORM_CODE = 'MfJkMNMW2JKXBuPcbP2rxkD3ynXmReAZZFm4fN7cAGwGJdKCmd'
 VITE_APP_WEBSOCKET = false
 
 # sse 开关
-VITE_APP_SSE = false
+VITE_APP_SSE = true

src/api/fulfiller/fulfiller/index.ts

@@ -0,0 +1,12 @@
+import request from '@/utils/request';
+
+/**
+ * 获取履约者详细信息
+ * @param id 履约者ID
+ */
+export function getFulfillerDetail(id: number | string) {
+  return request({
+    url: `/fulfiller/fulfiller/${id}`,
+    method: 'get'
+  });
+}

src/api/order/subOrder/index.ts

@@ -39,14 +39,6 @@ export const cancelSubOrder = (data: { orderId: string | number; }) => {
     });
 };
 
-export function listSubOrderOnMerchant(params: SubOrderListParams): AxiosPromise<SubOrderListResult> {
-    return request({
-        url: '/order/subOrder/listOnMerchant',
-        method: 'get',
-        params
-    });
-}
-
 export const remarkSubOrder = (data: { orderId: string | number; remark: string; }) => {
     return request({
         url: '/order/subOrder/remark',

src/api/system/notice/index.ts

@@ -43,3 +43,28 @@ export function delNotice(noticeId: string | number | Array<string | number>) {
     method: 'delete'
   });
 }
+
+// 获取我的消息列表
+export function listMyNotice(query: NoticeQuery): AxiosPromise<NoticeVO[]> {
+  return request({
+    url: '/system/notice/myList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 标记消息为已读
+export function readNotice(noticeId: string | number) {
+  return request({
+    url: '/system/notice/read/' + noticeId,
+    method: 'put'
+  });
+}
+
+// 标记所有消息为已读
+export function readAllNotice() {
+  return request({
+    url: '/system/notice/readAll',
+    method: 'put'
+  });
+}

src/api/system/notice/types.ts

@@ -6,13 +6,30 @@ export interface NoticeVO extends BaseEntity {
   status: string;
   remark: string;
   createByName: string;
+
+  // New fields from backend modification
+  id?: number | string;
+  title?: string;
+  type?: number | string;
+  content?: string;
+  senderType?: number;
+  sender?: number | string;
+  receiverType?: number;
+  receiver?: number | string;
+  readFlag?: boolean | string | number;
+  readTime?: string;
+  otherId?: number | string;
 }
 
 export interface NoticeQuery extends PageQuery {
-  noticeTitle: string;
-  createByName: string;
-  status: string;
-  noticeType: string;
+  noticeTitle?: string;
+  createByName?: string;
+  status?: string;
+  noticeType?: string;
+  // New fields from backend modification
+  title?: string;
+  type?: number | string;
+  readFlag?: boolean | string | number;
 }
 
 export interface NoticeForm {

src/assets/icons/svg/message-center.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+  <path d="M64 8c-20.2 0-36.5 16.3-36.5 36.5v28L16 84v8h96v-8l-11.5-11.5v-28C100.5 24.3 84.2 8 64 8zm0 112c7.7 0 14-6.3 14-14v-6H50v6c0 7.7 6.3 14 14 14z"/>
+</svg>

src/layout/components/Navbar.vue

@@ -6,20 +6,20 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
-          v-if="userId === 1 && tenantEnabled"
-          v-model="companyName"
-          class="min-w-244px"
-          clearable
-          filterable
-          reserve-keyword
-          :placeholder="proxy.$t('navbar.selectTenant')"
-          @change="dynamicTenantEvent"
-          @clear="dynamicClearEvent"
-        >
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select>
+<!--        <el-select-->
+<!--          v-if="userId === 1 && tenantEnabled"-->
+<!--          v-model="companyName"-->
+<!--          class="min-w-244px"-->
+<!--          clearable-->
+<!--          filterable-->
+<!--          reserve-keyword-->
+<!--          :placeholder="proxy.$t('navbar.selectTenant')"-->
+<!--          @change="dynamicTenantEvent"-->
+<!--          @clear="dynamicClearEvent"-->
+<!--        >-->
+<!--          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>-->
+<!--          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
+<!--        </el-select>-->
 
         <search-menu ref="searchMenuRef" />
 <!--        <el-tooltip content="搜索" effect="dark" placement="bottom">-->
@@ -27,17 +27,19 @@
 <!--            <svg-icon class-name="search-icon" icon-class="search" />-->
 <!--          </div>-->
 <!--        </el-tooltip>-->
-<!--        &lt;!&ndash; 消息 &ndash;&gt;-->
+        <!-- 消息 -->
 <!--        <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">-->
-<!--          <div>-->
-<!--            <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">-->
+<!--          <div class="message-wrapper">-->
+<!--            <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="350" :persistent="false" @before-enter="getNoticeList">-->
 <!--              <template #reference>-->
-<!--                <el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">-->
-<!--                  <div class="right-menu-item hover-effect" style="display: block"><svg-icon icon-class="message" /></div>-->
+<!--                <el-badge :value="newNotice > 0 ? newNotice : ''" :max="99" class="message-badge">-->
+<!--                  <div class="right-menu-item hover-effect notice-btn">-->
+<!--                    <svg-icon icon-class="message-center" style="width: 26px; height: 26px;" />-->
+<!--                  </div>-->
 <!--                </el-badge>-->
 <!--              </template>-->
 <!--              <template #default>-->
-<!--                <notice></notice>-->
+<!--                <notice ref="noticeRef" @read="updateNoticeCount"></notice>-->
 <!--              </template>-->
 <!--            </el-popover>-->
 <!--          </div>-->
@@ -99,6 +101,7 @@ import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
 import router from '@/router';
 import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type';
+import { listMyNotice } from '@/api/system/notice';
 
 const appStore = useAppStore();
 const userStore = useUserStore();
@@ -117,11 +120,50 @@ const dynamic = ref(false);
 const tenantEnabled = ref(true);
 // 搜索菜单
 const searchMenuRef = ref<InstanceType<typeof SearchMenu>>();
+const noticeRef = ref();
 
 const openSearchMenu = () => {
   searchMenuRef.value?.openSearch();
 };
 
+const getNoticeList = () => {
+  fetchUnreadCount();
+  noticeRef.value?.getList();
+};
+
+const updateNoticeCount = () => {
+  fetchUnreadCount();
+};
+
+const fetchUnreadCount = async () => {
+  try {
+    const res = await listMyNotice({
+      pageNum: 1,
+      pageSize: 1,
+      readFlag: false,
+      _t: new Date().getTime()
+    } as any);
+    newNotice.value = Number(res.total) || 0;
+  } catch (error) {
+    console.error('获取未读消息数量失败', error);
+  }
+};
+
+let pollingTimer: any = null;
+
+onMounted(() => {
+  // fetchUnreadCount();
+  // // 每5秒轮询一次后台获取未读消息
+  // pollingTimer = setInterval(fetchUnreadCount, 5000);
+});
+
+onUnmounted(() => {
+  if (pollingTimer) {
+    clearInterval(pollingTimer);
+    pollingTimer = null;
+  }
+});
+
 // 动态切换
 const dynamicTenantEvent = async (tenantId: string) => {
   if (companyName.value != null && companyName.value !== '') {
@@ -190,14 +232,14 @@ const handleCommand = (command: string) => {
     commandMap[command]();
   }
 };
-//用深度监听 消息
-watch(
-  () => noticeStore.state.value.notices,
-  (newVal) => {
-    newNotice.value = newVal.filter((item: any) => !item.read).length;
-  },
-  { deep: true }
-);
+// 用深度监听 消息 (目前使用定时器轮询替代)
+// watch(
+//   () => noticeStore.state.value.notices,
+//   (newVal) => {
+//     newNotice.value = newVal.filter((item: any) => !item.read).length;
+//   },
+//   { deep: true }
+// );
 </script>
 
 <style lang="scss" scoped>
@@ -206,7 +248,9 @@ watch(
 }
 
 :deep(.el-badge__content.is-fixed) {
-  top: 12px;
+  top: 15px;
+  right: 12px;
+  transform: translateY(-50%) translateX(50%) scale(0.9);
 }
 
 .flex {
@@ -217,6 +261,20 @@ watch(
   align-items: center;
 }
 
+.message-wrapper {
+  display: flex;
+  align-items: center;
+  height: 100%;
+}
+
+.notice-btn {
+  display: flex !important;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  padding: 0 8px !important;
+}
+
 .navbar {
   height: 50px;
   overflow: hidden;

src/layout/components/notice/index.vue

@@ -1,130 +1,288 @@
 <template>
-  <div v-loading="state.loading" class="layout-navbars-breadcrumb-user-news">
+  <div v-loading="loading" class="layout-notice">
     <div class="head-box">
-      <div class="head-box-title">通知公告</div>
-      <div class="head-box-btn" @click="readAll">全部已读</div>
+      <div class="head-box-title">消息通知</div>
+      <div class="head-box-btn" @click="handleReadAll">全部已读</div>
     </div>
-    <div v-loading="state.loading" class="content-box">
-      <template v-if="newsList.length > 0">
-        <div v-for="(v, k) in newsList" :key="k" class="content-box-item" @click="onNewsClick(k)">
-          <div class="item-conten">
-            <div>{{ v.message }}</div>
-            <div class="content-box-msg"></div>
-            <div class="content-box-time">{{ v.time }}</div>
+    <div class="content-box">
+      <template v-if="noticeList.length > 0">
+        <div v-for="item in noticeList" :key="item.id" class="content-box-item" @click="handleDetail(item)">
+          <div class="item-icon" :style="{ backgroundColor: getIconConfig(item).bgColor }">
+            <svg-icon :icon-class="getIconConfig(item).icon" />
           </div>
-          <!-- 已读/未读 -->
-          <span v-if="v.read" class="el-tag el-tag--success el-tag--mini read">已读</span>
-          <span v-else class="el-tag el-tag--danger el-tag--mini read">未读</span>
+          <div class="item-content">
+            <div class="item-title text-ellipsis">{{ item.title }}</div>
+            <div class="item-time">{{ parseTime(item.createTime, '{m}-{d} {h}:{i}') }}</div>
+          </div>
+          <div v-if="!item.readFlag" class="unread-dot"></div>
         </div>
       </template>
-      <el-empty v-else :description="'消息为空'"></el-empty>
+      <el-empty v-else :image-size="60" description="暂无未读消息"></el-empty>
     </div>
-    <div v-if="newsList.length > 0" class="foot-box" @click="onGoToGiteeClick">前往gitee</div>
+    <div class="foot-box" @click="handleViewAll">查看全部消息</div>
+
+    <!-- 消息详情对话框 -->
+    <el-dialog title="消息详情" v-model="detailDialog.open" width="500px" append-to-body destroy-on-close>
+      <div class="dialog-content-wrapper">
+        <div class="dialog-header">
+          <el-tag :type="detailDialog.tagType" effect="plain" size="small">{{ detailDialog.tagLabel }}</el-tag>
+          <span class="dialog-time">{{ detailDialog.createTime }}</span>
+        </div>
+        <div class="dialog-main-title">{{ detailDialog.title }}</div>
+        <div class="dialog-desc-block">
+          {{ detailDialog.content }}
+        </div>
+        <div class="dialog-action-link" @click="handleProcess">
+          <el-link type="primary" :underline="false">前往处理 >></el-link>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailDialog.open = false">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup lang="ts" name="layoutBreadcrumbUserNews">
-import { useNoticeStore } from '@/store/modules/notice';
+<script setup lang="ts">
+import { listMyNotice, readNotice, readAllNotice } from '@/api/system/notice';
+import { NoticeVO } from '@/api/system/notice/types';
+import router from '@/router';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const emit = defineEmits(['read']);
 
-const noticeStore = useNoticeStore();
-const { readAll } = useNoticeStore();
+const noticeList = ref<NoticeVO[]>([]);
+const loading = ref(false);
 
-// 定义变量内容
-const state = reactive({
-  loading: false
+const detailDialog = reactive({
+  open: false,
+  title: '',
+  content: '',
+  createTime: '',
+  tagLabel: '',
+  tagType: '' as any
 });
-const newsList = ref([]) as any;
-
-/**
- * 初始化数据
- * @returns
- */
-const getTableData = async () => {
-  state.loading = true;
-  newsList.value = noticeStore.state.notices;
-  state.loading = false;
+
+/** 获取图标和颜色配置 */
+const getIconConfig = (item: any) => {
+  const title = item.title || '';
+  if (title.includes('异常')) return { icon: 'bug', bgColor: '#f56c6c' };
+  if (title.includes('拒单')) return { icon: 'message-center', bgColor: '#f56c6c' };
+  if (title.includes('入驻') || title.includes('申请')) return { icon: 'user', bgColor: '#e6a23c' };
+  if (title.includes('派单') || title.includes('新订单')) return { icon: 'guide', bgColor: '#409eff' };
+  if (title.includes('完成')) return { icon: 'finish', bgColor: '#67c23a' };
+  return { icon: 'message-center', bgColor: '#909399' };
+};
+
+/** 查询未读消息 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listMyNotice({
+      pageNum: 1,
+      pageSize: 5,
+      readFlag: false
+    } as any);
+    noticeList.value = res.rows;
+  } finally {
+    loading.value = false;
+  }
 };
 
-//点击消息，写入已读
-const onNewsClick = (item: any) => {
-  newsList.value[item].read = true;
-  //并且写入pinia
-  noticeStore.state.notices = newsList.value;
+/** 消息详情 */
+const handleDetail = (item: NoticeVO) => {
+  const title = item.title || '';
+  detailDialog.title = title;
+  detailDialog.content = item.content || '';
+  detailDialog.createTime = proxy?.parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') || '';
+
+  if (title.includes('异常')) {
+    detailDialog.tagLabel = '异常上报';
+    detailDialog.tagType = 'danger';
+  } else if (title.includes('拒单')) {
+    detailDialog.tagLabel = '拒单通知';
+    detailDialog.tagType = 'danger';
+  } else if (title.includes('入驻') || title.includes('申请')) {
+    detailDialog.tagLabel = '自主注册审核';
+    detailDialog.tagType = 'warning';
+  } else if (title.includes('派单') || title.includes('新订单')) {
+    detailDialog.tagLabel = '新订单';
+    detailDialog.tagType = 'primary';
+  } else if (title.includes('完成')) {
+    detailDialog.tagLabel = '服务完成';
+    detailDialog.tagType = 'success';
+  } else {
+    detailDialog.tagLabel = '系统消息';
+    detailDialog.tagType = 'info';
+  }
+
+  detailDialog.open = true;
+
+  if (!item.readFlag) {
+    readNotice(item.id as number).then(() => {
+      item.readFlag = true;
+      emit('read');
+      setTimeout(getList, 300);
+    });
+  }
 };
 
-// 前往通知中心点击
-const onGoToGiteeClick = () => {
-  window.open('https://gitee.com/dromara/RuoYi-Vue-Plus/tree/5.X/');
+/** 前往处理 */
+const handleProcess = () => {
+  detailDialog.open = false;
+  if (detailDialog.title.includes('拒单') || detailDialog.title.includes('派单') || detailDialog.title.includes('异常')) {
+    router.push({ path: '/order/orderList' });
+  }
 };
 
-onMounted(() => {
-  nextTick(() => {
-    getTableData();
+/** 全部已读 */
+const handleReadAll = () => {
+  proxy?.$modal.confirm('是否将全部未读消息标记为已读？').then(() => {
+    return readAllNotice();
+  }).then(() => {
+    proxy?.$modal.msgSuccess('全部已读操作成功');
+    emit('read');
+    getList();
   });
+};
+
+/** 查看全部 */
+const handleViewAll = () => {
+  router.push('/notice');
+};
+
+defineExpose({
+  getList
+});
+
+onMounted(() => {
+  getList();
 });
 </script>
 
 <style lang="scss" scoped>
-.layout-navbars-breadcrumb-user-news {
+.layout-notice {
   .head-box {
     display: flex;
     border-bottom: 1px solid var(--el-border-color-lighter);
     box-sizing: border-box;
     color: var(--el-text-color-primary);
     justify-content: space-between;
-    height: 35px;
+    height: 40px;
     align-items: center;
+    padding: 0 16px;
+    .head-box-title {
+      font-size: 14px;
+      font-weight: bold;
+    }
     .head-box-btn {
       color: var(--el-color-primary);
-      font-size: 13px;
+      font-size: 12px;
       cursor: pointer;
-      opacity: 0.8;
       &:hover {
-        opacity: 1;
+        text-decoration: underline;
       }
     }
   }
   .content-box {
-    height: 300px;
-    overflow: auto;
-    font-size: 13px;
+    max-height: 400px;
+    overflow-y: auto;
+    padding: 8px 0;
     .content-box-item {
-      padding-top: 12px;
       display: flex;
-      &:last-of-type {
-        padding-bottom: 12px;
+      align-items: center;
+      padding: 12px 16px;
+      cursor: pointer;
+      position: relative;
+      transition: background-color 0.2s;
+      &:hover {
+        background-color: var(--el-fill-color-light);
       }
-      .content-box-msg {
-        color: var(--el-text-color-secondary);
-        margin-top: 5px;
-        margin-bottom: 5px;
+      .item-icon {
+        width: 36px;
+        height: 36px;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 12px;
+        flex-shrink: 0;
+        .svg-icon {
+          color: #fff;
+          font-size: 18px;
+        }
       }
-      .content-box-time {
-        color: var(--el-text-color-secondary);
+      .item-content {
+        flex: 1;
+        overflow: hidden;
+        .item-title {
+          font-size: 14px;
+          color: var(--el-text-color-primary);
+          margin-bottom: 4px;
+        }
+        .item-time {
+          font-size: 12px;
+          color: var(--el-text-color-secondary);
+        }
       }
-      .item-conten {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
+      .unread-dot {
+        width: 8px;
+        height: 8px;
+        background-color: var(--el-color-danger);
+        border-radius: 50%;
+        margin-left: 8px;
       }
     }
   }
   .foot-box {
-    height: 35px;
+    height: 40px;
     color: var(--el-color-primary);
     font-size: 13px;
     cursor: pointer;
-    opacity: 0.8;
     display: flex;
     align-items: center;
     justify-content: center;
     border-top: 1px solid var(--el-border-color-lighter);
     &:hover {
-      opacity: 1;
+      background-color: var(--el-fill-color-light);
     }
   }
-  :deep(.el-empty__description p) {
-    font-size: 13px;
+}
+
+.text-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.dialog-content-wrapper {
+  .dialog-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16px;
+    .dialog-time {
+      font-size: 12px;
+      color: #909399;
+    }
+  }
+  .dialog-main-title {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 12px;
+  }
+  .dialog-desc-block {
+    background-color: #f8f8f8;
+    padding: 12px;
+    border-radius: 4px;
+    font-size: 14px;
+    line-height: 1.6;
+    margin-bottom: 16px;
+  }
+  .dialog-action-link {
+    text-align: right;
   }
 }
 </style>

src/views/archieves/customer/index.vue

@@ -7,7 +7,7 @@
           <span class="title">用户管理</span>
           <div class="header-actions">
             <el-cascader v-model="searchRegionValue" :options="areaCascaderOptions"
-                         :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+                         :props="{ value: 'id', label: 'name' }"
                          placeholder="所属站点" style="width: 350px; margin-right: 10px" clearable @change="handleSearchRegionChange" />
             <el-input v-model="searchForm.keyword" placeholder="搜索姓名/手机号" style="width: 200px; margin-right: 10px;" clearable @keyup.enter="handleSearch" @clear="handleSearch" />
             <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['archieves:customer:add']">新增用户</el-button>
@@ -141,9 +141,9 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="24">
-            <el-form-item label="所属站点">
+            <el-form-item label="所属站点" required>
               <el-cascader v-model="formAreaValue" :options="areaTreeOptions" placeholder="请选择站点"
-                           :props="{ checkStrictly: true, value: 'value', label: 'label' }"
+                           :props="{ value: 'value', label: 'label' }"
                            style="width: 100%" clearable @change="handleFormAreaChange" />
             </el-form-item>
           </el-col>
@@ -174,7 +174,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="详细住址"><el-input v-model="form.address" placeholder="请输入街道/门牌号" /></el-form-item>
+            <el-form-item label="详细住址" required><el-input v-model="form.address" placeholder="请输入街道/门牌号" /></el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="房屋类型">
@@ -184,19 +184,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="入门方式">
+            <el-form-item label="入门方式" required>
               <el-radio-group v-model="form.entryMethod">
                 <el-radio v-for="dict in sys_entry_method" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.entryMethod === 'password'">
-            <el-form-item label="开门密码">
+            <el-form-item label="开门密码" required>
               <el-input v-model="form.entryPassword" placeholder="请输入密码" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="form.entryMethod === 'key'">
-            <el-form-item label="钥匙位置">
+            <el-form-item label="钥匙位置" required>
               <el-input v-model="form.keyLocation" placeholder="如：地毯下" />
             </el-form-item>
           </el-col>
@@ -262,26 +262,24 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="品种">
+                <el-form-item label="品种" required>
                   <el-select v-model="petForm.breed" placeholder="请选择品种" style="width: 100%" filterable allow-create default-first-option>
                     <el-option v-for="dict in sys_pet_breed" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="体型">
+                <el-form-item label="体型" required>
                   <el-select v-model="petForm.size" style="width: 100%">
-                    <el-option label="小型" value="small" />
-                    <el-option label="中型" value="medium" />
-                    <el-option label="大型" value="large" />
+                    <el-option v-for="dict in sys_pet_size" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="体重(kg)"><el-input-number v-model="petForm.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
+                <el-form-item label="体重(kg)" required><el-input-number v-model="petForm.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="年龄(岁)"><el-input-number v-model="petForm.age" :min="0" style="width: 100%" /></el-form-item>
+                <el-form-item label="年龄(岁)" required><el-input-number v-model="petForm.age" :min="0" style="width: 100%" /></el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="性格关键词"><el-input v-model="petForm.personality" placeholder="如：活泼、粘人" /></el-form-item>
@@ -306,40 +304,38 @@
             <el-form-item label="新来家庭时间">
               <el-date-picker v-model="petForm.arrivalTime" type="date" placeholder="选择日期" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="家庭房屋类型">
+            <el-form-item label="家庭房屋类型" required>
               <el-radio-group v-model="petForm.houseType">
-                <el-radio label="stairs">楼梯</el-radio>
-                <el-radio label="elevator">电梯</el-radio>
+                <el-radio v-for="dict in sys_house_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="入门方式">
+            <el-form-item label="入门方式" required>
               <el-radio-group v-model="petForm.entryMethod">
-                <el-radio label="password">密码开门</el-radio>
-                <el-radio label="key">钥匙开门</el-radio>
+                <el-radio v-for="dict in sys_entry_method" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="密码" v-if="petForm.entryMethod === 'password'">
+            <el-form-item label="密码" v-if="petForm.entryMethod === 'password'" required>
               <el-input v-model="petForm.entryPassword" placeholder="请输入门锁密码" />
             </el-form-item>
-            <el-form-item label="钥匙位置" v-if="petForm.entryMethod === 'key'">
+            <el-form-item label="钥匙位置" v-if="petForm.entryMethod === 'key'" required>
               <el-input v-model="petForm.keyLocation" placeholder="请输入钥匙存放位置" />
             </el-form-item>
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="健康状况" name="health">
           <el-form :model="petForm" label-width="120px">
-            <el-form-item label="健康状态">
+            <el-form-item label="健康状态" required>
               <el-radio-group v-model="petForm.healthStatus">
                 <el-radio label="健康">健康</el-radio>
                 <el-radio label="亚健康">亚健康</el-radio>
                 <el-radio label="疾病">疾病</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="是否有攻击倾向">
+            <el-form-item label="是否有攻击倾向" required>
               <el-switch v-model="petForm.aggression" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
             </el-form-item>
-            <el-form-item label="疫苗情况">
-              <el-radio-group v-model="petForm.vaccine">
+            <el-form-item label="疫苗情况" required>
+              <el-radio-group v-model="petForm.vaccineStatus">
                 <el-radio label="无">无</el-radio>
                 <el-radio label="已打1次">已打1次</el-radio>
                 <el-radio label="已打2次">已打2次</el-radio>
@@ -352,10 +348,10 @@
                 <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px; line-height: 100px;"><Plus /></el-icon>
               </el-upload>
             </el-form-item>
-            <el-form-item label="既往病史">
+            <el-form-item label="既往病史" required>
               <el-input v-model="petForm.medicalHistory" type="textarea" placeholder="如有病史请记录" />
             </el-form-item>
-            <el-form-item label="过敏史">
+            <el-form-item label="过敏史" required>
               <el-input v-model="petForm.allergies" type="textarea" placeholder="如有过敏源请记录" />
             </el-form-item>
           </el-form>
@@ -407,7 +403,11 @@ const areaCascaderOptions = computed(() => {
       .map(item => {
         const children = buildTree(data, item.id)
         const node = { id: item.id, name: item.name }
-        if (children.length > 0) node.children = children
+        if (children.length > 0) {
+          node.children = children
+        } else if (String(item.type) !== '2') {
+          node.disabled = true
+        }
         return node
       })
   }
@@ -550,7 +550,11 @@ const areaTreeOptions = computed(() => {
       .map(item => {
         const children = buildTree(data, item.id)
         const node = { value: item.id, label: item.name }
-        if (children.length > 0) node.children = children
+        if (children.length > 0) {
+          node.children = children
+        } else if (String(item.type) !== '2') {
+          node.disabled = true
+        }
         return node
       })
   }
@@ -728,8 +732,13 @@ const saveRemark = () => {
 }
 
 const saveUser = () => {
+  if (!form.stationId) return ElMessage.warning('所属站点只能选择具体的站点')
   if (!form.name) return ElMessage.warning('请输入姓名')
   if (!form.phone) return ElMessage.warning('请输入电话')
+  if (!form.address) return ElMessage.warning('请输入详细住址')
+  if (!form.entryMethod) return ElMessage.warning('请选择入门方式')
+  if (form.entryMethod === 'password' && !form.entryPassword) return ElMessage.warning('请输入开门密码')
+  if (form.entryMethod === 'key' && !form.keyLocation) return ElMessage.warning('请输入钥匙位置')
   submitLoading.value = true
   form.tagIds = selectedTagIds.value
   if (regionCascaderValue.value && regionCascaderValue.value.length > 0) {
@@ -908,7 +917,20 @@ const handlePetDelete = (row) => {
 }
 
 const savePet = () => {
-  if (!petForm.name) return ElMessage.warning('请输入宠物昵称')
+  if (!petForm.name) return ElMessage.warning('请输入宠物姓名');
+  if (!petForm.breed) return ElMessage.warning('请选择品种');
+  if (!petForm.size) return ElMessage.warning('请选择体型');
+  if (petForm.weight === undefined || petForm.weight === null) return ElMessage.warning('请输入体重(kg)');
+  if (petForm.age === undefined || petForm.age === null) return ElMessage.warning('请输入年龄(岁)');
+  if (!petForm.houseType) return ElMessage.warning('请选择家庭房屋类型');
+  if (!petForm.entryMethod) return ElMessage.warning('请选择入门方式');
+  if (petForm.entryMethod === 'password' && !petForm.entryPassword) return ElMessage.warning('请输入门锁密码');
+  if (petForm.entryMethod === 'key' && !petForm.keyLocation) return ElMessage.warning('请输入钥匙存放位置');
+  if (!petForm.healthStatus) return ElMessage.warning('请选择健康状态');
+  if (petForm.aggression === undefined || petForm.aggression === null) return ElMessage.warning('请选择是否有攻击倾向');
+  if (!petForm.vaccineStatus) return ElMessage.warning('请选择疫苗情况');
+  if (!petForm.medicalHistory) return ElMessage.warning('请输入既往病史');
+  if (!petForm.allergies) return ElMessage.warning('请输入过敏史');
   submitLoading.value = true
   const data = { ...petForm, aggression: Number(petForm.aggression) || 0 }
   const api = data.id ? updatePet(data) : addPet(data)

src/views/archieves/pet/index.vue

@@ -103,24 +103,24 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="品种">
+                <el-form-item label="品种" required>
                   <el-select v-model="form.breed" placeholder="请选择品种" style="width: 100%" filterable allow-create default-first-option>
                     <el-option v-for="dict in sys_pet_breed" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="体型">
+                <el-form-item label="体型" required>
                   <el-select v-model="form.size" style="width: 100%">
                     <el-option v-for="dict in sys_pet_size" :key="dict.value" :label="dict.label" :value="dict.value" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="体重(kg)"><el-input-number v-model="form.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
+                <el-form-item label="体重(kg)" required><el-input-number v-model="form.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="年龄(岁)"><el-input-number v-model="form.age" :min="0" style="width: 100%" /></el-form-item>
+                <el-form-item label="年龄(岁)" required><el-input-number v-model="form.age" :min="0" style="width: 100%" /></el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="性格关键词"><el-input v-model="form.personality" placeholder="如：活泼、粘人" /></el-form-item>
@@ -145,37 +145,37 @@
             <el-form-item label="新来家庭时间">
               <el-date-picker v-model="form.arrivalTime" type="date" placeholder="选择日期" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="家庭房屋类型">
+            <el-form-item label="家庭房屋类型" required>
               <el-radio-group v-model="form.houseType">
                 <el-radio v-for="dict in sys_house_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="入门方式">
+            <el-form-item label="入门方式" required>
               <el-radio-group v-model="form.entryMethod">
                 <el-radio v-for="dict in sys_entry_method" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="密码" v-if="form.entryMethod === 'password'">
+            <el-form-item label="密码" v-if="form.entryMethod === 'password'" required>
               <el-input v-model="form.entryPassword" placeholder="请输入门锁密码" />
             </el-form-item>
-            <el-form-item label="钥匙位置" v-if="form.entryMethod === 'key'">
+            <el-form-item label="钥匙位置" v-if="form.entryMethod === 'key'" required>
               <el-input v-model="form.keyLocation" placeholder="请输入钥匙存放位置" />
             </el-form-item>
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="健康状况" name="health">
           <el-form :model="form" label-width="120px">
-            <el-form-item label="健康状态">
+            <el-form-item label="健康状态" required>
               <el-radio-group v-model="form.healthStatus">
                 <el-radio label="健康">健康</el-radio>
                 <el-radio label="亚健康">亚健康</el-radio>
                 <el-radio label="疾病">疾病</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="是否有攻击倾向">
+            <el-form-item label="是否有攻击倾向" required>
               <el-switch v-model="form.aggression" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否" />
             </el-form-item>
-            <el-form-item label="疫苗情况">
+            <el-form-item label="疫苗情况" required>
               <el-radio-group v-model="form.vaccineStatus">
                 <el-radio label="无">无</el-radio>
                 <el-radio label="已打1次">已打1次</el-radio>
@@ -189,10 +189,10 @@
                 <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px; line-height: 100px"><Plus /></el-icon>
               </el-upload>
             </el-form-item>
-            <el-form-item label="既往病史">
+            <el-form-item label="既往病史" required>
               <el-input v-model="form.medicalHistory" type="textarea" placeholder="如有病史请记录" />
             </el-form-item>
-            <el-form-item label="过敏史">
+            <el-form-item label="过敏史" required>
               <el-input v-model="form.allergies" type="textarea" placeholder="如有过敏源请记录" />
             </el-form-item>
           </el-form>
@@ -459,6 +459,19 @@ const handleUploadVaccineCert = async (file) => {
 const saveData = () => {
   if (!form.name) return ElMessage.warning('请输入宠物姓名');
   if (!form.userId) return ElMessage.warning('请选择所属主人');
+  if (!form.breed) return ElMessage.warning('请选择品种');
+  if (!form.size) return ElMessage.warning('请选择体型');
+  if (form.weight === undefined || form.weight === null) return ElMessage.warning('请输入体重(kg)');
+  if (form.age === undefined || form.age === null) return ElMessage.warning('请输入年龄(岁)');
+  if (!form.houseType) return ElMessage.warning('请选择家庭房屋类型');
+  if (!form.entryMethod) return ElMessage.warning('请选择入门方式');
+  if (form.entryMethod === 'password' && !form.entryPassword) return ElMessage.warning('请输入门锁密码');
+  if (form.entryMethod === 'key' && !form.keyLocation) return ElMessage.warning('请输入钥匙存放位置');
+  if (!form.healthStatus) return ElMessage.warning('请选择健康状态');
+  if (form.aggression === undefined || form.aggression === null) return ElMessage.warning('请选择是否有攻击倾向');
+  if (!form.vaccineStatus) return ElMessage.warning('请选择疫苗情况');
+  if (!form.medicalHistory) return ElMessage.warning('请输入既往病史');
+  if (!form.allergies) return ElMessage.warning('请输入过敏史');
   submitLoading.value = true;
   const api = isEdit.value ? updatePet(form) : addPet(form);
   api.then(() => {

src/views/merchant/storeManagement/index.vue

@@ -58,8 +58,11 @@
         <el-table-column label="资质认证" align="center" width="100">
           <template #default="scope">
             <div class="auth-img-wrap">
-              <el-image v-if="scope.row.businessLicenseUrl" :src="scope.row.businessLicenseUrl" class="auth-img" :preview-src-list="[scope.row.businessLicenseUrl]" preview-teleported />
-              <span v-else class="text-placeholder">-</span>
+              <el-image :src="scope.row.businessLicenseUrl" class="auth-img" :preview-src-list="scope.row.businessLicenseUrl ? [scope.row.businessLicenseUrl] : []" preview-teleported>
+                <template #error>
+                  <div class="image-slot"><el-icon><Picture /></el-icon></div>
+                </template>
+              </el-image>
             </div>
           </template>
         </el-table-column>
@@ -203,7 +206,7 @@
                        placeholder="请选择所属站点" style="width: 100%"
                        @change="handleAreaChange" />
         </el-form-item>
-        <el-form-item label="详细地址">
+        <el-form-item label="详细地址" prop="detailAddress">
           <el-row :gutter="10" style="margin-bottom: 10px">
             <el-col :span="24">
               <el-cascader v-model="addressCascaderValue" :options="regionData" placeholder="选择省市区"
@@ -538,7 +541,7 @@ const data = reactive<PageData<StoreForm, SysStorePageBo>>({
       { required: true, message: "序号不能为空", trigger: "blur" }
     ],
     businessLicense: [
-      { required: true, message: "营业执照不能为空", trigger: "blur" }
+      { required: false, message: "营业执照不能为空", trigger: "blur" }
     ],
     name: [
       { required: true, message: "门店名称不能为空", trigger: "blur" }
@@ -568,6 +571,9 @@ const data = reactive<PageData<StoreForm, SysStorePageBo>>({
     site: [
       { required: true, message: "归属站点不能为空", trigger: "change" }
     ],
+    detailAddress: [
+      { required: true, message: "详细地址不能为空", trigger: "blur" }
+    ]
   }
 });
 

src/views/notice/notice/index.vue

@@ -0,0 +1,373 @@
+<template>
+  <div class="message-container">
+    <div class="message-header">
+      <div class="title">消息通知</div>
+      <el-button @click="handleReadAll">全部已读</el-button>
+    </div>
+
+    <!-- 顶部页签 -->
+    <el-tabs v-model="activeTab" @tab-click="handleTabClick">
+      <el-tab-pane label="全部消息" name="all"></el-tab-pane>
+      <el-tab-pane label="未读消息" name="unread"></el-tab-pane>
+      <el-tab-pane label="拒单通知" name="reject"></el-tab-pane>
+      <el-tab-pane label="异常上报" name="anomaly"></el-tab-pane>
+    </el-tabs>
+
+    <!-- 消息列表 -->
+    <div class="message-list" v-loading="loading">
+      <template v-if="noticeList && noticeList.length > 0">
+        <div 
+          class="message-item" 
+          v-for="item in noticeList" 
+          :key="item.id" 
+          :class="{'is-unread': !(item.readFlag || item.readFlag === '1' || item.readFlag === 1)}" 
+          @click="handleDetail(item)"
+        >
+          <el-badge 
+            :is-dot="!(item.readFlag || item.readFlag === '1' || item.readFlag === 1)" 
+            class="icon-badge top-left-dot"
+          >
+            <div class="item-icon" :style="{ backgroundColor: getIconConfig(item).bgColor }">
+              <svg-icon :icon-class="getIconConfig(item).icon" />
+            </div>
+          </el-badge>
+          
+          <div class="item-content">
+            <div class="item-title">{{ item.title }}</div>
+            <div class="item-desc">{{ item.content }}</div>
+          </div>
+          
+          <div class="item-time">
+            {{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}
+          </div>
+        </div>
+      </template>
+      <el-empty v-else description="暂无消息数据" />
+    </div>
+
+    <!-- 分页 -->
+    <div class="pagination-container" v-show="total > 0">
+      <el-pagination
+        v-model:current-page="queryParams.pageNum"
+        v-model:page-size="queryParams.pageSize"
+        layout="total, prev, pager, next, jumper"
+        :total="total"
+        @current-change="getList"
+      />
+    </div>
+
+    <!-- 消息详情对话框 -->
+    <el-dialog title="消息详情" v-model="detailDialog.open" width="600px" append-to-body destroy-on-close>
+      <div class="dialog-content-wrapper">
+        <div class="dialog-header">
+          <el-tag :type="detailDialog.tagType" effect="plain" size="small">{{ detailDialog.tagLabel }}</el-tag>
+          <span class="dialog-time">{{ detailDialog.createTime }}</span>
+        </div>
+        <div class="dialog-main-title">{{ detailDialog.title }}</div>
+        <div class="dialog-desc-block">
+          {{ detailDialog.content }}
+        </div>
+        <div class="dialog-action-link" @click="handleProcess">
+          <el-link type="primary" :underline="false">前往处理 >></el-link>
+        </div>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailDialog.open = false">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, getCurrentInstance, ComponentInternalInstance } from 'vue';
+import { useRouter } from 'vue-router';
+import { listMyNotice, readNotice, readAllNotice } from '@/api/system/notice';
+import { NoticeQuery, NoticeVO } from '@/api/system/notice/types';
+
+const router = useRouter();
+// eslint-disable-next-line camelcase
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const activeTab = ref('all');
+const noticeList = ref<NoticeVO[]>([]);
+const loading = ref(true);
+const total = ref(0);
+
+const detailDialog = reactive({
+  open: false,
+  title: '',
+  content: '',
+  createTime: '',
+  tagLabel: '',
+  tagType: '' as any
+});
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    title: undefined,
+    type: undefined,
+    readFlag: undefined
+  } as NoticeQuery
+});
+
+const { queryParams } = toRefs(data);
+
+/** 获取图标和颜色配置 */
+const getIconConfig = (item: any) => {
+  const title = item.title || '';
+  if (title.includes('异常')) return { icon: 'bug', bgColor: '#f56c6c' };
+  if (title.includes('拒单')) return { icon: 'message-center', bgColor: '#f56c6c' };
+  if (title.includes('入驻') || title.includes('申请')) return { icon: 'user', bgColor: '#e6a23c' };
+  if (title.includes('派单') || title.includes('新订单')) return { icon: 'guide', bgColor: '#409eff' };
+  if (title.includes('完成')) return { icon: 'finish', bgColor: '#67c23a' };
+  return { icon: 'message-center', bgColor: '#909399' }; 
+};
+
+/** 查询我的消息列表 */
+function getList() {
+  loading.value = true;
+  listMyNotice(queryParams.value).then((response: any) => {
+    noticeList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+/** 切换页签 */
+function handleTabClick(tab: any) {
+  queryParams.value.pageNum = 1;
+  queryParams.value.type = undefined;
+  queryParams.value.title = undefined;
+  queryParams.value.readFlag = undefined;
+  
+  const paneName = tab.paneName as string;
+  if (paneName === 'unread') {
+    queryParams.value.readFlag = false as any;
+  } else if (paneName === 'reject') {
+    queryParams.value.title = '拒单' as any;
+  } else if (paneName === 'anomaly') {
+    queryParams.value.title = '异常' as any;
+  }
+  
+  getList();
+}
+
+/** 消息详情点击与设为已读 */
+function handleDetail(item: NoticeVO) {
+  const title = item.title || '';
+  detailDialog.title = title;
+  detailDialog.content = item.content || '';
+  detailDialog.createTime = proxy?.parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') || '';
+  
+  if (title.includes('异常')) {
+    detailDialog.tagLabel = '异常上报';
+    detailDialog.tagType = 'danger';
+  } else if (title.includes('拒单')) {
+    detailDialog.tagLabel = '拒单通知';
+    detailDialog.tagType = 'danger';
+  } else if (title.includes('入驻') || title.includes('申请')) {
+    detailDialog.tagLabel = '自主注册审核';
+    detailDialog.tagType = 'warning';
+  } else if (title.includes('派单') || title.includes('新订单')) {
+    detailDialog.tagLabel = '新订单';
+    detailDialog.tagType = 'primary';
+  } else if (title.includes('完成')) {
+    detailDialog.tagLabel = '服务完成';
+    detailDialog.tagType = 'success';
+  } else {
+    detailDialog.tagLabel = '系统消息';
+    detailDialog.tagType = 'info';
+  }
+
+  detailDialog.open = true;
+
+  // 如果状态未读，发请求
+  if (!(item.readFlag || item.readFlag === '1' || item.readFlag === 1)) {
+    readNotice(item.id as number).then(() => {
+      item.readFlag = true as any; // 本地变更为已读
+    });
+  }
+}
+
+/** 前往处理 */
+function handleProcess() {
+  detailDialog.open = false;
+  if (detailDialog.title.includes('拒单') || detailDialog.title.includes('派单') || detailDialog.title.includes('异常')) {
+    router.push({ path: '/order/orderList' });
+  }
+}
+
+/** 全部标为已读操作 */
+function handleReadAll() {
+  proxy?.$modal.confirm('是否确认将全部未读消息标记为已读？').then(function () {
+    return readAllNotice();
+  }).then(() => {
+    proxy?.$modal.msgSuccess('全部已读操作成功');
+    getList();
+  }).catch(() => {});
+}
+
+getList();
+</script>
+
+<style lang="scss" scoped>
+.message-container {
+  padding: 24px;
+  background-color: #fff;
+  margin: 20px;
+  border-radius: 4px;
+  box-shadow: 0 1px 3px rgba(0,0,0,0.05);
+
+  .message-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 24px;
+
+    .title {
+      font-size: 18px;
+      font-weight: 600;
+      color: #303133;
+    }
+  }
+
+  :deep(.el-tabs__nav-wrap::after) {
+    background-color: #f0f0f0;
+    height: 1px;
+  }
+
+  .message-list {
+    min-height: 400px;
+  }
+
+  .message-item {
+    display: flex;
+    padding: 20px 24px;
+    border-bottom: 1px solid #f0f0f0;
+    cursor: pointer;
+    background-color: #fff;
+    align-items: flex-start;
+    transition: background-color 0.3s ease;
+
+    &.is-unread {
+      background-color: #f3faee;
+    }
+
+    &:hover {
+      background-color: #f5f7fa;
+      &.is-unread {
+        background-color: #ecf3e5;
+      }
+    }
+    
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+
+  .icon-badge.top-left-dot {
+    margin-right: 20px;
+    flex-shrink: 0;
+    
+    :deep(.el-badge__content.is-fixed.is-dot) {
+      right: auto;
+      left: 0;
+      transform: translateY(-30%) translateX(-30%);
+    }
+  }
+
+  .item-icon {
+    width: 48px;
+    height: 48px;
+    border-radius: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .svg-icon {
+      font-size: 24px;
+      color: #fff;
+    }
+  }
+
+  .item-content {
+    flex: 1;
+    overflow: hidden;
+
+    .item-title {
+      font-size: 16px;
+      font-weight: bold;
+      color: #303133;
+      margin-bottom: 8px;
+      line-height: 1.4;
+    }
+
+    .item-desc {
+      font-size: 14px;
+      color: #606266;
+      line-height: 1.5;
+    }
+  }
+
+  .item-time {
+    width: 150px;
+    text-align: right;
+    font-size: 13px;
+    font-family: monospace;
+    color: #909399;
+    flex-shrink: 0;
+  }
+
+  .pagination-container {
+    margin-top: 24px;
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+
+.dialog-content-wrapper {
+  padding: 0 10px;
+  
+  .dialog-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+    
+    .dialog-time {
+      font-size: 13px;
+      color: #909399;
+    }
+  }
+  
+  .dialog-main-title {
+    font-size: 18px;
+    font-weight: bold;
+    color: #303133;
+    margin-bottom: 16px;
+  }
+  
+  .dialog-desc-block {
+    background-color: #f8f8f8;
+    padding: 16px;
+    border-radius: 4px;
+    font-size: 14px;
+    color: #606266;
+    line-height: 1.6;
+    margin-bottom: 16px;
+  }
+  
+  .dialog-action-link {
+    text-align: right;
+    
+    .el-link {
+      font-size: 14px;
+    }
+  }
+}
+</style>

src/views/order/management/components/DispatchDialog.vue

@@ -397,6 +397,7 @@ const handleDispatchSubmit = () => {
     emit('submit', {
         riderId: rider.id,
         riderName: rider.name,
+        riderPhone: rider.phone,
         fee: dispatchFee.value
     })
     dialogVisible.value = false

src/views/order/management/components/OrderDetailDrawer.vue

@@ -41,10 +41,7 @@
                             <el-button icon="More">更多操作</el-button>
                             <template #dropdown>
                                 <el-dropdown-menu>
-                                    <el-dropdown-item v-hasPermi="['order:management:reward']" command="reward"
-                                        icon="Trophy">奖惩操作</el-dropdown-item>
-                                    <el-dropdown-item v-hasPermi="['order:management:remark']" command="remark"
-                                        icon="EditPen">订单备注</el-dropdown-item>
+
                                     <el-dropdown-item command="delete" v-if="[5, 4].includes(order.status)" divided
                                         icon="Delete" style="color: #f56c6c;">删除订单</el-dropdown-item>
                                 </el-dropdown-menu>
@@ -85,17 +82,17 @@
                                     </el-icon>
                                 </div>
                                 <div class="b-tags">
-                                    <el-tag size="small" type="info">{{ order.petAge || '未知年龄' }}</el-tag>
-                                    <el-tag size="small" type="info">{{ order.petWeight || '未知体重' }}</el-tag>
+                                    <el-tag size="small" type="info">{{ order.petAge || '-' }}</el-tag>
+                                    <el-tag size="small" type="info">{{ order.petWeight || '-' }}</el-tag>
                                 </div>
                             </div>
                         </div>
                         <el-descriptions :column="2" size="small" class="pet-desc" border>
-                            <el-descriptions-item label="品种">{{ order.petBreed || '未知' }}</el-descriptions-item>
-                            <el-descriptions-item label="疫苗状态"><span style="color:#67c23a">{{ order.petVaccine || '未知'
+                            <el-descriptions-item label="品种">{{ order.petBreed || '-' }}</el-descriptions-item>
+                            <el-descriptions-item label="疫苗状态"><span style="color:#67c23a">{{ order.petVaccine || '-'
                                     }}</span></el-descriptions-item>
-                            <el-descriptions-item label="性格特点">{{ order.petCharacter || '温顺' }}</el-descriptions-item>
-                            <el-descriptions-item label="健康状况">{{ order.petHealth || '健康' }}</el-descriptions-item>
+                            <el-descriptions-item label="性格特点">{{ order.petCharacter || '-' }}</el-descriptions-item>
+                            <el-descriptions-item label="健康状况">{{ order.petHealth || '-' }}</el-descriptions-item>
                         </el-descriptions>
                     </div>
 
@@ -115,7 +112,7 @@
                             </div>
                             <div class="addr-box">
                                 <div class="addr-label">服务地址</div>
-                                <div class="addr-txt">{{ order.city }}{{ order.district }} {{ order.address || '' }}
+                                <div class="addr-txt">{{ order.city }}{{ order.district }} {{ order.address || '-' }}
                                 </div>
                             </div>
                         </div>
@@ -133,26 +130,24 @@
                                     <el-descriptions-item label="系统单号">{{ order.orderNo }}</el-descriptions-item>
                                     <el-descriptions-item label="服务类型">
                                         {{ getTypeName(order.type) }}
-                                        <el-tag size="small" v-if="order.type === 'transport'" style="margin-left:5px"
-                                            effect="light">{{ getTransportModeName(order.transportType) }}</el-tag>
                                     </el-descriptions-item>
 
-                                    <el-descriptions-item label="归属门店">{{ order.merchantName }}
+                                    <el-descriptions-item label="归属门店">{{ order.merchantName || '-' }}
                                         ({{ Number(order.platformId) === 1 ? '门店下单' : '平台代下单' }})</el-descriptions-item>
-                                    <el-descriptions-item label="宠主信息">{{ order.userName }} / {{ order.contactPhone
+                                    <el-descriptions-item label="宠主信息">{{ order.userName || '-' }} / {{ order.contactPhone || '-'
                                         }}</el-descriptions-item>
                                     <el-descriptions-item label="订单佣金" label-class-name="money-label">
                                         <span style="color:#f56c6c; font-weight:bold;">¥ {{ order.orderCommission ? (order.orderCommission / 100).toFixed(2) : '0.00' }}</span>
                                     </el-descriptions-item>
 
-                                    <el-descriptions-item label="预约时间">{{ getServiceTimeRange(order.serviceTime)
+                                    <el-descriptions-item label="预约时间">{{ getServiceTimeRange(order.serviceTime) || '-'
                                         }}</el-descriptions-item>
-                                    <el-descriptions-item label="团购套餐">{{ order.groupBuyPackage || '未使用团购套餐'
+                                    <el-descriptions-item label="团购套餐">{{ order.groupBuyPackage || '-'
                                         }}</el-descriptions-item>
-                                    <el-descriptions-item label="创建时间">{{ order.createTime }}</el-descriptions-item>
+                                    <el-descriptions-item label="创建时间">{{ order.createTime || '-' }}</el-descriptions-item>
 
                                     <el-descriptions-item label="订单备注" :span="3">
-                                        {{ order.remark || '暂无备注' }}
+                                        {{ order.remark || '-' }}
                                     </el-descriptions-item>
                                 </el-descriptions>
                             </div>
@@ -167,19 +162,19 @@
                                     </div>
                                     <div class="t-row">
                                         <span class="t-k">起点</span>
-                                        <span class="t-v">{{ order.detail?.fromAddress || order.detail?.pickAddr || '--'
+                                        <span class="t-v">{{ order.detail?.fromAddress || order.detail?.pickAddr || '-'
                                         }}</span>
                                     </div>
                                     <div class="t-row">
                                         <span class="t-k">终点</span>
                                         <span class="t-v">{{ order.detail?.toAddress || order.detail?.dropAddr ||
                                             order.toAddress ||
-                                            '--' }}</span>
+                                            '-' }}</span>
                                     </div>
                                     <div class="t-row sub">
-                                        <span class="t-v">{{ order.contact || order.userName || '--' }} {{
+                                        <span class="t-v">{{ order.contact || order.userName || '-' }} {{
                                             order.contactPhoneNumber
-                                            || order.contactPhone || '--' }}</span>
+                                            || order.contactPhone || '-' }}</span>
                                     </div>
                                 </div>
                             </div>
@@ -187,7 +182,7 @@
                             <div v-if="['feeding', 'washing'].includes(order.type)" class="section-block">
                                 <div class="sec-title-bar">服务执行要求</div>
                                 <el-descriptions :column="2" border size="default" class="custom-desc">
-                                    <el-descriptions-item label="服务地址" :span="2">{{ order.detail?.area || order.address
+                                    <el-descriptions-item label="服务地址" :span="2">{{ order.detail?.area || order.address || '-'
                                         }}</el-descriptions-item>
                                 </el-descriptions>
                             </div>
@@ -208,9 +203,9 @@
                                         <el-tag size="small" type="primary" effect="plain" round>Lv1 普通</el-tag>
                                     </div>
                                     <div class="f-row2">
-                                        <span>联系电话：{{ order.fulfillerPhone || '138****0000' }}</span>
+                                        <span>联系电话：{{ order.fulfillerPhone || '-' }}</span>
                                         <span class="sep">|</span>
-                                        <span>归属区域：{{ order.fulfillerStation || '朝阳一站' }}</span>
+                                        <span>归属区域：{{ order.fulfillerStation || '-' }}</span>
                                     </div>
                                     <div class="f-row3"
                                         style="margin-top: 8px; font-size: 13px; color: #606266; background: #f9fafe; padding: 8px; border-radius: 4px; display: flex; gap: 20px;">
@@ -328,6 +323,7 @@ import { getPet } from '@/api/archieves/pet'
 import { getCustomer } from '@/api/archieves/customer'
 import { listSubOrderLog, exportSubOrderLogUrl } from '@/api/order/subOrderLog/index'
 import { listComplaintByOrder } from '@/api/fulfiller/complaint'
+import { getFulfillerDetail } from '@/api/fulfiller/fulfiller/index'
 import PetDetailDrawer from '@/components/PetDetailDrawer/index.vue'
 
 // 视频判定辅助函数
@@ -440,6 +436,21 @@ const loadPetAndCustomer = async (order) => {
         }
     }
 
+    const fulfillerId = next?.fulfiller || next?.fulfillerId
+    if (fulfillerId) {
+        try {
+            const res = await getFulfillerDetail(fulfillerId)
+            const fulfillerData = res?.data?.data || res?.data
+            if (fulfillerData) {
+                next.fulfillerAvatar = fulfillerData.avatarUrl ?? next.fulfillerAvatar
+                next.fulfillerPhone = fulfillerData.phone ?? next.fulfillerPhone
+                next.fulfillerStation = fulfillerData.stationName ?? next.fulfillerStation
+                next.fulfillerName = fulfillerData.name ?? next.fulfillerName
+            }
+        } catch {
+        }
+    }
+
     if (seq !== loadSeq.value) return
     orderDetail.value = next
 }

src/views/order/management/index.vue

@@ -7,24 +7,14 @@
           <div class="right-panel">
             <el-radio-group v-model="filters.service" size="default" @change="handleSearch">
               <el-radio-button value="">全部类型</el-radio-button>
-              <el-radio-button v-for="item in serviceOptions" :key="item.id" :value="item.id">{{ item.name }}</el-radio-button>
+              <el-radio-button v-for="item in serviceOptions" :key="item.id" :value="item.id">{{ item.name
+              }}</el-radio-button>
             </el-radio-group>
-            <el-input
-              v-model="filters.content"
-              placeholder="订单号/商户/宠主/手机号"
-              class="search-input"
-              prefix-icon="Search"
-              clearable
-              @clear="handleSearch"
-              @keyup.enter="handleSearch"
-            />
+            <el-input v-model="filters.content" placeholder="订单号/商户/宠主/手机号" class="search-input" prefix-icon="Search"
+              clearable @clear="handleSearch" @keyup.enter="handleSearch" />
             <el-button type="primary" icon="Search" @click="handleSearch">查询</el-button>
-            <el-button
-              v-hasPermi="['order:management:export']"
-              type="success"
-              icon="Download"
-              @click="handleExport"
-            >导出Excel</el-button>
+            <el-button v-hasPermi="['order:management:export']" type="success" icon="Download"
+              @click="handleExport">导出Excel</el-button>
           </div>
         </div>
 
@@ -39,17 +29,20 @@
         </el-tabs>
       </template>
 
-      <el-table :data="tableData" style="width: 100%" v-loading="loading" :header-cell-style="{ background: '#f5f7fa' }">
+      <el-table :data="tableData" style="width: 100%" v-loading="loading"
+        :header-cell-style="{ background: '#f5f7fa' }">
         <el-table-column prop="code" label="订单号" width="170" fixed="left" />
 
         <el-table-column label="服务类型" width="190">
           <template #default="{ row }">
             <div class="service-type-cell">
               <el-tag>{{ getServiceName(row.service) }}</el-tag>
-              <el-tag v-if="getServiceModeTag(row)" class="sub-tag" type="warning" effect="plain">{{ getServiceModeTag(row) }}</el-tag>
-              <el-tag v-if="getServiceOrderTypeTag(row)" class="sub-tag" :type="getServiceOrderTypeTag(row).type" effect="dark">{{
-                getServiceOrderTypeTag(row).label
-              }}</el-tag>
+              <el-tag v-if="getServiceModeTag(row)" class="sub-tag" type="warning" effect="plain">{{
+                getServiceModeTag(row) }}</el-tag>
+              <el-tag v-if="getServiceOrderTypeTag(row)" class="sub-tag" :type="getServiceOrderTypeTag(row).type"
+                effect="dark">{{
+                  getServiceOrderTypeTag(row).label
+                }}</el-tag>
             </div>
           </template>
         </el-table-column>
@@ -118,7 +111,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="履约信息" width="140">
+        <el-table-column label="订单佣金" width="100">
+          <template #default="{ row }">
+            <span v-if="row.orderCommission !== null && row.orderCommission !== undefined" style="color: #f56c6c; font-weight: bold">¥{{ row.orderCommission / 100.0 }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="履约者" width="120">
           <template #default="{ row }">
             <div v-if="row.fulfillerName" class="fulfiller-info">
               <span class="fulfiller-name">{{ row.fulfillerName }}</span>
@@ -127,15 +127,18 @@
           </template>
         </el-table-column>
 
+
         <el-table-column label="操作" width="200" fixed="right">
           <template #default="{ row }">
             <div class="op-cell">
               <el-button link type="primary" size="small" @click="handleDetail(row)">详情</el-button>
               <!--              <el-button v-if="row.status === 0" link type="success" size="small" @click="openDispatchDialog(row)">派单</el-button>-->
               <!--              <el-button v-if="![0, 4].includes(row.status)" link type="warning" size="small" @click="openDispatchDialog(row)">重新派单</el-button>-->
-              <el-button v-if="[0, 1].includes(row.status)" link type="danger" size="small" @click="handleCancel(row)">取消</el-button>
+              <el-button v-if="[0, 1].includes(row.status)" link type="danger" size="small"
+                @click="handleCancel(row)">取消</el-button>
 
-              <el-dropdown v-if="[3, 4].includes(row.status)" trigger="click" @command="(cmd) => handleCommand(cmd, row)">
+              <el-dropdown v-if="[3, 4].includes(row.status)" trigger="click"
+                @command="(cmd) => handleCommand(cmd, row)">
                 <span class="el-dropdown-link">
                   更多<el-icon class="el-icon--right">
                     <ArrowDown />
@@ -143,10 +146,10 @@
                 </span>
                 <template #dropdown>
                   <el-dropdown-menu>
-<!--                    <el-dropdown-item v-if="row.status === 3" command="complete">确认完成</el-dropdown-item>-->
-                    <el-dropdown-item v-if="row.status === 4 && getServiceMode(row.service) == 0" command="care_summary" v-hasPermi="['order:management:nursingSummary']">护理小结</el-dropdown-item>
-                    <el-dropdown-item command="reward" v-hasPermi="['order:management:reward']">奖惩</el-dropdown-item>
-                    <el-dropdown-item command="remark" v-hasPermi="['order:management:remark']">备注</el-dropdown-item>
+                    <!--                    <el-dropdown-item v-if="row.status === 3" command="complete">确认完成</el-dropdown-item>-->
+                    <el-dropdown-item v-if="row.status === 4 && getServiceMode(row.service) == 0" command="care_summary"
+                      v-hasPermi="['order:management:nursingSummary']">护理小结</el-dropdown-item>
+
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -156,48 +159,32 @@
       </el-table>
 
       <div class="pagination-container">
-        <el-pagination
-          v-model:current-page="pagination.current"
-          v-model:page-size="pagination.size"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="pagination.total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
+        <el-pagination v-model:current-page="pagination.current" v-model:page-size="pagination.size"
+          :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper" :total="pagination.total"
+          @size-change="handleSizeChange" @current-change="handleCurrentChange" />
       </div>
     </el-card>
 
     <!-- 组件 -->
-    <OrderDetailDrawer
-      v-model:visible="detailVisible"
-      :order="currentOrder"
-      @dispatch="openDispatchDialog"
-      @cancel="handleCancel"
-      @command="handleCommand"
-      @care-summary="openCareSummary"
-    />
+    <OrderDetailDrawer v-model:visible="detailVisible" :order="currentOrder" @dispatch="openDispatchDialog"
+      @cancel="handleCancel" @command="handleCommand" @care-summary="openCareSummary" />
 
-    <DispatchDialog v-model:visible="dispatchDialogVisible" :order="currentDispatchOrder" @submit="handleDispatchSubmit" />
+    <DispatchDialog v-model:visible="dispatchDialogVisible" :order="currentDispatchOrder"
+      @submit="handleDispatchSubmit" />
 
     <CareSummaryDrawer v-model:visible="careSummaryVisible" :order="careSummaryOrder" @submit="saveCareSummary" />
 
-    <RewardDialog v-model:visible="rewardDialogVisible" :order="currentOperateRow" @submit="handleRewardSubmit" />
-
-    <RemarkDialog v-model:visible="remarkDialogVisible" :order="currentOperateRow" @submit="handleRemarkSubmit" />
-
     <PetDetailDrawer v-model:visible="petDetailVisible" :pet-id="currentPetId" />
   </div>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, nextTick, getCurrentInstance, toRefs } from 'vue';
+import { ref, reactive, onMounted, onUnmounted, nextTick, getCurrentInstance, toRefs } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import OrderDetailDrawer from './components/OrderDetailDrawer.vue';
 import DispatchDialog from './components/DispatchDialog.vue';
 import CareSummaryDrawer from './components/CareSummaryDrawer.vue';
-import RewardDialog from './components/RewardDialog.vue';
-import RemarkDialog from './components/RemarkDialog.vue';
+
 import PetDetailDrawer from '@/components/PetDetailDrawer/index.vue';
 import { listAllService } from '@/api/service/list/index';
 import { listSubOrder, dispatchSubOrder, getSubOrderInfo, cancelSubOrder, remarkSubOrder, confirmSubOrder, nursingSummarySubOrder, exportSubOrder } from '@/api/order/subOrder/index';
@@ -232,10 +219,33 @@ const areaStationList = ref([]);
 const areaStationMap = ref({});
 const storeMap = ref({});
 
+let timer = null;
+
 onMounted(() => {
   getServiceList();
   getAreaStationList();
   handleSearch();
+
+  timer = setInterval(() => {
+    listSubOrder({
+      pageNum: pagination.current,
+      pageSize: pagination.size,
+      service: filters.service !== '' ? filters.service : undefined,
+      status: filters.status !== '' ? Number(filters.status) : undefined,
+      content: filters.content || undefined
+    }).then((res) => {
+      tableData.value = res.rows || [];
+      pagination.total = res.total || 0;
+      loadStoresForRows(tableData.value);
+    }).catch(() => { });
+  }, 5000);
+});
+
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
+  }
 });
 
 const getServiceList = () => {
@@ -416,40 +426,35 @@ const handleDetail = async (row) => {
     orderNo: row?.code || row?.orderCode || row?.orderNo || row?.orderNumber || row?.no || '',
     type: row?.typeCode || row?.type || typeCode,
     serviceItem: getServiceName(row?.service) || row?.serviceName || row?.service || '',
-    userAvatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
-    address: '某小区5号楼2单元101',
+    userAvatar: row?.userAvatar || '',
+    address: row?.address || '',
     groupBuyPackage: '',
-    transportType: row.splitType || row.transportType,
+    transportType: row?.splitType || row?.transportType,
     detail: {
-      ...row.detail,
-      pickTime: '2024-02-05 09:30',
-      pickAddr: row.detail?.pickAddr || '北京市朝阳区某小区5号楼2单元101',
-      pickContact: '李先生',
-      pickPhone: '13812345678',
-      dropTime: '2024-02-05 18:30',
-      dropAddr: row.detail?.dropAddr || '北京市朝阳区某小区5号楼2单元101',
-      dropContact: '李先生',
-      dropPhone: '13812345678',
-      packageName: row.detail?.packageName || '精细洗护套餐A',
-      petStatus: '胆小，需安抚',
-      area: '北京市朝阳区某小区5号楼2单元101'
+      ...row?.detail,
+      pickTime: row?.detail?.pickTime || '',
+      pickAddr: row?.detail?.pickAddr || '',
+      pickContact: row?.detail?.pickContact || '',
+      pickPhone: row?.detail?.pickPhone || '',
+      dropTime: row?.detail?.dropTime || '',
+      dropAddr: row?.detail?.dropAddr || '',
+      dropContact: row?.detail?.dropContact || '',
+      dropPhone: row?.detail?.dropPhone || '',
+      packageName: row?.detail?.packageName || '',
+      petStatus: row?.detail?.petStatus || '',
+      area: row?.detail?.area || ''
     },
-    petGender: 'male',
-    petAge: '2岁',
-    petWeight: '15kg',
-    petVaccine: '已接种',
-    petSterilized: true,
-    petCharacter: '活泼好动，喜欢球类玩具',
-    petHealth: '健康良好',
-    fulfillerAvatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
-    fulfillerPhone: '13812345678',
-    fulfillerStation: '朝阳服务站',
-    orderLogs: [
-      { time: '2024-02-04 09:30', title: '订单创建', content: '商户提交订单', icon: 'Document' },
-      { time: '2024-02-04 10:00', title: '系统派单', content: '指派给 王大力', icon: 'Bicycle' },
-      { time: '2024-02-04 10:05', title: '接单成功', content: '履约者已确认接单', icon: 'CircleCheck' },
-      { time: '2024-02-04 13:55', title: '到达服务点', content: '履约者已打卡', icon: 'Location' }
-    ]
+    petGender: '',
+    petAge: '',
+    petWeight: '',
+    petVaccine: '',
+    petSterilized: undefined,
+    petCharacter: '',
+    petHealth: '',
+    fulfillerAvatar: '',
+    fulfillerPhone: '',
+    fulfillerStation: '',
+    orderLogs: []
   };
 
   try {
@@ -482,6 +487,7 @@ const handleDetail = async (row) => {
         platformId: info.platformId ?? currentOrder.value?.platformId,
         groupBuyPackage: info.groupPurchasePackageName || currentOrder.value?.groupBuyPackage,
         fulfiller: info.fulfiller ?? currentOrder.value?.fulfiller,
+        remark: info.remark ?? currentOrder.value?.remark,
         detail: {
           ...(currentOrder.value?.detail || {}),
           pickTime: info.serviceTime || currentOrder.value?.detail?.pickTime,
@@ -502,7 +508,7 @@ const handleDetail = async (row) => {
         }
       };
     }
-  } catch {}
+  } catch { }
   detailVisible.value = true;
 };
 
@@ -514,12 +520,19 @@ const handlePetDetail = (row) => {
 
 // 取消订单
 const handleCancel = (row) => {
-  ElMessageBox.confirm('确认取消该订单吗？', '提示', { type: 'warning' }).then(() => {
-    cancelSubOrder({ orderId: row?.id }).then(() => {
+  ElMessageBox.prompt('请输入取消订单的原因', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputPattern: /\S+/,
+    inputErrorMessage: '取消原因不能为空',
+    inputPlaceholder: '必填，请输入取消原因',
+    type: 'warning'
+  }).then(({ value }) => {
+    cancelSubOrder({ orderId: row?.id, reason: value }).then(() => {
       ElMessage.success('订单已取消');
       handleSearch();
     });
-  });
+  }).catch(() => { });
 };
 
 // 派单
@@ -575,7 +588,7 @@ const handleDispatchSubmit = (payload) => {
     if (row) {
       row.status = 1;
       row.fulfillerName = payload.riderName || 'Unknown';
-      row.fulfillmentCommission = payload.fee;
+      row.price = payload.fee;
     }
     handleSearch();
   });

src/views/order/purchase/components/AddPetDialog.vue

@@ -28,24 +28,24 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="品种">
+              <el-form-item label="品种" required>
                 <el-select v-model="form.breed" placeholder="请选择品种" style="width: 100%" filterable allow-create default-first-option>
                   <el-option v-for="dict in sys_pet_breed" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="体型">
+              <el-form-item label="体型" required>
                 <el-select v-model="form.size" style="width: 100%">
                   <el-option v-for="dict in sys_pet_size" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="体重(kg)"><el-input-number v-model="form.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
+              <el-form-item label="体重(kg)" required><el-input-number v-model="form.weight" :min="0" :precision="1" style="width: 100%" /></el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="年龄(岁)"><el-input-number v-model="form.age" :min="0" style="width: 100%" /></el-form-item>
+              <el-form-item label="年龄(岁)" required><el-input-number v-model="form.age" :min="0" style="width: 100%" /></el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="性格关键词"><el-input v-model="form.personality" placeholder="如：活泼、粘人" /></el-form-item>
@@ -70,37 +70,37 @@
           <el-form-item label="新来家庭时间">
             <el-date-picker v-model="form.arrivalTime" type="date" placeholder="选择日期" style="width: 100%" />
           </el-form-item>
-          <el-form-item label="家庭房屋类型">
+          <el-form-item label="家庭房屋类型" required>
             <el-radio-group v-model="form.houseType">
               <el-radio v-for="dict in sys_house_type" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="入门方式">
+          <el-form-item label="入门方式" required>
             <el-radio-group v-model="form.entryMethod">
               <el-radio v-for="dict in sys_entry_method" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="密码" v-if="form.entryMethod === 'password'">
+          <el-form-item label="密码" v-if="form.entryMethod === 'password'" required>
             <el-input v-model="form.entryPassword" placeholder="请输入门锁密码" />
           </el-form-item>
-          <el-form-item label="钥匙位置" v-if="form.entryMethod === 'key'">
+          <el-form-item label="钥匙位置" v-if="form.entryMethod === 'key'" required>
             <el-input v-model="form.keyLocation" placeholder="请输入钥匙存放位置" />
           </el-form-item>
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="健康状况" name="health">
         <el-form :model="form" label-width="120px">
-          <el-form-item label="健康状态">
+          <el-form-item label="健康状态" required>
             <el-radio-group v-model="form.healthStatus">
               <el-radio value="健康">健康</el-radio>
               <el-radio value="亚健康">亚健康</el-radio>
               <el-radio value="疾病">疾病</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="是否有攻击倾向">
+          <el-form-item label="是否有攻击倾向" required>
             <el-switch v-model="form.aggression" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
           </el-form-item>
-          <el-form-item label="疫苗情况">
+          <el-form-item label="疫苗情况" required>
             <el-radio-group v-model="form.vaccineStatus">
               <el-radio value="无">无</el-radio>
               <el-radio value="已打1次">已打1次</el-radio>
@@ -114,10 +114,10 @@
               <el-icon v-else class="avatar-uploader-icon" style="width: 100px; height: 100px; line-height: 100px"><Plus /></el-icon>
             </el-upload>
           </el-form-item>
-          <el-form-item label="既往病史">
+          <el-form-item label="既往病史" required>
             <el-input v-model="form.medicalHistory" type="textarea" placeholder="如有病史请记录" />
           </el-form-item>
-          <el-form-item label="过敏史">
+          <el-form-item label="过敏史" required>
             <el-input v-model="form.allergies" type="textarea" placeholder="如有过敏源请记录" />
           </el-form-item>
         </el-form>
@@ -265,6 +265,19 @@ const handleUploadVaccineCert = async (file) => {
 const saveData = () => {
   if (!form.name) return ElMessage.warning('请输入宠物姓名')
   if (!form.userId) return ElMessage.warning('请先选择或新增所属主人')
+  if (!form.breed) return ElMessage.warning('请选择品种');
+  if (!form.size) return ElMessage.warning('请选择体型');
+  if (form.weight === undefined || form.weight === null) return ElMessage.warning('请输入体重(kg)');
+  if (form.age === undefined || form.age === null) return ElMessage.warning('请输入年龄(岁)');
+  if (!form.houseType) return ElMessage.warning('请选择家庭房屋类型');
+  if (!form.entryMethod) return ElMessage.warning('请选择入门方式');
+  if (form.entryMethod === 'password' && !form.entryPassword) return ElMessage.warning('请输入门锁密码');
+  if (form.entryMethod === 'key' && !form.keyLocation) return ElMessage.warning('请输入钥匙存放位置');
+  if (!form.healthStatus) return ElMessage.warning('请选择健康状态');
+  if (form.aggression === undefined || form.aggression === null) return ElMessage.warning('请选择是否有攻击倾向');
+  if (!form.vaccineStatus) return ElMessage.warning('请选择疫苗情况');
+  if (!form.medicalHistory) return ElMessage.warning('请输入既往病史');
+  if (!form.allergies) return ElMessage.warning('请输入过敏史');
 
   submitLoading.value = true
   addPetOnOrder(form).then(res => {

src/views/order/purchase/components/AddUserDialog.vue

@@ -12,7 +12,7 @@
         <el-col :span="24"><div class="form-section-header">基本资料</div></el-col>
         <!-- 录入来源不在表单中展示，自动使用当前登录用户的 tenantId，提交时静默传递 -->
         <el-col :span="24">
-          <el-form-item label="所属站点">
+          <el-form-item label="所属站点" required>
             <el-cascader v-model="formAreaValue" :options="areaTreeOptions" placeholder="请选择站点"
               :props="{ checkStrictly: true, value: 'value', label: 'label' }"
               style="width: 100%" clearable @change="handleFormAreaChange" />
@@ -45,7 +45,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="详细住址"><el-input v-model="form.address" placeholder="请输入街道/门牌号" /></el-form-item>
+          <el-form-item label="详细住址" required><el-input v-model="form.address" placeholder="请输入街道/门牌号" /></el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="房屋类型">
@@ -55,19 +55,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="入门方式">
+          <el-form-item label="入门方式" required>
             <el-radio-group v-model="form.entryMethod">
               <el-radio v-for="dict in sys_entry_method" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="form.entryMethod === 'password'">
-          <el-form-item label="开门密码">
+          <el-form-item label="开门密码" required>
             <el-input v-model="form.entryPassword" placeholder="请输入密码" />
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="form.entryMethod === 'key'">
-          <el-form-item label="钥匙位置">
+          <el-form-item label="钥匙位置" required>
             <el-input v-model="form.keyLocation" placeholder="如：地毯下" />
           </el-form-item>
         </el-col>
@@ -258,6 +258,11 @@ const handleUserUploadFile = async (file) => {
 const saveUser = () => {
   if (!form.name) return ElMessage.warning('请输入姓名')
   if (!form.phone) return ElMessage.warning('请输入电话')
+  if (!form.stationId) return ElMessage.warning('所属站点只能选择具体的站点')
+  if (!form.address) return ElMessage.warning('请输入详细住址')
+  if (!form.entryMethod) return ElMessage.warning('请选择入门方式')
+  if (form.entryMethod === 'password' && !form.entryPassword) return ElMessage.warning('请输入开门密码')
+  if (form.entryMethod === 'key' && !form.keyLocation) return ElMessage.warning('请输入钥匙存放位置')
 
   submitLoading.value = true
   form.tagIds = selectedTagIds.value

src/views/order/purchase/components/FeedingForm.vue

@@ -25,6 +25,7 @@
           placeholder="开始时间"
           style="width: 200px; margin-right: 5px;"
           format="YYYY-MM-DD HH:mm"
+          value-format="YYYY-MM-DD HH:mm"
         />
         <span style="margin:0 5px; color:#999;">~</span>
         <el-date-picker
@@ -33,6 +34,7 @@
           placeholder="结束时间 (可选)"
           style="width: 200px; margin-right: 15px;"
           format="YYYY-MM-DD HH:mm"
+          value-format="YYYY-MM-DD HH:mm"
         />
 
         <div style="display:flex; gap:8px; margin-left:5px;">

src/views/order/purchase/components/TransportForm.vue

@@ -38,7 +38,7 @@
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-date-picker v-model="transportData.pickTime" type="datetime" placeholder="选择接宠时间" style="width: 100%" />
+                <el-date-picker v-model="transportData.pickTime" type="datetime" placeholder="选择接宠时间" style="width: 100%" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" />
               </el-col>
             </el-row>
           </div>
@@ -76,13 +76,17 @@
             </el-row>
             <el-row :gutter="10">
               <el-col :span="24">
-                <el-date-picker v-model="transportData.dropTime" type="datetime" placeholder="预计送回时间 (可选)" style="width: 100%" />
+                <el-date-picker v-model="transportData.dropTime" type="datetime" placeholder="预计送回时间 (可选)" style="width: 100%" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" />
               </el-col>
             </el-row>
           </div>
         </div>
       </div>
     </div>
+
+    <div class="remark-section">
+      <el-input v-model="transportData.other" type="textarea" :rows="4" placeholder="请添加接送备注 (如宠物性格、接送要求等)" />
+    </div>
   </div>
 </template>
 
@@ -119,4 +123,5 @@ const emit = defineEmits(['change'])
   font-size: 14px;
   padding-right: 5px;
 }
+.remark-section { background: #fdfdfd; border: 1px dashed #dcdfe6; padding: 15px; border-radius: 6px; margin-top: 20px; }
 </style>

src/views/order/purchase/components/WashingForm.vue

@@ -25,6 +25,7 @@
           placeholder="开始时间"
           style="width: 200px; margin-right: 5px;"
           format="YYYY-MM-DD HH:mm"
+          value-format="YYYY-MM-DD HH:mm"
         />
         <span style="margin:0 5px; color:#999;">~</span>
         <el-date-picker
@@ -33,6 +34,7 @@
           placeholder="结束时间 (可选)"
           style="width: 200px; margin-right: 15px;"
           format="YYYY-MM-DD HH:mm"
+          value-format="YYYY-MM-DD HH:mm"
         />
 
         <div style="display:flex; gap:8px; margin-left:5px;">

src/views/order/purchase/index.vue

@@ -285,7 +285,8 @@ const form = reactive({
     dropEndDetail: '',
     dropContact: '',
     dropPhone: '',
-    dropTime: ''
+    dropTime: '',
+    other: ''
   },
   feeding: {
     pkgId: '',
@@ -602,7 +603,8 @@ const resetForm = () => {
     dropEndDetail: '',
     dropContact: '',
     dropPhone: '',
-    dropTime: ''
+    dropTime: '',
+    other: ''
   };
   form.feeding = {
     pkgId: '',
@@ -734,7 +736,7 @@ const handleSubmit = async () => {
       groupPurchasePackageName: form.groupBuyPackage || '',
       service: form.serviceId,
       orderCommission: Math.round(Number(form.orderCommission || 0) * 100),
-      remark: '', // 表单目前暂无备注字段
+      remark: form[form.type] && form[form.type].other ? form[form.type].other : "",
       tenantId: storeObj.tenantId || '',
       subOrders: subOrders
     };
@@ -771,19 +773,20 @@ onMounted(() => {
 
 .create-layout {
   display: flex;
-  gap: 20px;
   align-items: flex-start;
-  max-width: 1400px;
-  margin: 0 auto;
+  width: 100%;
+  margin: 0;
 }
 
 /* Left Content */
 .form-container {
-  flex: 1;
+  width: 70%;
+  padding-right: 20px;
   min-width: 0;
   display: flex;
   flex-direction: column;
   gap: 20px;
+  box-sizing: border-box;
 }
 
 .section-card {
@@ -1062,16 +1065,19 @@ onMounted(() => {
 
 /* Sidebar */
 .summary-sidebar {
-  width: 320px;
+  width: 30%;
   flex-shrink: 0;
 }
 
 .summary-panel {
   background: white;
   border-radius: 8px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-  position: sticky;
-  top: 20px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  position: fixed;
+  top: 154px;
+  right: 10px;
+  width: 25%;
+  z-index: 2000;
 }
 
 .summary-header {