Merge remote-tracking branch 'gogs-major/feature/v1' into dev/shenliang

.env.production

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

src/api/fulfiller/anamaly/index.ts

@@ -13,6 +13,18 @@ export function getAnamalyList(query: AnamalyQuery) {
     });
 }
 
+/**
+ * 获取异常上报详情
+ * @param id 记录ID
+ */
+export function getAnamaly(id: number | string) {
+    return request({
+        url: `/fulfiller/anamaly/getInfo`,
+        method: 'get',
+        params: { id }
+    });
+}
+
 /**
  * 新增异常上报
  * @param data 表单数据

src/api/fulfiller/anamaly/types.ts

@@ -24,6 +24,7 @@ export interface AnamalyVO {
     auditTime?: string;
     auditor?: number | string;
     auditorName?: string;
+    storeName?: string;
 }
 
 export interface AnamalyForm {

src/api/fulfiller/fulfiller/index.ts

@@ -24,3 +24,14 @@ export function getFulfillerGps(id: number | string): AxiosPromise<FulfillerGpsV
         method: 'get'
     });
 }
+
+/**
+ * 获取详细履约者信息
+ * @param id 履约者 ID
+ */
+export function getFulfiller(id: number | string) {
+    return request({
+        url: `/fulfiller/fulfiller/${id}`,
+        method: 'get'
+    });
+}

src/api/order/subOrder/index.ts

@@ -42,7 +42,7 @@ export const getSubOrderInfo = (id: string | number): AxiosPromise<SubOrderVO> =
     });
 };
 
