{{ fileName || $t('btn.preview') }}
-
+
{{ Math.round(pageScale * 100) }}%
-
+
-
+
{{ currentPage }} / {{ totalPages }}
-
+
-
+
{{ $t('btn.download') || '下载' }}
+ 
-
-
-
- ![]()
-
-
+
![]()
-
-
-
{{ item.title }}
@@ -101,7 +97,7 @@
import { computed, ref } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessageBox } from "element-plus";
-import { ArrowDown, DataLine, Document, Coin } from "@element-plus/icons-vue";
+import { ArrowDown } from "@element-plus/icons-vue";
import SvgIcon from "@/components/SvgIcon/index.vue";
import { useUserStore } from "@/stores/api/user";
import { useThemeStore } from "@/stores/theme";
@@ -110,18 +106,26 @@ import OrderFormDialog from "@/views/hospital/orders/OrderFormDialog.vue";
import PasswordDialog from "@/components/PasswordDialog.vue";
// 顶部菜单图标（直接以静态资源方式 import，绕开 SvgIcon 的 fill 干扰）
-import fuwuGd from "@/assets/image/admin/router/fuwu-gd.svg";
-import fuwuGdActive from "@/assets/image/admin/router/fuwu-gd-active.svg";
-import fuwuBg from "@/assets/image/admin/router/fuwu-bg.svg";
-import fuwuBgActive from "@/assets/image/admin/router/fuwu-bg-active.svg";
-import yiyuanXx from "@/assets/image/admin/router/yiyuan-xx.svg";
-import yiyuanXxActive from "@/assets/image/admin/router/yiyuan-xx-active.svg";
-import kehuFw from "@/assets/image/admin/router/kehu-fw.svg";
-import kehuFwActive from "@/assets/image/admin/router/kehu-fw-active.svg";
-import kehuJljf from "@/assets/image/admin/router/kehu-jljf.svg";
-import kehuJljfActive from "@/assets/image/admin/router/kehu-jljf-active.svg";
-import zhanghaoGl from "@/assets/image/admin/router/zhanghao-gl.svg";
-import zhanghaoGlActive from "@/assets/image/admin/router/zhanghao-gl-active.svg";
+// 管理端
+import fuwuGd from "@/assets/image/router/fuwu-gd.svg";
+import fuwuGdActive from "@/assets/image/router/fuwu-gd-active.svg";
+import fuwuBg from "@/assets/image/router/fuwu-bg.svg";
+import fuwuBgActive from "@/assets/image/router/fuwu-bg-active.svg";
+import yiyuanXx from "@/assets/image/router/yiyuan-xx.svg";
+import yiyuanXxActive from "@/assets/image/router/yiyuan-xx-active.svg";
+import kehuFw from "@/assets/image/router/kehu-fw.svg";
+import kehuFwActive from "@/assets/image/router/kehu-fw-active.svg";
+import kehuJljf from "@/assets/image/router/kehu-jljf.svg";
+import kehuJljfActive from "@/assets/image/router/kehu-jljf-active.svg";
+import zhanghaoGl from "@/assets/image/router/zhanghao-gl.svg";
+import zhanghaoGlActive from "@/assets/image/router/zhanghao-gl-active.svg";
+// 医院端
+import yyGzt from "@/assets/image/router/yy-gzt.svg";
+import yyGztActive from "@/assets/image/router/yy-gzt-active.svg";
+import yyGd from "@/assets/image/router/yy-gd.svg";
+import yyGdActive from "@/assets/image/router/yy-gd-active.svg";
+import yyJf from "@/assets/image/router/yy-jf.svg";
+import yyJfActive from "@/assets/image/router/yy-jf-active.svg";
// 头像(按性别)
import avatarMale from "@/assets/image/avatar-male.svg";
@@ -184,6 +188,7 @@ const handlePresetTheme = (value) => {
};
// 图标查找表：route meta.icon -> { normal, active }
+// 管理端 SVG
const ICON_MAP = {
"admin-router-fuwu-gd": { normal: fuwuGd, active: fuwuGdActive },
"admin-router-fuwu-bg": { normal: fuwuBg, active: fuwuBgActive },
@@ -193,13 +198,12 @@ const ICON_MAP = {
"admin-router-zhanghao-gl": { normal: zhanghaoGl, active: zhanghaoGlActive },
};
-// 医院端 Element Plus 图标映射：route meta.icon -> icon component
-const HOSPITAL_ICON_MAP = {
- DataLine,
- Document,
- Coin,
+// 医院端 SVG
+const HOSPITAL_SVG_ICON_MAP = {
+ "hospital-router-yy-gzt": { normal: yyGzt, active: yyGztActive },
+ "hospital-router-yy-gd": { normal: yyGd, active: yyGdActive },
+ "hospital-router-yy-jf": { normal: yyJf, active: yyJfActive },
};
-const resolveIcon = (name) => HOSPITAL_ICON_MAP[name] || Document;
// 当前 hover 的菜单项 path
const hoveredPath = ref("");
@@ -223,16 +227,9 @@ const sideRoutes = computed(() => {
return groupRoute.children
.filter((c) => c.meta?.title && !c.meta?.hidden && !c.path.includes(":"))
.map((c) => {
- if (isHospitalMode.value) {
- // 医院端：使用 Element Plus 图标
- return {
- path: `${groupPath}/${c.path}`,
- title: c.meta.title,
- iconName: c.meta?.icon || "Document",
- };
- }
- // 管理端：使用 SVG 图标
- const icon = ICON_MAP[c.meta?.icon];
+ // 管理端 / 医院端都按 SVG（normal + active）查表
+ const iconMap = isHospitalMode.value ? HOSPITAL_SVG_ICON_MAP : ICON_MAP;
+ const icon = iconMap[c.meta?.icon];
return {
path: `${groupPath}/${c.path}`,
title: c.meta.title,
@@ -249,7 +246,7 @@ const currentTitle = computed(() => {
// 头像：sex === 1 用男,否则用女
const avatarSrc = computed(() => {
- return userStore.userInfo?.sex === 2 ? avatarFemale : avatarMale;
+ return userStore.userInfo?.gender === '女' ? avatarFemale : avatarMale;
});
const handleCommand = async (cmd) => {
diff --git a/src/router/route.js b/src/router/route.js
index ea00f25..13c818e 100644
--- a/src/router/route.js
+++ b/src/router/route.js
@@ -22,13 +22,13 @@ export const constantRoutes = [
path: "workbench",
name: "HospitalWorkbench",
component: () => import("@/views/hospital/workbench.vue"),
- meta: { title: "我的工作台", icon: "DataLine" },
+ meta: { title: "我的工作台", icon: "hospital-router-yy-gzt" },
},
{
path: "orders",
name: "HospitalOrders",
component: () => import("@/views/hospital/orders/list.vue"),
- meta: { title: "我的工单", icon: "Document" },
+ meta: { title: "我的工单", icon: "hospital-router-yy-gd" },
},
{
path: "orders/detail/:id",
@@ -40,7 +40,7 @@ export const constantRoutes = [
path: "points",
name: "HospitalPoints",
component: () => import("@/views/hospital/points.vue"),
- meta: { title: "我的积分", icon: "Coin" },
+ meta: { title: "我的积分", icon: "hospital-router-yy-jf" },
},
// {
// path: "password",
@@ -65,25 +65,13 @@ export const constantRoutes = [
component: () => import("@/views/admin/orders/list.vue"),
meta: { title: "服务工单", icon: "admin-router-fuwu-gd" },
},
- // 服务报告（必须在 orders/detail/:id 之前声明，避免被动态路由抢占）
+ // 服务报告
{
path: "orders/report",
name: "AdminOrderReport",
component: () => import("@/views/admin/orders/report.vue"),
meta: { title: "服务报告", icon: "admin-router-fuwu-bg" },
},
- {
- path: "orders/detail/:id",
- name: "AdminOrderDetail",
- component: () => import("@/views/admin/orders/detail.vue"),
- meta: { title: "工单详情", hidden: true },
- },
- {
- path: "orders/process/:id",
- name: "AdminOrderProcess",
- component: () => import("@/views/admin/orders/process.vue"),
- meta: { title: "处理工单", hidden: true },
- },
// 医院信息
{
path: "hospitals",
diff --git a/src/service/modular/admin/index.js b/src/service/modular/admin/index.js
index af29b4b..d29d9c9 100644
--- a/src/service/modular/admin/index.js
+++ b/src/service/modular/admin/index.js
@@ -21,6 +21,10 @@ export const processAdminOrder = (id, data) => {
export const updateAdminOrder = (id, formData) => {
return kcRequest.uploadFile(`/admin/orders/${id}`, formData, true, "PUT");
};
+// 删除工单（软删除）
+export const deleteAdminOrder = (id) => {
+ return kcRequest.request(`/admin/orders/${id}`, "delete");
+};
// ============== 医院信息 ==============
export const getAdminHospitals = (params) => {
diff --git a/src/views/admin/orders/components/OrderDetailDialog.vue b/src/views/admin/orders/components/OrderDetailDialog.vue
new file mode 100644
index 0000000..b6fd019
--- /dev/null
+++ b/src/views/admin/orders/components/OrderDetailDialog.vue
@@ -0,0 +1,422 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/admin/orders/components/OrderFormDialog.vue b/src/views/admin/orders/components/OrderFormDialog.vue
index 5c74d49..b7eef4d 100644
--- a/src/views/admin/orders/components/OrderFormDialog.vue
+++ b/src/views/admin/orders/components/OrderFormDialog.vue
@@ -8,49 +8,28 @@
- {{ $t('msg.noPreview') || '暂不支持预览该类型' }}
+
+
@@ -140,6 +139,7 @@ watch(
gap: 12px;
width: 100%;
padding-right: 8px;
+ margin-bottom: 12px;
}
.file-preview-title {
@@ -201,3 +201,15 @@ watch(
padding: 60px 0;
}
+
\ No newline at end of file
diff --git a/src/components/layout/AdminLayout.vue b/src/components/layout/AdminLayout.vue
index 3faffac..b6cc4f8 100644
--- a/src/components/layout/AdminLayout.vue
+++ b/src/components/layout/AdminLayout.vue
@@ -13,15 +13,11 @@
+ ![]()
+
+ {{ $t('msg.noPreview') || '暂不支持预览该类型' }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('modal.detail') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工单号
+ {{ detail.orderNo }}
+
+
+ 当前状态
+ {{ detail.status }}
+
+
+ 优先级
+ {{ detail.priority }}
+
+
+ 服务类型
+ {{ detail.serviceType }}
+
+
+
+
+
+ 问题名称
+ {{ detail.title }}
+
+
+
+
+
+ 问题描述
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+ {{ f.fileName }}
+
+
+
+
+
+
+ 提出医院
+ {{ detail.hospitalName || '-' }}
+
+
+ 提出科室
+ {{ detail.department || '-' }}
+
+
+ 提出人员
+ {{ detail.submitter || '-' }}
+
+
+ 提交时间
+ {{ detail.createdAt?.split('T').join(' ') || '-' }}
+
-
-
-
-
-
-
- {{ $t('label.colorTag') }}
-
-
-
-
- 高
- 中
- 低
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
{
- colorPickerVisible.value = !colorPickerVisible.value;
-};
const selectColor = (val) => {
form.colorTag = val;
colorPickerVisible.value = false;
};
-const onDocClick = (e) => {
- if (!colorPickerVisible.value) return;
- const el = colorPickerRef.value;
- if (el && !el.contains(e.target)) {
- colorPickerVisible.value = false;
- }
-};
const formRef = ref();
// 弹窗打开到表单填充完毕这段时间的 loading（避免富文本在未挂载时被赋值）
@@ -430,7 +461,8 @@ watch(
formLoading.value = true;
nextTick(() => {
resetForm();
- if (isEdit.value) {
+ // 有回显数据时(编辑模式 / 复制工单)优先按 orderData 填充
+ if (isEdit.value || props.orderData) {
fillFormFromOrder(props.orderData || {});
} else {
// 快速提交默认填入当前时间作为提交时间
@@ -469,10 +501,6 @@ const onSubmit = async () => {
});
};
-onMounted(() => {
- document.addEventListener('click', onDocClick);
-});
-
const removePasteListener = () => {
const editor = editorRef.value;
if (!editor || !pasteHandlerRef) return;
@@ -483,7 +511,6 @@ const removePasteListener = () => {
};
onBeforeUnmount(() => {
- document.removeEventListener('click', onDocClick);
removePasteListener();
pasteHandlerRef = null;
const editor = editorRef.value;
@@ -492,7 +519,9 @@ onBeforeUnmount(() => {
});
-
diff --git a/src/views/admin/orders/components/OrderHandleDialog.vue b/src/views/admin/orders/components/OrderHandleDialog.vue
new file mode 100644
index 0000000..1e4f760
--- /dev/null
+++ b/src/views/admin/orders/components/OrderHandleDialog.vue
@@ -0,0 +1,566 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/orders/process.vue b/src/views/admin/orders/components/OrderProcessDialog.vue
similarity index 56%
rename from src/views/admin/orders/process.vue
rename to src/views/admin/orders/components/OrderProcessDialog.vue
index 2893ebd..312e1ee 100644
--- a/src/views/admin/orders/process.vue
+++ b/src/views/admin/orders/components/OrderProcessDialog.vue
@@ -1,55 +1,51 @@
-
+
{{
$t("btn.query")
}}
@@ -102,7 +106,12 @@
-
+
+ {{ row.title
+ }}
+
+
-
+
+
+ {{ form.title.length
+ }}/300
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ {{ $t('label.colorTag') }}
+
+
+
+
+
+
+
+ {{ opt.label }}
+
+
+
+
{{ $t('label.priority') }}
+
+ {{ value }}
+
+
+ {{ value }}
+
+
+ {{ value }}
+
+
+
+
+ 
+ 返回
+
+
+
+ 返回
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 优先级
+
+
+
+
+ {{ detail.priority }}
+
+
+ {{ detail.priority }}
+
+
+ {{ detail.priority }}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{
+ detail.status === "已完成" ? "修改" : "处理"
+ }}
+
+
+
+ ![]()
+ 编辑工单
+
+
+
+ ![]()
+ 复制工单
+
+
+
+ ![]()
+ 删除工单
+
+
+
+
+
+
+
+
+
+ ![]()
+ {{ f.fileName }}
+
+
-
-
- {{ $t("btn.process") }}
-
-
-
-
-
- {{ $t("btn.process") }}
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/src/views/admin/orders/detail.vue b/src/views/admin/orders/detail.vue
deleted file mode 100644
index 02dbefa..0000000
--- a/src/views/admin/orders/detail.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -68,12 +64,12 @@
{{
$t("btn.confirm")
- }}
- {{ $t("common.cancel") }}
+ }}
+ {{ $t("common.cancel") }}
-
-
+
+
+
+
+ 处理工单
+
+
+
-
-
-
- {{ $t('modal.detail') }}
-
-
-
-
-
-
- {{ detail.orderNo }}
- {{ detail.hospitalName }}
- {{ detail.serviceType }}
- {{ detail.submitter }}
- {{ detail.department }}
- {{ detail.createdAt?.split('T').join(' ') }}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/orders/list.vue b/src/views/admin/orders/list.vue
index f3eb8f1..fe866b9 100644
--- a/src/views/admin/orders/list.vue
+++ b/src/views/admin/orders/list.vue
@@ -76,6 +76,10 @@
:start-placeholder="$t('common.startDate')" :end-placeholder="$t('common.endDate')" value-format="YYYY-MM-DD"
style="width: 240px" />
+
- {{ detail.title }}
- {{ detail.priority }}
- {{ detail.status }}
-
- {{ $t('btn.edit') }}
-
-
-
-
-
-
-
- {{ $t('label.description') }}
-
-
-
-
- {{ $t('label.attachment') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('orderDetail.statusChange') }}
- {{ log.toStatus }} · {{ log.operator }}
-
- - 连续签到{{ streakDays }}天 排名{{ rank }}名 + 连续签到{{ streakDays }}天 + 排名第{{ rank }}名 + 暂无排名 每日签到 领积分 @@ -14,7 +16,9 @@
- 当前积分: {{ totalPoints }}分 您已击败全国{{ beatPercent }}%的医院
+ 当前积分: {{ totalPoints }}分
+ 您已击败全国{{ beatPercent }}%的医院
+ 暂未上榜
坚持签到，积分兑好礼
@@ -32,7 +36,7 @@
}">
- 第{{ idx + 1 }}天
+ 第{{ day.dayIdx }}天
今天