From 6b7f627c7c58945328b8e66c3793a571d7cda925 Mon Sep 17 00:00:00 2001
From: "2358328281@qq.com" <邮箱地址>
Date: Tue, 30 Jun 2026 16:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout/AdminLayout.vue         |   9 +-
 src/router/route.js                           |  14 +-
 src/utils/dateShortcuts.js                    |  73 ++++
 .../components/HospitalDetailDialog.vue       | 152 ++++++++
 .../components/HospitalEditDialog.vue         | 351 ++++++++++++++++++
 src/views/admin/hospitals/detail.vue          | 115 ------
 src/views/admin/hospitals/edit.vue            | 313 ----------------
 src/views/admin/hospitals/list.vue            |  42 ++-
 .../orders/components/OrderDetailDialog.vue   |  20 +-
 .../orders/components/OrderFormDialog.vue     | 119 +++++-
 .../orders/components/OrderHandleDialog.vue   |   6 +-
 .../orders/components/OrderProcessDialog.vue  |  71 ++--
 src/views/admin/orders/list.vue               |  53 ++-
 src/views/admin/orders/report.vue             |   2 +
 src/views/hospital/orders/list.vue            |   2 +
 src/views/hospital/workbench.vue              |   2 +
 16 files changed, 835 insertions(+), 509 deletions(-)
 create mode 100644 src/utils/dateShortcuts.js
 create mode 100644 src/views/admin/hospitals/components/HospitalDetailDialog.vue
 create mode 100644 src/views/admin/hospitals/components/HospitalEditDialog.vue
 delete mode 100644 src/views/admin/hospitals/detail.vue
 delete mode 100644 src/views/admin/hospitals/edit.vue

diff --git a/src/components/layout/AdminLayout.vue b/src/components/layout/AdminLayout.vue
index b6cc4f8..26dfb5f 100644
--- a/src/components/layout/AdminLayout.vue
+++ b/src/components/layout/AdminLayout.vue
@@ -4,8 +4,8 @@
 
       <!-- 管理端：显示 Logo / 医院端：显示医院名 -->
       <div class="logo-bar">
-        <span v-if="!isHospitalMode" class="logo-text"> 康策CSM系统管理平台<span>v1.0</span> </span>
-        <span v-else class="logo-text">{{ userStore.userInfo?.hospitalName || "医院端" }}</span>
+        <span v-if="!isHospitalMode" class="logo-text admin"> 康策CSM系统管理平台<span class="version">v1.0</span> </span>
+        <span v-else class="logo-text hospital">{{ userStore.userInfo?.hospitalName || "医院端" }}</span>
       </div>
 
       <div class="header-middle">
@@ -322,6 +322,11 @@ const handleCommand = async (cmd) => {
         background: linear-gradient(to right, #3fc5fd, #3b90fa);
         -webkit-background-clip: text;
         -webkit-text-fill-color: transparent;
+        font-size: 22px;
+
+        .version {
+          font-size: 14px;
+        }
       }
     }
 
diff --git a/src/router/route.js b/src/router/route.js
index 13c818e..c51820f 100644
--- a/src/router/route.js
+++ b/src/router/route.js
@@ -79,25 +79,13 @@ export const constantRoutes = [
         component: () => import("@/views/admin/hospitals/list.vue"),
         meta: { title: "医院信息", icon: "admin-router-yiyuan-xx" },
       },
-      // 客户服务（必须在 hospitals/detail/:id 之前声明）
+      // 客户服务
       {
         path: "hospitals/service",
         name: "AdminHospitalService",
         component: () => import("@/views/admin/hospitals/service.vue"),
         meta: { title: "客户服务", icon: "admin-router-kehu-fw" },
       },