-export const cancelSubOrder = (data: { orderId: string | number; }) => {
+export const cancelSubOrder = (data: { orderId: string | number; reason?: string; }) => {
     return request({
         url: '/order/subOrder/cancel',
         method: 'put',

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;
+  businessId?: 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/components/PetDetailDrawer/index.vue

@@ -163,9 +163,19 @@ const historyOrders = ref([])
 const detailActiveTab = ref('info')
 const remarkDialogVisible = ref(false)
 const remarkContent = ref('')
+const internalServiceList = ref([])
 
-// 直接使用父组件传入的服务列表数据
-const serviceOptions = computed(() => props.serviceList || [])
+// 优先使用父组件传入的服务列表数据，若无则使用内部加载的数据
+const serviceOptions = computed(() => (props.serviceList && props.serviceList.length > 0) ? props.serviceList : internalServiceList.value)
+
+const getServiceList = () => {
+  if (props.serviceList && props.serviceList.length > 0) return;
+  import('@/api/service/list/index').then(api => {
+    api.listAllService().then((res) => {
+      internalServiceList.value = res.data || [];
+    });
+  });
+};
 
 const getServiceName = (serviceId) => {
   const item = serviceOptions.value.find((i) => i.id === serviceId)
@@ -199,6 +209,8 @@ const loadData = async (id) => {
   listSubOrderOnPet(id).then((res) => {
     historyOrders.value = res.data || []
   })
+
+  getServiceList()
 }
 
 const handleRemark = () => {
@@ -228,7 +240,9 @@ watch(() => props.visible, (val) => {
 })
 
 onMounted(() => {
-  // 服务列表数据由父组件传入，无需在这里请求
+  if (props.visible && props.petId) {
+    getServiceList()
+  }
 })
 </script>
 

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,21 +27,23 @@
 <!--            <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">-->
-<!--              <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>-->
-<!--              </template>-->
-<!--              <template #default>-->
-<!--                <notice></notice>-->
-<!--              </template>-->
-<!--            </el-popover>-->
-<!--          </div>-->
-<!--        </el-tooltip>-->
+        <!-- 消息 -->
+        <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
+          <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" 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 ref="noticeRef" @read="updateNoticeCount"></notice>
+              </template>
+            </el-popover>
+          </div>
+        </el-tooltip>
         <!--        <el-tooltip content="Github" effect="dark" placement="bottom">-->
         <!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
         <!--        </el-tooltip>-->
@@ -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();
+  // 每10秒轮询一次后台获取未读消息，减少视觉频率偏差带来的困惑
+  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 }
-);
+// 已切换到 fetchUnreadCount 轮询模式，清理旧的隔离 store 监听
+// 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,303 @@
 <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">
+// 此代码由AI生成
+import { listMyNotice, readNotice, readAllNotice } from '@/api/system/notice';
+import { NoticeVO } from '@/api/system/notice/types';
+import router from '@/router';
 
-const noticeStore = useNoticeStore();
-const { readAll } = useNoticeStore();
-
-// 定义变量内容
-const state = reactive({
-  loading: false
-});
-const newsList = ref([]) as any;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const emit = defineEmits(['read']);
 
 /**
- * 初始化数据
- * @returns
+ * 此代码由AI生成
+ * 通知类型枚举（与后端监听器中的type值保持一致）
+ * 0 = 派单通知
+ * 1 = 拒单/取消订单通知
+ * 2 = 异常上报通知
  */
-const getTableData = async () => {
-  state.loading = true;
-  newsList.value = noticeStore.state.notices;
-  state.loading = false;
+const NOTICE_TYPE = {
+  DISPATCH: 0,
+  REJECT: 1,
+  ANOMALY: 2
 };
 
-//点击消息，写入已读
-const onNewsClick = (item: any) => {
-  newsList.value[item].read = true;
-  //并且写入pinia
-  noticeStore.state.notices = newsList.value;
+const noticeList = ref<NoticeVO[]>([]);
+const loading = ref(false);
+
+const detailDialog = reactive({
+  open: false,
+  title: '',
+  content: '',
+  createTime: '',
+  tagLabel: '',
+  tagType: '' as any,
+  type: undefined as number | string | undefined,
+  businessId: undefined as number | string | undefined
+});
+
+/** 此代码由AI生成 - 根据type枚举获取图标和颜色配置 */
+const getIconConfig = (item: any) => {
+  const type = item.type;
+  if (type === NOTICE_TYPE.ANOMALY) return { icon: 'bug', bgColor: '#f56c6c' };
+  if (type === NOTICE_TYPE.REJECT) return { icon: 'message-center', bgColor: '#f56c6c' };
+  if (type === NOTICE_TYPE.DISPATCH) return { icon: 'guide', bgColor: '#409eff' };
+  return { icon: 'message-center', bgColor: '#909399' };
 };
 
-// 前往通知中心点击
-const onGoToGiteeClick = () => {
-  window.open('https://gitee.com/dromara/RuoYi-Vue-Plus/tree/5.X/');
+/** 查询未读消息 */
+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;
+  }
 };
 
-onMounted(() => {
-  nextTick(() => {
-    getTableData();
+/** 此代码由AI生成 - 消息详情（使用type枚举判断） */
+const handleDetail = (item: NoticeVO) => {
+  detailDialog.title = item.title || '';
+  detailDialog.content = item.content || '';
+  detailDialog.createTime = proxy?.parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') || '';
+  detailDialog.type = item.type;
+  detailDialog.businessId = item.businessId;
+
+  const type = item.type;
+  if (type === NOTICE_TYPE.ANOMALY) {
+    detailDialog.tagLabel = '异常上报';
+    detailDialog.tagType = 'danger';
+  } else if (type === NOTICE_TYPE.REJECT) {
+    detailDialog.tagLabel = '取消订单';
+    detailDialog.tagType = 'danger';
+  } else if (type === NOTICE_TYPE.DISPATCH) {
+    detailDialog.tagLabel = '新订单';
+    detailDialog.tagType = 'primary';
+  } 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);
+    });
+  }
+};
+
+/** 此代码由AI生成 - 前往处理（使用type枚举判断跳转路由） */
+const handleProcess = () => {
+  detailDialog.open = false;
+  const type = detailDialog.type;
+  if (type === NOTICE_TYPE.ANOMALY) {
+    router.push({ path: '/fulfiller/anamaly', query: { id: detailDialog.businessId } });
+  } else if (type === NOTICE_TYPE.REJECT || type === NOTICE_TYPE.DISPATCH) {
+    router.push({ path: '/order/orderList', query: { id: detailDialog.businessId } });
+  }
+};
+
+/** 全部已读 */
+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;
+    white-space: pre-wrap;
+  }
+  .dialog-action-link {
+    text-align: right;
   }
 }
 </style>

src/views/archieves/customer/index.vue

@@ -141,7 +141,7 @@
 
           <el-col :span="24"><div class="form-section-header">基本资料</div></el-col>
           <el-col :span="12">
-            <el-form-item label="所属品牌">
+            <el-form-item label="所属品牌" required>
               <PageSelect v-model="form.tenantId"
                 :options="brandList.map(item => ({ value: item.tenantId, label: item.name }))"
                 :total="brandTotal" :pageSize="10" placeholder="请选择所属品牌"
@@ -163,7 +163,7 @@
             </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" :props="{ value: 'id', label: 'name' }" placeholder="请选择站点"
                 style="width: 100%" clearable @change="handleFormAreaChange" />
             </el-form-item>
@@ -182,7 +182,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="房屋类型">
@@ -192,19 +192,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>
@@ -281,26 +281,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>
@@ -325,40 +323,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>
@@ -371,10 +367,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>
@@ -764,8 +760,14 @@ const savePetRemark = () => {
 }
 
 const saveUser = () => {
+  if (!form.tenantId) return ElMessage.warning('请选择所属品牌')
   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
   if (regionCascaderValue.value && regionCascaderValue.value.length > 0) {
@@ -943,19 +945,34 @@ const handlePetDelete = (row) => {
 }
 
 const savePet = () => {
-  if (!petForm.name) return ElMessage.warning('请输入宠物昵称')
-  submitLoading.value = true
-  const data = { ...petForm, aggression: Number(petForm.aggression) || 0 }
-  const api = data.id ? updatePet(data) : addPet(data)
+  if (!petForm.name) return ElMessage.warning('请输入宠物姓名');
+  if (!petForm.userId) 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);
   api.then(() => {
-    ElMessage.success('宠物档案保存成功')
-    petDialogVisible.value = false
-    customerDetailRef.value?.refresh()
-    getList()
+    ElMessage.success('宠物档案保存成功');
+    petDialogVisible.value = false;
+    customerDetailRef.value?.refresh();
+    getList();
   }).finally(() => {
-    submitLoading.value = false
-  })
-}
+    submitLoading.value = false;
+  });
+};
 
 onMounted(() => {
   getList()

src/views/archieves/pet/index.vue

@@ -102,24 +102,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>
@@ -144,37 +144,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-switch v-model="form.aggression" active-text="是" inactive-text="否" />
+            <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 label="无">无</el-radio>
                 <el-radio label="已打1次">已打1次</el-radio>
@@ -188,10 +188,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>
@@ -441,6 +441,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/fulfiller/anamaly/index.vue

@@ -29,6 +29,11 @@
             <el-link type="primary" :underline="false">{{ scope.row.orderCode }}</el-link>
           </template>
         </el-table-column>
+        <el-table-column prop="storeName" label="所属门店" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ scope.row.storeName || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="type" label="异常类型" width="120">
           <template #default="scope">
             <dict-tag :options="flf_anamaly_type" :value="scope.row.type" />
@@ -104,6 +109,7 @@
         <!-- 1. Basic Info -->
         <el-descriptions title="基础信息" :column="2" border>
           <el-descriptions-item label="订单号">{{ currentItem.orderCode }}</el-descriptions-item>
+          <el-descriptions-item label="所属门店">{{ currentItem.storeName || '-' }}</el-descriptions-item>
           <el-descriptions-item label="提交时间">{{ currentItem.createTime }}</el-descriptions-item>
           <el-descriptions-item label="履约者">{{ currentItem.fulfillerName || currentItem.fulfiller }}</el-descriptions-item>
           <el-descriptions-item label="联系电话">{{ currentItem.fulfillerPhone || '-' }}</el-descriptions-item>
@@ -225,9 +231,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, getCurrentInstance, ComponentInternalInstance, toRefs } from 'vue';
+import { ref, reactive, onMounted, getCurrentInstance, ComponentInternalInstance, toRefs, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { getAnamalyList, addAnamaly, auditAnamaly, deleteAnamaly } from '@/api/fulfiller/anamaly';
+import { getAnamalyList, addAnamaly, auditAnamaly, deleteAnamaly, getAnamaly } from '@/api/fulfiller/anamaly';
 import type { AnamalyQuery, AnamalyVO, AnamalyForm } from '@/api/fulfiller/anamaly/types';
 import { listByNameAndPhoneNumber } from '@/api/fulfiller/fulfiller';
 import type { FulfillerSearchQuery } from '@/api/fulfiller/fulfiller/types';
@@ -237,6 +244,7 @@ import ImageUpload from '@/components/ImageUpload/index.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { flf_anamaly_type } = toRefs<any>(proxy?.useDict('flf_anamaly_type'));
 
+const route = useRoute();
 const loading = ref(false);
 
 const queryParams = reactive<AnamalyQuery>({
@@ -416,6 +424,24 @@ const saveData = async () => {
 
 onMounted(() => {
   getList();
+  if (route.query.id) {
+    getAnamaly(route.query.id as any).then(res => {
+      if (res.data) {
+         handleOpenDrawer(res.data, res.data.status === 0 ? 'audit' : 'view');
+      }
+    });
+  }
+});
+
+// 监听路由参数变化，实现从消息直达详情
+watch(() => route.query.id, (newId) => {
+  if (newId) {
+    getAnamaly(newId as any).then(res => {
+      if (res.data) {
+         handleOpenDrawer(res.data, res.data.status === 0 ? 'audit' : 'view');
+      }
+    });
+  }
 });
 </script>
 

src/views/fulfiller/pool/index.vue

@@ -691,7 +691,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted, getCurrentInstance } from 'vue'
+import { ref, reactive, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   listFulfiller, getFulfiller, addFulfiller, updateFulfiller,
@@ -782,8 +782,11 @@ const getStationPathText = (stationId: number | string | undefined) => {
 }
 
 /** 查询列表 */
-const getList = async () => {
-  loading.value = true
+const getList = async (isPolling: any = false) => {
+  const isAutoPoll = isPolling === true;
+  if (!isAutoPoll) {
+    loading.value = true
+  }
   try {
     const params: FlfFulfillerQuery = {
       pageNum: queryParams.pageNum,
@@ -796,7 +799,9 @@ const getList = async () => {
     tableData.value = res.rows
     total.value = res.total
   } finally {
-    loading.value = false
+    if (!isAutoPoll) {
+      loading.value = false
+    }
   }
 }
 
@@ -1284,11 +1289,23 @@ const handleCreateCascaderChange = (val: any[]) => {
   }
 }
 
+let timer: any = null;
+
 onMounted(() => {
   getList()
   loadAllTags()
   loadAreaStations()
   loadServiceOptions()
+  timer = setInterval(() => {
+    getList(true);
+  }, 5000);
+})
+
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
+  }
 })
 </script>
 

src/views/notice/index.vue

@@ -0,0 +1,385 @@
+<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">
+// 此代码由AI生成
+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;
+
+/**
+ * 此代码由AI生成
+ * 通知类型枚举（与后端监听器中的type值保持一致）
+ * 0 = 派单通知
+ * 1 = 拒单/取消订单通知
+ * 2 = 异常上报通知
+ */
+const NOTICE_TYPE = {
+  DISPATCH: 0,
+  REJECT: 1,
+  ANOMALY: 2
+};
+
+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,
+  type: undefined as number | string | undefined,
+  businessId: undefined as number | string | undefined
+});
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    title: undefined,
+    type: undefined,
+    readFlag: undefined
+  } as NoticeQuery
+});
+
+const { queryParams } = toRefs(data);
+
+/** 此代码由AI生成 - 根据type枚举获取图标和颜色配置 */
+const getIconConfig = (item: any) => {
+  const type = item.type;
+  if (type === NOTICE_TYPE.ANOMALY) return { icon: 'bug', bgColor: '#f56c6c' };
+  if (type === NOTICE_TYPE.REJECT) return { icon: 'message-center', bgColor: '#f56c6c' };
+  if (type === NOTICE_TYPE.DISPATCH) return { icon: 'guide', bgColor: '#409eff' };
+  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;
+  });
+}
+
+/** 此代码由AI生成 - 切换页签（使用type枚举过滤） */
+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.type = NOTICE_TYPE.REJECT as any;
+  } else if (paneName === 'anomaly') {
+    queryParams.value.type = NOTICE_TYPE.ANOMALY as any;
+  }
+
+  getList();
+}
+
+/** 此代码由AI生成 - 消息详情点击与设为已读（使用type枚举判断） */
+function handleDetail(item: NoticeVO) {
+  detailDialog.title = item.title || '';
+  detailDialog.content = item.content || '';
+  detailDialog.createTime = proxy?.parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') || '';
+  detailDialog.type = item.type;
+  detailDialog.businessId = item.businessId;
+
+  const type = item.type;
+  if (type === NOTICE_TYPE.ANOMALY) {
+    detailDialog.tagLabel = '异常上报';
+    detailDialog.tagType = 'danger';
+  } else if (type === NOTICE_TYPE.REJECT) {
+    detailDialog.tagLabel = '取消订单';
+    detailDialog.tagType = 'danger';
+  } else if (type === NOTICE_TYPE.DISPATCH) {
+    detailDialog.tagLabel = '新订单';
+    detailDialog.tagType = 'primary';
+  } 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; // 本地变更为已读
+    });
+  }
+}
+
+/** 此代码由AI生成 - 前往处理（使用type枚举判断跳转路由） */
+function handleProcess() {
+  detailDialog.open = false;
+  const type = detailDialog.type;
+  if (type === NOTICE_TYPE.ANOMALY) {
+    router.push({ path: '/fulfiller/anamaly', query: { id: detailDialog.businessId } });
+  } else if (type === NOTICE_TYPE.REJECT || type === NOTICE_TYPE.DISPATCH) {
+    router.push({ path: '/order/orderList', query: { id: detailDialog.businessId } });
+  }
+}
+
+/** 全部标为已读操作 */
+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;
+      // 单行截断展示如果太长可以放开注释
+      // white-space: nowrap;
+      // overflow: hidden;
+      // text-overflow: ellipsis;
+    }
+  }
+
+  .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;
+    white-space: pre-wrap;
+  }
+
+  .dialog-action-link {
+    text-align: right;
+
+    .el-link {
+      font-size: 14px;
+    }
+  }
+}
+</style>

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

