refactor(front): 后台化收口——删用户面三页,流程图/进度走后端中转接口,清 flowHost 残留
build / build (push) Successful in 2m28s

This commit is contained in:
chenxing
2026-09-17 01:05:51 +08:00
parent 6d972fe0cc
commit 166e55230f
12 changed files with 272 additions and 509 deletions
-2
View File
@@ -9,5 +9,3 @@ VITE_SERVICE_HOST=
VITE_ZIYUANKU_HOST=https://base.bestsch.com/BschZyk
VITE_ZHUANXIANG_HOST=https://base.bestsch.com/BschZncpd
VITE_IS_MOCK=false
# 流程中心基址(撤回/前往流程中心直调;flow-center CORS 已收 8087)
VITE_FLOW_HOST=http://localhost:8085
+22 -10
View File
@@ -1,6 +1,11 @@
# 办事大厅前端(svc-hall-front)
# 办事大厅后台管理端前端(svc-hall-front)
云海平台子应用:办事大厅(事项库 + 自定义表单 + 办件记录)。Vue 3 + Vite + view-ui-plus + alova。
云海平台子应用「办事大厅」的**管理端**:事项库 + 服务字典 + 自定义表单(设计器)+ 办件记录。
Vue 3 + Vite + view-ui-plus + alova。
> **用户面已迁出本前端**(2026-09-16,BP-R4-3):在线办理 / 我的办件 / 办件详情在学生与教师
> 办理入口的独立前端 **`svc-hall/app/public`(部署于 `/svc-hall/public/`)**,本前端只保留后台管理。
> 两个前端互不引用;管理端的办件详情是「办件记录」里的只读抽屉,不做提交人动作(撤回/重提)。
> 说明:本文件此前误为本仓 Notice(通知公告)前端的副本(描述 `/notice/*` 路由、
> `src/assets/mock/noticeapi.ts`、`NoticeUpload.vue` 等本仓不存在的文件),2026-09-16
@@ -16,7 +21,8 @@ npm run dev # http://localhost:8087
`dev` 模式下 `serviceHost` 留空,接口走同源相对路径 `/api/...`,由 vite proxy 转发到本地后端
`http://localhost:8086`(后端 CAS 过滤器对 `/api/*` 不回 CORS 头,浏览器直连会被拦,必须同源代理)。
本地完整链路还需:UserBase(base/sso 鉴权)、流程中心 `http://localhost:8085`(撤回、查看进度)。
本地完整链路还需:UserBase(base/sso 鉴权)、流程中心后端 `http://localhost:8085`
(流程选择器与流程图;本前端**不直连** flow-center,一律经 svc-hall 后端中转)。
另有 `npm run dev:mock`(`.env.mock`)用于后端不可达时的纯前端联调。
## 脚本
@@ -43,17 +49,19 @@ npm run dev # http://localhost:8087
| `/svc/dict` | 服务字典 | 24 |
| `/svc/form` | 表单管理 | 25 |
| `/svc/form/designer` | 表单设计器(拖拽三栏,`?id=` 回填) | 25(parentId 25) |
| `/svc/apply` | 办件记录(管理面) | 26 |
| `/my` | 我的办件(用户面) | 27 |
| `/apply` | 在线办理(用户面,query 传 `siteCode`/`itemCode`) | 不挂菜单 |
| `/apply-detail` | 办件详情(用户面,query 传 `id`) | 不挂菜单 |
| `/svc/apply` | 办件记录(管理面,含只读详情抽屉 + 流程图) | 26 |
| `/` | → `/svc/item` | — |
| 其他 | → `/svc/item`(旧用户面深链兜底,避免白屏) | — |
`modId` 是菜单 ↔ 路由的稳定契约(UserBase `app_module` 按本应用 appKey 配置);`/` 与未匹配路径都回落
`/my`(详情页走 query 传参,拼成路径参数会 no-match)。
`modId` 是菜单 ↔ 路由的稳定契约(UserBase `app_module` 按本应用 appKey 配置)。用户面路由
(原 `/my`、`/apply`、`/apply-detail`,modId 27)已随用户面迁出,`app_module` 里的对应菜单应删除
或改指 `/svc-hall/public/`。
## 目录要点
- `src/api/module/svc.ts`:接口封装(alova;`siteApi`/`svcItemApi`/`svcDictApi`/`svcFormApi`/`svcFlowApi`/`applyApi`/`fileApi`)
- `src/api/module/svc.ts`:接口封装(alova;`siteApi`/`svcItemApi`/`svcDictApi`/`svcFormApi`/`svcFlowApi`/`applyApi`/`fileApi`)。
**纪律:本文件不得出现 flow-center 地址**——流程能力(列表 `/api/svc/flow/list`、流程图
`/api/svc/flow/diagram.png`)一律经 svc-hall 后端中转(后端用 SDK `YschFlowOpenApi` 出站)
- `src/utils/site.ts`:当前站点上下文(`localStorage.svchall.site` 持久化,管理页共用)
- `src/components/DynamicForm.vue`:表单 schema 渲染器(`{groups:[{title,fields:[…]}]}`,一期 11 类控件;
多选类值为 `string[]`,附件/图片为上传返回体数组 `[{id,fileName,fileUrl,fileSize,mimeType}]`)
@@ -62,6 +70,10 @@ npm run dev # http://localhost:8087
## 契约纪律(改表单相关代码前必读)
- 前端**不得**直接调用流程中心(无 `flowHost`):撤回/进度/流程图走 svc-hall 后端
`/api/apply/{id}/withdraw|progress|diagram.png`,事项的流程图为 `/api/svc/flow/diagram.png`。
原因是浏览器直调外部应用需要跨应用 CAS 票据与 CORS,且授权点会落到前端(BP-R4-2)。
- schema 由后端 `FormValidator` 强校验:属性白名单 16 项(无 `precision`)、`key` 限
`^[A-Za-z0-9_]{1,64}$` 且表单内唯一、`select/radio/checkbox/multiselect` 必须有非空 `options`、
`maxSize` 单位 **MB**、`maxFiles` 缺省或 0=不限。设计器序列化只输出白名单键(剔除内部 `_uid` 与空串)。
+21 -22
View File
@@ -1,8 +1,8 @@
import { Method } from "alova";
import { alovaInstance } from "@/utils/alova/alova-iview";
import type {
ApplySubmitRequest,
ApplyVo,
FlowProgressVo,
FlowSummary,
PageResult,
SiteOption,
@@ -18,12 +18,14 @@ import type {
} from "@/types/svc";
/**
* 办事大厅接口封装(V2.0 Part B 契约)。
* siteCode 为一切管理面/用户面定位键;conf.serviceHost 本地为空(走 vite 代理)。
* 办事大厅后台管理端接口封装(V2.0 Part B 契约;用户面接口在独立前端 svc-hall-public)。
* siteCode 为一切管理面定位键;conf.serviceHost 本地为空(走 vite 代理)。
* 纪律:本文件不得出现 flow-center 地址——流程能力(列表/流程图)一律经本应用后端中转。
*/
const SVC = "/api/svc";
const APPLY = "/api/apply";
const FILE = "/api/file";
/** GET 请求 */
@@ -137,32 +139,29 @@ class SvcFlowApi {
list(siteCode: string) {
return get<FlowSummary[]>(`${SVC}/flow/list`, { siteCode });
}
/** 流程图地址(同源 <img src>/window.open;后端换免签 token 取图,前端不碰 flow-center 地址) */
diagramUrl(siteCode: string, flowGuid: string, mode = "dept") {
return `${SVC}/flow/diagram.png?siteCode=${encodeURIComponent(siteCode)}`
+ `&flowGuid=${encodeURIComponent(flowGuid)}&mode=${encodeURIComponent(mode)}`;
}
}
class ApplyApi {
/** 发起(用户面) */
submit(data: ApplySubmitRequest) {
return postJSON<ApplyVo>(`${APPLY}`, data);
}
retry(id: number) {
return postForm<ApplyVo>(`${APPLY}/${id}/retry`);
}
/** 一键重提(仅驳回/撤回态;同 bizId,flow-center R4 重启推进) */
resubmit(id: number) {
return postForm<ApplyVo>(`${APPLY}/${id}/resubmit`);
}
my(params?: Record<string, any>) {
return get<PageResult<ApplyVo>>(`${APPLY}/my`, params);
}
/** 发起页数据(事项要点+表单 schema) */
item(siteCode: string, itemCode: string) {
return get<Record<string, any>>(`${APPLY}/item`, { siteCode, itemCode });
/** 办件记录分页(管理面;用户面办件在独立前端 svc-hall-public) */
adminPage(params: Record<string, any>) {
return get<PageResult<ApplyVo>>(`${SVC}/apply/page`, params);
}
/** 办件详情(只读;与用户面同接口,管理员在守卫白名单内) */
detail(id: number) {
return get<ApplyVo>(`${APPLY}/${id}`);
}
adminPage(params: Record<string, any>) {
return get<PageResult<ApplyVo>>(`${SVC}/apply/page`, params);
/** 审批轨迹(只读;同上口径) */
progress(id: number) {
return get<FlowProgressVo>(`${APPLY}/${id}/progress`);
}
/** 流程图地址(同源图片;后端换免签 token 取图) */
diagramUrl(id: number, mode = "dept") {
return `${APPLY}/${id}/diagram.png?mode=${encodeURIComponent(mode)}`;
}
}
-5
View File
@@ -23,10 +23,6 @@ let conf: BaseConf = {
baseHost: origin,
ssoHost: "",
serviceHost: seg.length >= 2 ? `${origin}/${seg[0]}` : "",
// 流程中心基址(BP-R2-1:我的办件/办件详情"撤回"直调 flow-center /api/flow/instance/{id}/withdraw):
// 生产同主域 Caddy 路由 /flow-center/;本地 dev 由 VITE_FLOW_HOST 指向 http://localhost:8085
// (flow-center CORS 已收 8087,同 Notice host.config 同款约定)
flowHost: seg.length >= 2 ? `${origin}/flow-center` : "",
relayConf: {
ziyuankuHost: "",
zhuanxiangHost: "",
@@ -50,7 +46,6 @@ applyConf(conf, {
baseHost: env.VITE_BASE_HOST,
ssoHost: env.VITE_SSO_HOST,
serviceHost: env.VITE_IS_MOCK === "true" ? "" : env.VITE_SERVICE_HOST,
flowHost: env.VITE_FLOW_HOST,
relayConf: {
ziyuankuHost: env.VITE_ZIYUANKU_HOST,
zhuanxiangHost: env.VITE_ZHUANXIANG_HOST,
+10 -31
View File
@@ -1,12 +1,12 @@
import type { RouteRecordRaw } from "vue-router";
/**
* 办事大厅路由(V2.0 Part B.6)。
* 办事大厅**后台管理端**路由(用户面在独立前端 svc-hall-public,见 /svc-hall/public/)。
*
* modId 是菜单 ↔ 路由的稳定契约(UserBase app_module 按本应用 appKey 配置),
* 新 modId 提案(旧 CMS 21/22 随迁移退役):
* 23=办事事项 24=服务字典 25=表单管理 26=办件记录 27=我的办件
* 发起页 /apply 与详情 /apply-detail 为参数页,不挂菜单(parentId 仅作面包屑归属)。
* modId 是菜单 ↔ 路由的稳定契约(UserBase app_module 按本应用 appKey 配置):
* 23=办事事项 24=服务字典 25=表单管理 26=办件记录
* 编辑页/设计器为参数页,不挂菜单(parentId 仅作面包屑归属)。
* 用户面(我的办件/在线办理/办件详情)已迁出本前端(BP-R4-3):本前端只保留管理面。
*/
const routes: RouteRecordRaw[] = [
// 管理面:办事事项
@@ -49,32 +49,11 @@ const routes: RouteRecordRaw[] = [
component: () => import("@/views/svc/ApplyManage.vue"),
meta: { title: "办件记录", modId: 26 },
},
// 用户面:我的办件
{
path: "/my",
name: "svc_apply_my",
component: () => import("@/views/svc/ApplyMy.vue"),
meta: { title: "我的办件", modId: 27 },
},
// 用户面:发起(CMS 指南页"我要办理"跳入:/#/apply?siteCode=&itemCode=)
{
path: "/apply",
name: "svc_apply",
component: () => import("@/views/svc/Apply.vue"),
meta: { title: "在线办理", parentId: 27 },
},
// 用户面:办件详情
{
path: "/apply-detail",
name: "svc_apply_detail",
component: () => import("@/views/svc/ApplyDetail.vue"),
meta: { title: "办件详情", parentId: 27 },
},
// 应用入口默认页(pcUrl 直达时落到我的办件)
{ path: "/", redirect: "/my" },
// 兜底:外部深链(bizUrl 等)若拼成路径参数形态(/#/apply-detail/12)会 no-match,
// catch-all 避免静默空白页(回落我的办件,用户可自行进详情)
{ path: "/:pathMatch(.*)*", redirect: "/my" },
// 应用入口默认页(pcUrl 直达时落到办事事项)
{ path: "/", redirect: "/svc/item" },
// 兜底:外部深链(旧用户面链接 /#/apply-detail?id= 等)在本前端已无对应页面——
// 统一回落办事事项,避免静默空白页(用户面链接请改指 /svc-hall/public/)
{ path: "/:pathMatch(.*)*", redirect: "/svc/item" },
];
export default routes;
+36
View File
@@ -222,3 +222,39 @@ export interface PageResult<T> {
list?: T[];
items?: T[];
}
// ===== 审批进度(后端复用 SDK FlowProgress,见 /api/apply/{id}/progress)=====
export interface FlowProgressVo {
instanceId?: number;
bizType?: string;
bizId?: string;
bizTitle?: string;
status?: number;
currentNodes?: string;
submitterId?: number;
submitterName?: string;
submitTime?: string;
finishTime?: string;
steps?: FlowProgressStep[];
}
export interface FlowProgressStep {
nodeId?: string;
nodeName?: string;
label?: string;
active?: boolean;
assignees?: FlowProgressTask[];
}
export interface FlowProgressTask {
taskId?: number;
userId?: number;
userName?: string;
status?: number;
statusLabel?: string;
opinion?: string;
arriveTime?: string;
handleTime?: string;
edgeName?: string;
}
-120
View File
@@ -1,120 +0,0 @@
<script setup lang="ts">
/** 在线办理发起页(CMS 指南页"我要办理"跳入:/#/apply?siteCode=&itemCode=)。 */
import { computed, onMounted, reactive, ref } from "vue";
import { useRoute, useRouter } from "vue-router";
import { Message } from "view-ui-plus";
import { applyApi } from "@/api/module/svc";
import { useSite } from "@/utils/site";
import DynamicForm from "@/components/DynamicForm.vue";
const route = useRoute();
const router = useRouter();
const { setSite } = useSite();
const loading = ref(false);
const submitting = ref(false);
const item = ref<Record<string, any> | null>(null);
const loadError = ref("");
const formData = reactive<Record<string, any>>({});
const schemaJson = computed(() => (item.value?.schemaJson as string) || "");
async function load() {
const siteCode = String(route.query.siteCode || "");
const itemCode = String(route.query.itemCode || "");
if (!siteCode || !itemCode) {
Message.error("缺少 siteCode/itemCode 参数");
return;
}
setSite(siteCode);
loading.value = true;
try {
item.value = (await applyApi.item(siteCode, itemCode).send()) as any;
loadError.value = "";
} catch (e: any) {
// 区分加载失败与业务性不可办理(走查 §七.8):网络/服务异常不当成"事项不可办理"
loadError.value = String(e?.message || e || "网络或服务异常");
} finally {
loading.value = false;
}
}
async function submit() {
if (!item.value) return;
submitting.value = true;
try {
const apply: any = await applyApi
.submit({
siteCode: String(route.query.siteCode),
itemCode: String(route.query.itemCode),
formData: Object.keys(formData).length ? JSON.stringify(formData) : undefined,
})
.send();
if (apply.flowStatus === 0) {
Message.warning("流程中心暂不可用,已保存为待提交,可稍后在「我的办件」中重试");
} else {
Message.success("已提交,进入审批流程");
}
router.replace(`/apply-detail?id=${apply.id}`);
} finally {
submitting.value = false;
}
}
onMounted(load);
</script>
<template>
<div class="page">
<Card :bordered="false" dis-hover v-if="item">
<template #title>在线办理 · {{ item.title }}</template>
<div class="summary" v-if="item.summary || item.deptName || item.handleTimeLimit">
<div v-if="item.summary">{{ item.summary }}</div>
<div class="meta">
<span v-if="item.deptName">办理部门:{{ item.deptName }}</span>
<span v-if="item.handleTimeLimit">办理时限:{{ item.handleTimeLimit }}</span>
<span v-if="item.contactPhone">咨询电话:{{ item.contactPhone }}</span>
</div>
</div>
<Divider v-if="schemaJson" orientation="left">申请表单</Divider>
<DynamicForm v-if="schemaJson" :schema-json="schemaJson" v-model:form-data="formData" />
<div v-else class="no-form">该事项无需填写表单,直接提交申请材料请联系办理部门。</div>
<div class="actions">
<Button type="primary" :loading="submitting" @click="submit">提交申请</Button>
<Button @click="router.push('/my')">我的办件</Button>
</div>
</Card>
<Card v-else :bordered="false" dis-hover>
<div style="text-align: center; padding: 40px; color: #999">
<template v-if="loading">加载中…</template>
<template v-else-if="loadError">
事项加载失败:{{ loadError }}(网络或服务异常,请稍后重试)
</template>
<template v-else>事项不可办理(未发布或未开通在线办理)</template>
</div>
</Card>
</div>
</template>
<style scoped>
.summary {
padding-bottom: 12px;
}
.meta {
margin-top: 8px;
display: flex;
gap: 16px;
color: #888;
font-size: 13px;
flex-wrap: wrap;
}
.no-form {
color: #999;
padding: 12px 0;
}
.actions {
margin-top: 16px;
display: flex;
gap: 8px;
}
</style>
-177
View File
@@ -1,177 +0,0 @@
<script setup lang="ts">
/** 办件详情:快照回显 + 镜像状态 + 结果意见;撤回/前往流程中心直调 flow-center(同主域 CAS)。 */
import { computed, onMounted, ref } from "vue";
import { useRoute, useRouter } from "vue-router";
import { Message, Modal } from "view-ui-plus";
import { applyApi } from "@/api/module/svc";
import config from "@/assets/config/host.config";
import type { ApplyVo } from "@/types/svc";
const route = useRoute();
const router = useRouter();
const apply = ref<ApplyVo | null>(null);
const withdrawing = ref(false);
const STATUS: Record<number, { text: string; color: string }> = {
0: { text: "待提交", color: "default" },
10: { text: "审批中", color: "primary" },
20: { text: "已完成", color: "success" },
30: { text: "已拒绝", color: "error" },
40: { text: "已撤回", color: "warning" },
};
const snapshot = computed<Record<string, any>>(() => {
try {
return JSON.parse(apply.value?.itemSnapshotJson || "{}");
} catch {
return {};
}
});
const formData = computed<Record<string, any>>(() => {
try {
return JSON.parse(apply.value?.formDataJson || "{}");
} catch {
return {};
}
});
const result = computed<Record<string, any>>(() => {
try {
return JSON.parse(apply.value?.flowResultJson || "{}");
} catch {
return {};
}
});
async function load() {
const id = Number(route.query.id || 0);
if (id) {
apply.value = (await applyApi.detail(id).send()) as any;
}
}
/** 前往流程中心:flowHost 完整地址(不再依赖部署层反代 /flow-center/,BP-R3-3)
* 路由段须与 flow-center 前端一致(routes.ts path="/my" 我的办件;/#/my-instances 会 no-match 空白页) */
const flowCenterUrl = computed(() =>
config.flowHost ? `${config.flowHost}/#/my` : ""
);
/** 查看流程图:flow-center 示意图深链(办件 instanceId + 科室视图,整页跳转不受 CORS 约束) */
function openFlowDiagram() {
const instanceId = apply.value?.flowInstanceId;
if (!instanceId || !config.flowHost) {
Message.warning("流程中心地址未配置");
return;
}
window.open(`${config.flowHost}/#/diagram?instanceId=${instanceId}&mode=dept`, "_blank");
}
/** 撤回:直调 flow-center 用户面(BP-R2-1;同主域 CAS 免二次登录,本地 dev 走 flowHost CORS) */
async function withdraw() {
const instanceId = apply.value?.flowInstanceId;
if (!instanceId || !config.flowHost) {
Message.warning("流程中心地址未配置,无法撤回");
return;
}
withdrawing.value = true;
try {
const resp = await fetch(`${config.flowHost}/api/flow/instance/${instanceId}/withdraw`, {
method: "POST",
credentials: "include",
});
const res = await resp.json().catch(() => null);
if (resp.ok && res && res.code === 0) {
Message.success("已撤回,可重新发起或编辑后重提");
load();
} else {
Message.error(res?.msg || "撤回失败(已有任务被办理时不可撤回)");
}
} catch (e: any) {
Message.error("流程中心不可达:" + (e.message || e));
} finally {
withdrawing.value = false;
}
}
/** 一键重提(30/40 态;同 bizId R4 重启,表单数据沿用原填报) */
function resubmit() {
if (!apply.value) return;
Modal.confirm({
title: "重新提交确认",
content: `将以原填报内容重新提交「${apply.value.itemTitle}」,审批轨迹跨轮连续保留。确认继续?`,
onOk: async () => {
await applyApi.resubmit(apply.value!.id).send();
Message.success("已重新提交,进入审批流程");
load();
},
});
}
onMounted(load);
</script>
<template>
<div class="page">
<Card :bordered="false" dis-hover v-if="apply">
<template #title>
办件详情 #{{ apply.id }}
<Tag :color="STATUS[apply.flowStatus]?.color || 'default'">
{{ STATUS[apply.flowStatus]?.text || apply.flowStatus }}
</Tag>
</template>
<Descriptions :column="2" border>
<DescriptionsItem label="事项">{{ apply.itemTitle }}</DescriptionsItem>
<DescriptionsItem label="事项编码">{{ apply.itemCode }}</DescriptionsItem>
<DescriptionsItem label="提交人">{{ apply.submitterName }}</DescriptionsItem>
<DescriptionsItem label="提交时间">{{ apply.submitTime || "—" }}</DescriptionsItem>
<DescriptionsItem label="办理部门">{{ snapshot.deptName || "—" }}</DescriptionsItem>
<DescriptionsItem label="办理时限">{{ snapshot.handleTimeLimit || "—" }}</DescriptionsItem>
</Descriptions>
<template v-if="apply.formDataJson">
<Divider orientation="left">申请内容</Divider>
<div class="kv" v-for="(v, k) in formData" :key="String(k)">
<span class="k">{{ k }}</span>
<span class="v">{{ Array.isArray(v) ? v.map((f: any) => f.fileName || f).join("、") : v }}</span>
</div>
</template>
<template v-if="result.opinion || result.result">
<Divider orientation="left">审批结果</Divider>
<p>结果:{{ result.result || "—" }}</p>
<p v-if="result.opinion">意见:{{ result.opinion }}</p>
</template>
<div class="actions">
<Button @click="router.push('/my')">返回我的办件</Button>
<Button v-if="apply.flowInstanceId" @click="openFlowDiagram">查看流程图</Button>
<Button v-if="apply.flowStatus === 10 && apply.flowInstanceId" :loading="withdrawing"
@click="withdraw">撤回</Button>
<Button v-if="apply.flowStatus === 30 || apply.flowStatus === 40" @click="resubmit">重新提交</Button>
<Button v-if="flowCenterUrl && apply.flowInstanceId" type="primary" target="_blank"
:href="flowCenterUrl">前往流程中心查看进度</Button>
</div>
</Card>
</div>
</template>
<style scoped>
.kv {
display: flex;
padding: 6px 0;
border-bottom: 1px dashed #eee;
}
.k {
width: 220px;
color: #888;
}
.v {
flex: 1;
}
.actions {
margin-top: 16px;
display: flex;
gap: 8px;
}
</style>
+175 -5
View File
@@ -1,12 +1,18 @@
<script setup lang="ts">
/** 办件记录(管理面,modId 26):本校在途与历史办件分页。 */
/**
* 办件记录(管理面,modId 26):本校在途与历史办件分页 + 只读详情抽屉。
*
* 详情为什么在管理端自绘而不是跳用户面:用户面(在线办理/我的办件/办件详情)已迁到独立前端
* svc-hall-public(BP-R4-3),管理端不该跨应用跳转;管理员查办件要的是"快照 + 填报内容 +
* 审批轨迹 + 流程图",一个只读抽屉就够,也不必给管理员看"撤回/重提"这类提交人动作。
* 数据面复用用户面同口径接口(/api/apply/{id} 与 /{id}/progress,管理员在守卫白名单内)。
*/
import { onMounted, ref } from "vue";
import { useRouter } from "vue-router";
import { Message } from "view-ui-plus";
import { applyApi } from "@/api/module/svc";
import type { ApplyVo } from "@/types/svc";
import type { ApplyVo, FlowProgressVo } from "@/types/svc";
import { useSite } from "@/utils/site";
const router = useRouter();
const { currentSiteCode, sites, loadSites, setSite } = useSite();
const loading = ref(false);
const list = ref<ApplyVo[]>([]);
@@ -15,6 +21,13 @@ const page = ref(1);
const flowStatus = ref<number | undefined>(undefined);
const keyword = ref("");
const detailVisible = ref(false);
const detailLoading = ref(false);
const detail = ref<ApplyVo | null>(null);
const progress = ref<FlowProgressVo | null>(null);
const diagramVisible = ref(false);
const diagramUrl = ref("");
const STATUS: Record<number, { text: string; color: string }> = {
0: { text: "待提交", color: "default" },
10: { text: "审批中", color: "primary" },
@@ -23,6 +36,14 @@ const STATUS: Record<number, { text: string; color: string }> = {
40: { text: "已撤回", color: "warning" },
};
const SNAPSHOT_LABEL: Record<string, string> = {
itemTitle: "事项名称",
summary: "事项说明",
deptName: "办理部门",
handleTimeLimit: "办理时限",
contactPhone: "咨询电话",
};
const cols = [
{ title: "办件号", key: "id", width: 90 },
{ title: "事项", key: "itemTitle", minWidth: 180 },
@@ -53,6 +74,53 @@ async function load() {
}
}
function parse(json?: string): Record<string, any> {
try {
return JSON.parse(json || "{}");
} catch {
return {};
}
}
function displayValue(v: any): string {
if (v === null || v === undefined || v === "") return "—";
if (Array.isArray(v)) {
return v.map((f: any) => f?.fileName || f?.fileUrl || String(f)).join("、");
}
if (typeof v === "object") return JSON.stringify(v);
return String(v);
}
/** 只读详情:快照 + 填报内容 + 审批轨迹(管理员口径,守卫放行) */
async function openDetail(row: ApplyVo) {
detailVisible.value = true;
detailLoading.value = true;
detail.value = null;
progress.value = null;
try {
detail.value = (await applyApi.detail(row.id).send()) as any;
} catch (e: any) {
Message.error(e?.message || "加载办件详情失败");
} finally {
detailLoading.value = false;
}
try {
progress.value = (await applyApi.progress(row.id).send()) as any;
} catch {
// 轨迹取不到不打断详情(例如流程中心未接入)
}
}
/** 流程图:走本应用后端中转(同源图片),与事项编辑页同一套 */
function openDiagram() {
if (!detail.value?.flowInstanceId) {
Message.warning("该办件尚未进入流程,无流程图");
return;
}
diagramUrl.value = applyApi.diagramUrl(detail.value.id, "dept");
diagramVisible.value = true;
}
onMounted(async () => {
await loadSites();
load();
@@ -70,6 +138,7 @@ onMounted(async () => {
<Option v-for="(v, k) in STATUS" :key="k" :value="Number(k)">{{ v.text }}</Option>
</Select>
<Input v-model="keyword" search enter-button placeholder="事项/提交人" style="width: 220px" @on-search="load" />
<span class="sh-muted" style="color: #999; font-size: 13px">用户面办理入口在独立前端 /svc-hall/public/</span>
</div>
<Table :loading="loading" :columns="cols" :data="list">
<template #status="{ row }">
@@ -78,12 +147,72 @@ onMounted(async () => {
</Tag>
</template>
<template #action="{ row }">
<Button size="small" type="text" @click="router.push(`/apply-detail?id=${row.id}`)">详情</Button>
<Button size="small" type="text" @click="openDetail(row)">详情</Button>
</template>
</Table>
<Page class="pager" :total="total" :current="page" :page-size="10" show-total
@on-change="(p: number) => { page = p; load(); }" />
</Card>
<Drawer v-model="detailVisible" title="办件详情(只读)" width="620">
<Spin v-if="detailLoading" fix></Spin>
<template v-if="detail">
<Descriptions :column="1" border>
<DescriptionsItem label="办件号">{{ detail.id }}</DescriptionsItem>
<DescriptionsItem label="事项">{{ detail.itemTitle }}({{ detail.itemCode }})</DescriptionsItem>
<DescriptionsItem label="状态">
<Tag :color="STATUS[detail.flowStatus]?.color || 'default'">
{{ STATUS[detail.flowStatus]?.text || detail.flowStatus }}
</Tag>
</DescriptionsItem>
<DescriptionsItem label="提交人">{{ detail.submitterName }}</DescriptionsItem>
<DescriptionsItem label="提交时间">{{ detail.submitTime || "—" }}</DescriptionsItem>
<DescriptionsItem label="办结时间">{{ detail.finishTime || "—" }}</DescriptionsItem>
<DescriptionsItem label="流程实例">{{ detail.flowInstanceId || "—" }}</DescriptionsItem>
</Descriptions>
<Divider orientation="left">事项快照</Divider>
<div class="kv" v-for="(label, key) in SNAPSHOT_LABEL" :key="key" v-show="parse(detail.itemSnapshotJson)[key]">
<span class="k">{{ label }}</span>
<span class="v">{{ parse(detail.itemSnapshotJson)[key] }}</span>
</div>
<template v-if="detail.formDataJson">
<Divider orientation="left">申请内容</Divider>
<div class="kv" v-for="(v, k) in parse(detail.formDataJson)" :key="String(k)">
<span class="k">{{ k }}</span>
<span class="v">{{ displayValue(v) }}</span>
</div>
</template>
<Divider orientation="left">审批轨迹</Divider>
<div v-if="!progress || !progress.steps || !progress.steps.length" style="color: #999">
暂无轨迹(未进入流程或流程中心未接入)
</div>
<div v-for="(step, idx) in progress?.steps || []" :key="idx" class="step">
<div class="step-name">
{{ step.nodeName || step.label }}
<Tag v-if="step.active" color="primary" size="small">办理中</Tag>
</div>
<div v-for="(a, ai) in step.assignees || []" :key="ai" class="step-row">
<span>{{ a.userName || "—" }}</span>
<span style="color: #999">{{ a.statusLabel || "" }}</span>
<span style="color: #999">{{ a.handleTime || a.arriveTime || "" }}</span>
<span v-if="a.opinion" style="color: #666">意见:{{ a.opinion }}</span>
</div>
</div>
<div class="drawer-actions">
<Button v-if="detail.flowInstanceId" @click="openDiagram">查看流程图</Button>
</div>
</template>
</Drawer>
<Modal v-model="diagramVisible" title="流程图(含当前办理状态)" width="900" footer-hide>
<div class="diagram-wrap">
<img :src="diagramUrl" alt="流程图" />
</div>
</Modal>
</div>
</template>
@@ -92,9 +221,50 @@ onMounted(async () => {
display: flex;
gap: 8px;
margin-bottom: 8px;
align-items: center;
}
.pager {
margin-top: 12px;
text-align: right;
}
.kv {
display: flex;
padding: 5px 0;
font-size: 13px;
border-bottom: 1px dashed #eee;
}
.k {
width: 110px;
color: #999;
flex-shrink: 0;
}
.v {
flex: 1;
word-break: break-all;
}
.step {
padding: 6px 0;
}
.step-name {
font-weight: 600;
margin-bottom: 4px;
}
.step-row {
display: flex;
gap: 12px;
font-size: 13px;
padding: 2px 0 2px 10px;
flex-wrap: wrap;
}
.drawer-actions {
margin-top: 16px;
}
.diagram-wrap {
max-height: 70vh;
overflow: auto;
text-align: center;
}
.diagram-wrap img {
max-width: 100%;
}
</style>
-133
View File
@@ -1,133 +0,0 @@
<script setup lang="ts">
/** 我的办件(modId 27):镜像状态列表;撤回直调流程中心(同主域 CAS),审批轨迹后续接。 */
import { onMounted, ref } from "vue";
import { useRouter } from "vue-router";
import { Message, Modal } from "view-ui-plus";
import { applyApi } from "@/api/module/svc";
import config from "@/assets/config/host.config";
import type { ApplyVo } from "@/types/svc";
const router = useRouter();
const loading = ref(false);
const list = ref<ApplyVo[]>([]);
const total = ref(0);
const page = ref(1);
const flowStatus = ref<number | undefined>(undefined);
const withdrawingId = ref<number>(0);
const STATUS: Record<number, { text: string; color: string }> = {
0: { text: "待提交", color: "default" },
10: { text: "审批中", color: "primary" },
20: { text: "已完成", color: "success" },
30: { text: "已拒绝", color: "error" },
40: { text: "已撤回", color: "warning" },
};
const cols = [
{ title: "办件号", key: "id", width: 90 },
{ title: "事项", key: "itemTitle", minWidth: 200 },
{ title: "提交人", key: "submitterName", width: 110 },
{ title: "提交时间", key: "submitTime", width: 160 },
{ title: "状态", slot: "status", width: 100 },
{ title: "操作", slot: "action", width: 220 },
];
async function load() {
loading.value = true;
try {
const res: any = await applyApi.my({ flowStatus: flowStatus.value, page: page.value, pageSize: 10 }).send();
total.value = res.total || 0;
list.value = res.list || [];
} finally {
loading.value = false;
}
}
async function retry(row: ApplyVo) {
await applyApi.retry(row.id).send();
Message.success("已重新提交流程中心");
load();
}
/** 一键重提(30/40 态;同 bizId R4 重启,表单数据沿用原填报) */
async function resubmit(row: ApplyVo) {
Modal.confirm({
title: "重新提交确认",
content: `将以原填报内容重新提交「${row.itemTitle}」,审批轨迹跨轮连续保留。确认继续?`,
onOk: async () => {
await applyApi.resubmit(row.id).send();
Message.success("已重新提交,进入审批流程");
load();
},
});
}
/** 撤回:直调 flow-center 用户面(BP-R2-1;同主域 CAS 免二次登录,本地 dev 走 flowHost CORS) */
async function withdraw(row: ApplyVo) {
if (!row.flowInstanceId || !config.flowHost) {
Message.warning("流程中心地址未配置,无法撤回");
return;
}
withdrawingId.value = row.id;
try {
const resp = await fetch(`${config.flowHost}/api/flow/instance/${row.flowInstanceId}/withdraw`, {
method: "POST",
credentials: "include",
});
const res = await resp.json().catch(() => null);
if (resp.ok && res && res.code === 0) {
Message.success("已撤回,可重新发起或编辑后重提");
load();
} else {
Message.error(res?.msg || "撤回失败(已有任务被办理时不可撤回)");
}
} catch (e: any) {
Message.error("流程中心不可达:" + (e.message || e));
} finally {
withdrawingId.value = 0;
}
}
onMounted(load);
</script>
<template>
<div class="page">
<Card :bordered="false" dis-hover>
<div class="bar">
<Select v-model="flowStatus" clearable placeholder="状态" style="width: 140px" @on-change="() => { page = 1; load(); }">
<Option v-for="(v, k) in STATUS" :key="k" :value="Number(k)">{{ v.text }}</Option>
</Select>
</div>
<Table :loading="loading" :columns="cols" :data="list">
<template #status="{ row }">
<Tag :color="STATUS[row.flowStatus]?.color || 'default'">
{{ STATUS[row.flowStatus]?.text || row.flowStatus }}
</Tag>
</template>
<template #action="{ row }">
<Button size="small" type="text" @click="router.push(`/apply-detail?id=${row.id}`)">详情</Button>
<Button v-if="row.flowStatus === 0" size="small" type="text" @click="retry(row)">重试提交</Button>
<Button v-if="row.flowStatus === 10 && row.flowInstanceId" size="small" type="text"
:loading="withdrawingId === row.id" @click="withdraw(row)">撤回</Button>
<Button v-if="row.flowStatus === 30 || row.flowStatus === 40" size="small" type="text"
@click="resubmit(row)">重新提交</Button>
</template>
</Table>
<Page class="pager" :total="total" :current="page" :page-size="10" show-total
@on-change="(p: number) => { page = p; load(); }" />
</Card>
</div>
</template>
<style scoped>
.bar {
display: flex;
gap: 8px;
margin-bottom: 8px;
}
.pager {
margin-top: 12px;
text-align: right;
}
</style>
+8 -3
View File
@@ -11,7 +11,6 @@ import {
svcItemApi,
} from "@/api/module/svc";
import type { SvcDeptVo, SvcFormVo, SvcItemAttachmentVo, SvcItemSaveRequest } from "@/types/svc";
import config from "@/assets/config/host.config";
import { useSite } from "@/utils/site";
import RichTextEditor from "@/components/RichTextEditor.vue";
@@ -125,9 +124,15 @@ async function save(publishAfter: boolean) {
router.replace({ path: "/svc/item/edit", query: { id: String(id) } });
}
/** 流程图:flow-center 深链整页跳转(事项库场景用科室视图) */
/** 流程图:走本应用后端 /api/svc/flow/diagram.png(后端换免签 token 取图)。
* 原先是 window.open 到 flow-center 前端 /#/diagram?...——跨应用页面 + 需要流程中心的登录会话;
* 现在同源出图,浏览器只认 <img src>,也不再把 flow-center 地址带进前端配置。 */
function openFlowDiagram() {
window.open(`${config.flowHost}/#/diagram?flowGuid=${form.value.flowGuid}&mode=dept`, "_blank");
if (!currentSiteCode.value || !form.value.flowGuid) {
Message.warning("请先选择流程并确认当前站点");
return;
}
window.open(svcFlowApi.diagramUrl(currentSiteCode.value, form.value.flowGuid, "dept"), "_blank");
}
onMounted(loadAll);
-1
View File
@@ -4,7 +4,6 @@ interface ImportMetaEnv {
readonly VITE_BASE_HOST: string;
readonly VITE_SSO_HOST: string;
readonly VITE_SERVICE_HOST: string;
readonly VITE_FLOW_HOST: string;
readonly VITE_ZIYUANKU_HOST: string;
readonly VITE_ZHUANXIANG_HOST: string;
readonly VITE_IS_MOCK: string;