-      {
-        path: "hospitals/detail/:id",
-        name: "AdminHospitalDetail",
-        component: () => import("@/views/admin/hospitals/detail.vue"),
-        meta: { title: "医院详情", hidden: true },
-      },
-      {
-        path: "hospitals/edit/:id?",
-        name: "AdminHospitalEdit",
-        component: () => import("@/views/admin/hospitals/edit.vue"),
-        meta: { title: "编辑医院", hidden: true },
-      },
       // 客户经理积分
       {
         path: "performance/score",
diff --git a/src/utils/dateShortcuts.js b/src/utils/dateShortcuts.js
new file mode 100644
index 0000000..599ca12
--- /dev/null
+++ b/src/utils/dateShortcuts.js
@@ -0,0 +1,73 @@
+import dayjs from "dayjs";
+import isoWeek from "dayjs/plugin/isoWeek";
+import "dayjs/locale/zh-cn";
+
+dayjs.extend(isoWeek);
+dayjs.locale("zh-cn");
+
+const fmt = "YYYY-MM-DD";
+
+/**
+ * 日期范围快捷选项(用于 el-date-picker type="daterange" :shortcuts)
+ * 周定义:周一为一周开始(基于 ISO week)
+ */
+export const dateRangeShortcuts = [
+  {
+    text: "今天",
+    value: () => {
+      const d = dayjs().format(fmt);
+      return [d, d];
+    },
+  },
+  {
+    text: "昨天",
+    value: () => {
+      const d = dayjs().subtract(1, "day").format(fmt);
+      return [d, d];
+    },
+  },
+  {
+    text: "本周",
+    value: () => [
+      dayjs().startOf("isoWeek").format(fmt),
+      dayjs().endOf("isoWeek").format(fmt),
+    ],
+  },
+  {
+    text: "上周",
+    value: () => [
+      dayjs().subtract(1, "isoWeek").startOf("isoWeek").format(fmt),
+      dayjs().subtract(1, "isoWeek").endOf("isoWeek").format(fmt),
+    ],
+  },
+  {
+    text: "本月",
+    value: () => [
+      dayjs().startOf("month").format(fmt),
+      dayjs().endOf("month").format(fmt),
+    ],
+  },
+  {
+    text: "上月",
+    value: () => [
+      dayjs().subtract(1, "month").startOf("month").format(fmt),
+      dayjs().subtract(1, "month").endOf("month").format(fmt),
+    ],
+  },
+  {
+    text: "最近六个月",
+    value: () => [
+      dayjs().subtract(6, "month").format(fmt),
+      dayjs().format(fmt),
+    ],
+  },
+  {
+    text: "今年至今",
+    value: () => [
+      dayjs().startOf("year").format(fmt),
+      dayjs().format(fmt),
+    ],
+  },
+];
+
+export default dateRangeShortcuts;
\ No newline at end of file
diff --git a/src/views/admin/hospitals/components/HospitalDetailDialog.vue b/src/views/admin/hospitals/components/HospitalDetailDialog.vue
new file mode 100644
index 0000000..4fc665c
--- /dev/null
+++ b/src/views/admin/hospitals/components/HospitalDetailDialog.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-dialog :model-value="visible" class="hospital-detail-dialog" top="6vh" width="880px" destroy-on-close
+    :close-on-click-modal="false" @update:model-value="(v) => !v && close()">
+    <div class="body-wrap">
+      <div class="body-header">
+        <span class="body-title">
+          {{ $t("modal.detailHospital") }}
+        </span>
+        <img src="@/assets/image/close-btn.svg" alt="" class="close-btn" @click="close">
+      </div>
+
+      <div class="hospital-detail" v-loading="loading">
+        <el-card shadow="never" v-if="detail.id">
+          <template #header>
+            <div class="card-header">
+              <span class="title">{{ detail.name }}</span>
+              <el-tag size="small">
+                {{ detail.customerCategory }}
+                {{ $t("category.AShort").replace("A", "") }}
+              </el-tag>
+              <el-button type="primary" size="small" style="margin-left: auto" @click="goEdit">
+                {{ $t("btn.edit") }}
+              </el-button>
+            </div>
+          </template>
+
+          <el-descriptions :column="3" border>
+            <el-descriptions-item :label="$t('label.contactDept')">
+              {{ detail.contactDept }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('label.contactPerson')">
+              {{ detail.contactPerson }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('label.contactPosition')">
+              {{ detail.contactPosition }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('label.contactPhone')">
+              {{ detail.contactPhone }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('table.signDate')">
+              {{ formatDate(detail.signDate) }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('label.acceptDate')">
+              {{ formatDate(detail.acceptDate) }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('label.years')">
+              {{ detail.contractYears }}年
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('table.maintenanceEnd')">
+              {{ formatDate(detail.maintenanceEnd) }}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('table.manager')">
+              {{ detail.managerName }}
+            </el-descriptions-item>
+          </el-descriptions>
+
+          <div class="section">
+            <div class="section-title">{{ $t("common.remark") }}</div>
+            <div class="html-content">{{ detail.remark || "—" }}</div>
+          </div>
+        </el-card>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, watch } from "vue";
+import dayjs from "dayjs";
+import { getAdminHospitalDetail } from "@/service/modular/admin";
+
+const props = defineProps({
+  visible: { type: Boolean, default: false },
+  // 父组件传入的医院 id
+  hospitalId: { type: [String, Number], default: "" },
+});
+
+const emit = defineEmits(["update:visible", "close", "edit"]);
+
+const loading = ref(false);
+const detail = ref({});
+
+const formatDate = (v) => (v ? dayjs(v).format("YYYY-MM-DD") : "—");
+
+const loadDetail = async (id) => {
+  if (!id) {
+    detail.value = {};
+    return;
+  }
+  loading.value = true;
+  try {
+    detail.value = await getAdminHospitalDetail(id);
+  } finally {
+    loading.value = false;
+  }
+};
+
+// 弹窗打开或 id 变化时重新拉取详情
+watch(
+  () => [props.visible, props.hospitalId],
+  ([vis, id]) => {
+    if (vis) loadDetail(id);
+  },
+  { immediate: true }
+);
+
+const close = () => emit("update:visible", false);
+
+// 仅向父组件通知"进入编辑"，由父组件切换到编辑弹窗，避免组件间耦合路由
+const goEdit = () => emit("edit", props.hospitalId);
+</script>
+
+<style scoped lang="scss">
+.hospital-detail-dialog {
+  .body-header {
+    margin-bottom: 18px;
+  }
+}
+
+.hospital-detail {
+  .card-header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      margin-right: 8px;
+    }
+  }
+
+  .section {
+    margin-top: 20px;
+
+    .section-title {
+      font-size: 14px;
+      font-weight: 600;
+      color: #303133;
+      margin-bottom: 10px;
+    }
+  }
+
+  .html-content {
+    background: #fafafa;
+    padding: 12px;
+    border-radius: 4px;
+    min-height: 60px;
+    line-height: 1.6;
+  }
+}
+</style>
diff --git a/src/views/admin/hospitals/components/HospitalEditDialog.vue b/src/views/admin/hospitals/components/HospitalEditDialog.vue
new file mode 100644
index 0000000..78bcbe4
--- /dev/null
+++ b/src/views/admin/hospitals/components/HospitalEditDialog.vue
@@ -0,0 +1,351 @@
+<template>
+  <el-dialog :model-value="visible" class="hospital-edit-dialog" top="6vh" width="780px" destroy-on-close
+    :close-on-click-modal="false" @update:model-value="(v) => !v && close()">
+    <div class="body-wrap">
+      <div class="body-header">
+        <span class="body-title">
+          {{ isEdit ? $t("modal.editHospital") : $t("modal.addHospital") }}
+        </span>
+        <img src="@/assets/image/close-btn.svg" alt="" class="close-btn" @click="close">
+      </div>
+
+
+      <div class="hospital-edit" v-loading="loading">
+        <el-form ref="formRef" :model="form" :rules="rules" label-width="130px">
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item :label="$t('label.hospitalName')" prop="name">
+                <el-input v-model="form.name" :placeholder="$t('placeholder.hospital')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.category')" prop="customerCategory">
+                <el-select v-model="form.customerCategory" :placeholder="$t('label.category')" style="width: 200px">
+                  <el-option label="A类客户（活跃）" value="A" />
+                  <el-option label="B类客户（不活跃）" value="B" />
+                  <el-option label="C类客户（待挽回）" value="C" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.contactDept')">
+                <el-input v-model="form.contactDept" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.contactPerson')">
+                <el-input v-model="form.contactPerson" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item :label="$t('label.contactPosition')">
+                <el-input v-model="form.contactPosition" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.contactPhone')">
+                <el-input v-model="form.contactPhone" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.signDate')" prop="signDate">
+                <el-date-picker v-model="form.signDate" type="date" value-format="YYYY-MM-DD"
+                  :placeholder="$t('common.pleaseSelect')" style="width: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.acceptDate')" prop="acceptDate">
+                <el-date-picker v-model="form.acceptDate" type="date" value-format="YYYY-MM-DD"
+                  :placeholder="$t('common.pleaseSelect')" style="width: 200px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item :label="$t('label.years')" prop="contractYears">
+                <el-input-number v-model="form.contractYears" :min="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.maintenanceEndDate')" prop="maintenanceEnd">
+                <el-date-picker v-model="form.maintenanceEnd" type="date" value-format="YYYY-MM-DD"
+                  :placeholder="$t('common.pleaseSelect')" style="width: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('label.manager')">
+                <el-select v-model="form.managerId" :placeholder="$t('label.manager')" filterable clearable
+                  style="width: 240px">
+                  <el-option v-for="item in managerOptions" :key="item.id" :label="`${item.name}`" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+
+
+
+          <el-form-item :label="$t('label.acceptanceReport')" required>
+            <el-upload v-model:file-list="reportFileList" :auto-upload="false" :limit="1"
+              :on-exceed="handleReportExceed" accept=".pdf">
+              <el-button type="primary" plain>{{ $t("btn.upload") }}</el-button>
+              <template #tip>
+                <div class="el-upload__tip">
+                  {{ $t("label.acceptanceReportTip") }}
+                </div>
+              </template>
+            </el-upload>
+          </el-form-item>
+          <el-form-item :label="$t('common.remark')">
+            <el-input v-model="form.remark" type="textarea" :rows="3" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+
+
+    <div class="body-footer">
+      <el-button @click="close">{{ $t("common.cancel") }}</el-button>
+      <el-button type="primary" :loading="submitting" @click="submit">
+        {{ isEdit ? $t("common.save") : $t("common.add") }}
+      </el-button>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script setup>
+import { computed, reactive, ref, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { useI18n } from "vue-i18n";
+import {
+  getAdminHospitalDetail,
+  createAdminHospital,
+  updateAdminHospital,
+  getAdminAccounts,
+} from "@/service/modular/admin";
+
+const { t: $t } = useI18n();
+
+const props = defineProps({
+  visible: { type: Boolean, default: false },
+  // 父组件传入的医院 id，为空时为新增
+  hospitalId: { type: [String, Number], default: "" },
+});
+
+const emit = defineEmits(["update:visible", "close", "success"]);
+
+const loading = ref(false);
+const submitting = ref(false);
+const formRef = ref();
+const managerLoaded = ref(false);
+
+const isEdit = computed(() => !!props.hospitalId);
+
+// 详情接口返回的原始验收报告路径，为空表示无报告或已被用户替换
+const form = reactive({
+  name: "",
+  customerCategory: "",
+  contactDept: "",
+  contactPerson: "",
+  contactPosition: "",
+  contactPhone: "",
+  signDate: "",
+  acceptDate: "",
+  contractYears: 1,
+  maintenanceEnd: "",
+  managerId: undefined,
+  remark: "",
+  attachmentPath: "",
+});
+
+const rules = {
+  name: [
+    {
+      required: true,
+      message: () => $t("placeholder.hospital"),
+      trigger: "blur",
+    },
+  ],
+  customerCategory: [
+    { required: true, message: () => $t("label.category"), trigger: "change" },
+  ],
+  signDate: [
+    { required: true, message: () => $t("label.signDate"), trigger: "change" },
+  ],
+  acceptDate: [
+    {
+      required: true,
+      message: () => $t("label.acceptDate"),
+      trigger: "change",
+    },
+  ],
+  contractYears: [
+    { required: true, message: () => $t("label.years"), trigger: "blur" },
+  ],
+  maintenanceEnd: [
+    {
+      required: true,
+      message: () => $t("label.maintenanceEndDate"),
+      trigger: "change",
+    },
+  ],
+};
+
+const managerOptions = ref([]);
+
+const reportFileList = ref([]);
+
+// 超出 limit 时仅保留最后一个
+// 触发即代表用户上传了新文件替换原报告，清空 attachmentPath
+const handleReportExceed = (files) => {
+  reportFileList.value = files.slice(-1);
+  form.attachmentPath = "";
+};
+
+// 从带路径分隔符的地址中截取最后的文件名（兼容 / 与 \）
+const getAttachmentFileName = (path) => {
+  if (!path) return "";
+  return String(path).replace(/\\/g, "/").split("/").pop() || "";
+};
+
+// 重置表单到初始状态，弹窗每次打开时使用
+const resetForm = () => {
+  Object.assign(form, {
+    name: "",
+    customerCategory: "",
+    contactDept: "",
+    contactPerson: "",
+    contactPosition: "",
+    contactPhone: "",
+    signDate: "",
+    acceptDate: "",
+    contractYears: 1,
+    maintenanceEnd: "",
+    managerId: undefined,
+    remark: "",
+    attachmentPath: "",
+  });
+  reportFileList.value = [];
+  formRef.value?.clearValidate();
+};
+
+const loadManagers = async () => {
+  if (managerLoaded.value) return;
+  try {
+    const res = await getAdminAccounts({ type: "Admin" });
+    managerOptions.value = res?.list || [];
+    managerLoaded.value = true;
+  } catch (e) {
+    // request 层已统一提示错误
+  }
+};
+
+const loadDetail = async (id) => {
+  if (!id) return;
+  loading.value = true;
+  try {
+    const data = await getAdminHospitalDetail(id);
+    Object.assign(form, data);
+    // 若详情接口返回了验收报告路径，截取文件名以"已上传"状态回显到 file-list，
+    // 位置与正常上传后一致；不下载，仅展示以便用户决定是否替换
+    const fileName = getAttachmentFileName(data?.attachmentPath);
+    if (fileName) {
+      reportFileList.value = [
+        {
+          uid: `attachment-${id}`,
+          name: fileName,
+          status: "success",
+        },
+      ];
+    }
+  } finally {
+    loading.value = false;
+  }
+};
+
+const buildHospitalFormData = () => {
+  const fd = new FormData();
+  Object.entries(form).forEach(([key, value]) => {
+    if (value === undefined || value === null || value === "") return;
+    fd.append(key, value);
+  });
+  // 兼容 el-upload 在新增/编辑两种场景下 file-list 项的结构差异：
+  //   新增时：item 为 UploadFile 对象，包含 raw 指向 File
+  //   编辑时：item 本身即为 File 对象（el-upload 直接以原始 File 替换了回显项）
+  // 回显项无 raw 且 size 未定义，命中后自然不会走到 files 提交
+  const item = (reportFileList.value || [])[0];
+  if (item) {
+    const file = item.raw || (typeof item.size === "number" ? item : null);
+    if (file) fd.append("files", file);
+  }
+  return fd;
+};
+
+const submit = async () => {
+  await formRef.value.validate(async (valid) => {
+    if (!valid) return;
+    // 仅在"新增"或"编辑但原报告已被清空/移除"且 file-list 为空时，才提示需上传
+    const keepOriginal = isEdit.value && !!form.attachmentPath;
+    if (!reportFileList.value?.length && !keepOriginal) {
+      ElMessage.warning($t("label.acceptanceReport"));
+      return;
+    }
+    submitting.value = true;
+    try {
+      const fd = buildHospitalFormData();
+      if (isEdit.value) {
+        await updateAdminHospital(props.hospitalId, fd);
+        ElMessage.success($t("msg.hospitalEditSuccess"));
+      } else {
+        await createAdminHospital(fd);
+        ElMessage.success($t("msg.hospitalAddSuccess"));
+      }
+      emit("success");
+      emit("update:visible", false);
+    } finally {
+      submitting.value = false;
+    }
+  });
+};
+
+const close = () => emit("update:visible", false);
+
+// 弹窗打开或 id 变化时重新加载数据，与 detail.vue 行为一致
+watch(
+  () => [props.visible, props.hospitalId],
+  ([vis, id]) => {
+    if (vis) {
+      resetForm();
+      loadManagers();
+      if (id) loadDetail(id);
+    }
+  },
+  { immediate: true }
+);
+</script>
+
+<style scoped lang="scss">
+.hospital-edit {
+  max-height: 70vh;
+  overflow-y: auto;
+  padding-right: 4px;
+}
+</style>
+
+
+<style lang="scss">
+.hospital-edit-dialog {
+  min-width: 1168px;
+  max-width: 90vw;
+
+  .body-header {
+    margin-bottom: 18px;
+  }
+}
+</style>
diff --git a/src/views/admin/hospitals/detail.vue b/src/views/admin/hospitals/detail.vue
deleted file mode 100644
index c09c775..0000000
--- a/src/views/admin/hospitals/detail.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div class="hospital-detail" v-loading="loading">
-    <el-page-header :icon="ArrowLeft" :content="$t('common.back')" @back="goBack" class="page-header">
-      <template #content>
-        <span class="page-title">{{ $t('modal.detailHospital') }}</span>
-      </template>
-    </el-page-header>
-
-    <el-card shadow="never" v-if="detail.id">
-      <template #header>
-        <div class="card-header">
-          <span class="title">{{ detail.name }}</span>
-          <el-tag size="small">{{ detail.customerCategory }} {{ $t('category.AShort').replace('A', '') }}</el-tag>
-          <el-button type="primary" size="small" style="margin-left:auto" @click="goEdit">
-            {{ $t('btn.edit') }}
-          </el-button>
-        </div>
-      </template>
-
-      <el-descriptions :column="3" border>
-        <el-descriptions-item :label="$t('label.contactDept')">{{ detail.contactDept }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('label.contactPerson')">{{ detail.contactPerson }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('label.contactPosition')">{{ detail.contactPosition }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('label.contactPhone')">{{ detail.contactPhone }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('table.signDate')">{{ formatDate(detail.signDate) }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('label.acceptDate')">{{ formatDate(detail.acceptDate) }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('label.years')">{{ detail.contractYears }}年</el-descriptions-item>
-        <el-descriptions-item :label="$t('table.maintenanceEnd')">{{ formatDate(detail.maintenanceEnd) }}</el-descriptions-item>
-        <el-descriptions-item :label="$t('table.manager')">{{ detail.managerName }}</el-descriptions-item>
-      </el-descriptions>
-
-      <div class="section">
-        <div class="section-title">{{ $t('common.remark') }}</div>
-        <div class="html-content">{{ detail.remark || "—" }}</div>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import { onMounted, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ArrowLeft } from "@element-plus/icons-vue";
-import dayjs from "dayjs";
-import { getAdminHospitalDetail } from "@/service/modular/admin";
-
-const route = useRoute();
-const router = useRouter();
-const loading = ref(false);
-const detail = ref({});
-
-const formatDate = (v) => (v ? dayjs(v).format("YYYY-MM-DD") : "—");
-
-// 从签约日期到今天的使用年限，按"X年X天"展示
-const formatUsageYears = (signDate) => {
-  if (!signDate) return "—";
-  const start = dayjs(signDate);
-  const now = dayjs();
-  if (start.isAfter(now)) return "—";
-  const totalDays = now.diff(start, "day");
-  const years = Math.floor(totalDays / 365);
-  const days = totalDays - years * 365;
-  return `${years}年${days}天`;
-};
-
-const loadDetail = async () => {
-  loading.value = true;
-  try {
-    detail.value = await getAdminHospitalDetail(route.params.id);
-  } finally {
-    loading.value = false;
-  }
-};
-
-const goBack = () => router.back();
-const goEdit = () => router.push(`/admin/hospitals/edit/${route.params.id}`);
-
-onMounted(loadDetail);
-</script>
-
-<style scoped lang="scss">
-.page-header {
-  margin-bottom: 12px;
-  .page-title {
-    font-size: 16px;
-    font-weight: 600;
-  }
-}
-.card-header {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  .title {
-    font-size: 16px;
-    font-weight: 600;
-    margin-right: 8px;
-  }
-}
-.section {
-  margin-top: 20px;
-  .section-title {
-    font-size: 14px;
-    font-weight: 600;
-    color: #303133;
-    margin-bottom: 10px;
-  }
-}
-.html-content {
-  background: #fafafa;
-  padding: 12px;
-  border-radius: 4px;
-  min-height: 60px;
-  line-height: 1.6;
-}
-</style>
diff --git a/src/views/admin/hospitals/edit.vue b/src/views/admin/hospitals/edit.vue
deleted file mode 100644
index 0dc81f9..0000000
--- a/src/views/admin/hospitals/edit.vue
+++ /dev/null
@@ -1,313 +0,0 @@
-<template>
-  <div class="hospital-edit" v-loading="loading">
-    <el-page-header
-      :icon="ArrowLeft"
-      :content="$t('common.back')"
-      @back="goBack"
-      class="page-header"
-    >
-      <template #content>
-        <span class="page-title">{{
-          isEdit ? $t("modal.editHospital") : $t("modal.addHospital")
-        }}</span>
-      </template>
-    </el-page-header>
-
-    <el-card shadow="never">
-      <el-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        label-width="130px"
-        style="max-width: 800px"
-      >
-        <el-form-item :label="$t('label.hospitalName')" prop="name">
-          <el-input
-            v-model="form.name"
-            :placeholder="$t('placeholder.hospital')"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('label.category')" prop="customerCategory">
-          <el-select
-            v-model="form.customerCategory"
-            :placeholder="$t('label.category')"
-            style="width: 200px"
-          >
-            <el-option label="A类客户（活跃）" value="A" />
-            <el-option label="B类客户（不活跃）" value="B" />
-            <el-option label="C类客户（待挽回）" value="C" />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('label.contactDept')">
-          <el-input v-model="form.contactDept" />
-        </el-form-item>
-        <el-form-item :label="$t('label.contactPerson')">
-          <el-input v-model="form.contactPerson" />
-        </el-form-item>
-        <el-form-item :label="$t('label.contactPosition')">
-          <el-input v-model="form.contactPosition" />
-        </el-form-item>
-        <el-form-item :label="$t('label.contactPhone')">
-          <el-input v-model="form.contactPhone" />
-        </el-form-item>
-        <el-form-item :label="$t('label.signDate')" prop="signDate">
-          <el-date-picker
-            v-model="form.signDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            :placeholder="$t('common.pleaseSelect')"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('label.acceptDate')" prop="acceptDate">
-          <el-date-picker
-            v-model="form.acceptDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            :placeholder="$t('common.pleaseSelect')"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('label.years')" prop="contractYears">
-          <el-input-number v-model="form.contractYears" :min="1" :precision="0" />
-        </el-form-item>
-        <el-form-item
-          :label="$t('label.maintenanceEndDate')"
-          prop="maintenanceEnd"
-        >
-          <el-date-picker
-            v-model="form.maintenanceEnd"
-            type="date"
-            value-format="YYYY-MM-DD"
-            :placeholder="$t('common.pleaseSelect')"
-            style="width: 200px"
-          />
-        </el-form-item>
-        <el-form-item :label="$t('label.manager')">
-          <el-select
-            v-model="form.managerId"
-            :placeholder="$t('label.manager')"
-            filterable
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="item in managerOptions"
-              :key="item.id"
-              :label="`${item.name}`"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('label.acceptanceReport')" required>
-          <el-upload
-            v-model:file-list="reportFileList"
-            :auto-upload="false"
-            :limit="1"
-            :on-exceed="handleReportExceed"
-            accept=".pdf"
-          >
-            <el-button type="primary" plain>{{ $t("btn.upload") }}</el-button>
-            <template #tip>
-              <div class="el-upload__tip">
-                {{ $t("label.acceptanceReportTip") }}
-              </div>
-            </template>
-          </el-upload>
-        </el-form-item>
-        <el-form-item :label="$t('common.remark')">
-          <el-input v-model="form.remark" type="textarea" :rows="3" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" :loading="submitting" @click="submit">
-            {{ isEdit ? $t("common.save") : $t("common.add") }}
-          </el-button>
-          <el-button @click="goBack">{{ $t("common.cancel") }}</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import { computed, onMounted, reactive, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
-import { ArrowLeft } from "@element-plus/icons-vue";
-import { useI18n } from "vue-i18n";
-import {
-  getAdminHospitalDetail,
-  createAdminHospital,
-  updateAdminHospital,
-  getAdminAccounts,
-} from "@/service/modular/admin";
-
-const { t: $t } = useI18n();
-const route = useRoute();
-const router = useRouter();
-const loading = ref(false);
-const submitting = ref(false);
-const formRef = ref();
-
-const isEdit = computed(() => !!route.params.id);
-
-// 详情接口返回的原始验收报告路径，为空表示无报告或已被用户替换
-const form = reactive({
-  name: "",
-  customerCategory: "",
-  contactDept: "",
-  contactPerson: "",
-  contactPosition: "",
-  contactPhone: "",
-  signDate: "",
-  acceptDate: "",
-  contractYears: 1,
-  maintenanceEnd: "",
-  managerId: undefined,
-  remark: "",
-  attachmentPath: "",
-});
-
-const rules = {
-  name: [
-    {
-      required: true,
-      message: () => $t("placeholder.hospital"),
-      trigger: "blur",
-    },
-  ],
-  customerCategory: [
-    { required: true, message: () => $t("label.category"), trigger: "change" },
-  ],
-  signDate: [
-    { required: true, message: () => $t("label.signDate"), trigger: "change" },
-  ],
-  acceptDate: [
-    {
-      required: true,
-      message: () => $t("label.acceptDate"),
-      trigger: "change",
-    },
-  ],
-  contractYears: [
-    { required: true, message: () => $t("label.years"), trigger: "blur" },
-  ],
-  maintenanceEnd: [
-    {
-      required: true,
-      message: () => $t("label.maintenanceEndDate"),
-      trigger: "change",
-    },
-  ],
-};
-
-const managerOptions = ref([]);
-
-const reportFileList = ref([]);
-
-// 超出 limit 时仅保留最后一个
-// 触发即代表用户上传了新文件替换原报告，清空 attachmentPath
-const handleReportExceed = (files) => {
-  reportFileList.value = files.slice(-1);
-  form.attachmentPath = "";
-};
-
-// 从带路径分隔符的地址中截取最后的文件名（兼容 / 与 \）
-const getAttachmentFileName = (path) => {
-  if (!path) return "";
-  return String(path).replace(/\\/g, "/").split("/").pop() || "";
-};
-
-const buildHospitalFormData = () => {
-  const fd = new FormData();
-  Object.entries(form).forEach(([key, value]) => {
-    if (value === undefined || value === null || value === "") return;
-    fd.append(key, value);
-  });
-  // 兼容 el-upload 在新增/编辑两种场景下 file-list 项的结构差异：
-  //   新增时：item 为 UploadFile 对象，包含 raw 指向 File
-  //   编辑时：item 本身即为 File 对象（el-upload 直接以原始 File 替换了回显项）
-  // 回显项无 raw 且 size 未定义，命中后自然不会走到 files 提交
-  const item = (reportFileList.value || [])[0];
-  if (item) {
-    const file = item.raw || (typeof item.size === "number" ? item : null);
-    if (file) fd.append("files", file);
-  }
-  return fd;
-};
-
-const loadManagers = async () => {
-  try {
-    const res = await getAdminAccounts({ type: "Admin" });
-    managerOptions.value = res?.list || [];
-  } catch (e) {
-    // request 层已统一提示错误
-  }
-};
-
-const loadDetail = async () => {
-  if (!isEdit.value) return;
-  loading.value = true;
-  try {
-    const data = await getAdminHospitalDetail(route.params.id);
-    Object.assign(form, data);
-    // 若详情接口返回了验收报告路径，截取文件名以"已上传"状态回显到 file-list，
-    // 位置与正常上传后一致；不下载，仅展示以便用户决定是否替换
-    const fileName = getAttachmentFileName(data?.attachmentPath);
-    if (fileName) {
-      reportFileList.value = [
-        {
-          uid: `attachment-${route.params.id}`,
-          name: fileName,
-          status: "success",
-        },
-      ];
-    }
-  } finally {
-    loading.value = false;
-  }
-};
-
-const submit = async () => {
-  await formRef.value.validate(async (valid) => {
-    if (!valid) return;
-    // 仅在"新增"或"编辑但原报告已被清空/移除"且 file-list 为空时，才提示需上传
-    const keepOriginal = isEdit.value && !!form.attachmentPath;
-    if (!reportFileList.value?.length && !keepOriginal) {
-      ElMessage.warning($t("label.acceptanceReport"));
-      return;
-    }
-    submitting.value = true;
-    try {
-      const fd = buildHospitalFormData();
-      if (isEdit.value) {
-        await updateAdminHospital(route.params.id, fd);
-        ElMessage.success($t("msg.hospitalEditSuccess"));
-      } else {
-        await createAdminHospital(fd);
-        ElMessage.success($t("msg.hospitalAddSuccess"));
-      }
-      router.replace("/admin/hospitals");
-    } finally {
-      submitting.value = false;
-    }
-  });
-};
-
-const goBack = () => router.back();
-
-onMounted(() => {
-  loadManagers();
-  loadDetail();
-});
-</script>
-
-<style scoped lang="scss">
-.page-header {
-  margin-bottom: 12px;
-  .page-title {
-    font-size: 16px;
-    font-weight: 600;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/admin/hospitals/list.vue b/src/views/admin/hospitals/list.vue
index a98d294..972a2f9 100644
--- a/src/views/admin/hospitals/list.vue
+++ b/src/views/admin/hospitals/list.vue
@@ -94,20 +94,32 @@
       @close="cleanupPreview"
       @download="onPreviewDownload"
     />
+
+    <HospitalDetailDialog
+      v-model:visible="detailVisible"
+      :hospital-id="detailId"
+      @edit="onGoEdit"
+    />
+
+    <HospitalEditDialog
+      v-model:visible="editVisible"
+      :hospital-id="editId"
+      @success="loadList"
+    />
   </div>
 </template>
 
 <script setup>
 import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import dayjs from "dayjs";
 import { useI18n } from "vue-i18n";
 import { getAdminHospitals, getUploadFile } from "@/service/modular/admin";
 import FilePreviewDialog from "@/components/FilePreviewDialog.vue";
+import HospitalDetailDialog from "./components/HospitalDetailDialog.vue";
+import HospitalEditDialog from "./components/HospitalEditDialog.vue";
 
 const { t: $t } = useI18n();
-const router = useRouter();
 const list = ref([]);
 const total = ref(0);
 const page = ref(1);
@@ -162,9 +174,29 @@ const onReset = () => {
   onSearch();
 };
 
-const goDetail = (id) => router.push(`/admin/hospitals/detail/${id}`);
-const goEdit = (id) => router.push(`/admin/hospitals/edit/${id}`);
-const goAdd = () => router.push("/admin/hospitals/edit");
+// 详情 / 新增 / 编辑均通过弹窗打开，不再走路由跳转
+const detailVisible = ref(false);
+const detailId = ref("");
+const editVisible = ref(false);
+const editId = ref("");
+
+const goDetail = (id) => {
+  detailId.value = id;
+  detailVisible.value = true;
+};
+const goEdit = (id) => {
+  editId.value = id;
+  editVisible.value = true;
+};
+const goAdd = () => {
+  editId.value = "";
+  editVisible.value = true;
+};
+// 从详情弹窗跳到编辑：先关详情，再开编辑
+const onGoEdit = (id) => {
+  detailVisible.value = false;
+  goEdit(id);
+};
 
 const previewVisible = ref(false);
 const previewUrl = ref("");
diff --git a/src/views/admin/orders/components/OrderDetailDialog.vue b/src/views/admin/orders/components/OrderDetailDialog.vue
index b6fd019..198b49d 100644
--- a/src/views/admin/orders/components/OrderDetailDialog.vue
+++ b/src/views/admin/orders/components/OrderDetailDialog.vue
@@ -84,16 +84,16 @@
             </div>
 
 
-            <!-- <div class="section">
-                    <div class="section-title">{{ $t('orderDetail.statusChange') }}</div>
-                    <el-timeline>
-                        <el-timeline-item v-for="(log, i) in detail.statusLogs || []" :key="i"
-                            :timestamp="log.createdAt" placement="top">
-                            <div class="log-title">{{ log.toStatus }} · {{ log.operator }}</div>
-                            <div class="log-remark" v-html="log.remark"></div>
-                        </el-timeline-item>
-                    </el-timeline>
-                </div> -->
+            <div class="section" v-if="detail.statusLogs?.length">
+                <div class="section-title">{{ $t('orderDetail.statusChange') }}</div>
+                <el-timeline>
+                    <el-timeline-item v-for="(log, i) in detail.statusLogs || []" :key="i" :timestamp="log.createdAt"
+                        placement="top">
+                        <div class="log-title">{{ log.toStatus }} · {{ log.operator }}</div>
+                        <div class="log-remark" v-html="log.remark"></div>
+                    </el-timeline-item>
+                </el-timeline>
+            </div>
 
         </div>
 
diff --git a/src/views/admin/orders/components/OrderFormDialog.vue b/src/views/admin/orders/components/OrderFormDialog.vue
index b7eef4d..54bf6e3 100644
--- a/src/views/admin/orders/components/OrderFormDialog.vue
+++ b/src/views/admin/orders/components/OrderFormDialog.vue
@@ -10,7 +10,7 @@
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" v-loading="formLoading">
         <el-row :gutter="20">
           <el-col :span="8">
-            <el-form-item :label="$t('label.hospitalName')" prop="hospitalId">
+            <el-form-item :label="'所属医院'" prop="hospitalId">
               <el-select v-model="form.hospitalId" :placeholder="$t('msg.pleaseSelectHospital')" filterable
                 style="width: 100%">
                 <el-option v-for="h in hospitals" :key="h.id" :label="h.name" :value="h.id" />
@@ -64,7 +64,7 @@
             <el-input v-model="form.title" :placeholder="$t('placeholder.title')" maxlength="300" class="title-input">
               <template #suffix>
                 <span class="title-counter"><span :style="{ color: form.colorTag || '#dcdfe6' }">{{ form.title.length
-                }}</span>/300</span>
+                    }}</span>/300</span>
 
                 <div class="color-tag-picker">
                   <el-popover v-model:visible="colorPickerVisible" :width="180" placement="bottom-end" trigger="click"
@@ -118,11 +118,21 @@
           </div>
         </el-form-item>
         <el-form-item class="fujian" :label="$t('label.attachment')">
-          <el-upload v-model:file-list="form.files" :auto-upload="false" :limit="1" :on-exceed="handleAttachmentExceed"
-            :on-remove="handleAttachmentRemove" :on-change="handleAttachmentChange">
-            <el-button type="primary" plain>{{ $t('btn.upload') }}</el-button>
-            <template #tip>
-              <div class="el-upload__tip">{{ $t('label.attachmentTip') }}</div>
+          <el-upload class="upload-wrap" v-model:file-list="form.files" :auto-upload="false" :limit="1"
+            :on-exceed="handleAttachmentExceed" :on-remove="handleAttachmentRemove" :on-change="handleAttachmentChange">
+            <div class="upload-btn">
+              <div class="left">+ 添加文件</div>
+              <div class="right">{{ $t('label.attachmentTip') }}</div>
+            </div>
+
+            <template #file="{ file }">
+              <div class="file-item">
+                <img class="file-icon" src="@/assets/image/admin/orders/file.svg" alt="">
+                <div class="file-name">&nbsp;&nbsp;{{ file.name }}</div>
+                <div class="file-size">&nbsp;&nbsp;{{ (file.size / 1024 / 1024).toFixed(2) }}MB</div>
+                <!-- <div class="file-rename">重命名</div> -->
+                <div class="file-delete" @click="handleAttachmentDelete(file)">删除</div>
+              </div>
             </template>
           </el-upload>
         </el-form-item>
@@ -132,7 +142,7 @@
       <el-button @click="closeDialog">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" :loading="submitting" @click="onSubmit">{{ isEdit ? $t('common.save') :
         $t('common.submit')
-        }}</el-button>
+      }}</el-button>
     </div>
   </el-dialog>
 </template>
@@ -230,6 +240,12 @@ const handleAttachmentExceed = () => {
 const handleAttachmentRemove = () => {
   // el-upload 会自动从 v-model:file-list 移除，无需额外处理
 };
+const handleAttachmentDelete = (file) => {
+  // 自定义"删除"按钮：按 uid 从 form.files 中移除
+  // - 新上传的文件(raw 存在)：仅前端移除，不会再被提交
+  // - 编辑模式下的占位附件(无 raw)：从列表移除后，onSubmit 中不会再追加任何文件，从而保留后端的原附件行为
+  form.files = (form.files || []).filter((f) => f.uid !== file?.uid);
+};
 
 const rules = {
   hospitalId: [
@@ -447,6 +463,7 @@ const fillFormFromOrder = (d) => {
           uid: `attachment-${d.id || ''}-0`,
           name: fileName,
           status: 'success',
+          size: first.fileSize || 0,
         },
       ];
     }
@@ -763,29 +780,93 @@ onBeforeUnmount(() => {
     height: 40px;
   }
 
+  .fujian {
+
+    .upload-wrap {
+      width: 100%;
+
+      .el-upload-list__item {
+        &:hover {
+          background: transparent;
+        }
+
+        .file-item {
+          display: flex;
+          align-items: center;
+          font-weight: 400;
+          font-size: 14px;
+
+          .file-icon {
+            width: 18px;
+            height: 18px;
+          }
+
+          .file-name,
+          .file-rename,
+          .file-delete {
+            color: #1D2129;
+
+            &:hover {
+              color: #1890ff;
+            }
+          }
+
+          .file-rename,
+          .file-delete {
+            margin-left: 14px;
+            cursor: pointer;
+
+          }
+
+          .file-size {
+            color: #BCBCBC;
+          }
+        }
+      }
+    }
+
+    .upload-btn {
+      display: flex;
+      align-items: center;
+
+      .left {
+        font-weight: 400;
+        font-size: 14px;
+        color: #2B324C;
+      }
+
+      .right {
+        font-weight: 400;
+        font-size: 14px;
+        color: #666666;
+      }
+    }
+
 
-  // 颜色标签 popover 内容（默认 teleport 到 body，需放非 scoped 样式块）
-  .color-tag-popper {
-    padding: 12px 14px !important;
-    border-radius: 10px !important;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12) !important;
-    min-width: 180px;
   }
+}
+
+// 颜色标签 popover 内容（默认 teleport 到 body，需放非 scoped 样式块）
+.color-tag-popper {
+  padding: 12px 14px !important;
+  border-radius: 10px !important;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12) !important;
+  min-width: 180px;
 
-  .color-tag-popper .color-tag-title {
+  .color-tag-title {
     font-size: 13px;
     font-weight: 600;
     color: #333;
     margin-bottom: 10px;
   }
 
-  .color-tag-popper .color-tag-options {
+  .color-tag-options {
     display: flex;
     gap: 8px;
     flex-wrap: wrap;
   }
 
-  .color-tag-popper .color-tag-option {
+  .color-tag-option {
     width: 24px;
     height: 24px;
     border-radius: 6px;
@@ -796,11 +877,11 @@ onBeforeUnmount(() => {
       border-color 0.2s ease;
   }
 
-  .color-tag-popper .color-tag-option:hover {
+  .color-tag-option:hover {
     transform: scale(1.12);
   }
 
-  .color-tag-popper .color-tag-option.active {
+  .color-tag-option.active {
     border-color: #1890ff;
     box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
   }
diff --git a/src/views/admin/orders/components/OrderHandleDialog.vue b/src/views/admin/orders/components/OrderHandleDialog.vue
index 1e4f760..19806a3 100644
--- a/src/views/admin/orders/components/OrderHandleDialog.vue
+++ b/src/views/admin/orders/components/OrderHandleDialog.vue
@@ -86,7 +86,7 @@
                                 <span>复制工单</span>
                             </div>
                             <div class="line"></div>
-                            <el-popconfirm
+                            <el-popconfirm width="auto"
                                 title="确定删除该工单吗？"
                                 confirm-button-text="确定"
                                 cancel-button-text="取消"
@@ -161,6 +161,7 @@ import iconEdit from "@/assets/image/admin/orders/edit.svg";
 import iconCopy from "@/assets/image/admin/orders/copy.svg";
 import iconDelete from "@/assets/image/admin/orders/delete.svg";
 import iconFile from "@/assets/image/admin/orders/file.svg";
+import dayjs from "dayjs";
 
 const { t: $t } = useI18n();
 
@@ -214,7 +215,10 @@ const closeDialog = () => emit("update:modelValue", false);
 
 // 复制工单回填数据：剔除附件字段，避免上传框中显示原工单的附件占位项
 const copyOrderData = computed(() => {
+    console.log(detail.value);
+    
     const { attachments: _attachments, ...rest } = detail.value || {};
+    rest.createdAt = dayjs().format("YYYY-MM-DD HH:mm:ss");
     return rest;
 });
 
diff --git a/src/views/admin/orders/components/OrderProcessDialog.vue b/src/views/admin/orders/components/OrderProcessDialog.vue
index 312e1ee..7aa0e6a 100644
--- a/src/views/admin/orders/components/OrderProcessDialog.vue
+++ b/src/views/admin/orders/components/OrderProcessDialog.vue
@@ -17,24 +17,27 @@
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item :label="$t('table.dept')" prop="department">
-              <el-input v-model="form.department" :placeholder="'请输入科室'" />
+              <el-input v-model="form.department" :placeholder="'请输入科室'" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('table.submitter')" prop="submitter">
-              <el-input v-model="form.submitter" :placeholder="'请输入提交人'" />
+              <el-input v-model="form.submitter" :placeholder="'请输入提交人'" readonly />
             </el-form-item>
           </el-col>
         </el-row>
 
         <!-- 问题描述（可编辑富文本，默认回显原值） -->
         <el-form-item :label="$t('label.description')" prop="description">
-          <div class="rich-editor">
+          <!-- <div class="rich-editor">
             <Toolbar :editor="descEditorRef" :default-config="toolbarConfig" mode="default"
               style="border-bottom: 1px solid #dcdfe6" />
             <Editor v-model="form.description" :default-config="descEditorConfig" mode="default"
               style="height: 200px; overflow-y: auto" @on-created="handleDescEditorCreated"
               @custom-paste="handleEditorPasteImage" />
+          </div> -->
+          <div class="html-wrap" style="max-height: 300px; overflow: auto;">
+            <div class="html-content" v-html="detail.description || '—'"></div>
           </div>
         </el-form-item>
 
@@ -49,26 +52,30 @@
           </div>
         </el-form-item>
 
-        <!-- 新状态（只允许"已完成"） -->
-        <el-form-item :label="$t('table.status')" prop="status">
-          <el-select v-model="form.status" style="width: 240px">
-            <el-option :label="$t('status.completed')" value="已完成" />
-          </el-select>
-        </el-form-item>
-
-        <!-- 处理人（取当前登录用户名） -->
-        <el-form-item :label="$t('table.handler')">
-          <el-input :model-value="handlerName" readonly style="width: 240px" />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" :loading="submitting" @click="submit">{{
-            $t("btn.confirm")
-            }}</el-button>
-          <el-button @click="closeDialog">{{ $t("common.cancel") }}</el-button>
-        </el-form-item>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <!-- 新状态（只允许"已完成"） -->
+            <el-form-item :label="'新状态'" prop="status">
+              <el-select v-model="form.status">
+                <el-option :label="$t('status.completed')" value="已完成" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!-- 处理人（取当前登录用户名） -->
+            <el-form-item :label="$t('table.handler')">
+              <el-input :model-value="handlerName" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
+    <div class="body-footer">
+      <el-button @click="closeDialog">{{ $t("common.cancel") }}</el-button>
+      <el-button type="primary" :loading="submitting" @click="submit">{{
+        $t("btn.confirm")
+        }}</el-button>
+    </div>
   </el-dialog>
 </template>
 
@@ -335,6 +342,11 @@ onBeforeUnmount(() => {
 .admin-order-process-dialog {
   max-width: 90vw;
   min-width: 70vw;
+  --el-component-size: 40px;
+
+  .el-select__wrapper {
+    height: 40px;
+  }
 
   .body-header {
     margin-bottom: 16px;
@@ -349,6 +361,23 @@ onBeforeUnmount(() => {
     background: #fff;
   }
 
+  .html-wrap {
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+    width: 100%;
+    overflow: hidden;
+    background: #fff;
+    padding: 1px 11px;
+
+    .html-content {
+      min-height: 40px;
+
+      img {
+        max-width: 100%;
+      }
+    }
+  }
+
   .rich-editor :deep(.w-e-toolbar) {
     background: #fafafa;
   }
diff --git a/src/views/admin/orders/list.vue b/src/views/admin/orders/list.vue
index fe866b9..580f5c5 100644
--- a/src/views/admin/orders/list.vue
+++ b/src/views/admin/orders/list.vue
@@ -41,7 +41,7 @@
       </div>
     </div>
 
-    <el-form :inline="true" :model="filters" class="filter-form">
+    <el-form :inline="true" :model="filters" class="filter-form" :style="formStyle">
       <el-form-item :label="''">
         <el-input v-model="filters.keyword" :placeholder="'搜索问题名称/工单号'" clearable style="width: 200px" />
       </el-form-item>
@@ -74,11 +74,11 @@
       <el-form-item :label="'提交日期：'">
         <el-date-picker v-model="dateRange" type="daterange" range-separator="-"
           :start-placeholder="$t('common.startDate')" :end-placeholder="$t('common.endDate')" value-format="YYYY-MM-DD"
-          style="width: 240px" />
+          :shortcuts="dateRangeShortcuts" style="width: 240px" />
       </el-form-item>
       <el-form-item :label="'处理时间：'">
-        <el-date-picker v-model="processDateRange" type="datetimerange" range-separator="-" :start-placeholder="'开始时间'"
-          :end-placeholder="'结束时间'" value-format="YYYY-MM-DD HH:mm:ss" style="width: 400px" />
+        <el-date-picker v-model="processDateRange" type="daterange" range-separator="-" :start-placeholder="'开始时间'"
+          :end-placeholder="'结束时间'" value-format="YYYY-MM-DD" :shortcuts="dateRangeShortcuts" style="width: 240px" />
       </el-form-item>
       <el-button type="primary" plain @click="onSearch">{{
         $t("btn.query")
@@ -108,8 +108,8 @@
       </el-table-column>
       <el-table-column :label="$t('table.title')" min-width="300" show-overflow-tooltip>
         <template #default="{ row }">
-          <el-button type="primary" link style="text-decoration: underline;" @click="goHandle(row.id)">{{ row.title
-            }}</el-button>
+          <span class="title-link" style="text-decoration: underline;" @click="goHandle(row.id)">{{ row.title
+            }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('table.type')" prop="serviceType" width="120" />
@@ -167,7 +167,8 @@
 
 <script setup>
 import dayjs from "dayjs";
-import { onMounted, reactive, ref } from "vue";
+import { computed, onBeforeUnmount, onMounted, reactive, ref } from "vue";
+import { dateRangeShortcuts } from "@/utils/dateShortcuts";
 import { ElMessage } from "element-plus";
 import { useI18n } from "vue-i18n";
 import {
@@ -347,9 +348,26 @@ const onQuickSubmit = async ({ formData }) => {
   }
 };
 
+// 视口宽度，用于动态计算 filter-form 的缩放比例（基准 1920）
+const viewportWidth = ref(typeof window !== "undefined" ? (window.innerWidth - 120 ) : 1800);
+const onResize = () => {
+  viewportWidth.value = window.innerWidth - 120;
+};
 onMounted(() => {
   loadHospitals();
   loadList();
+  window.addEventListener("resize", onResize);
+});
+onBeforeUnmount(() => {
+  window.removeEventListener("resize", onResize);
+});
+
+const formStyle = computed(() => {
+  const scale = (viewportWidth.value / 1800).toFixed(4);
+  return {
+    transform: `scale(${scale})`,
+    transformOrigin: "center left",
+  };
 });
 </script>
 
@@ -360,13 +378,27 @@ onMounted(() => {
   border: 1px solid #e0e0e0;
   padding: 24px;
 
+  & .title-link {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    user-select: text;
+    -webkit-user-select: text;
+
+    &:hover {
+      color: var(--el-color-primary-light-3);
+    }
+  }
+
   :deep(.el-button.is-plain) {
     background-color: transparent;
-    // el-button 的 hover 样式是通过 :hover 读取 hover-* 变量实现的
-    // 这里把 plain 按钮 hover 时的变量重置为默认（未 hover）状态的值，hover 不再有视觉变化
+    // el-button 的 hover / active 样式是通过对应变量实现的
+    // 这里把 plain 按钮 hover 与 active 时的变量都重置为默认状态的值，避免 hover/active 产生视觉变化
     --el-button-hover-bg-color: var(--el-button-bg-color);
     --el-button-hover-text-color: var(--el-button-text-color);
     --el-button-hover-border-color: var(--el-button-border-color);
+    --el-button-active-bg-color: var(--el-button-bg-color);
+    --el-button-active-text-color: var(--el-button-text-color);
+    --el-button-active-border-color: var(--el-button-border-color);
   }
 
   :deep(.handle.el-button--success.is-plain) {
@@ -384,8 +416,9 @@ onMounted(() => {
   margin-bottom: 12px;
   display: flex;
   flex-wrap: wrap;
-  gap: 24px;
+  gap: 12px;
   align-items: center;
+  width: 1800px;
 
   :deep(.el-form-item),
   :deep(.el-button) {
diff --git a/src/views/admin/orders/report.vue b/src/views/admin/orders/report.vue
index 29ce627..4049f84 100644
--- a/src/views/admin/orders/report.vue
+++ b/src/views/admin/orders/report.vue
@@ -20,6 +20,7 @@
             :start-placeholder="$t('common.startDate')"
             :end-placeholder="$t('common.endDate')"
             value-format="YYYY-MM-DD"
+            :shortcuts="dateRangeShortcuts"
             style="width:240px"
           />
         </el-form-item>
@@ -69,6 +70,7 @@
 
 <script setup>
 import { onMounted, reactive, ref } from "vue";
+import { dateRangeShortcuts } from "@/utils/dateShortcuts";
 import { ElMessage } from "element-plus";
 import { useI18n } from "vue-i18n";
 
diff --git a/src/views/hospital/orders/list.vue b/src/views/hospital/orders/list.vue
index 2ed5106..0d80302 100644
--- a/src/views/hospital/orders/list.vue
+++ b/src/views/hospital/orders/list.vue
@@ -55,6 +55,7 @@
             :start-placeholder="$t('common.startDate')"
             :end-placeholder="$t('common.endDate')"
             value-format="YYYY-MM-DD"
+            :shortcuts="dateRangeShortcuts"
             style="width: 240px"
           />
         </el-form-item>
@@ -216,6 +217,7 @@
 <script setup>
 import dayjs from "dayjs";
 import { onMounted, onBeforeUnmount, reactive, ref } from "vue";
+import { dateRangeShortcuts } from "@/utils/dateShortcuts";
 import { onBeforeRouteLeave, useRoute, useRouter } from "vue-router";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useI18n } from "vue-i18n";
diff --git a/src/views/hospital/workbench.vue b/src/views/hospital/workbench.vue
index 9643758..6138059 100644
--- a/src/views/hospital/workbench.vue
+++ b/src/views/hospital/workbench.vue
@@ -16,6 +16,7 @@
         :start-placeholder="$t('common.startDate')"
         :end-placeholder="$t('common.endDate')"
         value-format="YYYY-MM-DD"
+        :shortcuts="dateRangeShortcuts"
         size="small"
         style="margin-left: 12px"
         @change="loadStats"
@@ -68,6 +69,7 @@
 <script setup>
 import dayjs from "dayjs";
 import { computed, onMounted, ref } from "vue";
+import { dateRangeShortcuts } from "@/utils/dateShortcuts";
 import { useRouter } from "vue-router";
 import { Tickets, Check, Bell, Warning } from "@element-plus/icons-vue";
 import VChart from "vue-echarts";