@@ -29,11 +29,19 @@
                             </el-icon> {{ order.time }}
                             <span class="days-tag" v-if="order.daysLater">{{ order.daysLater }}</span>
                         </div>
+                        <div class="row-remark" style="margin-top: 4px; font-size: 13px; color: #909399;">
+                            备注: {{ orderDetail?.remark || '-' }}
+                        </div>
                     </div>
                     <!-- 新增右侧按钮组 -->
-                    <div class="card-right" style="display: flex; align-items: center; gap: 10px; padding-left: 20px;">
-                        <el-button type="primary" size="small" plain round icon="User" @click="openCustomerDetail" :loading="orderInfoLoading">用户档案</el-button>
-                        <el-button type="success" size="small" plain round @click="openPetDetail" :loading="orderInfoLoading" style="margin-left: 0;">宠物档案</el-button>
+                    <div class="card-right" style="display: flex; flex-direction: column; gap: 8px; justify-content: center; padding-left: 20px;">
+                        <div style="display: flex; gap: 10px;">
+                            <el-button type="primary" size="small" plain round icon="User" @click="openCustomerDetail" :loading="orderInfoLoading">用户档案</el-button>
+                            <el-button type="success" size="small" plain round @click="openPetDetail" :loading="orderInfoLoading" style="margin-left: 0;">宠物档案</el-button>
+                        </div>
+                        <div style="font-size: 12px; color: #ff9900; background: #fff8e6; padding: 2px 6px; border-radius: 4px; border: 1px solid #ffd591; text-align: center;">
+                            团购套餐: {{ orderDetail?.groupPurchasePackageName || '-' }}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -150,14 +158,14 @@
                 </div>
                 <div class="btns">
                     <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" :disabled="!canSubmit" @click="handleDispatchSubmit">确认派单</el-button>
+                    <el-button type="primary" @click="handleDispatchSubmit">确认派单</el-button>
                 </div>
             </div>
         </div>
     </el-dialog>
 
     <CustomerDetailDrawer v-model:visible="customerDialogVisible" :customer-id="customerId" :service-list="serviceList" :area-station-list="areaStationList" />
-    <PetDetailDrawer v-model:visible="petDialogVisible" :pet-id="petId" />
+    <PetDetailDrawer v-model:visible="petDialogVisible" :pet-id="petId" :service-list="serviceOptions" />
 </template>
 
 <script setup>
@@ -214,6 +222,7 @@ const petDialogVisible = ref(false)
 const customerId = ref(null)
 const petId = ref(null)
 const orderInfoLoading = ref(false)
+const orderDetail = ref(null)
 
 const loadAllTags = async () => {
     if (allTags.value && allTags.value.length > 0) return
@@ -248,7 +257,8 @@ const loadRiders = async () => {
             content: dispatchSearchQuery.value || undefined,
             pageNum: pageNum.value,
             pageSize: pageSize.value,
-            service: props.order?.service
+            service: props.order?.service,
+            orderId: props.order?.id
         })
         const list = res?.rows || []
         ridersList.value = list.map(r => ({
@@ -278,6 +288,7 @@ watch(() => props.visible, (val) => {
         currentRider.value = null
         dispatchSearchQuery.value = ''
         selectedRiderId.value = null
+        orderDetail.value = null
         // price 单位为分，转成元显示
         dispatchFee.value = props.order?.fulfillmentCommission ? Number((props.order.fulfillmentCommission / 100).toFixed(2)) : 0
         orderCommission.value = props.order?.orderCommission ? Number((props.order.orderCommission / 100).toFixed(2)) : 0
@@ -298,6 +309,7 @@ watch(() => props.visible, (val) => {
         orderInfoLoading.value = true
         getSubOrderInfo(props.order.id).then((res) => {
             if(res.data) {
+                orderDetail.value = res.data;
                 // 如果 usrCustomer / usrPet 是对象则取其 id，如果是 ID 直接取
                 customerId.value = res.data.usrCustomer?.id || res.data.usrCustomer
                 petId.value = res.data.usrPet?.id || res.data.usrPet
@@ -390,10 +402,6 @@ const filteredDispatchRiders = computed(() => {
     return ridersList.value || []
 })
 
-const canSubmit = computed(() => {
-    return !!selectedRiderId.value && !!dispatchFee.value
-})
-
 const handleDispatchSubmit = () => {
     if (!selectedRiderId.value) {
         ElMessage.warning('请选择履约者')
@@ -546,7 +554,7 @@ const handleDispatchSubmit = () => {
 }
 
 .rider-scroll {
-    max-height: 45vh;
+    height: 320px;
 }
 
 .rider-grid {

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

@@ -29,11 +29,19 @@
                             </el-icon> {{ order.time }}
                             <span class="days-tag" v-if="order.daysLater">{{ order.daysLater }}</span>
                         </div>
+                        <div class="row-remark" style="margin-top: 4px; font-size: 13px; color: #909399;">
+                            备注: {{ orderDetail?.remark || '-' }}
+                        </div>
                     </div>
                     <!-- 新增右侧按钮组 -->
-                    <div class="card-right" style="display: flex; align-items: center; gap: 10px; padding-left: 20px;">
-                        <el-button type="primary" size="small" plain round icon="User" @click="openCustomerDetail" :loading="orderInfoLoading">用户档案</el-button>
-                        <el-button type="success" size="small" plain round @click="openPetDetail" :loading="orderInfoLoading" style="margin-left: 0;">宠物档案</el-button>
+                    <div class="card-right" style="display: flex; flex-direction: column; gap: 8px; justify-content: center; padding-left: 20px;">
+                        <div style="display: flex; gap: 10px;">
+                            <el-button type="primary" size="small" plain round icon="User" @click="openCustomerDetail" :loading="orderInfoLoading">用户档案</el-button>
+                            <el-button type="success" size="small" plain round @click="openPetDetail" :loading="orderInfoLoading" style="margin-left: 0;">宠物档案</el-button>
+                        </div>
+                        <div style="font-size: 12px; color: #ff9900; background: #fff8e6; padding: 2px 6px; border-radius: 4px; border: 1px solid #ffd591; text-align: center;">
+                            团购套餐: {{ orderDetail?.groupPurchasePackageName || '-' }}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -150,14 +158,14 @@
                 </div>
                 <div class="btns">
                     <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" :disabled="!canSubmit" @click="handleDispatchSubmit">确认派单</el-button>
+                    <el-button type="primary" @click="handleDispatchSubmit">确认派单</el-button>
                 </div>
             </div>
         </div>
     </el-dialog>
 
     <CustomerDetailDrawer v-model:visible="customerDialogVisible" :customer-id="customerId" :area-station-list="areaStationList" />
-    <PetDetailDrawer v-model:visible="petDialogVisible" :pet-id="petId" />
+    <PetDetailDrawer v-model:visible="petDialogVisible" :pet-id="petId" :service-list="serviceOptions" />
 </template>
 
 <script setup>
@@ -210,6 +218,7 @@ const petDialogVisible = ref(false)
 const customerId = ref(null)
 const petId = ref(null)
 const orderInfoLoading = ref(false)
+const orderDetail = ref(null)
 
 const loadAllTags = async () => {
     if (allTags.value && allTags.value.length > 0) return
@@ -250,7 +259,8 @@ const loadRiders = async () => {
             content: dispatchSearchQuery.value || undefined,
             pageNum: pageNum.value,
             pageSize: pageSize.value,
-            service: props.order?.service
+            service: props.order?.service,
+            orderId: props.order?.id
         })
         const list = res?.rows || []
         ridersList.value = list.map(r => ({
@@ -280,6 +290,7 @@ watch(() => props.visible, (val) => {
         currentRider.value = null
         dispatchSearchQuery.value = ''
         selectedRiderId.value = null
+        orderDetail.value = null
         // price 单位为分，转成元显示
         dispatchFee.value = props.order?.fulfillmentCommission ? Number((props.order.fulfillmentCommission / 100).toFixed(2)) : 0
         orderCommission.value = props.order?.orderCommission ? Number((props.order.orderCommission / 100).toFixed(2)) : 0
@@ -301,6 +312,7 @@ watch(() => props.visible, (val) => {
         orderInfoLoading.value = true
         getSubOrderInfo(props.order.id).then((res) => {
             if(res.data) {
+                orderDetail.value = res.data;
                 // 如果 usrCustomer / usrPet 是对象则取其 id，如果是 ID 直接取
                 customerId.value = res.data.usrCustomer?.id || res.data.usrCustomer
                 petId.value = res.data.usrPet?.id || res.data.usrPet
@@ -393,10 +405,6 @@ const filteredDispatchRiders = computed(() => {
     return ridersList.value || []
 })
 
-const canSubmit = computed(() => {
-    return !!selectedRiderId.value && !!dispatchFee.value
-})
-
 const handleDispatchSubmit = () => {
     if (!selectedRiderId.value) {
         ElMessage.warning('请选择履约者')
@@ -410,6 +418,8 @@ const handleDispatchSubmit = () => {
     emit('submit', {
         riderId: rider.id,
         riderName: rider.name,
+        riderPhone: rider.phone,
+        fee: dispatchFee.value
         fee: dispatchFee.value,
         orderCommission: orderCommission.value
     })
@@ -549,7 +559,7 @@ const handleDispatchSubmit = () => {
 }
 
 .rider-scroll {
-    max-height: 45vh;
+    height: 320px;
 }
 
 .rider-grid {

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

@@ -84,6 +84,8 @@
                                 <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>
@@ -92,6 +94,8 @@
                             }}</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.petPersonality || order.petCharacter || '-' }}</el-descriptions-item>
                             <el-descriptions-item label="健康状况">{{ order.petHealth || '-' }}</el-descriptions-item>
                         </el-descriptions>
@@ -145,7 +149,7 @@
 
                                     <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="订单佣金" label-class-name="money-label">
@@ -153,7 +157,7 @@
                                     </el-descriptions-item>
 
                                     <el-descriptions-item label="订单备注" :span="3">
-                                        {{ order.remark || '暂无备注' }}
+                                        {{ order.remark || '-' }}
                                     </el-descriptions-item>
                                 </el-descriptions>
                             </div>
@@ -168,19 +172,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>
@@ -206,10 +210,10 @@
                                 <div class="f-right">
                                     <div class="f-row1">
                                         <span class="f-name">{{ order.fulfillerName }}</span>
-                                        <el-tag size="small" type="primary" effect="plain" round>Lv1 普通</el-tag>
+                                        <el-tag size="small" type="primary" effect="plain" round>{{ order.fulfillerLevelName || '普通履约者' }}</el-tag>
                                     </div>
                                     <div class="f-row2">
-                                        <span>联系电话：{{ order.fulfillerPhone || '-' }}</span>
+                                        <span>联系电话：{{ order.fulfillerPhone || '138****0000' }}</span>
                                         <span class="sep">|</span>
                                         <span>归属区域：{{ order.fulfillerStation || '-' }}</span>
                                     </div>
@@ -326,6 +330,8 @@ import { ref, reactive, computed, watch, getCurrentInstance } from 'vue'
 import { ElMessage } from 'element-plus'
 import { getPet } from '@/api/archieves/pet'
 import { getCustomer } from '@/api/archieves/customer'
+import { getSubOrderInfo } from '@/api/order/subOrder/index'
+import { getFulfiller } from '@/api/fulfiller/fulfiller/index'
 import { listSubOrderLog, exportSubOrderLogUrl } from '@/api/order/subOrderLog/index'
 import { listComplaintByOrder } from '@/api/fulfiller/complaint'
 
@@ -401,7 +407,29 @@ const loadPetAndCustomer = async (order) => {
     const seq = ++loadSeq.value
     const next = { ...(order || {}) }
 
-    const petId = next?.pet || next?.petId
+    if (next.id) {
+        try {
+            const orderRes = await getSubOrderInfo(next.id)
+            if (orderRes.data) {
+                if (orderRes.data.type == null) {
+                    delete orderRes.data.type;
+                } else {
+                    const typeMap = { 0: 'transport', 1: 'feeding', 2: 'washing' };
+                    if (typeMap[orderRes.data.type] !== undefined) {
+                        orderRes.data.type = typeMap[orderRes.data.type];
+                    }
+                }
+                Object.assign(next, orderRes.data)
+                if (orderRes.data.price != null) {
+                    next.fulfillerFee = (orderRes.data.price / 100).toFixed(2)
+                }
+            }
+        } catch (e) {
+            console.error('获取订单详细信息失败', e)
+        }
+    }
+
+    const petId = next?.usrPet || next?.pet || next?.petId
     if (petId) {
         try {
             const res = await getPet(petId)
@@ -424,7 +452,7 @@ const loadPetAndCustomer = async (order) => {
         }
     }
 
-    const customerId = next?.customer || next?.customerId
+    const customerId = next?.usrCustomer || next?.customer || next?.customerId
     if (customerId) {
         try {
             const res = await getCustomer(customerId)
@@ -440,6 +468,19 @@ const loadPetAndCustomer = async (order) => {
         }
     }
 
+    const fulfillerId = next?.fulfiller
+    if (fulfillerId) {
+        try {
+            const fRes = await getFulfiller(fulfillerId)
+            const fulfiller = fRes?.data
+            if (fulfiller) {
+                next.fulfillerStation = fulfiller.stationName ?? next.fulfillerStation
+                next.fulfillerLevelName = fulfiller.levelName ?? next.fulfillerLevelName
+            }
+        } catch {
+        }
+    }
+
     if (seq !== loadSeq.value) return
     orderDetail.value = next
 }
@@ -467,7 +508,7 @@ const getStatusTag = (status) => {
 }
 const getTypeName = (type) => {
     const map = { transport: '宠物接送', feeding: '上门喂遛', washing: '上门洗护' }
-    return map[type]
+    return map[type] || '-'
 }
 const getTransportModeName = (type) => {
     const map = { round: '往返接送', pick: '单程接(到店)', drop: '单程送(回家)' }
@@ -482,7 +523,7 @@ const getTransportLabel = (t) => {
     return '接送'
 }
 const getServiceTimeRange = (timeStr) => {
-    if (!timeStr) return '--'
+    if (!timeStr) return '-'
     try {
         if (timeStr.length < 16) return timeStr
         let timePart = timeStr.substring(11, 16)

src/views/order/orderList/index.vue

@@ -114,8 +114,18 @@
           </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 }">
+            <span v-if="row.fulfillerName" style="font-weight: 500; color: #333;">{{ row.fulfillerName }}</span>
             <div v-if="row.fulfillerName" class="fulfiller-info">
               <span class="fulfiller-name">{{ row.fulfillerName }}</span>
               <span class="fulfiller-fee" v-if="row.fulfillmentCommission !== null && row.fulfillmentCommission !== undefined">¥{{ row.fulfillmentCommission / 100.0
@@ -125,6 +135,26 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="履约电话" width="130">
+          <template #default="{ row }">
+            <div v-if="row.fulfillerPhone" style="display: flex; align-items: center; gap: 4px;">
+              <el-icon><Phone /></el-icon>
+              <span>{{ row.fulfillerPhone }}</span>
+            </div>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="履约佣金" width="100">
+          <template #default="{ row }">
+            <span v-if="row.price !== null && row.price !== undefined"
+              style="color: #f56c6c; font-size: 14px; font-weight: bold;">
+              ¥{{ (row.price / 100).toFixed(2) }}
+            </span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" width="200" fixed="right">
           <template #default="{ row }">
             <div class="op-cell">
@@ -214,8 +244,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick, getCurrentInstance } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref, reactive, onMounted, onUnmounted, nextTick, getCurrentInstance } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import fulfillerEnums from '@/json/fulfiller.json';
 import OrderDetailDrawer from './components/OrderDetailDrawer.vue';
@@ -243,6 +273,7 @@ import { getPet } from '@/api/archieves/pet';
 import { getCustomer } from '@/api/archieves/customer';
 import { addComplaint } from '@/api/fulfiller/complaint';
 
+const route = useRoute();
 const loading = ref(false);
 
 const filters = reactive({
@@ -263,10 +294,34 @@ const areaStationList = ref([]);
 const areaStationMap = ref({});
 const storeMap = ref({});
 
+let timer: any = null;
+
 onMounted(() => {
   getServiceList();
   getAreaStationList();
   handleSearch();
+  
+  if (route.query.id) {
+    handleDetail({ id: route.query.id as any });
+  }
+
+  timer = setInterval(() => {
+    handleSearch(true);
+  }, 5000);
+});
+
+// 监听路由参数变化，实现从消息直达详情
+watch(() => route.query.id, (newId) => {
+  if (newId) {
+    handleDetail({ id: newId as any });
+  }
+});
+
+onUnmounted(() => {
+  if (timer) {
+    clearInterval(timer);
+    timer = null;
+  }
 });
 
 const getServiceList = () => {
@@ -318,8 +373,11 @@ const handleStatusTabChange = async () => {
   handleSearch();
 };
 
-const handleSearch = () => {
-  loading.value = true;
+const handleSearch = (isPolling: any = false) => {
+  const isAutoPoll = isPolling === true;
+  if (!isAutoPoll) {
+    loading.value = true;
+  }
   listSubOrder({
     pageNum: pagination.current,
     pageSize: pagination.size,
@@ -331,10 +389,10 @@ const handleSearch = () => {
       tableData.value = res.rows || [];
       pagination.total = res.total || 0;
       loadStoresForRows(tableData.value);
-      loading.value = false;
+      if (!isAutoPoll) loading.value = false;
     })
     .catch(() => {
-      loading.value = false;
+      if (!isAutoPoll) loading.value = false;
     });
 };
 
@@ -385,10 +443,10 @@ const getServiceModeTag = (row) => {
 const getServiceOrderTypeTag = (row) => {
   if (getServiceMode(row.service) !== 1) return null;
   const t = row?.type;
-  if (t === 0 || t === '0') return { label: '接', type: 'primary' };
-  if (t === 1 || t === '1') return { label: '送', type: 'success' };
-  if (t === 2 || t === '2') return { label: '单程接', type: 'primary' };
-  if (t === 3 || t === '3') return { label: '单程送', type: 'success' };
+  if (t === 0 || t === '0') return { label: '接', type: 'primary' as const };
+  if (t === 1 || t === '1') return { label: '送', type: 'success' as const };
+  if (t === 2 || t === '2') return { label: '单程接', type: 'primary' as const };
+  if (t === 3 || t === '3') return { label: '单程送', type: 'success' as const };
   return null;
 };
 
@@ -573,12 +631,25 @@ const handleDetail = async (row) => {
 };
 
 // 取消订单
-const handleCancel = (row) => {
-  ElMessageBox.confirm('确认取消该订单吗？', '提示', { type: 'warning' }).then(() => {
-    cancelSubOrder({ orderId: row?.id }).then(() => {
-      ElMessage.success('订单已取消');
+const handleCancel = (row: any) => {
+  ElMessageBox.prompt('请输入订单取消原因', '订单确认取消', {
+    confirmButtonText: '确认取消',
+    cancelButtonText: '暂不取消',
+    inputPlaceholder: '请输入取消原因（必填）',
+    inputValidator: (value) => {
+      if (!value || !value.trim()) {
+        return '取消原因不能为空';
+      }
+      return true;
+    },
+    type: 'warning'
+  }).then(({ value }) => {
+    cancelSubOrder({ orderId: row?.id, reason: value }).then(() => {
+      ElMessage.success('订单已成功取消');
       handleSearch();
     });
+  }).catch(() => {
+    // 用户取消输入
   });
 };
 
@@ -637,8 +708,7 @@ const handleDispatchSubmit = (payload) => {
     if (row) {
       row.status = 1;
       row.fulfillerName = payload.riderName || 'Unknown';
-      row.fulfillmentCommission = payload.fee * 100; // 后端期望的分
-      row.orderCommission = orderCommissionFen;
+      row.price = payload.fee;
     }
     handleSearch();
   });
@@ -1004,20 +1074,6 @@ const handleExport = () => {
   background-color: #909399;
 }
 
-.fulfiller-info {
-  display: flex;
-  flex-direction: column;
-}
-
-.fulfiller-name {
-  font-weight: 500;
-  color: #333;
-}
-
-.fulfiller-fee {
-  font-size: 12px;
-  color: #e6a23c;
-}
 
 .op-cell {
   display: flex;

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 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-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 label="无">无</el-radio>
               <el-radio label="已打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

@@ -24,7 +24,7 @@
           </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" :props="{ value: 'id', label: 'name' }" placeholder="请选择站点"
               style="width: 100%" clearable @change="handleFormAreaChange" />
           </el-form-item>
@@ -43,7 +43,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="房屋类型">
@@ -53,19 +53,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>
@@ -253,6 +253,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" class="required-field">
               <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" class="required-field">
               <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>
 
@@ -123,4 +127,6 @@ const emit = defineEmits(['change'])
 .required-field { margin-bottom: 10px; }
 .required-field :deep(.el-input__wrapper) { box-shadow: 0 0 0 1px #f56c6c inset; }
 .required-field :deep(.el-input__wrapper):hover { box-shadow: 0 0 0 1px #f56c6c inset !important; }
+
+.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

@@ -268,7 +268,8 @@ const form = reactive({
     dropPrice: 35,
     subType: 'round',
     pickStartRegion: [], pickStartDetail: '', pickEndRegion: [], pickEndDetail: '', pickContact: '', pickPhone: '', pickTime: '',
-    dropStartRegion: [], dropStartDetail: '', dropEndRegion: [], dropEndDetail: '', dropContact: '', dropPhone: '', dropTime: ''
+    dropStartRegion: [], dropStartDetail: '', dropEndRegion: [], dropEndDetail: '', dropContact: '', dropPhone: '', dropTime: '',
+    other: ''
   },
   feeding: {
     pkgId: '', fulfillmentCommission: 68,
@@ -585,7 +586,8 @@ const resetForm = () => {
     dropPrice: 35,
     subType: 'round',
     pickStartRegion: [], pickStartDetail: '', pickEndRegion: [], pickEndDetail: '', pickContact: '', pickPhone: '', pickTime: '',
-    dropStartRegion: [], dropStartDetail: '', dropEndRegion: [], dropEndDetail: '', dropContact: '', dropPhone: '', dropTime: ''
+    dropStartRegion: [], dropStartDetail: '', dropEndRegion: [], dropEndDetail: '', dropContact: '', dropPhone: '', dropTime: '',
+    other: ''
   }
   form.feeding = {
     pkgId: '', fulfillmentCommission: 68,
@@ -739,7 +741,7 @@ const handleSubmit = async () => {
       pet: form.petId,
       groupPurchasePackageName: form.groupBuyPackage || '',
       service: form.serviceId,
-      remark: "",
+      remark: form[form.type] && form[form.type].other ? form[form.type].other : "",
       tenantId: storeObj.tenantId || "",
       orderCommission: Math.round((form.orderCommission || 0) * 100), // 订单佣金，单位：分
       subOrders: subOrders
@@ -774,19 +776,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 {
@@ -1065,16 +1068,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 {

src/views/service/list/index.vue

@@ -121,10 +121,10 @@
                   <span>步骤 {{ index + 1 }}</span>
                 </div>
               </template>
-              <el-form-item label="步骤标题" label-width="80px" class="inner-form-item">
+              <el-form-item label="步骤标题" label-width="80px" class="inner-form-item" required>
                 <el-input v-model="item.title" placeholder="请输入步骤标题" />
               </el-form-item>
-              <el-form-item label="打卡备注" label-width="80px" class="inner-form-item last">
+              <el-form-item label="打卡备注" label-width="80px" class="inner-form-item last" required>
                 <el-input v-model="item.remark" type="textarea" placeholder="请输入当前步骤打卡备注" />
               </el-form-item>
             </el-card>
@@ -324,6 +324,18 @@ const handleUpdate = async (row: ServiceVO) => {
 const submitForm = () => {
   serviceFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
+      for (let i = 0; i < clockInRemarkList.value.length; i++) {
+        const item = clockInRemarkList.value[i];
+        if (!item.title) {
+          proxy?.$modal.msgError(`请填写步骤 ${i + 1} 的标题`);
+          return;
+        }
+        if (!item.remark) {
+          proxy?.$modal.msgError(`请填写步骤 ${i + 1} 的备注`);
+          return;
+        }
+      }
+
       form.value.clockInRemark = clockInRemarkList.value.length > 0 ? JSON.stringify(clockInRemarkList.value) : undefined;
 
       // 编码富文本字段为BASE64

src/views/system/store/index.vue

@@ -7,25 +7,13 @@
             <span class="title">门店管理</span>
           </div>
           <div class="header-right">
-            <el-input
-              v-model="queryParams.storeOrContact"
-              placeholder="搜索门店名称/联系人"
-              class="search-input"
-              prefix-icon="Search"
-              clearable
-              @keyup.enter="handleQuery"
-            />
-            <el-cascader
-              v-model="searchRegionValue"
-              :options="areaOptions"
-              :props="{ value: 'id', label: 'name' }"
-              placeholder="所属站点"
-              class="station-select"
-              style="width: 240px"
-              clearable
-              @change="handleSearchAreaChange"
-            />
-            <el-select v-model="queryParams.status" placeholder="状态" class="status-select" clearable @change="handleQuery">
+            <el-input v-model="queryParams.storeOrContact" placeholder="搜索门店名称/联系人" class="search-input"
+              prefix-icon="Search" clearable @keyup.enter="handleQuery" />
+            <el-cascader v-model="searchRegionValue" :options="areaOptions" :props="{ value: 'id', label: 'name' }"
+              placeholder="所属站点" class="station-select" style="width: 240px" clearable
+              @change="handleSearchAreaChange" />
+            <el-select v-model="queryParams.status" placeholder="状态" class="status-select" clearable
+              @change="handleQuery">
               <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
             <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['system:store:add']">新增门店</el-button>
@@ -33,7 +21,8 @@
         </div>
       </template>
 
-      <el-table v-loading="loading" :data="storeList" style="width: 100%" :header-cell-style="{ background: '#f8f9fb', color: '#606266' }">
+      <el-table v-loading="loading" :data="storeList" style="width: 100%"
+        :header-cell-style="{ background: '#f8f9fb', color: '#606266' }">
         <el-table-column label="门店信息" min-width="240">
           <template #default="scope">
             <div class="store-info-box">
@@ -41,8 +30,10 @@
               <div class="store-desc">
                 <div class="name">{{ scope.row.name }}</div>
                 <div class="tags">
-                  <el-tag size="small" type="warning" effect="plain" v-if="scope.row.tenantName">{{ scope.row.tenantName }}</el-tag>
-                  <el-tag size="small" type="success" effect="plain" v-if="scope.row.tenantCatergoriesName">{{ scope.row.tenantCatergoriesName }}</el-tag>
+                  <el-tag size="small" type="warning" effect="plain" v-if="scope.row.tenantName">{{ scope.row.tenantName
+                    }}</el-tag>
+                  <el-tag size="small" type="success" effect="plain" v-if="scope.row.tenantCatergoriesName">{{
+                    scope.row.tenantCatergoriesName }}</el-tag>
                 </div>
               </div>
             </div>
@@ -52,7 +43,8 @@
         <el-table-column label="服务项目" min-width="180">
           <template #default="scope">
             <div class="service-tags">
-              <el-tag v-for="service in scope.row.services" :key="service" size="small" effect="light" class="service-tag">
+              <el-tag v-for="service in scope.row.services" :key="service" size="small" effect="light"
+                class="service-tag">
                 {{ getServiceName(service) }}
               </el-tag>
             </div>
@@ -61,8 +53,7 @@
 
         <el-table-column label="资质认证" align="center" width="100">
           <template #default="scope">
-            <image-preview v-if="scope.row.businessLicenseUrl" :src="scope.row.businessLicenseUrl" :width="40" :height="40" />
-            <span v-else>-</span>
+            <image-preview :src="scope.row.businessLicenseUrl" :width="40" :height="40" />
           </template>
         </el-table-column>
 
@@ -71,7 +62,9 @@
             <div class="region-info">
               <div class="region-name">{{ getRegionNameBySite(scope.row.site) }}</div>
               <div class="site-name">
-                <el-icon><Location /></el-icon>
+                <el-icon>
+                  <Location />
+                </el-icon>
                 <span>{{ scope.row.siteName }}</span>
               </div>
             </div>
@@ -82,7 +75,8 @@
 
         <el-table-column label="营业时间" align="center" width="140">
           <template #default="scope">
-            <span class="time-text">{{ formatTime(scope.row.startBusinessTime) }},{{ formatTime(scope.row.endBusinessTime) }}</span>
+            <span class="time-text">{{ formatTime(scope.row.startBusinessTime) }},{{
+              formatTime(scope.row.endBusinessTime) }}</span>
           </template>
         </el-table-column>
 
@@ -90,10 +84,14 @@
           <template #default="scope">
             <div class="contact-info">
               <div class="contact-item">
-                <el-icon><User /></el-icon><span>{{ scope.row.contact }}</span>
+                <el-icon>
+                  <User />
+                </el-icon><span>{{ scope.row.contact }}</span>
               </div>
               <div class="contact-item phone">
-                <el-icon><Phone /></el-icon><span>{{ scope.row.contactNumber }}</span>
+                <el-icon>
+                  <Phone />
+                </el-icon><span>{{ scope.row.contactNumber }}</span>
               </div>
             </div>
           </template>
@@ -118,8 +116,10 @@
         <el-table-column label="操作" align="right" width="180" fixed="right">
           <template #default="scope">
             <div class="op-btns">
-              <el-button link type="primary" @click="handleDetail(scope.row)" v-hasPermi="['system:store:query']">详情</el-button>
-              <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:store:edit']">编辑</el-button>
+              <el-button link type="primary" @click="handleDetail(scope.row)"
+                v-hasPermi="['system:store:query']">详情</el-button>
+              <el-button link type="primary" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:store:edit']">编辑</el-button>
               <el-dropdown trigger="click" @command="(cmd) => handleCommand(cmd, scope.row)">
                 <el-button link type="primary" class="more-btn">
                   更多<el-icon class="el-icon--right"><arrow-down /></el-icon>
@@ -127,8 +127,10 @@
                 <template #dropdown>
                   <el-dropdown-menu>
                     <el-dropdown-item command="handleRenew" v-hasPermi="['system:store:renew']">续期</el-dropdown-item>
-                    <el-dropdown-item v-if="scope.row.status === 1 && checkPermi(['system:store:disable'])" command="handleBan" class="delete-item">禁用</el-dropdown-item>
-                    <el-dropdown-item v-if="scope.row.status === 3 && checkPermi(['system:store:enable'])" command="handleEnable">启用</el-dropdown-item>
+                    <el-dropdown-item v-if="scope.row.status === 1 && checkPermi(['system:store:disable'])"
+                      command="handleBan" class="delete-item">禁用</el-dropdown-item>
+                    <el-dropdown-item v-if="scope.row.status === 3 && checkPermi(['system:store:enable'])"
+                      command="handleEnable">启用</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -138,13 +140,8 @@
       </el-table>
 
       <div class="pagination-container">
-        <pagination
-          v-show="total > 0"
-          v-model:total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
+        <pagination v-show="total > 0" v-model:total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
       </div>
     </el-card>
 
@@ -168,35 +165,27 @@
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="商户分类" prop="tenantCatergories">
-          <PageSelect
-            v-model="form.tenantCatergories"
+          <PageSelect v-model="form.tenantCatergories"
             :options="tenantCategoriesList.map(item => ({ value: item.id, label: item.name }))"
-            :total="tenantCategoriesTotal"
-            :pageSize="10"
-            placeholder="请选择商户分类"
-            @page-change="handleTenantCategoriesPageChange"
-            @visible-change="handleTenantCategoriesVisibleChange"
-          />
+            :total="tenantCategoriesTotal" :pageSize="10" placeholder="请选择商户分类"
+            @page-change="handleTenantCategoriesPageChange" @visible-change="handleTenantCategoriesVisibleChange" />
         </el-form-item>
         <el-form-item label="所属品牌" prop="tenantId">
-          <PageSelect
-            v-model="form.tenantId"
-            :options="brandList.map(item => ({ value: item.tenantId, label: item.name }))"
-            :total="brandTotal"
-            :pageSize="10"
-            placeholder="请选择所属品牌"
-            @page-change="handleBrandPageChange"
-            @visible-change="handleBrandSelectVisibleChange"
-          />
+          <PageSelect v-model="form.tenantId"
+            :options="brandList.map(item => ({ value: item.tenantId, label: item.name }))" :total="brandTotal"
+            :pageSize="10" placeholder="请选择所属品牌" @page-change="handleBrandPageChange"
+            @visible-change="handleBrandSelectVisibleChange" />
         </el-form-item>
         <el-form-item label="营业时间" prop="startBusinessTime">
           <el-row :gutter="10">
             <el-col :span="10">
-              <el-time-picker clearable v-model="form.startBusinessTime" format="HH:mm" value-format="HH:mm" placeholder="开始时间" style="width: 100%" />
+              <el-time-picker clearable v-model="form.startBusinessTime" format="HH:mm" value-format="HH:mm"
+                placeholder="开始时间" style="width: 100%" />
             </el-col>
             <el-col :span="4" style="text-align: center; line-height: 32px">至</el-col>
             <el-col :span="10">
-              <el-time-picker clearable v-model="form.endBusinessTime" format="HH:mm" value-format="HH:mm" placeholder="结束时间" style="width: 100%" />
+              <el-time-picker clearable v-model="form.endBusinessTime" format="HH:mm" value-format="HH:mm"
+                placeholder="结束时间" style="width: 100%" />
             </el-col>
           </el-row>
         </el-form-item>
@@ -206,16 +195,19 @@
         <el-form-item label="联系电话" prop="contactNumber">
           <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
         </el-form-item>
-        <el-form-item label="有效期至" prop="validity">
-          <el-date-picker :disabled="!!form.id" clearable v-model="form.validity" type="date" value-format="YYYY-MM-DD" placeholder="请选择有效期至" style="width: 100%" />
+        <el-form-item label="合作有效期" prop="validity">
+          <el-date-picker :disabled="!!form.id" clearable v-model="form.validity" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择合作有效期" style="width: 100%" />
         </el-form-item>
         <el-form-item label="所属站点" prop="site">
-          <el-cascader v-model="regionValue" :options="areaOptions" :props="{ value: 'id', label: 'name' }" placeholder="选择站点" style="width: 100%" @change="handleAreaChange" />
+          <el-cascader v-model="regionValue" :options="areaOptions" :props="{ value: 'id', label: 'name' }"
+            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="选择省市区" style="width: 100%" />
+              <el-cascader v-model="addressCascaderValue" :options="regionData" placeholder="选择省市区"
+                style="width: 100%" />
             </el-col>
           </el-row>
           <el-input v-model="form.detailAddress" type="textarea" placeholder="输入详细地址" rows="3" style="width: 100%" />
@@ -253,14 +245,17 @@
             <el-descriptions-item label="门店名称">{{ detailData.name }}</el-descriptions-item>
             <el-descriptions-item label="商户分类">{{ detailData.tenantCatergoriesName || '-' }}</el-descriptions-item>
             <el-descriptions-item label="所属品牌">{{ detailData.tenantName || '-' }}</el-descriptions-item>
-            <el-descriptions-item label="营业时间">{{ formatTime(detailData.startBusinessTime) }} - {{ formatTime(detailData.endBusinessTime) }}</el-descriptions-item>
-            <el-descriptions-item label="有效期至">{{ parseTime(detailData.validity, '{y}-{m}-{d}') }}</el-descriptions-item>
+            <el-descriptions-item label="营业时间">{{ formatTime(detailData.startBusinessTime) }} - {{
+              formatTime(detailData.endBusinessTime) }}</el-descriptions-item>
+            <el-descriptions-item label="合作有效期">{{ parseTime(detailData.validity, '{y}-{m}-{d}')
+              }}</el-descriptions-item>
             <el-descriptions-item label="联系人">{{ detailData.contact }}</el-descriptions-item>
             <el-descriptions-item label="联系电话">{{ detailData.contactNumber }}</el-descriptions-item>
             <el-descriptions-item label="归属站点">{{ detailData.siteName }}</el-descriptions-item>
             <el-descriptions-item label="详细地址">{{ getFullAddress(detailData) }}</el-descriptions-item>
             <el-descriptions-item label="营业执照">
-              <image-preview v-if="detailData.businessLicenseUrl" :src="detailData.businessLicenseUrl" :width="80" :height="60" />
+              <image-preview v-if="detailData.businessLicenseUrl" :src="detailData.businessLicenseUrl" :width="80"
+                :height="60" />
               <span v-else>-</span>
             </el-descriptions-item>
           </el-descriptions>
@@ -282,7 +277,8 @@
             <el-table-column label="下单时间" prop="createTime" min-width="160" />
             <el-table-column label="状态" align="center" width="100">
               <template #default="scope">
-                <el-tag :type="getOrderStatusType(scope.row.status)" effect="plain" size="small">{{ getOrderStatusName(scope.row.status) }}</el-tag>
+                <el-tag :type="getOrderStatusType(scope.row.status)" effect="plain" size="small">{{
+                  getOrderStatusName(scope.row.status) }}</el-tag>
               </template>
             </el-table-column>
           </el-table>
@@ -300,14 +296,9 @@
     <!-- 门店续期对话框 -->
     <el-dialog title="门店续期" v-model="renewDialog.visible" width="400px" append-to-body>
       <el-form :model="renewForm" label-width="80px">
-        <el-form-item label="有效期至">
-          <el-date-picker
-            v-model="renewForm.to"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="选择日期时间"
-            style="width: 100%"
-          />
+        <el-form-item label="合作有效期">
+          <el-date-picker v-model="renewForm.to" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择日期时间"
+            style="width: 100%" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -533,14 +524,14 @@ const data = reactive<PageData<StoreForm, SysStorePageBo>>({
     params: {}
   },
   rules: {
-    businessLicense: [{ required: true, message: "营业执照不能为空", trigger: "blur" }],
     name: [{ required: true, message: "门店名称不能为空", trigger: "blur" }],
+    detailAddress: [{ required: true, message: "详细地址不能为空", trigger: "blur" }],
     tenantCatergories: [{ required: true, message: "商户分类不能为空", trigger: "change" }],
     startBusinessTime: [{ required: true, message: "开始营业时间不能为空", trigger: "blur" }],
     endBusinessTime: [{ required: true, message: "结束营业时间不能为空", trigger: "blur" }],
     contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
     contactNumber: [{ required: true, message: "联系电话不能为空", trigger: "blur" }],
-    validity: [{ required: true, message: "有效期至不能为空", trigger: "blur" }],
+    validity: [{ required: true, message: "合作有效期不能为空", trigger: "blur" }],
     tenantId: [{ required: true, message: "所属品牌不能为空", trigger: "change" }],
     regionId: [{ required: true, message: "所在区域不能为空", trigger: "change" }],
     site: [{ required: true, message: "归属站点不能为空", trigger: "change" }],
@@ -664,6 +655,10 @@ const geoErrorMsg = ref('');
 const submitForm = () => {
   storeFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
+      if (!form.value.areaCode) {
+        proxy?.$modal.msgError("请选择省市区");
+        return;
+      }
       buttonLoading.value = true;
       try {
         if (form.value.id) {
@@ -740,7 +735,7 @@ const getGeolocation = async () => {
   try {
     // 确保高德地图脚本已加载
     await loadAMapScript();
-    
+
     const AMap = (window as any).AMap;
     if (!AMap) {
       throw new Error('AMap is not defined');
@@ -967,7 +962,7 @@ onMounted(() => {
 .table-card {
   border: none;
   border-radius: 8px;
-  
+
   :deep(.el-card__header) {
     padding: 20px 24px;
     border-bottom: 1px solid #f0f0f0;
@@ -991,17 +986,27 @@ onMounted(() => {
 .header-right {
   display: flex;
   gap: 12px;
-  
-  .search-input { width: 200px; }
-  .station-select { width: 420px; flex-shrink: 0; }
-  .status-select { width: 140px; }
-  
+
+  .search-input {
+    width: 200px;
+  }
+
+  .station-select {
+    width: 420px;
+    flex-shrink: 0;
+  }
+
+  .status-select {
+    width: 140px;
+  }
+
   :deep(.el-input__wrapper) {
     background-color: #f4f5f7;
     box-shadow: none;
     border: 1px solid transparent;
-    
-    &:hover, &.is-focus {
+
+    &:hover,
+    &.is-focus {
       border-color: #409eff;
       background-color: #fff;
     }
@@ -1012,13 +1017,14 @@ onMounted(() => {
   display: flex;
   align-items: center;
   gap: 12px;
-  
+
   .store-desc {
     .name {
       font-weight: 600;
       color: #333;
       margin-bottom: 4px;
     }
+
     .tags {
       display: flex;
       gap: 4px;
@@ -1037,6 +1043,7 @@ onMounted(() => {
     font-weight: 500;
     color: #333;
   }
+
   .site-name {
     font-size: 12px;
     color: #909399;
@@ -1054,17 +1061,20 @@ onMounted(() => {
     gap: 4px;
     font-size: 13px;
     color: #606266;
-    
+
     &.phone {
       color: #409eff;
       margin-top: 2px;
     }
-    
-    .el-icon { font-size: 14px; }
+
+    .el-icon {
+      font-size: 14px;
+    }
   }
 }
 
-.time-text, .count-text {
+.time-text,
+.count-text {
   font-weight: 500;
   color: #606266;
 }
@@ -1090,6 +1100,7 @@ onMounted(() => {
 
 .delete-item {
   color: #f56c6c !important;
+
   &:hover {
     color: #f56c6c !important;
     background-color: #fef0f0 !important;
@@ -1104,11 +1115,11 @@ onMounted(() => {
 
 :deep(.el-table) {
   --el-table-border-color: #f0f0f0;
-  
+
   th.el-table__cell {
     font-weight: 600;
   }
-  
+
   td.el-table__cell {
     padding: 12px 0;
   }