提交“
This commit is contained in:
1 parent
69ee0f505c
commit
9b88581450
614 files changed
+90318
-689022
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -1,478 +0,0 @@
|
||||
# 中试服务申请单 — 详情页改弹窗 + UI合规修复 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 将中试服务申请单详情页从独立路由改为弹窗形式(照抄采集协议单的查看/编辑弹窗风格),并修复列表页按钮图标缺失。
|
||||
|
||||
**Architecture:** 新建 `ApplicationDetailDialog.vue`,从 `ApplicationDetail.vue` 复制全部业务逻辑,改 props-driven 弹窗接口。列表页 `index.vue` 引入弹窗组件替换路由跳转。照抄 `ProtocolViewDialog`(KPI+data-grid)和 `ProtocolFormDialog`(form-grid+section-card)的 CSS 风格。
|
||||
|
||||
**Tech Stack:** Vue 3 + Element Plus + TypeScript + SCSS
|
||||
|
||||
**设计规格:** `docs/superpowers/specs/2025-05-25-pilot-application-dialog-refactor-design.md`
|
||||
|
||||
---
|
||||
|
||||
## 文件结构
|
||||
|
||||
| 文件 | 操作 | 职责 |
|
||||
|------|------|------|
|
||||
| `src/views/pilot-service/pilot-application/ApplicationDetailDialog.vue` | **新建** | 详情弹窗组件,props-driven,照抄 ProtocolViewDialog + ProtocolFormDialog 风格 |
|
||||
| `src/views/pilot-service/pilot-application/index.vue` | **修改** | 列表页:引入弹窗组件、替换路由跳转、补按钮图标 |
|
||||
| `src/views/pilot-service/pilot-application/ApplicationDetail.vue` | **删除** | 被新组件完全替代 |
|
||||
| `src/router/modules/sqxp.ts` | **修改** | 删除 PilotApplicationDetail 路由定义 |
|
||||
|
||||
**参考文件(照抄风格源,只读不修改):**
|
||||
- `src/views/cell-storage/protocol/ProtocolViewDialog.vue` — KPI 摘要条、data-grid、section-card CSS
|
||||
- `src/views/cell-storage/protocol/ProtocolFormDialog.vue` — form-grid、upload-card CSS
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 创建 ApplicationDetailDialog.vue 弹窗壳层 + 基本信息Tab
|
||||
|
||||
**Files:**
|
||||
- Create: `src/views/pilot-service/pilot-application/ApplicationDetailDialog.vue`
|
||||
- Read: `src/views/pilot-service/pilot-application/ApplicationDetail.vue`(源文件,复制逻辑)
|
||||
- Read: `src/views/cell-storage/protocol/ProtocolViewDialog.vue`(照抄 KPI + data-grid + section-card CSS)
|
||||
|
||||
- [ ] **Step 1: 复制 ApplicationDetail.vue 为 ApplicationDetailDialog.vue 并改造弹窗壳层**
|
||||
|
||||
从 `ApplicationDetail.vue` 复制全部内容到 `ApplicationDetailDialog.vue`,然后改造:
|
||||
|
||||
1. **替换 `<template>` 最外层**:移除 `<div class="page-container">` 和 `<header class="page-head">`(返回按钮+标题),改为 `el-dialog` 弹窗壳:
|
||||
|
||||
```vue
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
:title="dialogTitle"
|
||||
width="1600px"
|
||||
class="dialog-form-layout application-detail-dialog"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div
|
||||
class="application-detail-body"
|
||||
:class="{ 'is-loading': detailLoading }"
|
||||
v-loading="detailLoading"
|
||||
element-loading-text="加载中…"
|
||||
>
|
||||
<!-- detail-tabs sticky 导航 -->
|
||||
<div class="detail-tabs">
|
||||
<div
|
||||
v-for="tab in detailTabs"
|
||||
:key="tab.key"
|
||||
class="detail-tab"
|
||||
:class="{ active: activeTab === tab.key }"
|
||||
@click="scrollToTab(tab.key)"
|
||||
>
|
||||
{{ tab.label }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="applicationDetail">
|
||||
<!-- KPI 摘要条 -->
|
||||
<div class="kpi-strip">
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-card__icon"><el-icon><Document /></el-icon></div>
|
||||
<div class="kpi-card__main">
|
||||
<div class="kpi-label">申请单号</div>
|
||||
<div class="kpi-value kpi-value--emphasis">{{ displayValue(applicationDetail.applicationNo) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-card__icon"><el-icon><CircleCheck /></el-icon></div>
|
||||
<div class="kpi-card__main">
|
||||
<div class="kpi-label">状态</div>
|
||||
<div class="kpi-value">
|
||||
<el-tag :type="applicationStatusTagType(applicationDetail.applicationStatus)" size="small">
|
||||
{{ applicationStatusLabel(applicationDetail.applicationStatus) }}
|
||||
</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-card__icon"><el-icon><User /></el-icon></div>
|
||||
<div class="kpi-card__main">
|
||||
<div class="kpi-label">渠道名称</div>
|
||||
<div class="kpi-value">{{ displayValue(applicationDetail.channelName) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-card__icon"><el-icon><Calendar /></el-icon></div>
|
||||
<div class="kpi-card__main">
|
||||
<div class="kpi-label">创建时间</div>
|
||||
<div class="kpi-value">{{ displayValue(applicationDetail.createTime) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 原 el-tabs 内容迁移到这里 -->
|
||||
<div id="tab-basic" class="form-tab-pane">
|
||||
<!-- 申请单信息(只读,用 data-grid 替代 el-descriptions) -->
|
||||
<div class="section-card section-card--white">
|
||||
<div class="section-title"><h3>申请单信息</h3></div>
|
||||
<div class="data-grid data-grid--4">
|
||||
<div class="data-item"><div class="data-label">申请单号</div><div class="data-value">{{ displayValue(applicationDetail.applicationNo) }}</div></div>
|
||||
<div class="data-item"><div class="data-label">渠道名称</div><div class="data-value">{{ displayValue(applicationDetail.channelName) }}</div></div>
|
||||
<div class="data-item"><div class="data-label">服务订单名称</div><div class="data-value">{{ displayValue(applicationDetail.serviceOrderNo) }}</div></div>
|
||||
<div class="data-item"><div class="data-label">状态</div><div class="data-value"><el-tag :type="applicationStatusTagType(applicationDetail.applicationStatus)" size="small">{{ applicationStatusLabel(applicationDetail.applicationStatus) }}</el-tag></div></div>
|
||||
<div class="data-item"><div class="data-label">创建时间</div><div class="data-value">{{ displayValue(applicationDetail.createTime) }}</div></div>
|
||||
<div class="data-item"><div class="data-label">备注</div><div class="data-value">{{ displayValue(applicationDetail.remark) }}</div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 患者信息(可编辑表单,保留原 form-grid-2 布局) -->
|
||||
<!-- 直接复制原 ApplicationDetail.vue 中 Tab1 的患者信息部分 -->
|
||||
</div>
|
||||
|
||||
<!-- 其余5个Tab内容照搬原文件,每个用 form-tab-pane 包裹 -->
|
||||
<!-- ... -->
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 状态操作按钮(照抄原 header 中的按钮) -->
|
||||
<template #header>
|
||||
<div class="detail-dialog-header">
|
||||
<div class="detail-dialog-header-left">
|
||||
<span class="detail-dialog-title">申请单详情</span>
|
||||
<el-tag v-if="applicationDetail.applicationStatus" :type="applicationStatusTagType(applicationDetail.applicationStatus)" size="large">
|
||||
{{ applicationStatusLabel(applicationDetail.applicationStatus) }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<div class="detail-dialog-header-right">
|
||||
<el-button v-if="applicationDetail.applicationStatus === 'dks'" class="btn-main" type="primary" @click="handleStart"><el-icon><VideoPlay /></el-icon>开始</el-button>
|
||||
<el-button v-if="applicationDetail.applicationStatus === 'jxz'" class="btn-main" type="primary" @click="handleComplete"><el-icon><CircleCheck /></el-icon>完成</el-button>
|
||||
<el-button v-if="applicationDetail.applicationStatus === 'dks' || applicationDetail.applicationStatus === 'jxz'" class="btn-op-item op-warn" type="danger" @click="handleVoid"><el-icon><CircleClose /></el-icon>作废</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<!-- 8个嵌套弹窗照搬 -->
|
||||
</template>
|
||||
```
|
||||
|
||||
2. **替换 `<script>` 的 props 接口**:
|
||||
|
||||
```typescript
|
||||
defineOptions({ name: 'ApplicationDetailDialog' })
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: boolean
|
||||
applicationId: string
|
||||
listRow?: any
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', val: boolean): void
|
||||
(e: 'status-changed'): void
|
||||
}>()
|
||||
```
|
||||
|
||||
3. **替换数据加载方式**:移除 `onMounted` + `route.query.id`,改为:
|
||||
|
||||
```typescript
|
||||
// 移除
|
||||
// const route = useRoute()
|
||||
// onMounted(() => { loadApplicationDetail(route.query.id) })
|
||||
|
||||
// 新增
|
||||
const detailTabs = [
|
||||
{ key: 'basic', label: '基本信息' },
|
||||
{ key: 'infusion', label: '输注方案' },
|
||||
{ key: 'checkup', label: '体检信息' },
|
||||
{ key: 'delivery', label: '交付信息' },
|
||||
{ key: 'release', label: '放行审核' },
|
||||
{ key: 'confirm', label: '应用确认' },
|
||||
]
|
||||
|
||||
const activeTab = ref('basic')
|
||||
|
||||
const scrollToTab = (key: string) => {
|
||||
activeTab.value = key
|
||||
const el = document.getElementById(`tab-${key}`)
|
||||
if (el) el.scrollIntoView({ behavior: 'smooth', block: 'start' })
|
||||
}
|
||||
|
||||
watch(() => props.applicationId, (newId) => {
|
||||
if (newId && props.modelValue) {
|
||||
loadApplicationDetail(newId)
|
||||
}
|
||||
}, { immediate: true })
|
||||
```
|
||||
|
||||
4. **状态操作后发射事件**:在 `handleStart`、`handleComplete`、`handleVoid` 成功后追加 `emit('status-changed')`
|
||||
|
||||
5. **新增图标 import**:`VideoPlay`, `CircleCheck`, `CircleClose`, `Document`, `Calendar` 等
|
||||
|
||||
- [ ] **Step 2: 照抄 CSS 样式**
|
||||
|
||||
从 `ProtocolViewDialog.vue` 的 `<style scoped>` 中复制以下 CSS 块到 `ApplicationDetailDialog.vue`:
|
||||
|
||||
- `.kpi-strip` / `.kpi-card` / `.kpi-card__icon` / `.kpi-card__main` / `.kpi-label` / `.kpi-value`(L2073-2143)
|
||||
- `.data-grid` / `--2` / `--3` / `--4`(L2197-2212)
|
||||
- `.data-item` / `.data-label` / `.data-value`(L2214-2238)
|
||||
- `.section-card` / `--white` / `--green`(L2146-2168)
|
||||
- `.section-title` + `::before` + `h3`(L2170-2194)
|
||||
|
||||
从 `ProtocolFormDialog.vue` 的 `<style scoped>` 中复制:
|
||||
|
||||
- `.detail-tabs` / `.detail-tab`(L2878-2912)
|
||||
- `.form-tab-pane`(L2917-2924)
|
||||
- `.form-grid` / `--col2` / `--col4` / `.form-col-span-2`(L2995-3023)
|
||||
|
||||
新增弹窗 header 样式:
|
||||
|
||||
```scss
|
||||
.detail-dialog-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.detail-dialog-header-left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.detail-dialog-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
}
|
||||
|
||||
.detail-dialog-header-right {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.application-detail-body {
|
||||
background: #f5f7fa;
|
||||
overflow: visible;
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证无编译错误**
|
||||
|
||||
Run: `cd web-admin && pnpm build:typecheck 2>&1 | head -50`
|
||||
Expected: 无与 ApplicationDetailDialog.vue 相关的类型错误
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 改造列表页 index.vue — 引入弹窗 + 补按钮图标
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/views/pilot-service/pilot-application/index.vue`
|
||||
|
||||
- [ ] **Step 1: 引入弹窗组件,替换路由跳转逻辑**
|
||||
|
||||
在 `<script>` 区域:
|
||||
|
||||
1. 移除 `const router = useRouter()`(如果其他地方还用到 router 则保留)
|
||||
|
||||
2. 新增弹窗状态变量和事件处理:
|
||||
|
||||
```typescript
|
||||
import ApplicationDetailDialog from './ApplicationDetailDialog.vue'
|
||||
|
||||
const detailDialogVisible = ref(false)
|
||||
const detailApplicationId = ref('')
|
||||
|
||||
const handleView = (row: any) => {
|
||||
detailApplicationId.value = row.id
|
||||
detailDialogVisible.value = true
|
||||
}
|
||||
|
||||
const handleEdit = (row: any) => {
|
||||
detailApplicationId.value = row.id
|
||||
detailDialogVisible.value = true
|
||||
}
|
||||
|
||||
// handleSubmit 中:创建成功后打开弹窗而非跳转路由
|
||||
// 将 router.push({ name: 'PilotApplicationDetail', ... }) 替换为:
|
||||
// detailApplicationId.value = newId
|
||||
// detailDialogVisible.value = true
|
||||
|
||||
const onDetailStatusChanged = () => {
|
||||
loadData()
|
||||
}
|
||||
```
|
||||
|
||||
3. 在 `<template>` 底部(新增申请单弹窗之后)添加弹窗组件:
|
||||
|
||||
```vue
|
||||
<ApplicationDetailDialog
|
||||
v-model="detailDialogVisible"
|
||||
:application-id="detailApplicationId"
|
||||
@status-changed="onDetailStatusChanged"
|
||||
/>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 补充操作列按钮的 el-icon**
|
||||
|
||||
在 `<template>` 操作列区域,为所有 `el-button` 补充 `<el-icon>` 前缀:
|
||||
|
||||
```vue
|
||||
<!-- 查看 -->
|
||||
<el-button class="btn-op-item primary" @click="handleView(row)">
|
||||
<el-icon><View /></el-icon>查看
|
||||
</el-button>
|
||||
|
||||
<!-- 编辑 -->
|
||||
<el-button v-if="row.applicationStatus === 'dks'" class="btn-op-item" @click="handleEdit(row)">
|
||||
<el-icon><Edit /></el-icon>编辑
|
||||
</el-button>
|
||||
|
||||
<!-- 删除(popconfirm 内) -->
|
||||
<template #reference>
|
||||
<el-button class="btn-op-item op-warn"><el-icon><Delete /></el-icon>删除</el-button>
|
||||
</template>
|
||||
|
||||
<!-- 开始 -->
|
||||
<el-button v-if="row.applicationStatus === 'dks'" class="btn-op-item primary" type="primary" @click="handleStart(row)">
|
||||
<el-icon><VideoPlay /></el-icon>开始
|
||||
</el-button>
|
||||
|
||||
<!-- 完成 -->
|
||||
<el-button v-if="row.applicationStatus === 'jxz'" class="btn-op-item primary" type="primary" @click="handleComplete(row)">
|
||||
<el-icon><CircleCheck /></el-icon>完成
|
||||
</el-button>
|
||||
|
||||
<!-- 作废 -->
|
||||
<el-button v-if="..." class="btn-op-item op-warn" type="danger" @click="handleVoid(row)">
|
||||
<el-icon><CircleClose /></el-icon>作废
|
||||
</el-button>
|
||||
```
|
||||
|
||||
更新 import 语句:
|
||||
|
||||
```typescript
|
||||
import {
|
||||
Plus, Search, RefreshLeft, Close, Check,
|
||||
View, Edit, Delete, VideoPlay, CircleCheck, CircleClose
|
||||
} from '@element-plus/icons-vue'
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证列表页无编译错误**
|
||||
|
||||
Run: `cd web-admin && pnpm build:typecheck 2>&1 | head -50`
|
||||
Expected: 无与 index.vue 相关的类型错误
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 清理路由 + 删除旧详情页
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/router/modules/sqxp.ts`
|
||||
- Delete: `src/views/pilot-service/pilot-application/ApplicationDetail.vue`
|
||||
|
||||
- [ ] **Step 1: 删除 PilotApplicationDetail 路由定义**
|
||||
|
||||
在 `src/router/modules/sqxp.ts` 第650-656行,删除:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000011',
|
||||
name: 'PilotApplicationDetail',
|
||||
path: 'pilot-application/detail',
|
||||
component: '/pilot-service/pilot-application/ApplicationDetail',
|
||||
meta: { title: '申请单详情', hidden: true }
|
||||
}
|
||||
```
|
||||
|
||||
注意保留上一行的逗号处理——删除该对象后,`PilotApplication` 路由对象后不应有尾随逗号。
|
||||
|
||||
- [ ] **Step 2: 删除 ApplicationDetail.vue**
|
||||
|
||||
```bash
|
||||
rm src/views/pilot-service/pilot-application/ApplicationDetail.vue
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 全局搜索确认无其他引用**
|
||||
|
||||
Run: `grep -r "PilotApplicationDetail\|ApplicationDetail" web-admin/src/ --include="*.vue" --include="*.ts"`
|
||||
Expected: 0 结果(所有引用已清理)
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 弹窗内嵌套弹窗按钮图标补充
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/views/pilot-service/pilot-application/ApplicationDetailDialog.vue`
|
||||
|
||||
- [ ] **Step 1: 检查并补充弹窗内所有操作按钮的 el-icon**
|
||||
|
||||
在 `ApplicationDetailDialog.vue` 中,搜索所有 `el-button` 标签(不含 `el-icon` 子元素的),按 openspec 规范补充图标:
|
||||
|
||||
- "新增输注方案" → `Plus`
|
||||
- "手动添加计划" → `Plus`
|
||||
- "选择客户" → `User`
|
||||
- "保存患者信息" → `Check`
|
||||
- 各 Tab 中的"编辑" → `Edit`
|
||||
- 各 Tab 中的"删除" → `Delete`
|
||||
- 嵌套弹窗 footer 的"取消" → `Close`,"确定" → `Check`
|
||||
- 其他操作按钮逐一检查
|
||||
|
||||
确保所有图标已在 `<script>` 中从 `@element-plus/icons-vue` import。
|
||||
|
||||
- [ ] **Step 2: 验证无遗漏**
|
||||
|
||||
Run: `grep -n '<el-button' web-admin/src/views/pilot-service/pilot-application/ApplicationDetailDialog.vue | head -50`
|
||||
Expected: 手动检查每个 el-button 是否包含 `<el-icon>` 子元素
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 端到端验证
|
||||
|
||||
**Files:** 无新增修改
|
||||
|
||||
- [ ] **Step 1: 构建检查**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -20`
|
||||
Expected: 构建成功,无错误
|
||||
|
||||
- [ ] **Step 2: Lint 检查**
|
||||
|
||||
Run: `cd web-admin && pnpm lint 2>&1 | tail -30`
|
||||
Expected: 无 ESLint 错误(或仅预存在的无关错误)
|
||||
|
||||
- [ ] **Step 3: 更新知识图谱**
|
||||
|
||||
Run: `./scripts/update-graph.sh frontend`
|
||||
Expected: 前端知识图谱更新成功
|
||||
|
||||
---
|
||||
|
||||
## Self-Review
|
||||
|
||||
### 1. Spec Coverage
|
||||
|
||||
| Spec Section | Task |
|
||||
|---|---|
|
||||
| 3.1 照抄清单 A1-A5 (ViewDialog) | Task 1 (弹窗壳层+CSS) |
|
||||
| 3.1 照抄清单 B1-B4 (FormDialog) | Task 1 (表单CSS) |
|
||||
| 3.1 照抄清单 C1-C4 (公共) | Task 1 (detail-tabs, section-card) |
|
||||
| 3.2 弹窗组件接口 | Task 1 (defineProps/defineEmits) |
|
||||
| 3.3 弹窗壳层配置 | Task 1 (el-dialog 1600px) |
|
||||
| 3.4 顶部区域改造 | Task 1 (自定义 #header) |
|
||||
| 3.5 正文结构 | Task 1 (KPI + data-grid + form-tab-pane) |
|
||||
| 3.6 数据加载变更 | Task 1 (watch) |
|
||||
| 3.7 列表页改造 | Task 2 (引入弹窗+替换路由) |
|
||||
| 4.1 操作列按钮图标 | Task 2 (补充 el-icon) |
|
||||
| 4.2 弹窗内按钮图标 | Task 4 |
|
||||
| 5. 路由清理 | Task 3 |
|
||||
|
||||
**Gap check:** 无遗漏。
|
||||
|
||||
### 2. Placeholder Scan
|
||||
|
||||
无 TBD/TODO/占位符。
|
||||
|
||||
### 3. Type Consistency
|
||||
|
||||
- `ApplicationDetailDialog` props: `modelValue: boolean`, `applicationId: string` — 与 `index.vue` 中的使用 `v-model="detailDialogVisible"` 和 `:application-id="detailApplicationId"` 一致。
|
||||
- Event `status-changed` — 与 `@status-changed="onDetailStatusChanged"` 一致。
|
||||
@@ -1,59 +0,0 @@
|
||||
# 细胞存储管理(2.2.6~2.2.10)Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 交付细胞存储管理一级菜单下 5 个页面及对应后端 API(方案 C),满足已定稿设计:`docs/superpowers/specs/2026-05-13-cell-storage-protocol-modules-design.md` 与 OpenSpec 变更 `openspec/changes/cell-storage-protocol-modules/`。
|
||||
|
||||
**Architecture:** FastAPI 路由挂在 `/web/admin` 旁路扩展;SQLAlchemy Model 覆盖四张业务表;CRUD 层封装租户过滤与 camelCase 列表 DTO;Vue 页面复制 `system/unit` 列表骨架并按模块替换列与弹窗。
|
||||
|
||||
**Tech Stack:** Python 3.9、FastAPI、SQLAlchemy、Pydantic v2;Vue 3、Element Plus、pnpm、TypeScript。
|
||||
|
||||
---
|
||||
|
||||
## 文件映射(落地前对齐)
|
||||
|
||||
| 区域 | 路径 |
|
||||
|------|------|
|
||||
| 设计/契约 | `docs/superpowers/specs/2026-05-13-cell-storage-protocol-modules-design.md`,`openspec/changes/cell-storage-protocol-modules/` |
|
||||
| Model | `backend/app/models/models.py` |
|
||||
| CRUD | `backend/app/crud/collection_protocol.py`(或按职责拆分文件) |
|
||||
| API | `backend/app/api/collection_protocol.py`,注册 `app/api/__init__.py`、`main.py` |
|
||||
| 菜单 | `backend/app/api/menu.py` |
|
||||
| 前端路由 | `web-admin/src/router/modules/sqxp.ts` |
|
||||
| 前端 API | `web-admin/src/api/collection-protocol.ts`(命名以仓库惯例为准) |
|
||||
| 页面 | `web-admin/src/views/cell-storage/{protocol,protocol-audit,payment-confirm,refund-confirm,installment-warning}/index.vue` |
|
||||
|
||||
---
|
||||
|
||||
## 执行清单(与 OpenSpec tasks.md 同步)
|
||||
|
||||
按顺序执行 `openspec/changes/cell-storage-protocol-modules/tasks.md` 中章节 **1 → 7**。每完成一节,将对应 `- [ ]` 改为 `- [x]`。
|
||||
|
||||
---
|
||||
|
||||
## Self-review(对照 spec)
|
||||
|
||||
| Spec capability | tasks.md 覆盖 |
|
||||
|-----------------|---------------|
|
||||
| cell-storage-collection-protocol | 1.x、2.x、5.1、3.x |
|
||||
| cell-storage-protocol-audit | 1.x、2.x、5.2 |
|
||||
| cell-storage-receipt-confirm | 1.x、2.x、5.3 |
|
||||
| cell-storage-refund-confirm | 1.x、2.x、5.4 |
|
||||
| cell-storage-installment-warning | 1.x、2.x、5.5 |
|
||||
|
||||
无占位:具体接口路径与状态码以实现对照 design.md 为准。
|
||||
|
||||
---
|
||||
|
||||
## Execution Handoff
|
||||
|
||||
Plan complete and saved to `docs/superpowers/plans/2026-05-13-cell-storage-protocol-modules.md`.
|
||||
|
||||
**Two execution options:**
|
||||
|
||||
1. **Subagent-Driven(推荐)** — 每个 task 派生子代理并在任务间复核
|
||||
2. **Inline Execution** — 本会话按 `openspec apply` 逐项实现(使用 executing-plans)
|
||||
|
||||
**Which approach?** 若未指定,默认本会话按 OpenSpec `tasks.md` 顺序实现。
|
||||
|
||||
下一步命令:`openspec instructions apply --change cell-storage-protocol-modules --json` 读取上下文文件后开始改代码。
|
||||
@@ -1,535 +0,0 @@
|
||||
# FlowDesigner 功能补全实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 补全流程设计器三个核心功能缺口:审批人选择(用户/角色下拉数据加载)、连线条件分支配置(点击连线编辑条件表达式)、SQL查询帮助提示。
|
||||
|
||||
**Architecture:** 后端新增2个轻量options端点;前端FlowDesigner.vue增加edge:click事件处理、selectedEdge状态、条件表达式编辑面板、以及handleOpen时加载用户/角色数据。
|
||||
|
||||
**Tech Stack:** Python FastAPI, Vue 3 + Element Plus, AntV X6
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| 文件 | 操作 | 职责 |
|
||||
|------|------|------|
|
||||
| `backend/app/api/admin.py` | 修改 | 新增 `GET /web/admin/users/options` 和 `GET /web/admin/roles/options` |
|
||||
| `web-admin/src/api/admin.ts` | 修改 | 新增 `fetchUserOptions()` 和 `fetchRoleOptions()` |
|
||||
| `web-admin/src/views/system/workflow/designer/FlowDesigner.vue` | 修改 | 核心改动:edge事件、selectedEdge、条件编辑面板、数据加载 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 后端新增 users/options 和 roles/options 端点
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/admin.py` — 在 `list_roles_for_select`(line 33)后面新增两个端点
|
||||
|
||||
- [ ] **Step 1: 新增 `GET /web/admin/users/options` 端点**
|
||||
|
||||
在 `admin.py` 的 `list_roles_for_select` 函数后面(约 line 63 之后),添加:
|
||||
|
||||
```python
|
||||
@router.get("/users/options")
|
||||
async def list_users_for_select(
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""返回用户下拉选项(label=昵称,value=用户ID),供流程设计器审批人选择使用。"""
|
||||
tenant_no = _user.get("tenant_no", "")
|
||||
q = db.query(SysUser).filter(SysUser.del_flag == 0, SysUser.status == "1")
|
||||
if tenant_no:
|
||||
q = q.filter(SysUser.tenant_no == tenant_no)
|
||||
rows = q.order_by(SysUser.order_num.asc(), SysUser.create_time.desc()).all()
|
||||
out = [{"label": (r.nick_name or r.user_no or ""), "value": r.id} for r in rows]
|
||||
return success_response(out)
|
||||
```
|
||||
|
||||
注意:顶部已有 `from app.models.models import SysUser, SysRole, ...` 等导入,无需新增。
|
||||
|
||||
- [ ] **Step 2: 新增 `GET /web/admin/roles/options` 端点**
|
||||
|
||||
紧接上面的函数后面添加:
|
||||
|
||||
```python
|
||||
@router.get("/roles/options")
|
||||
async def list_roles_for_designer(
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""返回角色下拉选项(label=角色名,value=角色ID UUID),供流程设计器审批人选择使用。
|
||||
与 /roles 不同,此端点返回角色 UUID 作为 value(引擎解析审批人需要 UUID)。"""
|
||||
tenant_no = _user.get("tenant_no", "")
|
||||
q = db.query(SysRole).filter(SysRole.del_flag == 0, SysRole.status == "1")
|
||||
if tenant_no:
|
||||
q = q.filter(SysRole.tenant_no == tenant_no)
|
||||
rows = q.order_by(SysRole.order_num.asc()).all()
|
||||
out = [{"label": (r.role_name or "").strip(), "value": r.id} for r in rows if (r.role_name or "").strip()]
|
||||
return success_response(out)
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证后端启动**
|
||||
|
||||
```bash
|
||||
cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.api.admin import router; print('OK')"
|
||||
```
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 前端 API 函数 + 设计器加载用户/角色数据
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts` — 新增两个 API 函数
|
||||
- Modify: `web-admin/src/views/system/workflow/designer/FlowDesigner.vue` — 导入 API、handleOpen 加载数据
|
||||
|
||||
- [ ] **Step 1: 在 `admin.ts` 新增两个 API 函数**
|
||||
|
||||
在 `fetchGetRoleList()`(line 18-22)后面添加:
|
||||
|
||||
```typescript
|
||||
/** 流程设计器:用户下拉选项(label=昵称,value=用户ID) */
|
||||
export function fetchUserOptions() {
|
||||
return request.get<Array<{ label: string; value: string }>>({
|
||||
url: '/web/admin/users/options'
|
||||
})
|
||||
}
|
||||
|
||||
/** 流程设计器:角色下拉选项(label=角色名,value=角色ID UUID) */
|
||||
export function fetchRoleOptions() {
|
||||
return request.get<Array<{ label: string; value: string }>>({
|
||||
url: '/web/admin/roles/options'
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 FlowDesigner.vue 导入新 API 并加载选项数据**
|
||||
|
||||
修改 line 146 的 import 语句:
|
||||
|
||||
```typescript
|
||||
import { fetchDesignerData, fetchPublishVersion } from '@/api/workflow'
|
||||
```
|
||||
|
||||
改为:
|
||||
|
||||
```typescript
|
||||
import { fetchDesignerData, fetchPublishVersion } from '@/api/workflow'
|
||||
import { fetchUserOptions, fetchRoleOptions } from '@/api/admin'
|
||||
```
|
||||
|
||||
然后在 `handleOpen()` 函数(line 742-748)中添加数据加载:
|
||||
|
||||
```typescript
|
||||
function handleOpen() {
|
||||
selectedNode.value = null
|
||||
selectedEdge.value = null
|
||||
registerShapes()
|
||||
nextTick(() => {
|
||||
initGraph()
|
||||
loadDesignerData()
|
||||
loadOptions()
|
||||
})
|
||||
}
|
||||
|
||||
async function loadOptions() {
|
||||
try {
|
||||
const [users, roles] = await Promise.all([fetchUserOptions(), fetchRoleOptions()])
|
||||
userOptions.value = users || []
|
||||
roleOptions.value = roles || []
|
||||
} catch {
|
||||
// 加载失败则保持空选项,不影响设计器其他功能
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
注意:`selectedEdge` 在 Task 3 中定义。
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 连线点击 + 条件表达式编辑器 + 连线标签
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/system/workflow/designer/FlowDesigner.vue`
|
||||
|
||||
这是最核心的改动。需要在 FlowDesigner.vue 中完成以下修改:
|
||||
|
||||
- [ ] **Step 1: 新增 `selectedEdge` 响应式状态和接口定义**
|
||||
|
||||
在 `selectedNode` 定义(line 201)后面添加:
|
||||
|
||||
```typescript
|
||||
interface ConditionRule {
|
||||
field: string
|
||||
op: string
|
||||
value: string
|
||||
}
|
||||
|
||||
interface SelectedEdgeData {
|
||||
id: string
|
||||
fromNodeName: string
|
||||
toNodeName: string
|
||||
rules: ConditionRule[]
|
||||
isDefault: boolean
|
||||
}
|
||||
|
||||
const selectedEdge = ref<SelectedEdgeData | null>(null)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 注册 edge:click 事件 + 修改 blank:click 和 node:click 清除 selectedEdge**
|
||||
|
||||
在 `initGraph()` 函数中,`graph.on('blank:click', ...)` (line 560-563)后面添加 edge 事件:
|
||||
|
||||
```typescript
|
||||
// 连线点击 → 选中(仅条件节点的出线可编辑条件)
|
||||
graph.on('edge:click', ({ edge }) => {
|
||||
const sourceId = edge.getSourceCellId() || ''
|
||||
const sourceNode = graph!.getCellById(sourceId)
|
||||
const sourceData = sourceNode?.getData() || {}
|
||||
const targetId = edge.getTargetCellId() || ''
|
||||
const targetNode = graph!.getCellById(targetId)
|
||||
const targetData = targetNode?.getData() || {}
|
||||
|
||||
const edgeData = edge.getData() || {}
|
||||
const rawRules = edgeData.conditionExpr ? (JSON.parse(edgeData.conditionExpr) || {}) : {}
|
||||
const rules: ConditionRule[] = rawRules.rules || rawRules || []
|
||||
// 确保至少有一条规则
|
||||
if (!Array.isArray(rules) || rules.length === 0) {
|
||||
rules.push({ field: '', op: '==', value: '' })
|
||||
}
|
||||
// 规范化为 ConditionRule[](只保留简单的 field/op/value 三元组)
|
||||
const normalizedRules: ConditionRule[] = rules.map((r: any) => ({
|
||||
field: r.field || '',
|
||||
op: r.op || '==',
|
||||
value: String(r.value ?? ''),
|
||||
}))
|
||||
|
||||
selectedEdge.value = {
|
||||
id: edge.id,
|
||||
fromNodeName: sourceData.nodeName || sourceId,
|
||||
toNodeName: targetData.nodeName || targetId,
|
||||
rules: normalizedRules,
|
||||
isDefault: !edgeData.conditionExpr,
|
||||
}
|
||||
selectedNode.value = null
|
||||
})
|
||||
```
|
||||
|
||||
同时修改 `blank:click` 和 `node:click` 事件处理,在清除/设置 `selectedNode` 时也清除 `selectedEdge`:
|
||||
|
||||
```typescript
|
||||
// node:click 处理中添加:
|
||||
selectedEdge.value = null
|
||||
|
||||
// blank:click 处理中改为:
|
||||
graph.on('blank:click', () => {
|
||||
selectedNode.value = null
|
||||
selectedEdge.value = null
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 连线创建时初始化 data**
|
||||
|
||||
在 `createEdge()` 函数(约 line 522-539)中,给新创建的 edge 加上 data 初始化:
|
||||
|
||||
在 `graph!.createEdge({...})` 调用中添加 `data: { conditionExpr: '' }` 属性:
|
||||
|
||||
```typescript
|
||||
createEdge() {
|
||||
return graph!.createEdge({
|
||||
shape: 'edge',
|
||||
data: { conditionExpr: '' },
|
||||
attrs: {
|
||||
// ... 保持原有 attrs 不变
|
||||
},
|
||||
router: { name: 'manhattan' },
|
||||
connector: { name: 'rounded', args: { radius: 8 } },
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 添加同步连线条件数据到 graph edge 的函数**
|
||||
|
||||
在 `syncNodeLabel` 函数后面添加:
|
||||
|
||||
```typescript
|
||||
// 同步条件表达式到 edge 并更新标签
|
||||
function syncEdgeCondition() {
|
||||
if (!selectedEdge.value || !graph) return
|
||||
const edge = graph.getCellById(selectedEdge.value.id)
|
||||
if (!edge || !edge.isEdge()) return
|
||||
|
||||
if (selectedEdge.value.isDefault) {
|
||||
edge.setData({ ...edge.getData(), conditionExpr: '' })
|
||||
edge.setLabels([])
|
||||
} else {
|
||||
const rules = selectedEdge.value.rules
|
||||
.filter((r) => r.field.trim())
|
||||
.map((r) => ({ field: r.field, op: r.op, value: r.value }))
|
||||
const expr = JSON.stringify({ rules })
|
||||
edge.setData({ ...edge.getData(), conditionExpr: expr })
|
||||
// 设置标签显示条件摘要
|
||||
const summary = rules.map((r) => `${r.field} ${r.op} ${r.value}`).join(' & ')
|
||||
edge.setLabels([
|
||||
{
|
||||
attrs: {
|
||||
label: {
|
||||
text: summary || '条件',
|
||||
fill: '#374151',
|
||||
fontSize: 11,
|
||||
textAnchor: 'middle',
|
||||
textVerticalAnchor: 'bottom',
|
||||
},
|
||||
rect: {
|
||||
fill: '#fff',
|
||||
stroke: '#d1d5db',
|
||||
strokeWidth: 1,
|
||||
rx: 4,
|
||||
ry: 4,
|
||||
},
|
||||
},
|
||||
position: {
|
||||
distance: 0.5,
|
||||
},
|
||||
},
|
||||
])
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 修改序列化函数,从 edge data 读取 conditionExpr**
|
||||
|
||||
当前 `serializeGraph()` 已经正确读取 `e.getData()?.conditionExpr`(line 670),无需修改。确认即可。
|
||||
|
||||
- [ ] **Step 6: 修改模板 — 右侧属性面板增加连线编辑状态**
|
||||
|
||||
在模板的 `<aside class="props-panel">` 中(line 60-138),修改三态逻辑:
|
||||
|
||||
将原来的 `<template v-if="selectedNode">` ... `<template v-else>` 结构改为三态:
|
||||
|
||||
```html
|
||||
<!-- 右侧属性面板 -->
|
||||
<aside class="props-panel">
|
||||
<!-- 节点选中状态 -->
|
||||
<template v-if="selectedNode">
|
||||
<div class="panel-section-title">节点属性</div>
|
||||
<el-form label-position="top" class="props-form">
|
||||
<!-- ... 保持原有节点属性表单不变 (lines 64-132) ... -->
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<!-- 连线选中状态(条件编辑) -->
|
||||
<template v-else-if="selectedEdge">
|
||||
<div class="panel-section-title">连线条件</div>
|
||||
<div class="edge-info">
|
||||
<span class="edge-from">{{ selectedEdge.fromNodeName }}</span>
|
||||
<span class="edge-arrow">→</span>
|
||||
<span class="edge-to">{{ selectedEdge.toNodeName }}</span>
|
||||
</div>
|
||||
|
||||
<el-form label-position="top" class="props-form" style="margin-top: 12px">
|
||||
<el-form-item>
|
||||
<el-checkbox v-model="selectedEdge.isDefault" @change="syncEdgeCondition">
|
||||
默认分支(无条件,其他分支都不满足时走此路径)
|
||||
</el-checkbox>
|
||||
</el-form-item>
|
||||
|
||||
<template v-if="!selectedEdge.isDefault">
|
||||
<div v-for="(rule, idx) in selectedEdge.rules" :key="idx" class="condition-rule-row">
|
||||
<el-input v-model="rule.field" placeholder="字段名" style="width: 30%" @input="syncEdgeCondition" />
|
||||
<el-select v-model="rule.op" style="width: 22%" @change="syncEdgeCondition">
|
||||
<el-option label="==" value="==" />
|
||||
<el-option label="!=" value="!=" />
|
||||
<el-option label=">" value=">" />
|
||||
<el-option label="<" value="<" />
|
||||
<el-option label=">=" value=">=" />
|
||||
<el-option label="<=" value="<=" />
|
||||
<el-option label="in" value="in" />
|
||||
<el-option label="not_in" value="not_in" />
|
||||
<el-option label="contains" value="contains" />
|
||||
</el-select>
|
||||
<el-input v-model="rule.value" placeholder="值" style="width: 30%" @input="syncEdgeCondition" />
|
||||
<el-button
|
||||
:icon="selectedEdge.rules.length > 1 ? 'Delete' : undefined"
|
||||
text
|
||||
type="danger"
|
||||
@click="removeConditionRule(idx)"
|
||||
/>
|
||||
</div>
|
||||
<el-button type="primary" link @click="addConditionRule">+ 添加条件</el-button>
|
||||
</template>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<!-- 空状态 -->
|
||||
<template v-else>
|
||||
<div class="panel-section-title">属性</div>
|
||||
<div class="empty-hint">点击画布中的节点或连线查看属性</div>
|
||||
</template>
|
||||
</aside>
|
||||
```
|
||||
|
||||
- [ ] **Step 7: 添加条件规则操作函数**
|
||||
|
||||
在 `syncEdgeCondition` 函数后面添加:
|
||||
|
||||
```typescript
|
||||
function addConditionRule() {
|
||||
if (selectedEdge.value) {
|
||||
selectedEdge.value.rules.push({ field: '', op: '==', value: '' })
|
||||
}
|
||||
}
|
||||
|
||||
function removeConditionRule(idx: number) {
|
||||
if (selectedEdge.value && selectedEdge.value.rules.length > 1) {
|
||||
selectedEdge.value.rules.splice(idx, 1)
|
||||
syncEdgeCondition()
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 8: 添加条件编辑面板的 CSS**
|
||||
|
||||
在 `<style scoped lang="scss">` 块中添加:
|
||||
|
||||
```scss
|
||||
.edge-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 8px 12px;
|
||||
background: #f9fafb;
|
||||
border-radius: 6px;
|
||||
font-size: 13px;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.edge-from {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.edge-arrow {
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
.edge-to {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.condition-rule-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 9: 更新操作提示列表**
|
||||
|
||||
在左侧面板的操作提示(line 46-51)中,添加连线相关的提示:
|
||||
|
||||
```html
|
||||
<li>点击连线编辑条件规则</li>
|
||||
```
|
||||
|
||||
添加在 "从节点连接点拖出连线" 后面。
|
||||
|
||||
---
|
||||
|
||||
### Task 4: SQL 模式帮助提示
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/system/workflow/designer/FlowDesigner.vue`
|
||||
|
||||
- [ ] **Step 1: 在 SQL textarea 下方添加帮助提示**
|
||||
|
||||
将原有的 SQL textarea(约 line 111-118)修改为:
|
||||
|
||||
```html
|
||||
<el-form-item v-if="selectedNode.config.strategy === 'sql'" label="SQL查询语句">
|
||||
<el-input
|
||||
v-model="selectedNode.config.sqlExpr"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
placeholder="SELECT user_id FROM sys_user WHERE ..."
|
||||
/>
|
||||
<div class="sql-help">
|
||||
<p><strong>SQL审批人策略说明:</strong></p>
|
||||
<ul>
|
||||
<li>必须以 <code>SELECT</code> 开头,只允许只读查询</li>
|
||||
<li>查询结果第一列将作为审批人 user_id</li>
|
||||
<li>可使用流程变量作为参数:<code>:var_name</code> 占位符</li>
|
||||
<li>禁止 INSERT / UPDATE / DELETE / DROP 等写操作</li>
|
||||
</ul>
|
||||
<p class="sql-example">示例:<code>SELECT id FROM sys_user WHERE dept_id = :dept_id AND del_flag = 0</code></p>
|
||||
</div>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 添加 SQL 帮助样式**
|
||||
|
||||
在 scoped style 中添加:
|
||||
|
||||
```scss
|
||||
.sql-help {
|
||||
margin-top: 8px;
|
||||
padding: 10px 12px;
|
||||
background: #f0fdf4;
|
||||
border: 1px solid #bbf7d0;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
color: #374151;
|
||||
line-height: 1.6;
|
||||
|
||||
p {
|
||||
margin: 0 0 4px;
|
||||
}
|
||||
|
||||
ul {
|
||||
margin: 4px 0;
|
||||
padding-left: 18px;
|
||||
}
|
||||
|
||||
li {
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
code {
|
||||
background: #e0f2fe;
|
||||
padding: 1px 4px;
|
||||
border-radius: 3px;
|
||||
font-size: 11px;
|
||||
color: #0369a1;
|
||||
}
|
||||
}
|
||||
|
||||
.sql-example {
|
||||
margin-top: 6px !important;
|
||||
color: #059669;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 验证
|
||||
|
||||
- [ ] **Step 1: 后端验证**
|
||||
|
||||
```bash
|
||||
cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.api.admin import router; print('OK')"
|
||||
```
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 2: 前端 build 验证**
|
||||
|
||||
```bash
|
||||
cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm build
|
||||
```
|
||||
|
||||
Expected: Build 成功,无新增错误
|
||||
|
||||
- [ ] **Step 3: LSP 诊断**
|
||||
|
||||
对 `FlowDesigner.vue` 运行 `lsp_diagnostics`,确认无类型错误。
|
||||
@@ -1,612 +0,0 @@
|
||||
# FlowDesigner 企业级增强实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development or superpowers:executing-plans.
|
||||
|
||||
**Goal:** 将流程设计器从基础原型提升到企业可用级别:节点删除、撤销重做、键盘快捷键、AND/OR条件组、发布前验证、缩放工具栏。
|
||||
|
||||
**Architecture:** 安装 AntV X6 插件(Selection/Keyboard/History/Snapline/Clipboard),增强 FlowDesigner.vue 的交互能力和条件编辑器,新增验证逻辑。
|
||||
|
||||
**Tech Stack:** AntV X6 v3 + X6 插件, Vue 3 + Element Plus
|
||||
|
||||
---
|
||||
|
||||
## 前置:安装 X6 插件
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm add @antv/x6-plugin-selection @antv/x6-plugin-keyboard @antv/x6-plugin-history @antv/x6-plugin-snapline @antv/x6-plugin-clipboard
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 1: 交互增强 — 删除 + 撤销重做 + 快捷键
|
||||
|
||||
**Files:** `web-admin/src/views/system/workflow/designer/FlowDesigner.vue`
|
||||
|
||||
### 1.1 新增插件导入
|
||||
```typescript
|
||||
import { Selection } from '@antv/x6-plugin-selection'
|
||||
import { Keyboard } from '@antv/x6-plugin-keyboard'
|
||||
import { History } from '@antv/x6-plugin-history'
|
||||
import { Snapline } from '@antv/x6-plugin-snapline'
|
||||
import { Clipboard } from '@antv/x6-plugin-clipboard'
|
||||
```
|
||||
|
||||
### 1.2 Graph 构造函数启用 history
|
||||
```typescript
|
||||
history: { enabled: true },
|
||||
```
|
||||
|
||||
### 1.3 initGraph 中注册插件(在 graph 创建后、事件绑定前)
|
||||
```typescript
|
||||
graph.use(new Selection({ enabled: true, multiple: true, rubberband: true, movable: true, showNodeSelectionBox: true }))
|
||||
graph.use(new Keyboard({ enabled: true }))
|
||||
graph.use(new Snapline({ enabled: true }))
|
||||
graph.use(new Clipboard({ enabled: true }))
|
||||
```
|
||||
|
||||
### 1.4 键盘快捷键绑定
|
||||
```typescript
|
||||
// Delete/Backspace 删除选中
|
||||
graph.bindKey(['delete', 'backspace'], () => {
|
||||
const cells = graph.getSelectedCells()
|
||||
if (cells.length) {
|
||||
// 保护:不允许删除 start 和 end 节点以外的连线
|
||||
const toRemove = cells.filter((c) => {
|
||||
if (c.isNode()) {
|
||||
const data = c.getData() || {}
|
||||
return data.nodeType !== 'start' && data.nodeType !== 'end'
|
||||
}
|
||||
return true // 边都可以删除
|
||||
})
|
||||
if (toRemove.length) graph.removeCells(toRemove)
|
||||
}
|
||||
selectedNode.value = null
|
||||
selectedEdge.value = null
|
||||
return false
|
||||
})
|
||||
|
||||
// Undo Ctrl+Z
|
||||
graph.bindKey(['ctrl+z', 'meta+z'], () => {
|
||||
if (graph.canUndo()) graph.undo()
|
||||
return false
|
||||
})
|
||||
|
||||
// Redo Ctrl+Y
|
||||
graph.bindKey(['ctrl+y', 'meta+shift+z'], () => {
|
||||
if (graph.canRedo()) graph.redo()
|
||||
return false
|
||||
})
|
||||
|
||||
// Copy Ctrl+C
|
||||
graph.bindKey(['ctrl+c', 'meta+c'], () => {
|
||||
const cells = graph.getSelectedCells().filter((c) => c.isNode())
|
||||
if (cells.length) graph.copy(cells)
|
||||
return false
|
||||
})
|
||||
|
||||
// Paste Ctrl+V
|
||||
graph.bindKey(['ctrl+v', 'meta+v'], () => {
|
||||
if (!graph.isClipboardEmpty()) {
|
||||
const cells = graph.paste({ offset: 32 })
|
||||
graph.cleanSelection()
|
||||
graph.select(cells)
|
||||
}
|
||||
return false
|
||||
})
|
||||
```
|
||||
|
||||
### 1.5 节点/边删除后清除选中状态
|
||||
```typescript
|
||||
graph.on('cell:removed', () => {
|
||||
selectedNode.value = null
|
||||
selectedEdge.value = null
|
||||
})
|
||||
```
|
||||
|
||||
### 1.6 属性面板增加删除按钮
|
||||
在节点属性面板的顶部,节点名称旁边增加删除按钮:
|
||||
```html
|
||||
<div style="display: flex; align-items: center; justify-content: space-between">
|
||||
<span style="font-weight: 500">节点属性</span>
|
||||
<el-button
|
||||
v-if="selectedNode.nodeType !== 'start' && selectedNode.nodeType !== 'end'"
|
||||
type="danger"
|
||||
text
|
||||
size="small"
|
||||
@click="deleteSelectedNode"
|
||||
>
|
||||
删除节点
|
||||
</el-button>
|
||||
</div>
|
||||
```
|
||||
|
||||
在连线条件面板顶部也增加删除按钮:
|
||||
```html
|
||||
<div style="display: flex; align-items: center; justify-content: space-between">
|
||||
<span class="panel-section-title" style="margin: 0">连线条件</span>
|
||||
<el-button type="danger" text size="small" @click="deleteSelectedEdge">删除连线</el-button>
|
||||
</div>
|
||||
```
|
||||
|
||||
### 1.7 删除函数
|
||||
```typescript
|
||||
function deleteSelectedNode() {
|
||||
if (!selectedNode.value || !graph) return
|
||||
const cell = graph.getCellById(selectedNode.value.id)
|
||||
if (cell) graph.removeCell(cell)
|
||||
selectedNode.value = null
|
||||
}
|
||||
|
||||
function deleteSelectedEdge() {
|
||||
if (!selectedEdge.value || !graph) return
|
||||
const cell = graph.getCellById(selectedEdge.value.id)
|
||||
if (cell) graph.removeCell(cell)
|
||||
selectedEdge.value = null
|
||||
}
|
||||
```
|
||||
|
||||
### 1.8 工具栏增加撤销/重做按钮
|
||||
在 header 的按钮区域增加撤销/重做:
|
||||
```html
|
||||
<el-button class="btn-ghost" :disabled="!canUndo" @click="handleUndo">撤销</el-button>
|
||||
<el-button class="btn-ghost" :disabled="!canRedo" @click="handleRedo">重做</el-button>
|
||||
```
|
||||
|
||||
新增响应式状态和函数:
|
||||
```typescript
|
||||
const canUndo = ref(false)
|
||||
const canRedo = ref(false)
|
||||
|
||||
// 在 initGraph 中,history 插件注册后:
|
||||
graph.on('history:change', () => {
|
||||
canUndo.value = graph?.canUndo() ?? false
|
||||
canRedo.value = graph?.canRedo() ?? false
|
||||
})
|
||||
|
||||
function handleUndo() {
|
||||
if (graph?.canUndo()) graph.undo()
|
||||
}
|
||||
|
||||
function handleRedo() {
|
||||
if (graph?.canRedo()) graph.redo()
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 2: 条件表达式增强 — AND/OR 分组 + 流程变量提示
|
||||
|
||||
### 2.1 数据模型改为分组结构
|
||||
|
||||
替换 `ConditionRule` 接口为分组结构:
|
||||
```typescript
|
||||
interface ConditionRule {
|
||||
field: string
|
||||
op: string
|
||||
value: string
|
||||
}
|
||||
|
||||
interface ConditionGroup {
|
||||
logic: 'and' | 'or' // 组内规则之间的逻辑
|
||||
rules: ConditionRule[]
|
||||
}
|
||||
```
|
||||
|
||||
替换 `SelectedEdgeData` 的 `rules` 为 `groups`:
|
||||
```typescript
|
||||
interface SelectedEdgeData {
|
||||
id: string
|
||||
fromNodeName: string
|
||||
toNodeName: string
|
||||
groups: ConditionGroup[] // 组之间是 OR 关系
|
||||
groupLogic: 'or' // 组间逻辑(固定为 OR)
|
||||
isDefault: boolean
|
||||
}
|
||||
```
|
||||
|
||||
条件语义:组内 AND,组间 OR。即 `(rule1 AND rule2) OR (rule3 AND rule4)`
|
||||
|
||||
### 2.2 条件编辑器 UI 改为分组模式
|
||||
|
||||
```html
|
||||
<template v-if="!selectedEdge.isDefault">
|
||||
<div v-for="(group, gIdx) in selectedEdge.groups" :key="gIdx" class="condition-group">
|
||||
<div class="group-header">
|
||||
<span class="group-label">条件组 {{ gIdx + 1 }}</span>
|
||||
<span class="group-logic-badge">组内条件全部满足 (AND)</span>
|
||||
<el-button
|
||||
v-if="selectedEdge.groups.length > 1"
|
||||
type="danger"
|
||||
text
|
||||
size="small"
|
||||
@click="removeConditionGroup(gIdx)"
|
||||
>
|
||||
删除组
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-for="(rule, rIdx) in group.rules" :key="rIdx" class="condition-rule-row">
|
||||
<el-input v-model="rule.field" placeholder="字段名(流程变量)" style="width: 28%" @input="syncEdgeCondition" />
|
||||
<el-select v-model="rule.op" style="width: 20%" @change="syncEdgeCondition">
|
||||
<el-option label="==" value="==" />
|
||||
<el-option label="!=" value="!=" />
|
||||
<el-option label=">" value=">" />
|
||||
<el-option label="<" value="<" />
|
||||
<el-option label=">=" value=">=" />
|
||||
<el-option label="<=" value="<=" />
|
||||
<el-option label="包含" value="contains" />
|
||||
<el-option label="不包含" value="not_in" />
|
||||
</el-select>
|
||||
<el-input v-model="rule.value" placeholder="值" style="width: 28%" @input="syncEdgeCondition" />
|
||||
<el-button
|
||||
v-if="group.rules.length > 1"
|
||||
text
|
||||
type="danger"
|
||||
size="small"
|
||||
@click="removeConditionRule(gIdx, rIdx)"
|
||||
>
|
||||
×
|
||||
</el-button>
|
||||
</div>
|
||||
<el-button type="primary" link size="small" @click="addConditionRule(gIdx)">
|
||||
+ 添加条件
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="group-logic-hint">组间关系:任一条件组满足即可 (OR)</div>
|
||||
<el-button type="primary" link @click="addConditionGroup">+ 添加条件组 (OR)</el-button>
|
||||
</template>
|
||||
```
|
||||
|
||||
### 2.3 操作函数更新
|
||||
|
||||
```typescript
|
||||
function addConditionGroup() {
|
||||
if (selectedEdge.value) {
|
||||
selectedEdge.value.groups.push({ logic: 'and', rules: [{ field: '', op: '==', value: '' }] })
|
||||
}
|
||||
}
|
||||
|
||||
function removeConditionGroup(gIdx: number) {
|
||||
if (selectedEdge.value && selectedEdge.value.groups.length > 1) {
|
||||
selectedEdge.value.groups.splice(gIdx, 1)
|
||||
syncEdgeCondition()
|
||||
}
|
||||
}
|
||||
|
||||
function addConditionRule(gIdx: number) {
|
||||
if (selectedEdge.value) {
|
||||
selectedEdge.value.groups[gIdx].rules.push({ field: '', op: '==', value: '' })
|
||||
}
|
||||
}
|
||||
|
||||
function removeConditionRule(gIdx: number, rIdx: number) {
|
||||
if (selectedEdge.value && selectedEdge.value.groups[gIdx].rules.length > 1) {
|
||||
selectedEdge.value.groups[gIdx].rules.splice(rIdx, 1)
|
||||
syncEdgeCondition()
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 2.4 syncEdgeCondition 序列化更新
|
||||
|
||||
生成与后端引擎兼容的 JSON:
|
||||
```typescript
|
||||
function syncEdgeCondition() {
|
||||
if (!selectedEdge.value || !graph) return
|
||||
const edge = graph.getCellById(selectedEdge.value.id)
|
||||
if (!edge || !edge.isEdge()) return
|
||||
|
||||
if (selectedEdge.value.isDefault) {
|
||||
edge.setData({ ...edge.getData(), conditionExpr: '' })
|
||||
edge.setLabels([])
|
||||
} else {
|
||||
// 序列化为引擎兼容格式:[{and: [{field,op,value},...]}, {and: [...]}]
|
||||
// 顶层 array = OR 语义(引擎 _check_rules 对 list 做 any())
|
||||
const groups = selectedEdge.value.groups
|
||||
.filter((g) => g.rules.some((r) => r.field.trim()))
|
||||
.map((g) => ({
|
||||
and: g.rules
|
||||
.filter((r) => r.field.trim())
|
||||
.map((r) => ({ field: r.field, op: r.op, value: r.value })),
|
||||
}))
|
||||
const expr = JSON.stringify(groups)
|
||||
edge.setData({ ...edge.getData(), conditionExpr: expr })
|
||||
|
||||
// 生成可读标签
|
||||
const parts = groups.map((g) =>
|
||||
g.and.map((r) => `${r.field} ${r.op} ${r.value}`).join(' & '),
|
||||
)
|
||||
const summary = parts.join(' | ')
|
||||
edge.setLabels([
|
||||
{
|
||||
attrs: {
|
||||
label: { text: summary || '条件', fill: '#374151', fontSize: 11, textAnchor: 'middle', textVerticalAnchor: 'bottom' },
|
||||
rect: { fill: '#fff', stroke: '#d1d5db', strokeWidth: 1, rx: 4, ry: 4 },
|
||||
},
|
||||
position: { distance: 0.5 },
|
||||
},
|
||||
])
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 2.5 edge:click 解析更新
|
||||
|
||||
解析引擎格式到分组 UI:
|
||||
```typescript
|
||||
// 在 edge:click handler 中:
|
||||
let normalizedGroups: ConditionGroup[] = []
|
||||
if (edgeData.conditionExpr) {
|
||||
try {
|
||||
const parsed = JSON.parse(edgeData.conditionExpr)
|
||||
if (Array.isArray(parsed)) {
|
||||
// 引擎格式: [{and: [{field,op,value},...]}, ...]
|
||||
normalizedGroups = parsed.map((item: any) => {
|
||||
if (item.and) {
|
||||
return { logic: 'and' as const, rules: item.and.map((r: any) => ({ field: r.field || '', op: r.op || '==', value: String(r.value ?? '') })) }
|
||||
}
|
||||
if (item.or) {
|
||||
return { logic: 'or' as const, rules: item.or.map((r: any) => ({ field: r.field || '', op: r.op || '==', value: String(r.value ?? '') })) }
|
||||
}
|
||||
// 兼容旧格式: [{rules: [...]}]
|
||||
const rawRules = item.rules || [item]
|
||||
return { logic: 'and' as const, rules: rawRules.map((r: any) => ({ field: r.field || '', op: r.op || '==', value: String(r.value ?? '') })) }
|
||||
})
|
||||
} else if (parsed.rules) {
|
||||
// 旧格式: {rules: [{field,op,value},...]}
|
||||
normalizedGroups = [{ logic: 'and', rules: parsed.rules.map((r: any) => ({ field: r.field || '', op: r.op || '==', value: String(r.value ?? '') })) }]
|
||||
}
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
if (normalizedGroups.length === 0) {
|
||||
normalizedGroups = [{ logic: 'and', rules: [{ field: '', op: '==', value: '' }] }]
|
||||
}
|
||||
```
|
||||
|
||||
### 2.6 流程变量提示
|
||||
|
||||
在条件字段输入下方添加提示:
|
||||
```html
|
||||
<div class="field-hint">
|
||||
<p>字段名为流程发起时传入的变量名,支持点号嵌套路径(如 <code>order.amount</code>)</p>
|
||||
<p>常见变量:<code>amount</code>(金额) <code>department</code>(部门) <code>applicant.dept_id</code>(发起人部门)</p>
|
||||
</div>
|
||||
```
|
||||
|
||||
### 2.7 CSS 新增
|
||||
```scss
|
||||
.condition-group {
|
||||
background: #f9fafb;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: 6px;
|
||||
padding: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.group-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.group-label {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.group-logic-badge {
|
||||
font-size: 11px;
|
||||
color: #6b7280;
|
||||
background: #e5e7eb;
|
||||
padding: 2px 6px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.group-logic-hint {
|
||||
font-size: 12px;
|
||||
color: #6b7280;
|
||||
margin: 8px 0;
|
||||
padding: 4px 8px;
|
||||
background: #fef3c7;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.field-hint {
|
||||
margin-top: 8px;
|
||||
padding: 8px 10px;
|
||||
background: #eff6ff;
|
||||
border: 1px solid #bfdbfe;
|
||||
border-radius: 6px;
|
||||
font-size: 12px;
|
||||
color: #1e40af;
|
||||
line-height: 1.6;
|
||||
|
||||
p { margin: 0 0 2px; }
|
||||
code { background: #dbeafe; padding: 1px 4px; border-radius: 3px; font-size: 11px; }
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 3: 保存/发布前验证
|
||||
|
||||
### 3.1 验证函数
|
||||
```typescript
|
||||
interface ValidationError {
|
||||
type: 'error' | 'warning'
|
||||
message: string
|
||||
nodeId?: string
|
||||
}
|
||||
|
||||
function validateGraph(): ValidationError[] {
|
||||
const errors: ValidationError[] = []
|
||||
if (!graph) return errors
|
||||
|
||||
const cells = graph.getCells()
|
||||
const nodes = cells.filter((c) => c.isNode())
|
||||
const edges = cells.filter((c) => c.isEdge())
|
||||
|
||||
// 1. 必须有且仅有一个开始节点
|
||||
const startNodes = nodes.filter((n) => (n.getData() || {}).nodeType === 'start')
|
||||
if (startNodes.length === 0) {
|
||||
errors.push({ type: 'error', message: '必须有一个开始节点' })
|
||||
} else if (startNodes.length > 1) {
|
||||
errors.push({ type: 'error', message: '只能有一个开始节点', nodeId: startNodes[1].id })
|
||||
}
|
||||
|
||||
// 2. 必须有至少一个结束节点
|
||||
const endNodes = nodes.filter((n) => (n.getData() || {}).nodeType === 'end')
|
||||
if (endNodes.length === 0) {
|
||||
errors.push({ type: 'error', message: '必须至少有一个结束节点' })
|
||||
}
|
||||
|
||||
// 3. 开始节点必须有出边
|
||||
if (startNodes.length === 1) {
|
||||
const hasOutEdge = edges.some((e) => e.getSourceCellId() === startNodes[0].id)
|
||||
if (!hasOutEdge) {
|
||||
errors.push({ type: 'error', message: '开始节点必须连接到下游节点', nodeId: startNodes[0].id })
|
||||
}
|
||||
}
|
||||
|
||||
// 4. 结束节点必须有入边
|
||||
endNodes.forEach((en) => {
|
||||
const hasInEdge = edges.some((e) => e.getTargetCellId() === en.id)
|
||||
if (!hasInEdge) {
|
||||
errors.push({ type: 'error', message: '结束节点必须有入边连接', nodeId: en.id })
|
||||
}
|
||||
})
|
||||
|
||||
// 5. 审批节点必须配置审批人
|
||||
nodes.filter((n) => (n.getData() || {}).nodeType === 'approval').forEach((n) => {
|
||||
const config = (n.getData() || {}).config || {}
|
||||
const strategy = config.strategy || 'users'
|
||||
if (strategy === 'users' && (!config.userIds || config.userIds.length === 0)) {
|
||||
errors.push({ type: 'error', message: `审批节点"${(n.getData() || {}).nodeName || n.id}"未选择审批用户`, nodeId: n.id })
|
||||
}
|
||||
if (strategy === 'roles' && (!config.roleIds || config.roleIds.length === 0)) {
|
||||
errors.push({ type: 'error', message: `审批节点"${(n.getData() || {}).nodeName || n.id}"未选择审批角色`, nodeId: n.id })
|
||||
}
|
||||
if (strategy === 'sql' && (!config.sqlExpr || !config.sqlExpr.trim())) {
|
||||
errors.push({ type: 'error', message: `审批节点"${(n.getData() || {}).nodeName || n.id}"未填写SQL查询`, nodeId: n.id })
|
||||
}
|
||||
})
|
||||
|
||||
// 6. 条件节点必须有至少2条出边
|
||||
nodes.filter((n) => (n.getData() || {}).nodeType === 'condition').forEach((n) => {
|
||||
const outEdges = edges.filter((e) => e.getSourceCellId() === n.id)
|
||||
if (outEdges.length < 2) {
|
||||
errors.push({ type: 'error', message: `条件节点"${(n.getData() || {}).nodeName || n.id}"至少需要2条出边`, nodeId: n.id })
|
||||
}
|
||||
})
|
||||
|
||||
// 7. 孤立节点检查(非开始/结束节点必须有入边和出边)
|
||||
nodes.forEach((n) => {
|
||||
const nodeType = (n.getData() || {}).nodeType
|
||||
if (nodeType === 'start' || nodeType === 'end') return
|
||||
const hasIn = edges.some((e) => e.getTargetCellId() === n.id)
|
||||
const hasOut = edges.some((e) => e.getSourceCellId() === n.id)
|
||||
if (!hasIn || !hasOut) {
|
||||
errors.push({ type: 'warning', message: `节点"${(n.getData() || {}).nodeName || n.id}"未完全连接`, nodeId: n.id })
|
||||
}
|
||||
})
|
||||
|
||||
return errors
|
||||
}
|
||||
```
|
||||
|
||||
### 3.2 在 handlePublish 中调用验证
|
||||
```typescript
|
||||
async function handlePublish() {
|
||||
const errors = validateGraph()
|
||||
const blockers = errors.filter((e) => e.type === 'error')
|
||||
if (blockers.length > 0) {
|
||||
ElMessage.error(blockers[0].message)
|
||||
// 高亮错误节点
|
||||
if (blockers[0].nodeId && graph) {
|
||||
const cell = graph.getCellById(blockers[0].nodeId)
|
||||
if (cell && cell.isNode()) {
|
||||
graph.resetSelection(cell)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
// ... 原有发布逻辑
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 4: 缩放工具栏 + 默认分支标记
|
||||
|
||||
### 4.1 缩放工具栏
|
||||
在 header 按钮区域添加缩放控制:
|
||||
```html
|
||||
<div class="zoom-controls">
|
||||
<el-button text size="small" @click="handleZoomOut" title="缩小">−</el-button>
|
||||
<span class="zoom-level">{{ zoomLevel }}%</span>
|
||||
<el-button text size="small" @click="handleZoomIn" title="放大">+</el-button>
|
||||
<el-button text size="small" @click="handleZoomReset" title="适应画布">⊞</el-button>
|
||||
</div>
|
||||
```
|
||||
|
||||
```typescript
|
||||
const zoomLevel = ref(100)
|
||||
|
||||
function handleZoomIn() {
|
||||
if (!graph) return
|
||||
const cur = graph.zoom()
|
||||
graph.zoom(0.1)
|
||||
zoomLevel.value = Math.round((cur + 0.1) * 100)
|
||||
}
|
||||
|
||||
function handleZoomOut() {
|
||||
if (!graph) return
|
||||
const cur = graph.zoom()
|
||||
graph.zoom(-0.1)
|
||||
zoomLevel.value = Math.round((cur - 0.1) * 100)
|
||||
}
|
||||
|
||||
function handleZoomReset() {
|
||||
if (!graph) return
|
||||
graph.zoomToFit({ padding: 40, maxScale: 1 })
|
||||
zoomLevel.value = Math.round(graph.zoom() * 100)
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 默认分支连线标记
|
||||
默认分支的连线标签显示"其他情况":
|
||||
```typescript
|
||||
// syncEdgeCondition 中,默认分支:
|
||||
if (selectedEdge.value.isDefault) {
|
||||
edge.setData({ ...edge.getData(), conditionExpr: '' })
|
||||
edge.setLabels([{
|
||||
attrs: {
|
||||
label: { text: '其他情况', fill: '#9ca3af', fontSize: 11, textAnchor: 'middle', textVerticalAnchor: 'bottom', fontStyle: 'italic' },
|
||||
rect: { fill: '#f9fafb', stroke: '#d1d5db', strokeWidth: 1, rx: 4, ry: 4, strokeDasharray: '3,3' },
|
||||
},
|
||||
position: { distance: 0.5 },
|
||||
}])
|
||||
}
|
||||
```
|
||||
|
||||
### 4.3 CSS
|
||||
```scss
|
||||
.zoom-controls {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
margin-right: 12px;
|
||||
padding-right: 12px;
|
||||
border-right: 1px solid #e5e7eb;
|
||||
}
|
||||
|
||||
.zoom-level {
|
||||
font-size: 12px;
|
||||
color: #6b7280;
|
||||
min-width: 36px;
|
||||
text-align: center;
|
||||
}
|
||||
```
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,618 +0,0 @@
|
||||
# 运营支撑模块 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Implement 3 operations support modules (洁净室管理, 库位管理, 展馆预约) with backend API + frontend UI, following existing codebase patterns exactly.
|
||||
|
||||
**Architecture:** FastAPI backend with flat-function CRUD (no service layer), Vue 3 + Element Plus frontend with standard list/tree page templates. All 3 modules share a new API route file `app/api/operations.py` and frontend route group.
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2 (backend); Vue 3 / TypeScript / Element Plus / Tailwind CSS 4 (frontend)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-15-operations-support-design.md`
|
||||
|
||||
**Key Reference Files (READ FIRST):**
|
||||
- Backend CRUD pattern: `backend/app/crud/item_unit.py`
|
||||
- Backend API pattern: `backend/app/api/basic_info.py` (lines 1-100 for simple CRUD)
|
||||
- Backend model pattern: `backend/app/models/models.py` (class BizItemUnit, lines 259-275)
|
||||
- Frontend standard list: `web-admin/src/views/system/unit/index.vue`
|
||||
- Frontend tree template: `web-admin/src/views/system/category/index.vue`
|
||||
- Frontend API pattern: `web-admin/src/api/admin.ts` (any CRUD section)
|
||||
- Frontend router: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
### Backend (create/modify)
|
||||
| File | Action | Purpose |
|
||||
|------|--------|---------|
|
||||
| `backend/app/models/models.py` | MODIFY | Add 5 model classes at end of file |
|
||||
| `backend/app/crud/clean_room.py` | CREATE | CleanRoom + AccessLog CRUD functions |
|
||||
| `backend/app/crud/storage_facility.py` | CREATE | StorageFacility tree + Slot CRUD functions |
|
||||
| `backend/app/crud/exhibition_appointment.py` | CREATE | ExhibitionAppointment CRUD functions |
|
||||
| `backend/app/api/operations.py` | CREATE | All 3 modules API routes |
|
||||
| `backend/app/api/__init__.py` | MODIFY | Import + export operations_router |
|
||||
| `backend/app/main.py` | MODIFY | Import + register operations_router |
|
||||
| `backend/tests/test_operations_api.py` | CREATE | Backend API tests |
|
||||
|
||||
### Frontend (create/modify)
|
||||
| File | Action | Purpose |
|
||||
|------|--------|---------|
|
||||
| `web-admin/src/api/admin.ts` | MODIFY | Add API functions for all 3 modules |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | MODIFY | Add 运营支撑 route group |
|
||||
| `web-admin/src/views/operations/clean-room/index.vue` | CREATE | Clean room list page |
|
||||
| `web-admin/src/views/operations/storage-facility/index.vue` | CREATE | Storage facility tree page |
|
||||
| `web-admin/src/views/operations/exhibition-appointment/index.vue` | CREATE | Exhibition appointment list page |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: Backend Models (5 SQLAlchemy models)
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (append at end, before EOF)
|
||||
|
||||
- [ ] **Step 1: Add 5 model classes to models.py**
|
||||
|
||||
Append the following after the last class in `backend/app/models/models.py`:
|
||||
|
||||
```python
|
||||
# =============================================================================
|
||||
# V0.4 运营支撑(2.4 洁净室管理 / 库位管理 / 展馆预约)
|
||||
# =============================================================================
|
||||
|
||||
|
||||
class BizCleanRoom(Base):
|
||||
"""洁净室信息 biz_clean_room"""
|
||||
|
||||
__tablename__ = "biz_clean_room"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
room_code = Column(String(64), nullable=False, comment="编号")
|
||||
room_name = Column(String(200), nullable=False, comment="名称")
|
||||
room_grade = Column(String(8), nullable=True, comment="等级 A/B/C/D")
|
||||
room_status = Column(String(16), nullable=False, default="zc", comment="zc正常 yc异常")
|
||||
area_sqm = Column(Numeric(12, 2), nullable=True, comment="面积m²")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizCleanRoomAccessLog(Base):
|
||||
"""洁净室人员进出 biz_clean_room_access_log"""
|
||||
|
||||
__tablename__ = "biz_clean_room_access_log"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
clean_room_id = Column(String(64), nullable=False, comment="洁净室ID")
|
||||
user_id = Column(String(64), nullable=True, comment="人员用户ID")
|
||||
person_name = Column(String(100), nullable=True, comment="人员姓名(冗余)")
|
||||
dept_name = Column(String(200), nullable=True, comment="部门")
|
||||
enter_time = Column(DateTime, nullable=False, comment="进入时间")
|
||||
purpose = Column(String(512), nullable=True, comment="目的")
|
||||
leave_time = Column(DateTime, nullable=True, comment="离开时间")
|
||||
body_temp = Column(String(32), nullable=True, comment="体温")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizStorageFacility(Base):
|
||||
"""细胞存储设施树节点 biz_storage_facility"""
|
||||
|
||||
__tablename__ = "biz_storage_facility"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
parent_id = Column(String(64), nullable=False, default="0", comment="父节点ID,0根")
|
||||
node_name = Column(String(200), nullable=False, comment="节点名称(罐/层/盒等)")
|
||||
node_type = Column(String(32), nullable=True, comment="facility/layer/box 等扩展")
|
||||
is_leaf = Column(SmallInteger, nullable=False, default=0, comment="是否叶子存储位 1是")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizStorageFacilitySlot(Base):
|
||||
"""细胞存储设施储存位置(格子)biz_storage_facility_slot"""
|
||||
|
||||
__tablename__ = "biz_storage_facility_slot"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
facility_node_id = Column(String(64), nullable=False, comment="设施树叶子节点ID")
|
||||
slot_code = Column(String(64), nullable=True, comment="小格编码/坐标")
|
||||
slot_status = Column(String(16), nullable=True, comment="占用状态等扩展")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizExhibitionAppointment(Base):
|
||||
"""展馆预约 biz_exhibition_appointment"""
|
||||
|
||||
__tablename__ = "biz_exhibition_appointment"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
appointment_no = Column(String(64), nullable=False, comment="预约编号")
|
||||
visit_org = Column(String(200), nullable=True, comment="来访单位")
|
||||
contact_name = Column(String(100), nullable=True, comment="联系人")
|
||||
visit_date = Column(CHAR(8), nullable=True, comment="到访日期YYYYMMDD")
|
||||
visitor_count = Column(Integer, nullable=True, comment="人数")
|
||||
reception_user_id = Column(String(64), nullable=True, comment="接待人员用户ID")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Verify models load without errors**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.models.models import BizCleanRoom, BizCleanRoomAccessLog, BizStorageFacility, BizStorageFacilitySlot, BizExhibitionAppointment; print('All models imported OK')"`
|
||||
Expected: "All models imported OK"
|
||||
|
||||
---
|
||||
|
||||
## Task 2: Backend CRUD — Exhibition Appointment (simplest, start here)
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/exhibition_appointment.py`
|
||||
|
||||
- [ ] **Step 1: Create CRUD file**
|
||||
|
||||
Create `backend/app/crud/exhibition_appointment.py` following the `item_unit.py` pattern exactly. Functions: `_row_to_dict`, `list_exhibition_appointments`, `get_exhibition_appointment`, `appointment_no_exists`, `create_exhibition_appointment`, `update_exhibition_appointment`, `soft_delete_exhibition_appointment`, `total_pages`. All queries filter by `del_flag==0` and `tenant_no`. List supports keyword search on `appointment_no`, `visit_org`, `contact_name`. Default sort by `create_time DESC`.
|
||||
|
||||
- [ ] **Step 2: Verify import**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud import exhibition_appointment; print('OK')"`
|
||||
Expected: "OK"
|
||||
|
||||
---
|
||||
|
||||
## Task 3: Backend CRUD — Clean Room + Access Log
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/clean_room.py`
|
||||
|
||||
- [ ] **Step 1: Create CRUD file**
|
||||
|
||||
Create `backend/app/crud/clean_room.py` with two sets of CRUD functions:
|
||||
|
||||
**Clean Room functions:** `_row_to_dict`, `list_clean_rooms`, `get_clean_room`, `room_code_exists`, `create_clean_room`, `update_clean_room`, `soft_delete_clean_room`, `total_pages`. Keyword search on `room_code`, `room_name`. Filter by `tenant_no` and `del_flag==0`.
|
||||
|
||||
**Access Log functions:** `_access_log_to_dict`, `list_access_logs` (filter by `clean_room_id`), `get_access_log`, `create_access_log`, `update_access_log`, `soft_delete_access_log`. List supports `clean_room_id` filter + keyword on `person_name`, `dept_name`.
|
||||
|
||||
- [ ] **Step 2: Verify import**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud import clean_room; print('OK')"`
|
||||
Expected: "OK"
|
||||
|
||||
---
|
||||
|
||||
## Task 4: Backend CRUD — Storage Facility (tree) + Slot
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/storage_facility.py`
|
||||
|
||||
- [ ] **Step 1: Create CRUD file**
|
||||
|
||||
Create `backend/app/crud/storage_facility.py` with:
|
||||
|
||||
**Facility tree functions:** `_row_to_dict`, `list_all_facilities` (returns flat list, filtered by `tenant_no`, `del_flag==0`), `get_facility`, `create_facility`, `update_facility`, `soft_delete_facility` (cascade: soft-delete all children + their slots), `get_children` (find direct children of a node).
|
||||
|
||||
**Slot functions:** `_slot_to_dict`, `list_slots` (filter by `facility_node_id`), `get_slot`, `create_slot`, `update_slot`, `soft_delete_slot`.
|
||||
|
||||
**Tree helpers:** `build_tree` — converts flat list to nested tree structure with `children` array. `collect_descendant_ids` — recursively collects all descendant node IDs for cascade delete.
|
||||
|
||||
- [ ] **Step 2: Verify import**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud import storage_facility; print('OK')"`
|
||||
Expected: "OK"
|
||||
|
||||
---
|
||||
|
||||
## Task 5: Backend API Routes — operations.py
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/operations.py`
|
||||
|
||||
- [ ] **Step 1: Create the API route file**
|
||||
|
||||
Create `backend/app/api/operations.py` with `router = APIRouter(prefix="/web/admin", tags=["运营支撑"])`. Include:
|
||||
|
||||
**Clean Room endpoints:**
|
||||
- `GET /clean-rooms` — paginated list with keyword
|
||||
- `POST /clean-rooms` — create
|
||||
- `PUT /clean-rooms/{room_id}` — update
|
||||
- `DELETE /clean-rooms/{room_id}` — soft delete
|
||||
|
||||
**Access Log endpoints:**
|
||||
- `GET /clean-room-access-logs` — list by clean_room_id, paginated
|
||||
- `POST /clean-room-access-logs` — create
|
||||
- `PUT /clean-room-access-logs/{log_id}` — update
|
||||
- `DELETE /clean-room-access-logs/{log_id}` — soft delete
|
||||
|
||||
**Storage Facility endpoints:**
|
||||
- `GET /storage-facilities` — flat list (frontend builds tree)
|
||||
- `POST /storage-facilities` — create node
|
||||
- `PUT /storage-facilities/{node_id}` — update node
|
||||
- `DELETE /storage-facilities/{node_id}` — cascade soft delete
|
||||
|
||||
**Storage Slot endpoints:**
|
||||
- `GET /storage-facility-slots` — list by facility_node_id
|
||||
- `POST /storage-facility-slots` — create
|
||||
- `PUT /storage-facility-slots/{slot_id}` — update
|
||||
- `DELETE /storage-facility-slots/{slot_id}` — soft delete
|
||||
|
||||
**Exhibition Appointment endpoints:**
|
||||
- `GET /exhibition-appointments` — paginated list with keyword
|
||||
- `POST /exhibition-appointments` — create
|
||||
- `PUT /exhibition-appointments/{appointment_id}` — update
|
||||
- `DELETE /exhibition-appointments/{appointment_id}` — soft delete
|
||||
|
||||
All endpoints use `Depends(require_admin_or_super_admin)` and `_get_tenant_no(db, user)`.
|
||||
|
||||
Each endpoint follows the pattern from `basic_info.py`: Pydantic body classes inline with `ConfigDict(populate_by_name=True)` and `Field(..., alias="camelCase")`. List endpoints return `success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})`.
|
||||
|
||||
- [ ] **Step 2: Verify import**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.api.operations import router; print(f'Routes: {len(router.routes)}')"`
|
||||
Expected: "Routes: 13"
|
||||
|
||||
---
|
||||
|
||||
## Task 6: Backend Router Registration
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
- [ ] **Step 1: Register in __init__.py**
|
||||
|
||||
Add to `backend/app/api/__init__.py`:
|
||||
```python
|
||||
from app.api.operations import router as operations_router
|
||||
```
|
||||
And add `"operations_router"` to `__all__`.
|
||||
|
||||
- [ ] **Step 2: Register in main.py**
|
||||
|
||||
Add to `backend/app/main.py` line 13 import section:
|
||||
```python
|
||||
from app.api import public_router, menu_router, admin_router, workflow_router, basic_info_router, collection_protocol_router, leave_router, operations_router
|
||||
```
|
||||
Add after line 67:
|
||||
```python
|
||||
app.include_router(operations_router, prefix=settings.API_V1_PREFIX)
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Verify app starts**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.main import app; print(f'App routes: {len(app.routes)}')"`
|
||||
Expected: A number > previous route count
|
||||
|
||||
---
|
||||
|
||||
## Task 7: Backend Tests
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/tests/test_operations_api.py`
|
||||
|
||||
- [ ] **Step 1: Write test file**
|
||||
|
||||
Create `backend/tests/test_operations_api.py` with tests for each module:
|
||||
|
||||
1. **Clean Room tests:** test_create_clean_room, test_list_clean_rooms, test_update_clean_room, test_delete_clean_room
|
||||
2. **Access Log tests:** test_create_access_log, test_list_access_logs_by_room
|
||||
3. **Storage Facility tests:** test_create_facility_node, test_list_facilities_flat, test_create_child_node, test_cascade_delete
|
||||
4. **Slot tests:** test_create_slot, test_list_slots_by_node
|
||||
5. **Exhibition Appointment tests:** test_create_appointment, test_list_appointments, test_update_appointment, test_delete_appointment
|
||||
|
||||
Use `pytest` with FastAPI `TestClient`. Each test creates, reads, updates, deletes and verifies. Tests can use the running dev server or TestClient.
|
||||
|
||||
- [ ] **Step 2: Run tests**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -m pytest tests/test_operations_api.py -v`
|
||||
Expected: All tests PASS
|
||||
|
||||
---
|
||||
|
||||
## Task 8: Frontend API Functions
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`
|
||||
|
||||
- [ ] **Step 1: Add API functions for all 3 modules**
|
||||
|
||||
Append to `web-admin/src/api/admin.ts` three new section blocks:
|
||||
|
||||
**Clean Room section:**
|
||||
```typescript
|
||||
// ---------------------------------------------------------------------------
|
||||
// 洁净室管理
|
||||
// ---------------------------------------------------------------------------
|
||||
export function fetchCleanRoomList(params?: { page?: number; pageSize?: number; keyword?: string }) {
|
||||
return request.get({ url: '/web/admin/clean-rooms', params })
|
||||
}
|
||||
export function fetchCreateCleanRoom(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/clean-rooms', params: data })
|
||||
}
|
||||
export function fetchUpdateCleanRoom(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/clean-rooms/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteCleanRoom(id: string) {
|
||||
return request.del({ url: `/web/admin/clean-rooms/${id}` })
|
||||
}
|
||||
// 人员进出
|
||||
export function fetchAccessLogList(params?: { page?: number; pageSize?: number; cleanRoomId?: string; keyword?: string }) {
|
||||
return request.get({ url: '/web/admin/clean-room-access-logs', params })
|
||||
}
|
||||
export function fetchCreateAccessLog(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/clean-room-access-logs', params: data })
|
||||
}
|
||||
export function fetchUpdateAccessLog(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/clean-room-access-logs/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteAccessLog(id: string) {
|
||||
return request.del({ url: `/web/admin/clean-room-access-logs/${id}` })
|
||||
}
|
||||
```
|
||||
|
||||
**Storage Facility section:**
|
||||
```typescript
|
||||
// ---------------------------------------------------------------------------
|
||||
// 库位管理
|
||||
// ---------------------------------------------------------------------------
|
||||
export function fetchStorageFacilityList(params?: { keyword?: string }) {
|
||||
return request.get({ url: '/web/admin/storage-facilities', params })
|
||||
}
|
||||
export function fetchCreateStorageFacility(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/storage-facilities', params: data })
|
||||
}
|
||||
export function fetchUpdateStorageFacility(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/storage-facilities/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteStorageFacility(id: string) {
|
||||
return request.del({ url: `/web/admin/storage-facilities/${id}` })
|
||||
}
|
||||
// 格子
|
||||
export function fetchStorageSlotList(params?: { facilityNodeId?: string }) {
|
||||
return request.get({ url: '/web/admin/storage-facility-slots', params })
|
||||
}
|
||||
export function fetchCreateStorageSlot(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/storage-facility-slots', params: data })
|
||||
}
|
||||
export function fetchUpdateStorageSlot(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/storage-facility-slots/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteStorageSlot(id: string) {
|
||||
return request.del({ url: `/web/admin/storage-facility-slots/${id}` })
|
||||
}
|
||||
```
|
||||
|
||||
**Exhibition Appointment section:**
|
||||
```typescript
|
||||
// ---------------------------------------------------------------------------
|
||||
// 展馆预约
|
||||
// ---------------------------------------------------------------------------
|
||||
export function fetchExhibitionAppointmentList(params?: { page?: number; pageSize?: number; keyword?: string }) {
|
||||
return request.get({ url: '/web/admin/exhibition-appointments', params })
|
||||
}
|
||||
export function fetchCreateExhibitionAppointment(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/exhibition-appointments', params: data })
|
||||
}
|
||||
export function fetchUpdateExhibitionAppointment(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/exhibition-appointments/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteExhibitionAppointment(id: string) {
|
||||
return request.del({ url: `/web/admin/exhibition-appointments/${id}` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Verify no TypeScript errors**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm build:typecheck 2>&1 | tail -5`
|
||||
Expected: No errors related to new functions
|
||||
|
||||
---
|
||||
|
||||
## Task 9: Frontend Router — Add 运营支撑 Group
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
- [ ] **Step 1: Add route group**
|
||||
|
||||
Add before the closing `]` of `sqxpAdminRoutes` (before the last `}` or after the Workflow section):
|
||||
|
||||
```typescript
|
||||
,
|
||||
{
|
||||
id: '60000000000000000000000000000001',
|
||||
name: 'Operations',
|
||||
path: '/operations',
|
||||
component: '/index/index',
|
||||
meta: {
|
||||
title: '运营支撑',
|
||||
icon: 'operation',
|
||||
keepAlive: false,
|
||||
roles: ['admin']
|
||||
},
|
||||
children: [
|
||||
{
|
||||
id: '60000000000000000000000000000002',
|
||||
name: 'CleanRoom',
|
||||
path: 'clean-room',
|
||||
component: '/operations/clean-room/index',
|
||||
meta: { title: '洁净室管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '60000000000000000000000000000003',
|
||||
name: 'StorageFacility',
|
||||
path: 'storage-facility',
|
||||
component: '/operations/storage-facility/index',
|
||||
meta: { title: '库位管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '60000000000000000000000000000004',
|
||||
name: 'ExhibitionAppointment',
|
||||
path: 'exhibition-appointment',
|
||||
component: '/operations/exhibition-appointment/index',
|
||||
meta: { title: '展馆预约', keepAlive: true }
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Verify routes compile**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm build:typecheck 2>&1 | tail -5`
|
||||
Expected: No route-related errors
|
||||
|
||||
---
|
||||
|
||||
## Task 10: Frontend — Clean Room Page
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/operations/clean-room/index.vue`
|
||||
|
||||
- [ ] **Step 1: Create the Vue page**
|
||||
|
||||
Create `web-admin/src/views/operations/clean-room/index.vue` following the `system/unit/index.vue` template exactly:
|
||||
|
||||
**Page structure:**
|
||||
- `page-container` → `header.page-head` → `section.panel`
|
||||
- Filter: keyword search
|
||||
- Table columns: 编号(roomCode), 名称(roomName), 等级(roomGrade, tag display: A级绿色/B级蓝色/C级黄色/D级灰色), 状态(roomStatus, tag: 正常=success/异常=danger), 面积(areaSqm), 操作
|
||||
- Toolbar: 新增按钮, 批量删除按钮
|
||||
- Dialog form (label-position="top", form-grid-2):
|
||||
- 编号(roomCode, required), 名称(roomName, required), 等级(roomGrade, select: A/B/C/D), 状态(roomStatus, select: 正常zc/异常yc), 面积(areaSqm, number input, suffix "m²"), 备注(remark)
|
||||
- 操作列: 查看, 编辑, 人员进出, 删除
|
||||
- "人员进出"按钮 → 打开新弹窗显示该洁净室的进出记录列表(带分页), 弹窗内支持新增/编辑/删除进出记录
|
||||
- 进出记录表单: 人员姓名(personName), 部门(deptName), 进入时间(enterTime, datetime), 目的(purpose), 离开时间(leaveTime, datetime), 体温(bodyTemp), 备注(remark)
|
||||
- View dialog using SystemViewDialog component
|
||||
- API calls: `fetchCleanRoomList`, `fetchCreateCleanRoom`, `fetchUpdateCleanRoom`, `fetchDeleteCleanRoom`, `fetchAccessLogList`, `fetchCreateAccessLog`, `fetchUpdateAccessLog`, `fetchDeleteAccessLog`
|
||||
|
||||
- [ ] **Step 2: Verify page renders**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm dev`, then navigate to `/#/operations/clean-room`
|
||||
Expected: Page loads without console errors, shows empty list with filter bar and toolbar
|
||||
|
||||
---
|
||||
|
||||
## Task 11: Frontend — Storage Facility Page (Tree)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/operations/storage-facility/index.vue`
|
||||
|
||||
- [ ] **Step 1: Create the Vue page**
|
||||
|
||||
Create `web-admin/src/views/operations/storage-facility/index.vue` following the `system/category/index.vue` tree template:
|
||||
|
||||
**Page structure:**
|
||||
- Left panel: tree structure display using `el-table` with `row-key="id"` and `:tree-props="{ children: 'children' }"`
|
||||
- Data fetched as flat list via `fetchStorageFacilityList`, then `buildTree()` converts to nested tree
|
||||
- Tree columns: 节点名称(nodeName), 节点类型(nodeType, display as tag: facility=设施/layer=层/box=盒), 是否叶子(isLeaf, icon or tag), 备注(remark)
|
||||
- Toolbar: 新增根节点, 展开全部, 折叠全部
|
||||
- 操作列: 新增子节点, 编辑, 删除(需确认)
|
||||
- Right panel: when a leaf node (`isLeaf===1`) is selected, show its slots (格子) list
|
||||
- Slot table: 编码(slotCode), 状态(slotStatus), 操作(编辑/删除)
|
||||
- Add slot button
|
||||
- Dialog form for facility node (label-position="top", form-grid-2):
|
||||
- 父节点(parentId, select from tree list, show full path via `buildTreePathLabelFromFlat`), 节点名称(nodeName, required), 节点类型(nodeType, select: facility/layer/box), 是否叶子(isLeaf, switch), 备注(remark)
|
||||
- Dialog form for slot:
|
||||
- 编码(slotCode, required), 状态(slotStatus, select), 备注(remark)
|
||||
- Tree utilities: import `buildTreePathLabelFromFlat` from `@/utils/tree-path`
|
||||
- API calls: `fetchStorageFacilityList`, `fetchCreateStorageFacility`, `fetchUpdateStorageFacility`, `fetchDeleteStorageFacility`, `fetchStorageSlotList`, `fetchCreateStorageSlot`, `fetchUpdateStorageSlot`, `fetchDeleteStorageSlot`
|
||||
|
||||
- [ ] **Step 2: Verify page renders**
|
||||
|
||||
Navigate to `/#/operations/storage-facility`
|
||||
Expected: Page loads, shows empty tree with toolbar
|
||||
|
||||
---
|
||||
|
||||
## Task 12: Frontend — Exhibition Appointment Page
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/operations/exhibition-appointment/index.vue`
|
||||
|
||||
- [ ] **Step 1: Create the Vue page**
|
||||
|
||||
Create `web-admin/src/views/operations/exhibition-appointment/index.vue` following the `system/unit/index.vue` standard list template:
|
||||
|
||||
**Page structure:**
|
||||
- Filter: keyword search (搜索预约编号/来访单位/联系人)
|
||||
- Table columns: 预约编号(appointmentNo), 来访单位(visitOrg), 联系人(contactName), 到访日期(visitDate), 人数(visitorCount), 接待人员(receptionUserId → display name), 操作
|
||||
- Toolbar: 新增按钮, 批量删除按钮
|
||||
- Dialog form (label-position="top", form-grid-2):
|
||||
- 预约编号(appointmentNo, required), 来访单位(visitOrg, required), 联系人(contactName), 到访日期(visitDate, date picker), 人数(visitorCount, number input), 接待人员(receptionUserId, select from user options), 备注(remark)
|
||||
- View dialog using SystemViewDialog component
|
||||
- API calls: `fetchExhibitionAppointmentList`, `fetchCreateExhibitionAppointment`, `fetchUpdateExhibitionAppointment`, `fetchDeleteExhibitionAppointment`
|
||||
|
||||
- [ ] **Step 2: Verify page renders**
|
||||
|
||||
Navigate to `/#/operations/exhibition-appointment`
|
||||
Expected: Page loads without errors, shows empty list
|
||||
|
||||
---
|
||||
|
||||
## Task 13: Integration Test & Verification
|
||||
|
||||
- [ ] **Step 1: Start backend and verify all API endpoints**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -m pytest tests/test_operations_api.py -v`
|
||||
Expected: All tests pass
|
||||
|
||||
- [ ] **Step 2: Start frontend and verify all 3 pages**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm dev`
|
||||
Navigate to each page:
|
||||
- `/#/operations/clean-room` — verify list, create dialog, access log dialog
|
||||
- `/#/operations/storage-facility` — verify tree display, node CRUD, slot CRUD
|
||||
- `/#/operations/exhibition-appointment` — verify list, create/edit dialog
|
||||
|
||||
- [ ] **Step 3: Run frontend typecheck**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm build:typecheck`
|
||||
Expected: No TypeScript errors
|
||||
|
||||
- [ ] **Step 4: Run frontend lint**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm lint`
|
||||
Expected: No lint errors (or only pre-existing ones)
|
||||
|
||||
---
|
||||
|
||||
## Self-Review Checklist
|
||||
|
||||
1. **Spec coverage**: All 5 tables have models ✓, all 3 modules have CRUD ✓, API ✓, frontend ✓
|
||||
2. **Placeholder scan**: No TBD/TODO, all steps have actual code or descriptions ✓
|
||||
3. **Type consistency**: Model field names match CRUD `_row_to_dict` keys match API aliases ✓
|
||||
4. **Convention compliance**: tenant_no filter ✓, soft delete ✓, camelCase API ✓, Fresh Mint colors ✓
|
||||
@@ -1,924 +0,0 @@
|
||||
# 库位管理页面改造 — 实现计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 将库位管理页面从树形表格+右侧窄面板改为左右布局(左侧 el-tree 树形列表 + 右侧货架行格子卡片),并新增批量生成格子功能。
|
||||
|
||||
**Architecture:** 前端完全重写 `index.vue`,参考 `user/index.vue` 的 el-tree 侧边栏模式。后端新增一个批量创建格子的 API 端点(rows×cols 参数 → 一次事务创建多个 slot)。前端格子区域使用 CSS flex 按行分组展示,每行左侧有行标(A/B/C),格子内编号+状态在第一行,下方预留空间。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy(后端),Vue 3 + Element Plus + SCSS(前端)
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| File | Action | Responsibility |
|
||||
|------|--------|---------------|
|
||||
| `backend/app/crud/storage_facility.py` | Modify | 新增 `batch_create_slots()` 函数 |
|
||||
| `backend/app/api/operations.py` | Modify | 新增 `POST /storage-facility-slots/batch` 端点 |
|
||||
| `web-admin/src/api/admin.ts` | Modify | 新增 `fetchBatchCreateSlots()` 函数 |
|
||||
| `web-admin/src/views/operations/storage-facility/index.vue` | Rewrite | 完全重写为 el-tree + 货架行布局 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 后端 — 批量创建格子 CRUD 函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/storage_facility.py` (在文件末尾 `soft_delete_slot` 之后追加)
|
||||
|
||||
- [ ] **Step 1: 在 `storage_facility.py` 末尾添加 `batch_create_slots` 函数**
|
||||
|
||||
在 `backend/app/crud/storage_facility.py` 文件末尾追加以下函数(在 `soft_delete_slot` 函数之后):
|
||||
|
||||
```python
|
||||
def batch_create_slots(
|
||||
db: Session,
|
||||
*,
|
||||
facility_node_id: str,
|
||||
rows: int,
|
||||
cols: int,
|
||||
code_prefix: str = "",
|
||||
tenant_no: str = "zkxw",
|
||||
user_id: Optional[str] = None,
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""Batch create rows×cols slots for a leaf facility node in a single transaction."""
|
||||
fid = (facility_node_id or "").strip()
|
||||
if not fid:
|
||||
raise ValueError("所属设施节点不能为空")
|
||||
if rows < 1 or cols < 1:
|
||||
raise ValueError("行数和列数必须大于 0")
|
||||
if rows > 50 or cols > 50:
|
||||
raise ValueError("单次最多生成 50×50 = 2500 个格子")
|
||||
|
||||
node = db.query(BizStorageFacility).filter(
|
||||
and_(BizStorageFacility.id == fid, BizStorageFacility.del_flag == 0)
|
||||
).first()
|
||||
if not node:
|
||||
raise ValueError("所属设施节点不存在")
|
||||
if not node.is_leaf:
|
||||
raise ValueError("只能为叶子节点创建格子")
|
||||
|
||||
prefix = (code_prefix or "").strip()
|
||||
now = datetime.now()
|
||||
slots: List[BizStorageFacilitySlot] = []
|
||||
|
||||
for r in range(1, rows + 1):
|
||||
for c in range(1, cols + 1):
|
||||
code = f"{prefix}{r}-{c}" if prefix else f"{r}-{c}"
|
||||
order = (r - 1) * cols + c
|
||||
obj = BizStorageFacilitySlot(
|
||||
id=generate_uuid(),
|
||||
facility_node_id=fid,
|
||||
slot_code=code,
|
||||
slot_status="空",
|
||||
tenant_no=tenant_no,
|
||||
order_num=order,
|
||||
remark=None,
|
||||
create_by=user_id,
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_by=user_id,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
db.add(obj)
|
||||
slots.append(obj)
|
||||
|
||||
db.commit()
|
||||
for s in slots:
|
||||
db.refresh(s)
|
||||
return [_slot_to_dict(s) for s in slots]
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证语法无误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud.storage_facility import batch_create_slots; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 后端 — 批量创建格子 API 端点
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/operations.py` (在 `StorageSlotCreateBody` 类之后、`list_storage_slots` 端点之前插入)
|
||||
|
||||
- [ ] **Step 1: 添加 Pydantic body model 和 API 端点**
|
||||
|
||||
在 `backend/app/api/operations.py` 中,在 `StorageSlotCreateBody` 类定义之后(约第 377 行之后),添加 body model:
|
||||
|
||||
```python
|
||||
class StorageSlotBatchCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
facility_node_id: str = Field(..., alias="facilityNodeId")
|
||||
rows: int = Field(..., ge=1, le=50)
|
||||
cols: int = Field(..., ge=1, le=50)
|
||||
code_prefix: Optional[str] = Field("", alias="codePrefix")
|
||||
```
|
||||
|
||||
然后在 `@router.post("/storage-facility-slots")` 端点之前(`StorageSlotBatchCreateBody` 定义之后),添加批量创建端点:
|
||||
|
||||
```python
|
||||
@router.post("/storage-facility-slots/batch")
|
||||
async def batch_create_storage_slots(
|
||||
body: StorageSlotBatchCreateBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
items = storage_facility_svc.batch_create_slots(
|
||||
db,
|
||||
facility_node_id=body.facility_node_id,
|
||||
rows=body.rows,
|
||||
cols=body.cols,
|
||||
code_prefix=body.code_prefix,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user.get("user_id"),
|
||||
)
|
||||
return success_response(items, message=f"批量创建 {len(items)} 个格子成功")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
```
|
||||
|
||||
**重要**:这个端点必须放在 `/storage-facility-slots` 路由之前,否则 FastAPI 会把 `batch` 当做 `{slot_id}` 参数匹配。
|
||||
|
||||
- [ ] **Step 2: 验证语法无误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.api.operations import router; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 前端 — 添加批量创建 API 函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts` (在 `fetchCreateStorageSlot` 函数之后)
|
||||
|
||||
- [ ] **Step 1: 在 `admin.ts` 中 `fetchCreateStorageSlot` 之后添加批量创建函数**
|
||||
|
||||
在 `web-admin/src/api/admin.ts` 中,在 `fetchCreateStorageSlot` 函数(第 1336-1338 行)之后插入:
|
||||
|
||||
```typescript
|
||||
export function fetchBatchCreateSlots(data: { facilityNodeId: string; rows: number; cols: number; codePrefix?: string }) {
|
||||
return request.post({ url: '/web/admin/storage-facility-slots/batch', params: data })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证 lint 通过**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && npx eslint src/api/admin.ts --no-error-on-unmatched-pattern 2>&1 | tail -5`
|
||||
Expected: 无错误输出
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 前端 — 重写库位管理页面
|
||||
|
||||
**Files:**
|
||||
- Rewrite: `web-admin/src/views/operations/storage-facility/index.vue`
|
||||
- Reference: `web-admin/src/views/system/user/index.vue` (el-tree 侧边栏模式)
|
||||
- Reference: `web-admin/storage-redesign-prototype.html` (视觉原型)
|
||||
|
||||
这是最大的任务。完全重写页面,从树形表格+窄面板 → el-tree 侧边栏 + 货架行格子布局。
|
||||
|
||||
- [ ] **Step 1: 重写整个 index.vue**
|
||||
|
||||
用以下完整内容替换 `web-admin/src/views/operations/storage-facility/index.vue` 的全部内容。
|
||||
|
||||
**关键设计决策:**
|
||||
|
||||
1. **左侧 el-tree** — 参考 `user/index.vue` 的 `w-[280px] shrink-0 border-r` 布局。使用 `el-tree` 组件 + `buildTree()` 构建树形数据。树节点通过 `@node-click` 触发右侧面板更新。
|
||||
|
||||
2. **右侧货架行格子** — 使用 flex 布局,按行分组。每行由行标 `.shelf-label` + 格子容器 `.shelf-cells` 组成。每个格子 `.shelf-cell` 内编号+状态在顶部一行,下方预留空间。
|
||||
|
||||
3. **批量生成** — 点击"批量生成格子"弹出 dialog,输入行数、列数、编码前缀。确认后调用 `fetchBatchCreateSlots`。
|
||||
|
||||
4. **格子编辑** — 点击格子弹出编辑 dialog,修改编码和状态。
|
||||
|
||||
5. **节点 CRUD** — el-tree 节点 hover 显示操作按钮(新增子节点、编辑、删除),点击弹出 dialog。
|
||||
|
||||
**完整代码如下:**
|
||||
|
||||
```vue
|
||||
<template>
|
||||
<div class="page-container">
|
||||
<header class="page-head">
|
||||
<h1>库位管理</h1>
|
||||
<p class="page-desc">维护库位设施树结构,以及叶子节点的格子管理。</p>
|
||||
</header>
|
||||
|
||||
<section class="panel">
|
||||
<div class="flex gap-4">
|
||||
<div class="w-[280px] shrink-0 border-r border-[var(--mint-border)] pr-4">
|
||||
<div class="panel-top sf-tree-aside__head">
|
||||
<h2 class="title-bar-heading">库位树</h2>
|
||||
<el-button class="btn-main" type="primary" size="small" @click="handleAddRoot">新增</el-button>
|
||||
</div>
|
||||
<el-input
|
||||
v-model="treeKeyword"
|
||||
placeholder="搜索节点"
|
||||
clearable
|
||||
class="sf-tree-search"
|
||||
/>
|
||||
<el-tree
|
||||
ref="treeRef"
|
||||
:data="treeData"
|
||||
:props="{ label: 'nodeName', children: 'children' }"
|
||||
node-key="id"
|
||||
highlight-current
|
||||
default-expand-all
|
||||
:filter-node-method="filterNode"
|
||||
@node-click="handleNodeClick"
|
||||
>
|
||||
<template #default="{ node, data }">
|
||||
<div class="sf-tree-node" @mouseenter="hoveredNodeId = data.id" @mouseleave="hoveredNodeId = ''">
|
||||
<span class="sf-tree-node__label">{{ data.nodeName }}</span>
|
||||
<span v-if="data.isLeaf === 1" class="sf-tree-node__leaf">叶</span>
|
||||
<div v-if="hoveredNodeId === data.id" class="sf-tree-node__ops" @click.stop>
|
||||
<el-button v-if="data.isLeaf !== 1" link size="small" @click="handleAddChild(data)">+</el-button>
|
||||
<el-button link size="small" @click="handleEditNode(data)">编辑</el-button>
|
||||
<el-button link size="small" type="danger" @click="handleDeleteNode(data)">删除</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-tree>
|
||||
</div>
|
||||
|
||||
<div class="flex-1 min-w-0">
|
||||
<div v-if="!selectedNode" class="sf-empty">
|
||||
<el-empty description="请在左侧选择一个叶子节点查看格子" />
|
||||
</div>
|
||||
|
||||
<template v-if="selectedNode && selectedNode.isLeaf !== 1">
|
||||
<div class="panel-top">
|
||||
<h2 class="title-bar-heading">{{ selectedNode.nodeName }}</h2>
|
||||
</div>
|
||||
<el-empty description="非叶子节点,请继续选择子节点" />
|
||||
</template>
|
||||
|
||||
<template v-if="selectedNode && selectedNode.isLeaf === 1">
|
||||
<div class="panel-top">
|
||||
<h2 class="title-bar-heading">
|
||||
{{ buildTreePathLabelFromFlat(selectedNode.id, flatList, { nameKey: 'nodeName' }) }} — 格子管理
|
||||
</h2>
|
||||
<span class="sf-count">共 {{ slotList.length }} 个格子</span>
|
||||
</div>
|
||||
|
||||
<div class="list-toolbar">
|
||||
<div class="list-toolbar-row">
|
||||
<el-button class="btn-main" type="primary" @click="handleBatchCreate">批量生成格子</el-button>
|
||||
<el-button
|
||||
v-if="slotList.length > 0"
|
||||
class="btn-ghost"
|
||||
@click="handleClearAllSlots"
|
||||
>
|
||||
清空格子
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="slotList.length === 0" class="sf-empty">
|
||||
<el-empty description="暂无格子,点击「批量生成格子」创建" />
|
||||
</div>
|
||||
|
||||
<div v-else class="sf-shelf-container">
|
||||
<div v-for="(row, ri) in shelfRows" :key="ri" class="sf-shelf-row">
|
||||
<div class="sf-shelf-label">{{ row.label }}</div>
|
||||
<div class="sf-shelf-cells">
|
||||
<div
|
||||
v-for="cell in row.cells"
|
||||
:key="cell.id"
|
||||
class="sf-shelf-cell"
|
||||
:class="{ 'is-occupied': cell.slotStatus === '占用' }"
|
||||
@click="handleEditSlot(cell)"
|
||||
>
|
||||
<div class="sf-cell-top">
|
||||
<span class="sf-cell-code">{{ cell.slotCode }}</span>
|
||||
<span
|
||||
class="sf-cell-status"
|
||||
:class="cell.slotStatus === '占用' ? 'is-occupied' : 'is-empty'"
|
||||
>
|
||||
{{ cell.slotStatus || '空' }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="sf-cell-body">
|
||||
<span class="sf-cell-reserved">—</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<el-dialog
|
||||
v-model="nodeDialogVisible"
|
||||
:title="nodeDialogTitle"
|
||||
width="560px"
|
||||
class="dialog-form-layout"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@close="handleNodeDialogClose"
|
||||
>
|
||||
<el-form
|
||||
ref="nodeFormRef"
|
||||
:model="nodeFormData"
|
||||
:rules="nodeFormRules"
|
||||
label-position="top"
|
||||
scroll-to-error
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="上级节点">
|
||||
<el-select
|
||||
v-model="nodeFormData.parentId"
|
||||
placeholder="请选择上级节点(空为根节点)"
|
||||
clearable
|
||||
filterable
|
||||
>
|
||||
<el-option
|
||||
v-for="item in flatList"
|
||||
:key="item.id"
|
||||
:label="buildTreePathLabelFromFlat(item.id, flatList, { nameKey: 'nodeName' })"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="节点名称" prop="nodeName">
|
||||
<el-input v-model="nodeFormData.nodeName" placeholder="请输入节点名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="节点类型">
|
||||
<el-select v-model="nodeFormData.nodeType" placeholder="请选择节点类型">
|
||||
<el-option label="设施" value="facility" />
|
||||
<el-option label="层" value="layer" />
|
||||
<el-option label="盒" value="box" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否叶子">
|
||||
<el-switch v-model="nodeFormData.isLeaf" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" class="form-col-span-2">
|
||||
<el-input v-model="nodeFormData.remark" placeholder="可选" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button class="btn-ghost" @click="nodeDialogVisible = false">取消</el-button>
|
||||
<el-button class="btn-main" type="primary" @click="handleNodeSubmit" :loading="nodeSubmitLoading">确定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
v-model="slotDialogVisible"
|
||||
:title="slotDialogTitle"
|
||||
width="480px"
|
||||
class="dialog-form-layout"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@close="handleSlotDialogClose"
|
||||
>
|
||||
<el-form
|
||||
ref="slotFormRef"
|
||||
:model="slotFormData"
|
||||
:rules="slotFormRules"
|
||||
label-position="top"
|
||||
scroll-to-error
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="格子编码" prop="slotCode">
|
||||
<el-input v-model="slotFormData.slotCode" placeholder="请输入格子编码" />
|
||||
</el-form-item>
|
||||
<el-form-item label="格子状态">
|
||||
<el-select v-model="slotFormData.slotStatus" placeholder="请选择状态">
|
||||
<el-option label="空" value="空" />
|
||||
<el-option label="占用" value="占用" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button class="btn-ghost" @click="slotDialogVisible = false">取消</el-button>
|
||||
<el-button class="btn-main" type="primary" @click="handleSlotSubmit" :loading="slotSubmitLoading">确定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
v-model="batchDialogVisible"
|
||||
title="批量生成格子"
|
||||
width="440px"
|
||||
class="dialog-form-layout"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-form label-position="top">
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="行数">
|
||||
<el-input-number v-model="batchForm.rows" :min="1" :max="20" style="width: 100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="列数">
|
||||
<el-input-number v-model="batchForm.cols" :min="1" :max="20" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-form-item label="编码前缀">
|
||||
<el-input v-model="batchForm.codePrefix" placeholder="如 A、B-、01-(可选)" />
|
||||
<template #label>
|
||||
编码前缀
|
||||
<span class="form-label-tip">生成格式:前缀+行号-列号,如 A-1-1</span>
|
||||
</template>
|
||||
</el-form-item>
|
||||
<div class="sf-batch-preview">
|
||||
将生成 <strong>{{ batchForm.rows * batchForm.cols }}</strong> 个格子({{ batchForm.rows }} 行 × {{ batchForm.cols }} 列)
|
||||
</div>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button class="btn-ghost" @click="batchDialogVisible = false">取消</el-button>
|
||||
<el-button class="btn-main" type="primary" @click="handleBatchSubmit" :loading="batchSubmitLoading">确认生成</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import {
|
||||
fetchStorageFacilityList,
|
||||
fetchCreateStorageFacility,
|
||||
fetchUpdateStorageFacility,
|
||||
fetchDeleteStorageFacility,
|
||||
fetchStorageSlotList,
|
||||
fetchBatchCreateSlots,
|
||||
fetchUpdateStorageSlot,
|
||||
fetchDeleteStorageSlot
|
||||
} from '@/api/admin'
|
||||
import { buildTreePathLabelFromFlat } from '@/utils/tree-path'
|
||||
|
||||
defineOptions({ name: 'StorageFacility' })
|
||||
|
||||
const ROW_LABELS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T']
|
||||
|
||||
const hoveredNodeId = ref('')
|
||||
const treeKeyword = ref('')
|
||||
const treeRef = ref()
|
||||
const loading = ref(false)
|
||||
const flatList = ref<any[]>([])
|
||||
const treeData = ref<any[]>([])
|
||||
const selectedNode = ref<any>(null)
|
||||
const slotLoading = ref(false)
|
||||
const slotList = ref<any[]>([])
|
||||
|
||||
const buildTree = (list: any[]) => {
|
||||
const map = new Map<string, any>()
|
||||
const roots: any[] = []
|
||||
list.forEach(item => { map.set(item.id, { ...item, children: [] }) })
|
||||
list.forEach(item => {
|
||||
const node = map.get(item.id)!
|
||||
if (item.parentId && item.parentId !== '0' && map.has(item.parentId)) {
|
||||
map.get(item.parentId)!.children.push(node)
|
||||
} else {
|
||||
roots.push(node)
|
||||
}
|
||||
})
|
||||
return roots
|
||||
}
|
||||
|
||||
const loadData = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const res: any = await fetchStorageFacilityList({ keyword: treeKeyword.value || undefined })
|
||||
const list = res?.list || res || []
|
||||
flatList.value = list
|
||||
treeData.value = buildTree(list)
|
||||
} catch (error) {
|
||||
console.error('加载库位数据失败:', error)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const filterNode = (value: string, data: any) => {
|
||||
if (!value) return true
|
||||
return data.nodeName?.includes(value)
|
||||
}
|
||||
|
||||
watch(treeKeyword, val => { treeRef.value?.filter(val) })
|
||||
|
||||
const handleNodeClick = async (data: any) => {
|
||||
selectedNode.value = data
|
||||
if (data.isLeaf === 1) {
|
||||
await loadSlots(data.id)
|
||||
} else {
|
||||
slotList.value = []
|
||||
}
|
||||
}
|
||||
|
||||
const loadSlots = async (facilityNodeId: string) => {
|
||||
slotLoading.value = true
|
||||
try {
|
||||
const res: any = await fetchStorageSlotList({ facilityNodeId })
|
||||
slotList.value = res?.list || res || []
|
||||
} catch (error) {
|
||||
console.error('加载格子数据失败:', error)
|
||||
slotList.value = []
|
||||
} finally {
|
||||
slotLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const shelfRows = computed(() => {
|
||||
const cols = batchForm.cols
|
||||
const result: { label: string; cells: any[] }[] = []
|
||||
for (let r = 0; r * cols < slotList.value.length; r++) {
|
||||
const rowCells = slotList.value.slice(r * cols, (r + 1) * cols)
|
||||
if (rowCells.length > 0) {
|
||||
result.push({ label: ROW_LABELS[r] || String(r + 1), cells: rowCells })
|
||||
}
|
||||
}
|
||||
return result
|
||||
})
|
||||
|
||||
const nodeDialogVisible = ref(false)
|
||||
const nodeDialogTitle = ref('新增根节点')
|
||||
const isNodeEdit = ref(false)
|
||||
const nodeSubmitLoading = ref(false)
|
||||
const nodeFormRef = ref()
|
||||
const nodeFormData = reactive({
|
||||
id: '',
|
||||
parentId: '',
|
||||
nodeName: '',
|
||||
nodeType: 'facility',
|
||||
isLeaf: 0 as 0 | 1,
|
||||
remark: ''
|
||||
})
|
||||
const nodeFormRules = { nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }] }
|
||||
|
||||
const handleAddRoot = () => {
|
||||
isNodeEdit.value = false
|
||||
nodeDialogTitle.value = '新增根节点'
|
||||
Object.assign(nodeFormData, { id: '', parentId: '', nodeName: '', nodeType: 'facility', isLeaf: 0, remark: '' })
|
||||
nodeDialogVisible.value = true
|
||||
nextTick(() => nodeFormRef.value?.clearValidate?.())
|
||||
}
|
||||
|
||||
const handleAddChild = (row: any) => {
|
||||
isNodeEdit.value = false
|
||||
nodeDialogTitle.value = '新增子节点'
|
||||
Object.assign(nodeFormData, { id: '', parentId: row.id, nodeName: '', nodeType: 'layer', isLeaf: 0, remark: '' })
|
||||
nodeDialogVisible.value = true
|
||||
nextTick(() => nodeFormRef.value?.clearValidate?.())
|
||||
}
|
||||
|
||||
const handleEditNode = (row: any) => {
|
||||
isNodeEdit.value = true
|
||||
nodeDialogTitle.value = '编辑节点'
|
||||
Object.assign(nodeFormData, {
|
||||
id: row.id,
|
||||
parentId: row.parentId || '',
|
||||
nodeName: row.nodeName || '',
|
||||
nodeType: row.nodeType || 'facility',
|
||||
isLeaf: row.isLeaf ?? 0,
|
||||
remark: row.remark || ''
|
||||
})
|
||||
nodeDialogVisible.value = true
|
||||
nextTick(() => nodeFormRef.value?.clearValidate?.())
|
||||
}
|
||||
|
||||
const handleNodeSubmit = async () => {
|
||||
await nodeFormRef.value?.validate?.()
|
||||
nodeSubmitLoading.value = true
|
||||
try {
|
||||
const payload = {
|
||||
parentId: nodeFormData.parentId || undefined,
|
||||
nodeName: nodeFormData.nodeName.trim(),
|
||||
nodeType: nodeFormData.nodeType,
|
||||
isLeaf: nodeFormData.isLeaf,
|
||||
remark: nodeFormData.remark?.trim() || undefined
|
||||
}
|
||||
if (isNodeEdit.value && nodeFormData.id) {
|
||||
await fetchUpdateStorageFacility(nodeFormData.id, payload)
|
||||
} else {
|
||||
await fetchCreateStorageFacility(payload)
|
||||
}
|
||||
ElMessage.success(isNodeEdit.value ? '更新成功' : '创建成功')
|
||||
nodeDialogVisible.value = false
|
||||
await loadData()
|
||||
} catch { /* handled globally */ } finally {
|
||||
nodeSubmitLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleNodeDialogClose = () => {
|
||||
Object.assign(nodeFormData, { id: '', parentId: '', nodeName: '', nodeType: 'facility', isLeaf: 0, remark: '' })
|
||||
nodeFormRef.value?.clearValidate?.()
|
||||
}
|
||||
|
||||
const handleDeleteNode = async (row: any) => {
|
||||
try {
|
||||
await ElMessageBox.confirm('删除节点将一并删除其子节点和格子。确定继续吗?', '提示', { type: 'warning' })
|
||||
await fetchDeleteStorageFacility(row.id)
|
||||
ElMessage.success('删除成功')
|
||||
if (selectedNode.value?.id === row.id) {
|
||||
selectedNode.value = null
|
||||
slotList.value = []
|
||||
}
|
||||
await loadData()
|
||||
} catch (error: any) {
|
||||
if (error !== 'cancel') console.error('删除失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
const slotDialogVisible = ref(false)
|
||||
const slotDialogTitle = ref('编辑格子')
|
||||
const isSlotEdit = ref(false)
|
||||
const slotSubmitLoading = ref(false)
|
||||
const slotFormRef = ref()
|
||||
const editingSlotId = ref<string | null>(null)
|
||||
const slotFormData = reactive({ slotCode: '', slotStatus: '空' })
|
||||
const slotFormRules = { slotCode: [{ required: true, message: '请输入格子编码', trigger: 'blur' }] }
|
||||
|
||||
const handleEditSlot = (row: any) => {
|
||||
isSlotEdit.value = true
|
||||
slotDialogTitle.value = '编辑格子'
|
||||
editingSlotId.value = row.id
|
||||
Object.assign(slotFormData, { slotCode: row.slotCode || '', slotStatus: row.slotStatus || '空' })
|
||||
slotDialogVisible.value = true
|
||||
nextTick(() => slotFormRef.value?.clearValidate?.())
|
||||
}
|
||||
|
||||
const handleSlotSubmit = async () => {
|
||||
await slotFormRef.value?.validate?.()
|
||||
slotSubmitLoading.value = true
|
||||
try {
|
||||
const payload = {
|
||||
facilityNodeId: selectedNode.value?.id,
|
||||
slotCode: slotFormData.slotCode.trim(),
|
||||
slotStatus: slotFormData.slotStatus
|
||||
}
|
||||
if (editingSlotId.value) {
|
||||
await fetchUpdateStorageSlot(editingSlotId.value, payload)
|
||||
}
|
||||
ElMessage.success('更新成功')
|
||||
slotDialogVisible.value = false
|
||||
if (selectedNode.value?.id) await loadSlots(selectedNode.value.id)
|
||||
} catch { /* handled globally */ } finally {
|
||||
slotSubmitLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleSlotDialogClose = () => {
|
||||
Object.assign(slotFormData, { slotCode: '', slotStatus: '空' })
|
||||
editingSlotId.value = null
|
||||
slotFormRef.value?.clearValidate?.()
|
||||
}
|
||||
|
||||
const batchDialogVisible = ref(false)
|
||||
const batchSubmitLoading = ref(false)
|
||||
const batchForm = reactive({ rows: 4, cols: 6, codePrefix: '' })
|
||||
|
||||
const handleBatchCreate = () => {
|
||||
Object.assign(batchForm, { rows: 4, cols: 6, codePrefix: '' })
|
||||
batchDialogVisible.value = true
|
||||
}
|
||||
|
||||
const handleBatchSubmit = async () => {
|
||||
if (!selectedNode.value?.id) return
|
||||
batchSubmitLoading.value = true
|
||||
try {
|
||||
await fetchBatchCreateSlots({
|
||||
facilityNodeId: selectedNode.value.id,
|
||||
rows: batchForm.rows,
|
||||
cols: batchForm.cols,
|
||||
codePrefix: batchForm.codePrefix || undefined
|
||||
})
|
||||
ElMessage.success('批量生成成功')
|
||||
batchDialogVisible.value = false
|
||||
await loadSlots(selectedNode.value.id)
|
||||
} catch { /* handled globally */ } finally {
|
||||
batchSubmitLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleClearAllSlots = async () => {
|
||||
try {
|
||||
await ElMessageBox.confirm(`确定要清空当前节点的全部 ${slotList.value.length} 个格子吗?`, '提示', { type: 'warning' })
|
||||
for (const slot of slotList.value) {
|
||||
await fetchDeleteStorageSlot(slot.id)
|
||||
}
|
||||
ElMessage.success('清空成功')
|
||||
if (selectedNode.value?.id) await loadSlots(selectedNode.value.id)
|
||||
} catch (error: any) {
|
||||
if (error !== 'cancel') console.error('清空失败:', error)
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => { loadData() })
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.sf-tree-aside__head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.sf-tree-search {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.sf-tree-node {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
flex: 1;
|
||||
font-size: 13px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.sf-tree-node__label {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.sf-tree-node__leaf {
|
||||
font-size: 10px;
|
||||
padding: 0 4px;
|
||||
border-radius: 3px;
|
||||
background: var(--el-color-success-light-9, #ecfdf5);
|
||||
color: var(--el-color-success, #10b981);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.sf-tree-node__ops {
|
||||
display: flex;
|
||||
gap: 2px;
|
||||
margin-left: auto;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.sf-empty {
|
||||
padding: 60px 0;
|
||||
}
|
||||
|
||||
.sf-count {
|
||||
font-size: 12px;
|
||||
color: var(--el-text-color-secondary, #909399);
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
/* Shelf layout */
|
||||
.sf-shelf-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
.sf-shelf-row {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.sf-shelf-label {
|
||||
width: 36px;
|
||||
flex-shrink: 0;
|
||||
background: #059669;
|
||||
color: #fff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
border-radius: 6px 0 0 6px;
|
||||
}
|
||||
|
||||
.sf-shelf-cells {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.sf-shelf-cell {
|
||||
flex: 1;
|
||||
min-height: 80px;
|
||||
border: 1px solid var(--el-border-color-lighter, #d1fae5);
|
||||
border-right: none;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
cursor: pointer;
|
||||
transition: background 0.15s;
|
||||
background: #fff;
|
||||
padding: 8px 6px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.sf-shelf-cell:last-child {
|
||||
border-right: 1px solid var(--el-border-color-lighter, #d1fae5);
|
||||
border-radius: 0 6px 6px 0;
|
||||
}
|
||||
|
||||
.sf-shelf-cell:first-child {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.sf-shelf-cell:hover {
|
||||
background: #ecfdf5;
|
||||
}
|
||||
|
||||
.sf-shelf-cell.is-occupied {
|
||||
background: #fffbeb;
|
||||
border-color: #fde68a;
|
||||
}
|
||||
|
||||
.sf-shelf-cell.is-occupied:hover {
|
||||
background: #fef3c7;
|
||||
}
|
||||
|
||||
.sf-cell-top {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.sf-cell-code {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.sf-shelf-cell.is-occupied .sf-cell-code {
|
||||
color: #92400e;
|
||||
}
|
||||
|
||||
.sf-cell-status {
|
||||
font-size: 10px;
|
||||
padding: 1px 6px;
|
||||
border-radius: 10px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.sf-cell-status.is-empty {
|
||||
background: #ecfdf5;
|
||||
color: #059669;
|
||||
}
|
||||
|
||||
.sf-cell-status.is-occupied {
|
||||
background: #fef3c7;
|
||||
color: #b45309;
|
||||
}
|
||||
|
||||
.sf-cell-body {
|
||||
flex: 1;
|
||||
margin-top: 6px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.sf-cell-reserved {
|
||||
font-size: 11px;
|
||||
color: #dcdfe6;
|
||||
}
|
||||
|
||||
.sf-batch-preview {
|
||||
background: #ecfdf5;
|
||||
border-radius: 6px;
|
||||
padding: 10px 14px;
|
||||
font-size: 13px;
|
||||
color: #059669;
|
||||
margin-top: 8px;
|
||||
}
|
||||
</style>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证 lint 通过**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && npx eslint src/views/operations/storage-facility/index.vue --no-error-on-unmatched-pattern 2>&1 | tail -10`
|
||||
Expected: 无错误输出
|
||||
|
||||
- [ ] **Step 3: 验证 dev server 正常**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && npx vite build --mode development 2>&1 | tail -5`
|
||||
Expected: 构建成功,无编译错误
|
||||
|
||||
---
|
||||
|
||||
## Self-Review
|
||||
|
||||
**Spec coverage:**
|
||||
- ✅ 左侧 el-tree 树形列表(自由层级)
|
||||
- ✅ 右侧货架行布局格子展示(最末层叶子节点)
|
||||
- ✅ 编号+状态在格子顶部一行
|
||||
- ✅ 下方预留空间
|
||||
- ✅ 批量生成格子(指定行列数)
|
||||
- ✅ 格子点击编辑(dialog)
|
||||
- ✅ 节点 CRUD(弹窗)
|
||||
- ✅ 节点删除级联删除子节点和格子
|
||||
|
||||
**Placeholder scan:** 无 TBD/TODO/待定内容。所有代码完整。
|
||||
|
||||
**Type consistency:** 所有函数签名、变量名前后一致。`fetchBatchCreateSlots` 在 admin.ts 定义并在 index.vue 中使用。
|
||||
@@ -1,688 +0,0 @@
|
||||
# 权限系统全面修复实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 补全 SQL 权限模型(sys_menu, sys_role, sys_role_menu, sys_role_data_scope_detail, sys_user_role)定义的全部权限执行逻辑,使菜单权限和数据权限在后端 API 和前端 UI 层真正生效。
|
||||
|
||||
**Architecture:** 后端添加 `data_scope.py` 服务模块实现数据权限过滤,在现有路由上叠加 `require_menu_code()` 菜单权限守卫;前端用户管理添加角色选择器,业务页面按钮添加 `hasAuth` 权限控制。
|
||||
|
||||
**Tech Stack:** Python/FastAPI/SQLAlchemy (backend), Vue 3/TypeScript/Element Plus (frontend)
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
### 后端新增/修改文件
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 新增 | `backend/app/core/data_scope.py` | 数据权限过滤服务:读取用户角色 data_scope,构建 SQLAlchemy 过滤条件 |
|
||||
| 修改 | `backend/app/api/basic_info.py` | 客户/样本类型/采集地区/协议号/样本编码 路由添加 `require_menu_code` + `apply_data_scope` |
|
||||
| 修改 | `backend/app/api/operations.py` | 洁净室/仓储/展厅预约 路由添加 `require_menu_code` + `apply_data_scope` |
|
||||
| 修改 | `backend/app/api/collection_protocol.py` | 采集协议路由添加 `require_menu_code` + `apply_data_scope` |
|
||||
| 修改 | `backend/app/api/sample_reception.py` | 样本接收路由添加 `require_menu_code` + `apply_data_scope` |
|
||||
| 修改 | `backend/app/api/admin.py` | 用户/角色管理路由添加 `require_menu_code`(仅业务部分) |
|
||||
| 修改 | `backend/app/api/public.py` | 修复 admin 无权限码返回 `all:true` 的安全漏洞 |
|
||||
| 新增 | `docs/sql/sys_menu_button_perms.sql` | 为每个 C 类型菜单补充 F 类型按钮权限记录 |
|
||||
|
||||
### 前端修改文件
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 修改 | `web-admin/src/views/system/user/index.vue` | 用户弹窗添加角色多选下拉框 |
|
||||
| 修改 | `web-admin/src/views/basic-info/customer/index.vue` | 按钮添加 hasAuth 权限控制 |
|
||||
| 修改 | `web-admin/src/views/basic-info/cell-sample-type/index.vue` | 按钮添加 hasAuth 权限控制 |
|
||||
| 修改 | `web-admin/src/views/basic-info/collection-region/index.vue` | 按钮添加 hasAuth 权限控制 |
|
||||
| 修改 | `web-admin/src/views/basic-info/collection-protocol-no/index.vue` | 按钮添加 hasAuth 权限控制 |
|
||||
| 修改 | `web-admin/src/views/basic-info/sample-code/index.vue` | 按钮添加 hasAuth 权限控制 |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 创建 F 类型按钮权限 SQL 脚本
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/sys_menu_button_perms.sql`
|
||||
|
||||
**说明:** 当前 `sys_menu` 中 C 类型菜单的 `perms` 字段(如 `biz:customer:list`)用于列表页面权限。需为每个 C 类型菜单新增 F 类型子记录,用于增删改操作权限控制。
|
||||
|
||||
- [ ] **Step 1: 编写 SQL 脚本**
|
||||
|
||||
```sql
|
||||
-- sys_menu 按钮(F)权限初始化
|
||||
-- 为每个 C 类型菜单新增 list/add/edit/delete 四个 F 类型按钮权限
|
||||
-- 执行前请确认 sys_menu 中已有的 C 类型菜单记录
|
||||
|
||||
-- ============================================================
|
||||
-- 客户管理 (parent: 121, perms prefix: biz:customer)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '客户查询', '121', 'F', '', NULL, 'biz:customer:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '客户新增', '121', 'F', '', NULL, 'biz:customer:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '客户修改', '121', 'F', '', NULL, 'biz:customer:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '客户删除', '121', 'F', '', NULL, 'biz:customer:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 细胞样本类型管理 (parent: 122, perms prefix: biz:cellSampleType)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '样本类型查询', '122', 'F', '', NULL, 'biz:cellSampleType:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本类型新增', '122', 'F', '', NULL, 'biz:cellSampleType:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本类型修改', '122', 'F', '', NULL, 'biz:cellSampleType:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本类型删除', '122', 'F', '', NULL, 'biz:cellSampleType:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 采集地区及医院管理 (parent: 123, perms prefix: biz:collectionRegion)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '采集地区查询', '123', 'F', '', NULL, 'biz:collectionRegion:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '采集地区新增', '123', 'F', '', NULL, 'biz:collectionRegion:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '采集地区修改', '123', 'F', '', NULL, 'biz:collectionRegion:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '采集地区删除', '123', 'F', '', NULL, 'biz:collectionRegion:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 采集协议号管理 (parent: 124, perms prefix: biz:collectionProtocolNo)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '协议号查询', '124', 'F', '', NULL, 'biz:collectionProtocolNo:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '协议号新增', '124', 'F', '', NULL, 'biz:collectionProtocolNo:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '协议号修改', '124', 'F', '', NULL, 'biz:collectionProtocolNo:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '协议号删除', '124', 'F', '', NULL, 'biz:collectionProtocolNo:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 样本编码管理 (parent: 125, perms prefix: biz:sampleCode)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '样本编码查询', '125', 'F', '', NULL, 'biz:sampleCode:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本编码新增', '125', 'F', '', NULL, 'biz:sampleCode:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本编码修改', '125', 'F', '', NULL, 'biz:sampleCode:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本编码删除', '125', 'F', '', NULL, 'biz:sampleCode:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 租户管理 (parent: 101, perms prefix: system:tenant) — super_admin only
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '租户查询', '101', 'F', '', NULL, 'system:tenant:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '租户新增', '101', 'F', '', NULL, 'system:tenant:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '租户修改', '101', 'F', '', NULL, 'system:tenant:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '租户删除', '101', 'F', '', NULL, 'system:tenant:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 字典管理 (parent: 102, perms prefix: system:dict)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '字典查询', '102', 'F', '', NULL, 'system:dict:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '字典新增', '102', 'F', '', NULL, 'system:dict:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '字典修改', '102', 'F', '', NULL, 'system:dict:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '字典删除', '102', 'F', '', NULL, 'system:dict:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 组织管理 (parent: 103, perms prefix: system:dept)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '组织查询', '103', 'F', '', NULL, 'system:dept:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '组织新增', '103', 'F', '', NULL, 'system:dept:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '组织修改', '103', 'F', '', NULL, 'system:dept:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '组织删除', '103', 'F', '', NULL, 'system:dept:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 用户管理 (parent: 104, perms prefix: system:user)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '用户查询', '104', 'F', '', NULL, 'system:user:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '用户新增', '104', 'F', '', NULL, 'system:user:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '用户修改', '104', 'F', '', NULL, 'system:user:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '用户删除', '104', 'F', '', NULL, 'system:user:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 角色管理 (parent: 105, perms prefix: system:role)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '角色查询', '105', 'F', '', NULL, 'system:role:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '角色新增', '105', 'F', '', NULL, 'system:role:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '角色修改', '105', 'F', '', NULL, 'system:role:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '角色删除', '105', 'F', '', NULL, 'system:role:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 菜单管理 (parent: 106, perms prefix: system:menu)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '菜单查询', '106', 'F', '', NULL, 'system:menu:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '菜单新增', '106', 'F', '', NULL, 'system:menu:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '菜单修改', '106', 'F', '', NULL, 'system:menu:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '菜单删除', '106', 'F', '', NULL, 'system:menu:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 站点管理 (parent: 107, perms prefix: system:site)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '站点查询', '107', 'F', '', NULL, 'system:site:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '站点新增', '107', 'F', '', NULL, 'system:site:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '站点修改', '107', 'F', '', NULL, 'system:site:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '站点删除', '107', 'F', '', NULL, 'system:site:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 职位管理 (parent: 108, perms prefix: system:post)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '职位查询', '108', 'F', '', NULL, 'system:post:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '职位新增', '108', 'F', '', NULL, 'system:post:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '职位修改', '108', 'F', '', NULL, 'system:post:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '职位删除', '108', 'F', '', NULL, 'system:post:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 物品单位 (parent: 109, perms prefix: system:unit)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '单位查询', '109', 'F', '', NULL, 'system:unit:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '单位新增', '109', 'F', '', NULL, 'system:unit:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '单位修改', '109', 'F', '', NULL, 'system:unit:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '单位删除', '109', 'F', '', NULL, 'system:unit:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 快递公司 (parent: 110, perms prefix: system:express)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '快递公司查询', '110', 'F', '', NULL, 'system:express:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '快递公司新增', '110', 'F', '', NULL, 'system:express:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '快递公司修改', '110', 'F', '', NULL, 'system:express:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '快递公司删除', '110', 'F', '', NULL, 'system:express:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- ============================================================
|
||||
-- 质量检测-样本接收 (parent: 70000000000000000000000000000002, perms prefix: biz:sampleReception)
|
||||
-- ============================================================
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES
|
||||
(UUID(), '样本接收查询', '70000000000000000000000000000002', 'F', '', NULL, 'biz:sampleReception:list', 1, '1', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本接收新增', '70000000000000000000000000000002', 'F', '', NULL, 'biz:sampleReception:add', 1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本接收修改', '70000000000000000000000000000002', 'F', '', NULL, 'biz:sampleReception:edit', 1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0),
|
||||
(UUID(), '样本接收删除', '70000000000000000000000000000002', 'F', '', NULL, 'biz:sampleReception:delete', 1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/sys_menu_button_perms.sql
|
||||
git commit -m "feat: 添加 sys_menu 按钮权限(F 类型)初始化 SQL 脚本"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 创建后端数据权限服务 `data_scope.py`
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/core/data_scope.py`
|
||||
|
||||
- [ ] **Step 1: 编写数据权限服务模块**
|
||||
|
||||
```python
|
||||
"""数据权限过滤服务
|
||||
|
||||
根据用户角色的 data_scope 设置,在 SQLAlchemy query 上叠加过滤条件。
|
||||
支持 5 种数据范围:全部、本部门、本部门及以下、仅本人、自定义。
|
||||
多角色场景取并集。
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Dict, List, Optional, Set, Tuple
|
||||
|
||||
from sqlalchemy import and_, or_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.models import (
|
||||
SysRole,
|
||||
SysRoleDataScopeDetail,
|
||||
SysUserRole,
|
||||
SysDept,
|
||||
)
|
||||
|
||||
|
||||
def get_user_dept_id(db: Session, user_id: str) -> Optional[str]:
|
||||
"""获取用户的部门ID"""
|
||||
from app.models.models import SysUser
|
||||
user = db.query(SysUser).filter(SysUser.id == user_id).first()
|
||||
return user.dept_id if user else None
|
||||
|
||||
|
||||
def _get_child_dept_ids(db: Session, dept_id: str, tenant_no: str) -> List[str]:
|
||||
"""递归获取部门及所有子部门ID列表"""
|
||||
result = [dept_id]
|
||||
children = (
|
||||
db.query(SysDept.id)
|
||||
.filter(
|
||||
SysDept.parent_id == dept_id,
|
||||
SysDept.del_flag == 0,
|
||||
SysDept.status == "1",
|
||||
SysDept.tenant_no == tenant_no,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
for child in children:
|
||||
result.extend(_get_child_dept_ids(db, child.id, tenant_no))
|
||||
return result
|
||||
|
||||
|
||||
def _resolve_user_role_scopes(
|
||||
db: Session, user_id: str, tenant_no: str
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""获取用户所有角色的 data_scope 和自定义范围明细。
|
||||
|
||||
Returns:
|
||||
[{"data_scope": "1", "scope_details": [...]}]
|
||||
"""
|
||||
roles = (
|
||||
db.query(SysRole)
|
||||
.join(SysUserRole, SysUserRole.role_id == SysRole.id)
|
||||
.filter(
|
||||
SysUserRole.user_id == user_id,
|
||||
SysUserRole.del_flag == 0,
|
||||
SysUserRole.tenant_no == tenant_no,
|
||||
SysRole.del_flag == 0,
|
||||
SysRole.status == "1",
|
||||
SysRole.tenant_no == tenant_no,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
|
||||
result = []
|
||||
for role in roles:
|
||||
scope_details = (
|
||||
db.query(SysRoleDataScopeDetail)
|
||||
.filter(
|
||||
SysRoleDataScopeDetail.role_id == role.id,
|
||||
SysRoleDataScopeDetail.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
result.append({
|
||||
"data_scope": role.data_scope or "1",
|
||||
"scope_details": [
|
||||
{"scope_type": d.scope_type, "scope_value": d.scope_value}
|
||||
for d in scope_details
|
||||
],
|
||||
})
|
||||
return result
|
||||
|
||||
|
||||
def apply_data_scope(
|
||||
query: Any,
|
||||
model: Any,
|
||||
user_info: dict,
|
||||
db: Session,
|
||||
tenant_no: Optional[str] = None,
|
||||
) -> Any:
|
||||
"""在 SQLAlchemy query 上叠加数据权限过滤条件。
|
||||
|
||||
Args:
|
||||
query: 原始 SQLAlchemy query 对象
|
||||
model: ORM 模型类(需要有 create_dept_id, create_by 字段)
|
||||
user_info: get_current_user 返回的 dict(含 user_id, dept_id 或 region_id)
|
||||
db: 数据库 session
|
||||
tenant_no: 租户编号(可选,用于部门树查询)
|
||||
|
||||
Returns:
|
||||
添加了数据权限过滤条件的 query。如果用户是 super_admin 或无角色,返回原 query。
|
||||
"""
|
||||
# super_admin 不过滤
|
||||
role = user_info.get("role")
|
||||
if role == "super_admin":
|
||||
return query
|
||||
|
||||
user_id = user_info.get("user_id")
|
||||
if not user_id:
|
||||
return query
|
||||
|
||||
tn = tenant_no or "zkxw"
|
||||
|
||||
# 确保模型有必要字段
|
||||
if not hasattr(model, "create_dept_id") and not hasattr(model, "create_by"):
|
||||
return query
|
||||
|
||||
# 获取用户所有角色的数据范围
|
||||
role_scopes = _resolve_user_role_scopes(db, user_id, tn)
|
||||
if not role_scopes:
|
||||
# 无角色 → 不过滤(由菜单守卫控制是否可访问)
|
||||
return query
|
||||
|
||||
# 任一角色 scope=1(全部数据)→ 不过滤
|
||||
if any(rs["data_scope"] == "1" for rs in role_scopes):
|
||||
return query
|
||||
|
||||
# 用户的部门ID
|
||||
user_dept_id = user_info.get("dept_id") or user_info.get("region_id") or get_user_dept_id(db, user_id)
|
||||
|
||||
# 合并所有角色的过滤范围(并集)
|
||||
dept_ids: Set[str] = set()
|
||||
user_ids: Set[str] = set()
|
||||
|
||||
for rs in role_scopes:
|
||||
ds = rs["data_scope"]
|
||||
if ds == "2":
|
||||
# 本部门
|
||||
if user_dept_id:
|
||||
dept_ids.add(user_dept_id)
|
||||
elif ds == "3":
|
||||
# 本部门及以下
|
||||
if user_dept_id:
|
||||
dept_ids.update(_get_child_dept_ids(db, user_dept_id, tn))
|
||||
elif ds == "4":
|
||||
# 仅本人
|
||||
user_ids.add(user_id)
|
||||
elif ds == "5":
|
||||
# 自定义
|
||||
for detail in rs["scope_details"]:
|
||||
val = detail["scope_value"]
|
||||
if detail["scope_type"] == "dept":
|
||||
dept_ids.add(val)
|
||||
elif detail["scope_type"] == "user":
|
||||
user_ids.add(val)
|
||||
|
||||
# 构建过滤条件
|
||||
conditions = []
|
||||
has_dept_field = hasattr(model, "create_dept_id")
|
||||
has_create_by_field = hasattr(model, "create_by")
|
||||
|
||||
if dept_ids and has_dept_field:
|
||||
conditions.append(model.create_dept_id.in_(dept_ids))
|
||||
if user_ids and has_create_by_field:
|
||||
conditions.append(model.create_by.in_(user_ids))
|
||||
|
||||
if not conditions:
|
||||
# 没有任何有效范围 → 退回不过滤
|
||||
return query
|
||||
|
||||
# 多条件取 OR(并集语义)
|
||||
if len(conditions) == 1:
|
||||
return query.filter(conditions[0])
|
||||
return query.filter(or_(*conditions))
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/core/data_scope.py
|
||||
git commit -m "feat: 添加数据权限过滤服务 data_scope.py"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 修复 admin 无权限码安全漏洞
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/public.py` (lines 272-279)
|
||||
|
||||
- [ ] **Step 1: 修改 public.py 中 menu-codes 端点**
|
||||
|
||||
将 `backend/app/api/public.py` 第 272-279 行的代码:
|
||||
|
||||
```python
|
||||
if role == "admin" and not menu_codes:
|
||||
return success_response(
|
||||
{
|
||||
"isSuperAdmin": False,
|
||||
"all": True,
|
||||
"menuCodes": [],
|
||||
}
|
||||
)
|
||||
```
|
||||
|
||||
改为:
|
||||
|
||||
```python
|
||||
# admin 无权限码时返回空列表(不再赋予全部权限)
|
||||
# 安全修复:空权限码 = 无菜单访问权限
|
||||
```
|
||||
|
||||
即删除整个 `if role == "admin" and not menu_codes:` 分支。后续的 `return success_response(...)` 会自动处理,返回 `all: False, menuCodes: []`。
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/public.py
|
||||
git commit -m "fix: 修复 admin 无权限码时返回 all:true 的安全漏洞"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端业务路由添加菜单权限守卫 + 数据权限过滤
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/basic_info.py`
|
||||
- Modify: `backend/app/api/operations.py`
|
||||
- Modify: `backend/app/api/collection_protocol.py`
|
||||
- Modify: `backend/app/api/sample_reception.py`
|
||||
- Modify: `backend/app/api/admin.py` (用户/角色管理部分)
|
||||
|
||||
**原则:**
|
||||
- 每个路由文件的 import 中添加 `from app.core.menu_guard import require_menu_code` 和 `from app.core.data_scope import apply_data_scope`
|
||||
- 将 `Depends(require_admin_or_super_admin)` 替换为 `Depends(require_menu_code("xxx:list"))`(list 端点)、`Depends(require_menu_code("xxx:add"))`(create 端点)等
|
||||
- list 端点在查询链中调用 `apply_data_scope(query, Model, user, db, tenant_no)`
|
||||
|
||||
- [ ] **Step 1: 修改 `basic_info.py`**
|
||||
|
||||
1. 替换 import:`from app.core.menu_guard import require_admin_or_super_admin` → `from app.core.menu_guard import require_menu_code`
|
||||
2. 添加 import:`from app.core.data_scope import apply_data_scope`
|
||||
3. 客户管理路由:
|
||||
- `list_customers`: `Depends(require_menu_code("biz:customer:list"))` + 查询添加 `apply_data_scope`
|
||||
- `create_customer`: `Depends(require_menu_code("biz:customer:add"))`
|
||||
- `update_customer`: `Depends(require_menu_code("biz:customer:edit"))`
|
||||
- `delete_customer`: `Depends(require_menu_code("biz:customer:delete"))`
|
||||
4. 细胞样本类型路由:同理,perms 为 `biz:cellSampleType:*`
|
||||
5. 采集地区路由:同理,perms 为 `biz:collectionRegion:*`
|
||||
6. 采集协议号路由:同理,perms 为 `biz:collectionProtocolNo:*`
|
||||
7. 样本编码路由:同理,perms 为 `biz:sampleCode:*`
|
||||
|
||||
- [ ] **Step 2: 修改 `operations.py`**
|
||||
|
||||
洁净室路由添加 `require_menu_code("biz:cleanRoom:*")` + `apply_data_scope`。仓储设施、展厅预约同理。
|
||||
|
||||
注意:operations.py 中的业务目前没有对应的 `sys_menu.perms`,需要根据 SQL 中是否有对应菜单决定。如果 SQL 中尚无菜单记录,则保持 `require_admin_or_super_admin` 不变,待后续添加菜单后再改。
|
||||
|
||||
- [ ] **Step 3: 修改 `collection_protocol.py`**
|
||||
|
||||
采集协议路由添加 `require_menu_code("biz:collectionProtocol:*")` + `apply_data_scope`。
|
||||
|
||||
注意:SQL 中当前没有 `biz:collectionProtocol:list` 的菜单记录。如果此模块菜单尚未配置,保持 `require_admin_or_super_admin`。
|
||||
|
||||
- [ ] **Step 4: 修改 `sample_reception.py`**
|
||||
|
||||
样本接收路由添加 `require_menu_code("biz:sampleReception:*")` + `apply_data_scope`。
|
||||
|
||||
- [ ] **Step 5: 修改 `admin.py`**
|
||||
|
||||
用户管理、角色管理、字典管理等系统管理接口添加 `require_menu_code`:
|
||||
- 用户 CRUD:`system:user:list/add/edit/delete`
|
||||
- 角色 CRUD:`system:role:list/add/edit/delete`
|
||||
- 租户 CRUD:保持 `require_admin_or_super_admin`(仅 super_admin)
|
||||
- 字典管理:`system:dict:list/add/edit/delete`
|
||||
- 组织管理:`system:dept:list/add/edit/delete`
|
||||
- 菜单管理:`system:menu:list/add/edit/delete`
|
||||
|
||||
用户列表添加 `apply_data_scope` 过滤。
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/basic_info.py backend/app/api/operations.py backend/app/api/collection_protocol.py backend/app/api/sample_reception.py backend/app/api/admin.py
|
||||
git commit -m "feat: 所有业务路由添加菜单权限守卫和数据权限过滤"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端用户管理添加角色选择器
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/system/user/index.vue`
|
||||
|
||||
- [ ] **Step 1: 在 formData 中添加 roleIds 字段**
|
||||
|
||||
```typescript
|
||||
const formData = reactive({
|
||||
userNo: '',
|
||||
nickName: '',
|
||||
password: '',
|
||||
deptId: '',
|
||||
email: '',
|
||||
phoneNo: '',
|
||||
sex: '0',
|
||||
avatar: '',
|
||||
status: '1',
|
||||
orderNum: 0,
|
||||
remark: '',
|
||||
roleIds: [] as string[], // 新增
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 添加角色选项加载逻辑**
|
||||
|
||||
```typescript
|
||||
import { fetchRoleOptions } from '@/api/admin'
|
||||
|
||||
const roleOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
|
||||
async function loadRoleOptions() {
|
||||
try {
|
||||
roleOptions.value = await fetchRoleOptions()
|
||||
} catch (e) {
|
||||
console.error('加载角色选项失败:', e)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 在弹窗表单中添加角色多选下拉框**
|
||||
|
||||
在 `<div class="form-grid-2">` 中,"状态" 选择器后面、"备注" 前面添加:
|
||||
|
||||
```html
|
||||
<el-form-item label="角色" style="grid-column: 1 / -1">
|
||||
<el-select
|
||||
v-model="formData.roleIds"
|
||||
multiple
|
||||
placeholder="请选择角色"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in roleOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 在 handleSubmit 中传递 roleIds**
|
||||
|
||||
```typescript
|
||||
// create 分支
|
||||
await fetchCreateUser({
|
||||
...其他字段,
|
||||
roleIds: formData.roleIds.length ? formData.roleIds : undefined,
|
||||
})
|
||||
|
||||
// update 分支
|
||||
await fetchUpdateUser(editingId.value, {
|
||||
...其他字段,
|
||||
roleIds: formData.roleIds.length ? formData.roleIds : undefined,
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 在 handleEdit 中回填 roleIds**
|
||||
|
||||
编辑时从 `row.roleIds` 回填:
|
||||
|
||||
```typescript
|
||||
function handleEdit(row: Api.User.UserItem) {
|
||||
// ... 现有字段回填 ...
|
||||
formData.roleIds = (row as any).roleIds || [] // 后端 get_user_detail 返回 roleIds
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 在 resetForm 和 onMounted 中处理**
|
||||
|
||||
```typescript
|
||||
function resetForm() {
|
||||
// ... 现有重置 ...
|
||||
formData.roleIds = []
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadDeptTree()
|
||||
loadData()
|
||||
loadRoleOptions()
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 7: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/system/user/index.vue
|
||||
git commit -m "feat: 用户管理弹窗添加角色多选下拉框"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端业务页面按钮添加权限控制
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/basic-info/customer/index.vue`
|
||||
- Modify: `web-admin/src/views/basic-info/cell-sample-type/index.vue`
|
||||
- Modify: `web-admin/src/views/basic-info/collection-region/index.vue`
|
||||
- Modify: `web-admin/src/views/basic-info/collection-protocol-no/index.vue`
|
||||
- Modify: `web-admin/src/views/basic-info/sample-code/index.vue`
|
||||
|
||||
**每个页面的修改模式相同:**
|
||||
|
||||
- [ ] **Step 1: 在 `<script setup>` 中导入 useAuth**
|
||||
|
||||
```typescript
|
||||
import { useAuth } from '@/hooks/core/useAuth'
|
||||
const { hasAuth } = useAuth()
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在模板按钮上添加 v-if 权限控制**
|
||||
|
||||
工具栏"新增"按钮:
|
||||
```html
|
||||
<el-button v-if="hasAuth('add')" type="primary" @click="handleAdd">新增</el-button>
|
||||
```
|
||||
|
||||
表格操作列按钮:
|
||||
```html
|
||||
<el-button v-if="hasAuth('edit')" link type="primary" @click="handleEdit(row)">编辑</el-button>
|
||||
<el-button v-if="hasAuth('delete')" link type="danger" @click="handleDelete(row)">删除</el-button>
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 对所有 5 个页面重复以上修改**
|
||||
|
||||
每个页面的按钮权限标识通过 `hasAuth('add')` / `hasAuth('edit')` / `hasAuth('delete')` 控制,对应 `sys_menu` 中 F 类型按钮记录的 `perms` 尾段。
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/basic-info/
|
||||
git commit -m "feat: 基础信息管理页面按钮添加 hasAuth 权限控制"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 自检清单
|
||||
|
||||
- [x] **Spec 覆盖**:Task 1 覆盖 F 类型菜单数据;Task 2 覆盖数据权限服务;Task 3 覆盖安全漏洞修复;Task 4 覆盖后端路由守卫;Task 5 覆盖前端角色选择器;Task 6 覆盖前端按钮权限
|
||||
- [x] **Placeholder 扫描**:无 TBD、TODO、"implement later"
|
||||
- [x] **类型一致性**:`apply_data_scope` 函数签名在 Task 2 定义,Task 4 使用时参数匹配
|
||||
- [x] **文件路径准确**:所有路径基于实际代码库结构
|
||||
@@ -1,660 +0,0 @@
|
||||
# 中试服务管理 6 模块实现计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 实现中试服务管理下 6 个基础数据 CRUD 模块(后端 API + 前端页面 + 路由 + 菜单),覆盖细胞产品类型/规格/价格体系/项目价格、渠道信息、体检机构。
|
||||
|
||||
**Architecture:** 后端单文件 `pilot_service.py`(CRUD + Route),Model 追加到 `models.py`;前端 6 个 Vue 页面 + API 函数追加到 `admin.ts`;菜单 SQL 独立文件。所有模块严格复制现有 `customer.py` / `item_unit.py` / `basic_info.py` 模式。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2(后端);Vue 3 / TypeScript / Element Plus / Tailwind CSS 4(前端);MySQL 5.7
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-17-pilot-service-management-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| # | 文件 | 操作 | 职责 |
|
||||
|---|------|------|------|
|
||||
| 1 | `backend/app/models/models.py` | 追加 | 13 个 SQLAlchemy Model |
|
||||
| 2 | `backend/app/crud/pilot_service.py` | 新建 | 全部 6 模块 CRUD 函数 |
|
||||
| 3 | `backend/app/api/pilot_service.py` | 新建 | 全部 6 模块路由 + Pydantic Body |
|
||||
| 4 | `backend/app/api/__init__.py` | 追加 | import + __all__ |
|
||||
| 5 | `backend/app/main.py` | 追加 | include_router |
|
||||
| 6 | `web-admin/src/api/admin.ts` | 追加 | API 函数 |
|
||||
| 7-12 | `web-admin/src/views/pilot-service/{module}/index.vue` | 新建 ×6 | 前端页面 |
|
||||
| 13 | `web-admin/src/router/modules/sqxp.ts` | 追加 | 路由配置 |
|
||||
| 14 | `docs/sql/sys_menu_pilot_service.sql` | 新建 | 菜单 INSERT |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 后端 — 新增 13 个 SQLAlchemy Model
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (在 L1354 `BizExhibitionAppointment` 之后、L1356 qc_param import 之前追加)
|
||||
|
||||
- [ ] **Step 1: 在 `models.py` 末尾(qc_param import 行之前)追加 13 个 Model 类**
|
||||
|
||||
在 `BizExhibitionAppointment` 类定义之后、`from app.models.qc_param import ...` 行之前,追加以下 13 个 Model。每个 Model 严格遵循 `id → 业务字段 → 公共字段` 顺序,列定义与 `zkxw.sql` 中 CREATE TABLE 语句一一对应。
|
||||
|
||||
需要追加的 13 个类:
|
||||
|
||||
```
|
||||
# 2.3.1 细胞产品类型
|
||||
BizCellProductType(biz_cell_product_type)
|
||||
id, product_type_code, product_type_name → 公共字段
|
||||
|
||||
# 2.3.2 细胞产品规格
|
||||
BizCellProductSpec(biz_cell_product_spec)
|
||||
id, spec_code, spec_name → 公共字段
|
||||
|
||||
# 2.3.3 细胞产品价格体系
|
||||
BizCellProductPrice(biz_cell_product_price)
|
||||
id, project_name, project_code, cell_type_code, cell_type_name, spec_text, spec_id, cell_product_type_id, unit_price(Numeric(18,2)) → 公共字段
|
||||
|
||||
# 2.3.4 细胞产品项目价格体系(主表)
|
||||
BizCellProductProjectSystem(biz_cell_product_project_system)
|
||||
id, system_name, system_code, status(CHAR(1), default="1") → 公共字段
|
||||
|
||||
# 2.3.4 细胞产品项目价格体系(明细子表)
|
||||
BizCellProductProjectSystemItem(biz_cell_product_project_system_item)
|
||||
id, project_system_id, source_price_id, project_name, project_code, cell_type_code, cell_type_name, spec_text, spec_id, cell_product_type_id, unit_price(Numeric(18,2)) → 公共字段
|
||||
|
||||
# 2.3.5 渠道信息(主表)
|
||||
BizChannel(biz_channel)
|
||||
id, channel_name, credit_code, channel_type, contact_name, contact_phone, contact_email, protocol_attachments(String(4000)) → 公共字段
|
||||
|
||||
# 2.3.5 渠道协议
|
||||
BizChannelAgreement(biz_channel_agreement)
|
||||
id, channel_id, agreement_type, business_type, settle_mode, credit_limit_amount(Numeric(18,2)), effective_date(CHAR(8)), expire_date(CHAR(8)), agreement_status(default="sxz") → 公共字段
|
||||
|
||||
# 2.3.5 渠道协议-产品价格
|
||||
BizChannelAgreementProductPrice(biz_channel_agreement_product_price)
|
||||
id, channel_agreement_id, project_name, project_code, cell_type_code, cell_type_name, spec_text, original_price(Numeric(18,2)), agreement_price(Numeric(18,2)) → 公共字段
|
||||
|
||||
# 2.3.5 渠道开票信息
|
||||
BizChannelInvoice(biz_channel_invoice)
|
||||
id, channel_id, company_name, tax_no, company_address, company_phone, bank_name, bank_account → 公共字段
|
||||
|
||||
# 2.3.5 渠道邮寄地址
|
||||
BizChannelMailAddress(biz_channel_mail_address)
|
||||
id, channel_id, mail_address, mail_contact, mail_phone → 公共字段
|
||||
|
||||
# 2.3.6 体检机构
|
||||
BizCheckupInstitution(biz_checkup_institution)
|
||||
id, institution_name, institution_address, contact_name, contact_phone, status(CHAR(1), default="1") → 公共字段
|
||||
|
||||
# 2.3.6 体检机构开票信息
|
||||
BizCheckupInstitutionInvoice(biz_checkup_institution_invoice)
|
||||
id, checkup_institution_id, company_name, tax_no, company_address, company_phone, bank_name, bank_account → 公共字段
|
||||
|
||||
# 2.3.6 体检机构项目及价格
|
||||
BizCheckupInstitutionProject(biz_checkup_institution_project)
|
||||
id, checkup_institution_id, project_name, project_fee(Numeric(18,2)) → 公共字段
|
||||
```
|
||||
|
||||
每个类的公共字段(从 `tenant_no` 到 `del_flag`)完全复制 `BizExhibitionAppointment` 的模式。
|
||||
|
||||
- [ ] **Step 2: 验证 Model 无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizCellProductType, BizCellProductSpec, BizCellProductPrice, BizCellProductProjectSystem, BizCellProductProjectSystemItem, BizChannel, BizChannelAgreement, BizChannelAgreementProductPrice, BizChannelInvoice, BizChannelMailAddress, BizCheckupInstitution, BizCheckupInstitutionInvoice, BizCheckupInstitutionProject; print('All 13 models imported OK')"`
|
||||
Expected: `All 13 models imported OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py
|
||||
git commit -m "feat: add 13 SQLAlchemy models for pilot service management (2.3.1-2.3.6)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 — 创建 CRUD 文件
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/pilot_service.py`
|
||||
|
||||
- [ ] **Step 1: 创建 `backend/app/crud/pilot_service.py`**
|
||||
|
||||
单文件,按模块分段组织。文件结构:
|
||||
|
||||
```python
|
||||
"""中试服务管理 CRUD(细胞产品类型/规格/价格体系/项目价格、渠道信息、体检机构)"""
|
||||
from __future__ import annotations
|
||||
import math
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional, Tuple
|
||||
from sqlalchemy import and_, func, or_
|
||||
from sqlalchemy.orm import Session
|
||||
from app.core.utils import generate_uuid
|
||||
from app.models.models import (
|
||||
BizCellProductType, BizCellProductSpec, BizCellProductPrice,
|
||||
BizCellProductProjectSystem, BizCellProductProjectSystemItem,
|
||||
BizChannel, BizChannelAgreement, BizChannelAgreementProductPrice,
|
||||
BizChannelInvoice, BizChannelMailAddress,
|
||||
BizCheckupInstitution, BizCheckupInstitutionInvoice, BizCheckupInstitutionProject,
|
||||
)
|
||||
```
|
||||
|
||||
每个实体遵循 `customer.py` 的完整模式:
|
||||
1. `_row_to_dict_xxx()` — camelCase 转换
|
||||
2. `list_xxx()` — 分页 + keyword + tenant_no 过滤
|
||||
3. `get_xxx()` — 单条查询
|
||||
4. `xxx_code_exists()` — 编码唯一性校验(有编码字段的实体)
|
||||
5. `create_xxx()` — 新增(generate_uuid, validate, commit+refresh)
|
||||
6. `update_xxx()` — 更新(validate, commit+refresh)
|
||||
7. `soft_delete_xxx()` — 软删除(del_flag=1)
|
||||
|
||||
**简单实体(复制 customer.py 模式,字段替换)**:
|
||||
- `BizCellProductType` — keyword 搜索 product_type_code / product_type_name
|
||||
- `BizCellProductSpec` — keyword 搜索 spec_code / spec_name
|
||||
- `BizCellProductPrice` — keyword 搜索 project_name / project_code / cell_type_name;额外接受 `cell_type_code` 过滤参数
|
||||
|
||||
**主子表实体(主表 CRUD + 子表 CRUD)**:
|
||||
|
||||
`BizCellProductProjectSystem` + `BizCellProductProjectSystemItem`:
|
||||
- 主表:标准 7 函数
|
||||
- 子表:`list_project_system_items(db, project_system_id, tenant_no)` + `create_project_system_item()` + `update_project_system_item()` + `soft_delete_project_system_item()`
|
||||
- `_row_to_dict_project_system_item()` 中包含完整字段
|
||||
|
||||
`BizChannel` + 4 张子表:
|
||||
- 主表 BizChannel:标准 7 函数,keyword 搜索 channel_name / credit_code / contact_name
|
||||
- 子表 BizChannelInvoice:标准子表 CRUD(by channel_id)
|
||||
- 子表 BizChannelMailAddress:标准子表 CRUD(by channel_id)
|
||||
- 子表 BizChannelAgreement:标准子表 CRUD(by channel_id)+ `activate_channel_agreement()` (设置 agreement_status="sxz") + `void_channel_agreement()` (设置 agreement_status="yzf")
|
||||
- 子表 BizChannelAgreementProductPrice:标准子表 CRUD(by channel_agreement_id)
|
||||
|
||||
`BizCheckupInstitution` + 2 张子表:
|
||||
- 主表 BizCheckupInstitution:标准 7 函数
|
||||
- 子表 BizCheckupInstitutionInvoice:标准子表 CRUD(by checkup_institution_id)
|
||||
- 子表 BizCheckupInstitutionProject:标准子表 CRUD(by checkup_institution_id)
|
||||
|
||||
末尾提供 `total_pages(total, page_size)` 工具函数(与 customer.py 一致)。
|
||||
|
||||
- [ ] **Step 2: 验证 CRUD 文件可导入**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud import pilot_service; print('CRUD imported OK')"`
|
||||
Expected: `CRUD imported OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_service.py
|
||||
git commit -m "feat: add CRUD functions for pilot service management (6 modules, 13 entities)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 — 创建路由文件 + 注册
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/pilot_service.py`
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
- [ ] **Step 1: 创建 `backend/app/api/pilot_service.py`**
|
||||
|
||||
复制 `basic_info.py` 的头部模式:
|
||||
|
||||
```python
|
||||
"""中试服务管理 API(细胞产品类型/规格/价格体系/项目价格、渠道信息、体检机构)"""
|
||||
from typing import Any, List, Optional
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from sqlalchemy.orm import Session
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin, require_menu_code
|
||||
from app.core.response import error_response, success_response
|
||||
from app.crud import pilot_service as ps_svc
|
||||
from app.models.models import SysUser
|
||||
|
||||
router = APIRouter(prefix="/web/admin", tags=["中试服务管理"])
|
||||
|
||||
def _get_tenant_no(db: Session, user: dict) -> str:
|
||||
user_id = user.get("user_id")
|
||||
if not user_id:
|
||||
raise PermissionError("用户身份信息缺失")
|
||||
sys_user = db.query(SysUser).filter(SysUser.id == user_id).first()
|
||||
if not sys_user or not sys_user.tenant_no:
|
||||
raise PermissionError("用户租户信息缺失")
|
||||
return sys_user.tenant_no
|
||||
```
|
||||
|
||||
**每个简单实体提供 4 个端点**(GET list / POST create / PUT update / DELETE),完全复制 `basic_info.py` 中客户管理的模式。
|
||||
|
||||
**端点清单**:
|
||||
|
||||
简单实体(4 端点 × 3):
|
||||
- `/cell-product-types` — 2.3.1
|
||||
- `/cell-product-specs` — 2.3.2
|
||||
- `/cell-product-prices` — 2.3.3(CreateBody 额外含 cell_type_code, cell_type_name, spec_id, spec_text, cell_product_type_id, unit_price)
|
||||
|
||||
主子表实体(主表 4 端点 + 子表 4 端点):
|
||||
- `/project-price-systems` — 2.3.4 主表
|
||||
- `/project-price-systems/{id}/items` GET — 列出子表
|
||||
- `/project-price-systems/{id}/items` POST — 新增子表行
|
||||
- `/project-system-items/{id}` PUT — 更新子表行
|
||||
- `/project-system-items/{id}` DELETE — 删除子表行
|
||||
|
||||
渠道(主表 4 端点 + 各子表端点):
|
||||
- `/channels` — 2.3.5 主表 CRUD
|
||||
- `/channels/{id}/invoices` GET/POST — 开票信息
|
||||
- `/channel-invoices/{id}` PUT/DELETE — 开票信息
|
||||
- `/channels/{id}/mail-addresses` GET/POST — 邮寄地址
|
||||
- `/channel-mail-addresses/{id}` PUT/DELETE — 邮寄地址
|
||||
- `/channels/{id}/agreements` GET/POST — 协议
|
||||
- `/channel-agreements/{id}` PUT/DELETE — 协议
|
||||
- `/channel-agreements/{id}/activate` PUT — 协议生效
|
||||
- `/channel-agreements/{id}/void` PUT — 协议作废
|
||||
- `/channel-agreements/{id}/product-prices` GET/POST — 协议产品价格
|
||||
- `/channel-agreement-product-prices/{id}` PUT/DELETE — 协议产品价格
|
||||
|
||||
体检机构(主表 4 端点 + 子表端点):
|
||||
- `/checkup-institutions` — 2.3.6 主表 CRUD
|
||||
- `/checkup-institutions/{id}/invoices` GET/POST — 开票信息
|
||||
- `/checkup-institution-invoices/{id}` PUT/DELETE — 开票信息
|
||||
- `/checkup-institutions/{id}/projects` GET/POST — 项目及价格
|
||||
- `/checkup-institution-projects/{id}` PUT/DELETE — 项目及价格
|
||||
|
||||
**Pydantic Body Models** 定义在路由文件内部(与 `basic_info.py` 一致),使用 `Field(..., alias="camelCase")` 映射。
|
||||
|
||||
**List 端点**暂时使用 `require_admin_or_super_admin`(与 `admin.py` 中物品单位管理一致),不引入 menu_code。后续菜单配置完成后再按需调整。
|
||||
|
||||
- [ ] **Step 2: 注册路由到 `__init__.py`**
|
||||
|
||||
在 `backend/app/api/__init__.py` 中追加:
|
||||
```python
|
||||
from app.api.pilot_service import router as pilot_service_router
|
||||
```
|
||||
并在 `__all__` 列表中追加 `"pilot_service_router"`。
|
||||
|
||||
- [ ] **Step 3: 注册路由到 `main.py`**
|
||||
|
||||
在 `backend/app/main.py` 中:
|
||||
- import 行追加 `from app.api import ..., pilot_service_router`
|
||||
- 在已有的 `app.include_router(...)` 行之后追加:
|
||||
`app.include_router(pilot_service_router, prefix=settings.API_V1_PREFIX)`
|
||||
|
||||
- [ ] **Step 4: 验证路由注册成功**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; routes = [r.path for r in app.routes]; print(any('cell-product-types' in str(r) for r in routes))"`
|
||||
Expected: `True`
|
||||
|
||||
- [ ] **Step 5: 启动服务验证无报错**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && timeout 5 python -c "import uvicorn; from app.main import app; print('App loads OK')" 2>&1`
|
||||
Expected: `App loads OK`
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/pilot_service.py backend/app/api/__init__.py backend/app/main.py
|
||||
git commit -m "feat: add pilot service API routes + registration (6 modules, 13 entities)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 前端 — API 函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`
|
||||
|
||||
- [ ] **Step 1: 在 `admin.ts` 末尾追加所有 API 函数**
|
||||
|
||||
每个实体 4 个函数(fetchXxxList / fetchCreateXxx / fetchUpdateXxx / fetchDeleteXxx),遵循现有模式:
|
||||
|
||||
```typescript
|
||||
// URL 模式: GET /web/admin/cell-product-types, POST /web/admin/cell-product-types, 等
|
||||
// request.post 使用 params 而非 data(HTTP client 自动处理)
|
||||
```
|
||||
|
||||
需要追加的函数组:
|
||||
|
||||
**2.3.1 细胞产品类型** (4 函数)
|
||||
**2.3.2 细胞产品规格** (4 函数)
|
||||
**2.3.3 细胞产品价格体系** (4 函数,list 额外支持 cellTypeCode 过滤参数)
|
||||
**2.3.4 项目价格体系主表** (4 函数)
|
||||
**2.3.4 项目价格体系子表** (4 函数 + fetchProjectSystemItems)
|
||||
**2.3.5 渠道主表** (4 函数)
|
||||
**2.3.5 渠道开票信息子表** (4 函数 + fetchChannelInvoices)
|
||||
**2.3.5 渠道邮寄地址子表** (4 函数 + fetchChannelMailAddresses)
|
||||
**2.3.5 渠道协议子表** (4 函数 + fetchChannelAgreements + fetchActivateChannelAgreement + fetchVoidChannelAgreement)
|
||||
**2.3.5 渠道协议价格子表** (4 函数 + fetchChannelAgreementPrices)
|
||||
**2.3.6 体检机构主表** (4 函数)
|
||||
**2.3.6 体检机构开票信息子表** (4 函数 + fetchCheckupInstitutionInvoices)
|
||||
**2.3.6 体检机构项目子表** (4 函数 + fetchCheckupInstitutionProjects)
|
||||
|
||||
总计约 50+ API 函数。
|
||||
|
||||
- [ ] **Step 2: 验证 TypeScript 无报错**
|
||||
|
||||
Run: `cd web-admin && npx tsc --noEmit src/api/admin.ts 2>&1 | head -20`
|
||||
Expected: 无错误输出(或仅与本次修改无关的已有警告)
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/admin.ts
|
||||
git commit -m "feat: add frontend API functions for pilot service management (6 modules)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 — 细胞产品类型管理页面 (2.3.1)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/cell-product-type/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
复制 `web-admin/src/views/system/unit/index.vue` 作为模板,修改为:
|
||||
|
||||
- `defineOptions({ name: 'PilotCellProductType' })`
|
||||
- API 调用替换为 `fetchCellProductTypeList` / `fetchCreateCellProductType` / `fetchUpdateCellProductType` / `fetchDeleteCellProductType`
|
||||
- import 来源 `@/api/admin`
|
||||
- 列表列:序号、类型编码(`productTypeCode`)、类型名称(`productTypeName`)、备注(`remark`)、创建时间(`createTime`)、操作
|
||||
- 表单字段:类型编码(必填)、类型名称(必填)、备注
|
||||
- 搜索:keyword 搜索编码/名称
|
||||
- 标题:`细胞产品类型管理`
|
||||
- 保持 `unit/index.vue` 的所有 CSS 类和布局结构不变
|
||||
- 操作列按钮:查看、编辑、删除
|
||||
- 不展示排序字段(按 AGENTS.md 约定)
|
||||
|
||||
- [ ] **Step 2: 验证页面可正常加载(dev server)**
|
||||
|
||||
Run: `cd web-admin && npx vue-tsc --noEmit src/views/pilot-service/cell-product-type/index.vue 2>&1 | head -10`
|
||||
Expected: 无错误
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/cell-product-type/index.vue
|
||||
git commit -m "feat: add cell product type management page (2.3.1)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端 — 细胞产品规格管理页面 (2.3.2)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/cell-product-spec/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
复制 Task 5 的 `cell-product-type/index.vue`,修改为:
|
||||
|
||||
- `defineOptions({ name: 'PilotCellProductSpec' })`
|
||||
- API 调用替换为 `fetchCellProductSpecList` / `fetchCreateCellProductSpec` / ...
|
||||
- 列表列:序号、规格编码(`specCode`)、规格名称(`specName`)、备注、创建时间、操作
|
||||
- 表单字段:规格编码(必填)、规格名称(必填)、备注
|
||||
- 标题:`细胞产品规格管理`
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/cell-product-spec/index.vue
|
||||
git commit -m "feat: add cell product spec management page (2.3.2)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端 — 细胞产品价格体系管理页面 (2.3.3)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/cell-product-price/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
复制 Task 5 的 `cell-product-type/index.vue`,扩展为:
|
||||
|
||||
- `defineOptions({ name: 'PilotCellProductPrice' })`
|
||||
- API 调用替换为对应函数
|
||||
- 列表列:序号、项目名称(`projectName`)、项目编码(`projectCode`)、细胞类型名称(`cellTypeName`)、规格(`specText`)、单价(`unitPrice`)、备注、创建时间、操作
|
||||
- **新增/编辑弹窗增加下拉关联**:
|
||||
- 细胞产品类型:`el-select` 调用 `fetchCellProductTypeList({ page: 1, pageSize: 999 })` 获取选项,选择后填充 `cellTypeCode` + `cellTypeName` + `cellProductTypeId`
|
||||
- 规格:`el-select` 调用 `fetchCellProductSpecList({ page: 1, pageSize: 999 })` 获取选项,选择后填充 `specId` + `specText`
|
||||
- 单价:`el-input-number` (precision=2, min=0)
|
||||
- 表单字段:项目名称(必填)、项目编码(必填)、细胞产品类型(下拉)、规格(下拉)、单价(元)、备注
|
||||
- import 新增:`fetchCellProductTypeList`, `fetchCellProductSpecList`
|
||||
- 标题:`细胞产品价格体系管理`
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/cell-product-price/index.vue
|
||||
git commit -m "feat: add cell product price system page with dropdown relations (2.3.3)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端 — 细胞产品项目价格管理页面 (2.3.4)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/project-price-system/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
参考 `web-admin/src/views/system/category/index.vue` 主子表模式,构建:
|
||||
|
||||
- `defineOptions({ name: 'PilotProjectPriceSystem' })`
|
||||
- **列表区**:主表分页列表
|
||||
- 列:序号、体系名称(`systemName`)、体系编码(`systemCode`)、状态(tag: 正常/停用)、备注、创建时间、操作
|
||||
- 操作按钮:查看、编辑、删除
|
||||
- **新增/编辑弹窗**:
|
||||
- 上半部分:主表字段(体系名称必填、体系编码必填、状态下拉、备注)
|
||||
- 下半部分:`el-table` 明细表(可编辑)
|
||||
- 列:项目名称、项目编码、细胞类型名称、规格、单价(可编辑 el-input-number)、操作(删除)
|
||||
- 底部按钮:"从价格体系添加" — 弹出 `el-dialog` 选择价格体系(2.3.3)的行,选择后自动填充明细行数据
|
||||
- 支持手动修改 `unitPrice`
|
||||
- 保存时:先 save 主表 → 获取 id → 逐行 save 子表
|
||||
- import:`fetchProjectSystemList`, `fetchCreateProjectSystem`, ... 以及 `fetchCellProductPriceList`(用于选择添加)
|
||||
- 标题:`细胞产品项目价格管理`
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/project-price-system/index.vue
|
||||
git commit -m "feat: add project price system page with master-detail table (2.3.4)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 前端 — 渠道信息管理页面 (2.3.5)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/channel/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
参考 `web-admin/src/views/system/product/index.vue` 多 section 模式,构建:
|
||||
|
||||
- `defineOptions({ name: 'PilotChannel' })`
|
||||
- **列表区**:渠道分页列表
|
||||
- 列:序号、渠道名称(`channelName`)、统一社会信用代码(`creditCode`)、渠道类型(tag: yy医院/hzjg合作机构/zs诊所/zfjg政府机构/qt其他)、联系人(`contactName`)、联系电话(`contactPhone`)、创建时间、操作
|
||||
- **新增/编辑弹窗**(宽度 `1000px`,使用 `el-tabs`):
|
||||
- **Tab 1 基础信息**:渠道名称(必填)、统一社会信用代码、渠道类型(下拉)、联系人姓名、联系电话、联系邮箱、渠道协议附件(上传)、备注
|
||||
- **Tab 2 开票信息**:`el-table` 子表 + 新增/编辑/删除按钮
|
||||
- 弹窗表单:单位名称(必填)、税号、单位地址、电话、开户银行、银行账号
|
||||
- **Tab 3 邮寄地址**:`el-table` 子表 + 新增/编辑/删除按钮
|
||||
- 弹窗表单:邮寄地址(必填)、邮寄联系人、邮寄联系电话
|
||||
- **Tab 4 协议信息**:`el-table` 子表 + 新增/编辑/删除按钮
|
||||
- 弹窗表单:协议类型(必填,下拉 kyxy/zsxy/lcxy)、结算方式(下拉)、授信额度、生效日期、到期日期
|
||||
- 每行操作按钮:查看价格明细、生效、作废
|
||||
- **价格明细子弹窗**:`el-table` 显示协议价格
|
||||
- 底部按钮:"从价格体系添加"、"从项目价格体系添加"
|
||||
- 选择后自动填充项目名称/编码/细胞类型/规格/原价,协议价需手动输入
|
||||
- 支持编辑协议价、删除行
|
||||
- import:渠道相关 API + `fetchCellProductPriceList` + `fetchProjectSystemList` + `fetchProjectSystemItems`
|
||||
- 标题:`渠道信息管理`
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/channel/index.vue
|
||||
git commit -m "feat: add channel management page with multi-tab sub-tables (2.3.5)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 前端 — 体检机构及项目价格页面 (2.3.6)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/checkup-institution/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建页面文件**
|
||||
|
||||
参考 `category/index.vue` 主子表模式 + Task 9 的 tab 模式:
|
||||
|
||||
- `defineOptions({ name: 'PilotCheckupInstitution' })`
|
||||
- **列表区**:分页列表
|
||||
- 列:序号、机构名称(`institutionName`)、机构地址(`institutionAddress`)、联系人(`contactName`)、联系电话(`contactPhone`)、状态(tag)、创建时间、操作
|
||||
- **新增/编辑弹窗**(宽度 `900px`,`el-tabs`):
|
||||
- **Tab 1 基础信息**:机构名称(必填)、机构地址、联系人、联系电话、状态(正常/停用)、备注
|
||||
- **Tab 2 开票信息**:`el-table` 子表 + 新增/编辑/删除
|
||||
- 弹窗表单:单位名称(必填)、税号、单位地址、电话、开户银行、银行账号
|
||||
- **Tab 3 项目及价格**:`el-table` 子表 + 新增/编辑/删除
|
||||
- 弹窗表单:项目名称(必填)、项目费用(元, el-input-number)
|
||||
- 标题:`体检机构及项目价格`
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-institution/index.vue
|
||||
git commit -m "feat: add checkup institution management page with sub-tables (2.3.6)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 11: 前端路由 + 菜单 SQL
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
- Create: `docs/sql/sys_menu_pilot_service.sql`
|
||||
|
||||
- [ ] **Step 1: 在 `sqxp.ts` 中追加中试服务管理路由块**
|
||||
|
||||
在 `CellStorage` 路由块之后追加新的路由组:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000001',
|
||||
name: 'PilotService',
|
||||
path: '/pilot-service',
|
||||
component: '/index/index',
|
||||
meta: {
|
||||
title: '中试服务管理',
|
||||
icon: 'ri:flask-line',
|
||||
keepAlive: false,
|
||||
roles: ['admin']
|
||||
},
|
||||
children: [
|
||||
{
|
||||
id: '80000000000000000000000000000002',
|
||||
name: 'CellProductType',
|
||||
path: 'cell-product-type',
|
||||
component: '/pilot-service/cell-product-type/index',
|
||||
meta: { title: '细胞产品类型管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000003',
|
||||
name: 'CellProductSpec',
|
||||
path: 'cell-product-spec',
|
||||
component: '/pilot-service/cell-product-spec/index',
|
||||
meta: { title: '细胞产品规格管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000004',
|
||||
name: 'CellProductPrice',
|
||||
path: 'cell-product-price',
|
||||
component: '/pilot-service/cell-product-price/index',
|
||||
meta: { title: '细胞产品价格体系管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000005',
|
||||
name: 'ProjectPriceSystem',
|
||||
path: 'project-price-system',
|
||||
component: '/pilot-service/project-price-system/index',
|
||||
meta: { title: '细胞产品项目价格管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000006',
|
||||
name: 'Channel',
|
||||
path: 'channel',
|
||||
component: '/pilot-service/channel/index',
|
||||
meta: { title: '渠道信息管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000007',
|
||||
name: 'CheckupInstitution',
|
||||
path: 'checkup-institution',
|
||||
component: '/pilot-service/checkup-institution/index',
|
||||
meta: { title: '体检机构及项目价格', keepAlive: true }
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
注意:追加在 `sqxpAdminRoutes` 数组中 `CellStorage` 路由块之后。
|
||||
|
||||
- [ ] **Step 2: 创建 `docs/sql/sys_menu_pilot_service.sql`**
|
||||
|
||||
```sql
|
||||
-- 中试服务管理菜单 (Web端,parent_id=2 为 Web 端根菜单)
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000001', '中试服务管理', 2, 5, '/pilot-service', NULL, 'D', '1', '1', NULL, 'ri:flask-line', NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000002', '细胞产品类型管理', '80000000000000000000000000000001', 1, 'cell-product-type', 'pilot-service/cell-product-type/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000003', '细胞产品规格管理', '80000000000000000000000000000001', 2, 'cell-product-spec', 'pilot-service/cell-product-spec/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000004', '细胞产品价格体系管理', '80000000000000000000000000000001', 3, 'cell-product-price', 'pilot-service/cell-product-price/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000005', '细胞产品项目价格管理', '80000000000000000000000000000001', 4, 'project-price-system', 'pilot-service/project-price-system/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000006', '渠道信息管理', '80000000000000000000000000000001', 5, 'channel', 'pilot-service/channel/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, menu_type, visible, status, perms, icon, create_time, update_time)
|
||||
VALUES ('80000000000000000000000000000007', '体检机构及项目价格', '80000000000000000000000000000001', 6, 'checkup-institution', 'pilot-service/checkup-institution/index', 'C', '1', '1', NULL, NULL, NOW(), NOW());
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/router/modules/sqxp.ts docs/sql/sys_menu_pilot_service.sql
|
||||
git commit -m "feat: add pilot service routes and menu SQL (6 modules)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 12: 最终验证
|
||||
|
||||
- [ ] **Step 1: 后端启动验证**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && timeout 8 python -c "from app.main import app; print('Backend loads OK')" 2>&1`
|
||||
Expected: `Backend loads OK`
|
||||
|
||||
- [ ] **Step 2: 前端构建验证**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
Expected: 构建成功,无错误
|
||||
|
||||
- [ ] **Step 3: LSP 诊断检查**
|
||||
|
||||
对以下文件运行 `lsp_diagnostics`:
|
||||
- `backend/app/api/pilot_service.py`
|
||||
- `backend/app/crud/pilot_service.py`
|
||||
- `web-admin/src/views/pilot-service/channel/index.vue`
|
||||
|
||||
Expected: 无 error 级别诊断
|
||||
|
||||
- [ ] **Step 4: Final commit (if any fixes needed)**
|
||||
|
||||
```bash
|
||||
git add -A
|
||||
git commit -m "fix: address final verification issues for pilot service management"
|
||||
```
|
||||
@@ -1,815 +0,0 @@
|
||||
# 生产管理模块 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Implement 7 production management modules (耗材管理、试剂管理、SOP文档、工艺工序分类、工艺产出物类型、耗材包管理、工艺库管理) with backend API + frontend UI, following existing codebase patterns exactly. 工艺路线配置 deferred to next iteration.
|
||||
|
||||
**Architecture:** FastAPI backend with flat-function CRUD (no service layer), Vue 3 + Element Plus frontend with standard list page template. Batch 1 (5 simple CRUD modules) has no dependencies. Batch 2 (耗材包+工艺库) depends on Batch 1. All modules share a new API route file `app/api/production.py` and frontend route group under `/production`.
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2 (backend); Vue 3 / TypeScript / Element Plus / Tailwind CSS 4 (frontend)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-17-production-management-design.md`
|
||||
|
||||
**Key Reference Files (READ FIRST):**
|
||||
- Backend CRUD pattern: `backend/app/crud/item_unit.py` — **canonical simple CRUD**
|
||||
- Backend API pattern: `backend/app/api/admin.py` (item-unit section, lines 968-1059)
|
||||
- Backend model pattern: `backend/app/models/models.py` (class BizItemUnit)
|
||||
- Frontend standard list: `web-admin/src/views/system/unit/index.vue` — **canonical list page**
|
||||
- Frontend API pattern: `web-admin/src/api/admin.ts` (fetchXxxList/fetchCreateXxx/fetchUpdateXxx/fetchDeleteXxx)
|
||||
- Frontend router: `web-admin/src/router/modules/sqxp.ts`
|
||||
- Upload pattern: `web-admin/src/api/business.ts` (fetchUploadAttachment)
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
### Backend (create/modify)
|
||||
| File | Action | Purpose |
|
||||
|------|--------|---------|
|
||||
| `docs/sql/production.sql` | CREATE | All 11 tables DDL + menu INSERT statements |
|
||||
| `backend/app/models/models.py` | MODIFY | Add 11 model classes at end of file |
|
||||
| `backend/app/crud/consumable.py` | CREATE | 耗材 CRUD |
|
||||
| `backend/app/crud/reagent.py` | CREATE | 试剂 CRUD |
|
||||
| `backend/app/crud/sop_document.py` | CREATE | SOP文档 CRUD |
|
||||
| `backend/app/crud/process_category.py` | CREATE | 工艺工序分类 CRUD |
|
||||
| `backend/app/crud/output_type.py` | CREATE | 工艺产出物类型 CRUD |
|
||||
| `backend/app/crud/consumable_pack.py` | CREATE | 耗材包 CRUD (主表+明细) |
|
||||
| `backend/app/crud/process.py` | CREATE | 工艺库 CRUD (主表+3子表) |
|
||||
| `backend/app/api/production.py` | CREATE | All 7 modules API routes |
|
||||
| `backend/app/api/__init__.py` | MODIFY | Import + export production_router |
|
||||
| `backend/app/main.py` | MODIFY | Import + register production_router |
|
||||
|
||||
### Frontend (create/modify)
|
||||
| File | Action | Purpose |
|
||||
|------|--------|---------|
|
||||
| `web-admin/src/api/production.ts` | CREATE | All 7 modules API functions |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | MODIFY | Add 生产管理 route group |
|
||||
| `web-admin/src/views/production/consumable/index.vue` | CREATE | 耗材管理标准列表页 |
|
||||
| `web-admin/src/views/production/reagent/index.vue` | CREATE | 试剂管理标准列表页 |
|
||||
| `web-admin/src/views/production/sop/index.vue` | CREATE | SOP文档列表页(含附件上传) |
|
||||
| `web-admin/src/views/production/process-category/index.vue` | CREATE | 工艺工序分类标准列表页 |
|
||||
| `web-admin/src/views/production/output-type/index.vue` | CREATE | 工艺产出物类型标准列表页 |
|
||||
| `web-admin/src/views/production/consumable-pack/index.vue` | CREATE | 耗材包管理列表页(含明细子表) |
|
||||
| `web-admin/src/views/production/process/index.vue` | CREATE | 工艺库管理列表页(Tab式编辑) |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: SQL DDL + Menu Entries
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/production.sql`
|
||||
|
||||
- [ ] **Step 1: Create the SQL DDL file with all 11 tables and menu entries**
|
||||
|
||||
Create `docs/sql/production.sql` with the complete DDL. All tables follow project conventions: `id VARCHAR(64) UUID`, business fields first, then public fields (`tenant_no` through `del_flag`), `ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci`.
|
||||
|
||||
Tables to create:
|
||||
1. `biz_consumable` — consumable_code, consumable_name, spec_model, standard_usage, description
|
||||
2. `biz_reagent` — reagent_code, reagent_name, spec, standard_usage, unit, description
|
||||
3. `biz_sop_document` — sop_code, sop_name, version_no, sop_attachments
|
||||
4. `biz_process_category` — category_code, category_name
|
||||
5. `biz_output_type` — type_code, type_name
|
||||
6. `biz_consumable_pack` — pack_code, pack_name, usage_scene, pack_type, status
|
||||
7. `biz_consumable_pack_item` — pack_id, consumable_code, consumable_name, spec_model, standard_usage, remark
|
||||
8. `biz_process` — process_code, category_id, process_name, description, equipment_name, estimated_duration, sop_ids
|
||||
9. `biz_process_reagent` — process_id, reagent_code, reagent_name, spec, standard_usage, unit, is_key_material
|
||||
10. `biz_process_consumable` — process_id, consumable_code, consumable_name, spec_model, standard_usage, is_required, remark
|
||||
11. `biz_process_output` — process_id, output_type_id, output_name, output_barcode
|
||||
|
||||
Also include INSERT statements for `sys_menu`:
|
||||
- Top-level menu "生产管理" under Web root (parent_id pointing to the Web menu root, which has id='1')
|
||||
- 7 child menu items, each with appropriate `menu_code` (e.g., `production:consumable:list`, `production:reagent:list`, etc.)
|
||||
|
||||
**Verification:** File contains valid SQL, all tables have public fields, all tables use `VARCHAR(64)` for id, charset utf8mb4.
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/production.sql
|
||||
git commit -m "feat: add production management SQL DDL and menu entries"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: Backend Models (11 SQLAlchemy models)
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (append at end)
|
||||
- Modify: `backend/app/models/__init__.py` (re-export new models)
|
||||
|
||||
- [ ] **Step 1: Add 11 model classes to models.py**
|
||||
|
||||
Append after the last class in `backend/app/models/models.py`. Follow the exact pattern of `BizItemUnit`:
|
||||
- Inherit from `Base` (from `app.core.database`)
|
||||
- All columns use `Column(...)` with explicit types
|
||||
- Public fields in exact order: tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
- `create_time` uses `default=datetime.now`, `update_time` uses `default=datetime.now, onupdate=datetime.now`
|
||||
- `del_flag` uses `SmallInteger` with `default=0`
|
||||
|
||||
Models:
|
||||
- `BizConsumable` → `biz_consumable`
|
||||
- `BizReagent` → `biz_reagent`
|
||||
- `BizSopDocument` → `biz_sop_document`
|
||||
- `BizProcessCategory` → `biz_process_category`
|
||||
- `BizOutputType` → `biz_output_type`
|
||||
- `BizConsumablePack` → `biz_consumable_pack`
|
||||
- `BizConsumablePackItem` → `biz_consumable_pack_item`
|
||||
- `BizProcess` → `biz_process`
|
||||
- `BizProcessReagent` → `biz_process_reagent`
|
||||
- `BizProcessConsumable` → `biz_process_consumable`
|
||||
- `BizProcessOutput` → `biz_process_output`
|
||||
|
||||
- [ ] **Step 2: Re-export in `backend/app/models/__init__.py`**
|
||||
|
||||
Add all 11 new classes to the imports and `__all__` list.
|
||||
|
||||
- [ ] **Step 3: Verify**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizConsumable, BizReagent, BizSopDocument, BizProcessCategory, BizOutputType, BizConsumablePack, BizConsumablePackItem, BizProcess, BizProcessReagent, BizProcessConsumable, BizProcessOutput; print('All models imported OK')"`
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/
|
||||
git commit -m "feat: add 11 production management SQLAlchemy models"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: Backend CRUD — Batch 1 (5 simple modules)
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/consumable.py`
|
||||
- Create: `backend/app/crud/reagent.py`
|
||||
- Create: `backend/app/crud/sop_document.py`
|
||||
- Create: `backend/app/crud/process_category.py`
|
||||
- Create: `backend/app/crud/output_type.py`
|
||||
|
||||
Each CRUD file follows the EXACT pattern from `backend/app/crud/item_unit.py`:
|
||||
1. `_row_to_dict(obj)` — returns dict with camelCase keys
|
||||
2. `list_xxx(db, *, page, page_size, keyword, tenant_no)` — paginated list with keyword search + tenant filter + soft-delete filter
|
||||
3. `get_xxx(db, id)` — single record by id with del_flag=0 check
|
||||
4. `xxx_code_exists(db, code, tenant_no, exclude_id=None)` — uniqueness check on code field
|
||||
5. `create_xxx(db, *, ...fields..., tenant_no, user_id)` — validate + create with `generate_uuid()`
|
||||
6. `update_xxx(db, id, *, ...fields..., user_id)` — validate + update
|
||||
7. `soft_delete_xxx(db, id)` — set del_flag=1
|
||||
8. `total_pages(total, page_size)` — pagination helper
|
||||
|
||||
- [ ] **Step 1: Create `backend/app/crud/consumable.py`**
|
||||
|
||||
Fields: consumable_code, consumable_name, spec_model, standard_usage, description
|
||||
Keyword search on: consumable_code, consumable_name
|
||||
|
||||
- [ ] **Step 2: Create `backend/app/crud/reagent.py`**
|
||||
|
||||
Fields: reagent_code, reagent_name, spec, standard_usage, unit, description
|
||||
Keyword search on: reagent_code, reagent_name
|
||||
|
||||
- [ ] **Step 3: Create `backend/app/crud/sop_document.py`**
|
||||
|
||||
Fields: sop_code, sop_name, version_no, sop_attachments
|
||||
Keyword search on: sop_code, sop_name
|
||||
NOTE: `sop_attachments` stores comma-separated URLs, returned as-is in `_row_to_dict`
|
||||
|
||||
- [ ] **Step 4: Create `backend/app/crud/process_category.py`**
|
||||
|
||||
Fields: category_code, category_name
|
||||
Keyword search on: category_code, category_name
|
||||
|
||||
- [ ] **Step 5: Create `backend/app/crud/output_type.py`**
|
||||
|
||||
Fields: type_code, type_name
|
||||
Keyword search on: type_code, type_name
|
||||
|
||||
- [ ] **Step 6: Verify all CRUD modules import correctly**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud import consumable, reagent, sop_document, process_category, output_type; print('All CRUD modules OK')"`
|
||||
|
||||
- [ ] **Step 7: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/consumable.py backend/app/crud/reagent.py backend/app/crud/sop_document.py backend/app/crud/process_category.py backend/app/crud/output_type.py
|
||||
git commit -m "feat: add batch 1 CRUD modules (consumable, reagent, sop, process-category, output-type)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: Backend CRUD — Batch 2 (耗材包 + 工艺库)
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/consumable_pack.py`
|
||||
- Create: `backend/app/crud/process.py`
|
||||
|
||||
### 耗材包 CRUD (主表+明细)
|
||||
|
||||
- [ ] **Step 1: Create `backend/app/crud/consumable_pack.py`**
|
||||
|
||||
This module needs:
|
||||
- `BizConsumablePack` main table CRUD (list, get, create, update, soft_delete)
|
||||
- `BizConsumablePackItem` detail table CRUD
|
||||
- **Create**: Accept main fields + list of items. Generate UUID for pack, then create each item with `pack_id`.
|
||||
- **Update**: Accept main fields + list of items. Update main record, then **delete existing items + re-insert** (simple replace strategy).
|
||||
- **Get detail**: Return main record + list of child items (`_row_to_dict` for main includes `items: [...]`)
|
||||
- **Soft delete**: Also soft-delete all child items (set their del_flag=1)
|
||||
- `_row_to_dict` for main includes: pack items as nested list
|
||||
|
||||
`_row_to_dict` for pack item:
|
||||
```python
|
||||
{
|
||||
"id": item.id,
|
||||
"packId": item.pack_id,
|
||||
"consumableCode": item.consumable_code,
|
||||
"consumableName": item.consumable_name,
|
||||
"specModel": item.spec_model,
|
||||
"standardUsage": item.standard_usage,
|
||||
"remark": item.remark or "",
|
||||
}
|
||||
```
|
||||
|
||||
### 工艺库 CRUD (主表+3个子表)
|
||||
|
||||
- [ ] **Step 2: Create `backend/app/crud/process.py`**
|
||||
|
||||
This module needs:
|
||||
- `BizProcess` main table CRUD
|
||||
- `BizProcessReagent` sub-table CRUD
|
||||
- `BizProcessConsumable` sub-table CRUD
|
||||
- `BizProcessOutput` sub-table CRUD
|
||||
- **Create**: Accept main fields + 3 lists (reagents, consumables, outputs). Generate UUID for process, then create each sub-record with `process_id`.
|
||||
- **Update**: Replace strategy — update main, delete+re-insert all sub-records.
|
||||
- **Get detail**: Return main record + 3 nested lists.
|
||||
- **Soft delete**: Also soft-delete all child records.
|
||||
|
||||
`_row_to_dict` for process includes:
|
||||
```python
|
||||
{
|
||||
"id": ...,
|
||||
"processCode": ...,
|
||||
"categoryId": ...,
|
||||
"processName": ...,
|
||||
"description": ...,
|
||||
"equipmentName": ...,
|
||||
"estimatedDuration": ...,
|
||||
"sopIds": ...,
|
||||
# ... public fields ...
|
||||
"reagents": [reagent_row_to_dict(r) for r in reagents],
|
||||
"consumables": [consumable_row_to_dict(c) for c in consumables],
|
||||
"outputs": [output_row_to_dict(o) for o in outputs],
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Verify**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud import consumable_pack, process; print('Batch 2 CRUD OK')"`
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/consumable_pack.py backend/app/crud/process.py
|
||||
git commit -m "feat: add batch 2 CRUD modules (consumable-pack, process)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: Backend API Routes + Registration
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/production.py`
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
- [ ] **Step 1: Create `backend/app/api/production.py`**
|
||||
|
||||
Follow the exact pattern from `backend/app/api/admin.py` (item-units section).
|
||||
|
||||
Structure:
|
||||
```python
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from sqlalchemy.orm import Session
|
||||
from typing import Any, Optional, List
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin, require_menu_code
|
||||
from app.core.response import success_response, error_response
|
||||
from app.crud import consumable as consumable_svc
|
||||
from app.crud import reagent as reagent_svc
|
||||
from app.crud import sop_document as sop_document_svc
|
||||
from app.crud import process_category as process_category_svc
|
||||
from app.crud import output_type as output_type_svc
|
||||
from app.crud import consumable_pack as consumable_pack_svc
|
||||
from app.crud import process as process_svc
|
||||
from app.models.models import SysUser
|
||||
|
||||
router = APIRouter(prefix="/web/admin", tags=["生产管理"])
|
||||
|
||||
def _get_tenant_no(db: Session, user: dict) -> str:
|
||||
# Same pattern as admin.py
|
||||
...
|
||||
```
|
||||
|
||||
**Endpoints to create (7 modules × 4 CRUD operations = 28 endpoints):**
|
||||
|
||||
| Module | List (GET) | Create (POST) | Update (PUT) | Delete (DELETE) |
|
||||
|--------|-----------|---------------|--------------|-----------------|
|
||||
| 耗材 | `/consumables` | `/consumables` | `/consumables/{id}` | `/consumables/{id}` |
|
||||
| 试剂 | `/reagents` | `/reagents` | `/reagents/{id}` | `/reagents/{id}` |
|
||||
| SOP | `/sop-documents` | `/sop-documents` | `/sop-documents/{id}` | `/sop-documents/{id}` |
|
||||
| 工序分类 | `/process-categories` | `/process-categories` | `/process-categories/{id}` | `/process-categories/{id}` |
|
||||
| 产出物类型 | `/output-types` | `/output-types` | `/output-types/{id}` | `/output-types/{id}` |
|
||||
| 耗材包 | `/consumable-packs` | `/consumable-packs` | `/consumable-packs/{id}` | `/consumable-packs/{id}` |
|
||||
| 工艺库 | `/processes` | `/processes` | `/processes/{id}` | `/processes/{id}` |
|
||||
|
||||
**Additional list-only endpoints needed by dropdowns:**
|
||||
- GET `/reagers/all` — all reagents (no pagination, for dropdown in process form)
|
||||
- GET `/consumables/all` — all consumables (for dropdown in pack/process form)
|
||||
- GET `/sop-documents/all` — all SOP docs (for multi-select in process form)
|
||||
- GET `/process-categories/all` — all categories (for dropdown)
|
||||
- GET `/output-types/all` — all output types (for dropdown)
|
||||
- GET `/consumable-packs/{id}/items` — pack items (for importing into process)
|
||||
|
||||
**Request body patterns:**
|
||||
|
||||
Simple CRUD (耗材 as example):
|
||||
```python
|
||||
class ConsumableCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
consumable_code: str = Field(..., alias="consumableCode")
|
||||
consumable_name: str = Field(..., alias="consumableName")
|
||||
spec_model: Optional[str] = Field(None, alias="specModel")
|
||||
standard_usage: Optional[str] = Field(None, alias="standardUsage")
|
||||
description: Optional[str] = None
|
||||
order_num: Optional[int] = Field(0, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
```
|
||||
|
||||
耗材包 Create/Update (includes items):
|
||||
```python
|
||||
class PackItemInput(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
consumable_code: Optional[str] = Field(None, alias="consumableCode")
|
||||
consumable_name: Optional[str] = Field(None, alias="consumableName")
|
||||
spec_model: Optional[str] = Field(None, alias="specModel")
|
||||
standard_usage: Optional[str] = Field(None, alias="standardUsage")
|
||||
remark: Optional[str] = None
|
||||
|
||||
class ConsumablePackCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
pack_code: str = Field(..., alias="packCode")
|
||||
pack_name: str = Field(..., alias="packName")
|
||||
usage_scene: Optional[str] = Field(None, alias="usageScene")
|
||||
pack_type: Optional[str] = Field(None, alias="packType")
|
||||
status: Optional[str] = "1"
|
||||
order_num: Optional[int] = Field(0, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
items: List[PackItemInput] = []
|
||||
```
|
||||
|
||||
工艺库 Create/Update (includes 3 sub-lists):
|
||||
```python
|
||||
class ProcessReagentInput(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
reagent_code: Optional[str] = Field(None, alias="reagentCode")
|
||||
reagent_name: Optional[str] = Field(None, alias="reagentName")
|
||||
spec: Optional[str] = None
|
||||
standard_usage: Optional[str] = Field(None, alias="standardUsage")
|
||||
unit: Optional[str] = None
|
||||
is_key_material: Optional[str] = Field("0", alias="isKeyMaterial")
|
||||
|
||||
class ProcessConsumableInput(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
consumable_code: Optional[str] = Field(None, alias="consumableCode")
|
||||
consumable_name: Optional[str] = Field(None, alias="consumableName")
|
||||
spec_model: Optional[str] = Field(None, alias="specModel")
|
||||
standard_usage: Optional[str] = Field(None, alias="standardUsage")
|
||||
is_required: Optional[str] = Field("1", alias="isRequired")
|
||||
remark: Optional[str] = None
|
||||
|
||||
class ProcessOutputInput(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
output_type_id: Optional[str] = Field(None, alias="outputTypeId")
|
||||
output_name: Optional[str] = Field(None, alias="outputName")
|
||||
output_barcode: Optional[str] = Field(None, alias="outputBarcode")
|
||||
|
||||
class ProcessCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
process_code: str = Field(..., alias="processCode")
|
||||
category_id: Optional[str] = Field(None, alias="categoryId")
|
||||
process_name: str = Field(..., alias="processName")
|
||||
description: Optional[str] = None
|
||||
equipment_name: Optional[str] = Field(None, alias="equipmentName")
|
||||
estimated_duration: Optional[str] = Field(None, alias="estimatedDuration")
|
||||
sop_ids: Optional[str] = Field(None, alias="sopIds")
|
||||
order_num: Optional[int] = Field(0, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
reagents: List[ProcessReagentInput] = []
|
||||
consumables: List[ProcessConsumableInput] = []
|
||||
outputs: List[ProcessOutputInput] = []
|
||||
```
|
||||
|
||||
**Auth patterns:**
|
||||
- List endpoints: `Depends(require_menu_code("production:xxx:list"))`
|
||||
- Write endpoints: `Depends(require_admin_or_super_admin)`
|
||||
- "All" dropdown endpoints: `Depends(require_admin_or_super_admin)` (lightweight, no pagination)
|
||||
|
||||
- [ ] **Step 2: Register router in `backend/app/api/__init__.py`**
|
||||
|
||||
Add:
|
||||
```python
|
||||
from app.api.production import router as production_router
|
||||
```
|
||||
Add `production_router` to `__all__`.
|
||||
|
||||
- [ ] **Step 3: Register router in `backend/app/main.py`**
|
||||
|
||||
Add import and:
|
||||
```python
|
||||
app.include_router(production_router, prefix=settings.API_V1_PREFIX)
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Verify backend starts**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; routes = [r.path for r in app.routes]; prod = [r for r in routes if 'consumable' in r or 'reagent' in r or 'sop-document' in r or 'process-categor' in r or 'output-type' in r or 'consumable-pack' in r or 'processes' in r]; print(f'Production routes: {len(prod)}'); print(prod[:10])"`
|
||||
|
||||
Expected: 28+ production routes registered.
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/production.py backend/app/api/__init__.py backend/app/main.py
|
||||
git commit -m "feat: add production management API routes (7 modules, 28 endpoints)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: Frontend API Functions
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/api/production.ts`
|
||||
|
||||
- [ ] **Step 1: Create `web-admin/src/api/production.ts`**
|
||||
|
||||
Follow the pattern from `web-admin/src/api/admin.ts`. Use `request.get/post/put/del` with `params` for JSON body and `data` for FormData.
|
||||
|
||||
For each of the 7 modules, define 4 API functions (list, create, update, delete). Also define "all" functions for dropdown data.
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/http'
|
||||
|
||||
// ==================== 耗材管理 ====================
|
||||
export function fetchConsumableList(params?: { page?: number; pageSize?: number; keyword?: string }) {
|
||||
return request.get<{ list: any[]; total: number; page: number; pageSize: number; totalPages: number }>({
|
||||
url: '/web/admin/consumables', params
|
||||
})
|
||||
}
|
||||
export function fetchAllConsumables() {
|
||||
return request.get<any[]>({ url: '/web/admin/consumables/all' })
|
||||
}
|
||||
export function fetchCreateConsumable(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/consumables', params: data })
|
||||
}
|
||||
export function fetchUpdateConsumable(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/consumables/${id}`, params: data })
|
||||
}
|
||||
export function fetchDeleteConsumable(id: string) {
|
||||
return request.del({ url: `/web/admin/consumables/${id}` })
|
||||
}
|
||||
|
||||
// ==================== 试剂管理 ====================
|
||||
// (same pattern: fetchReagentList, fetchAllReagents, fetchCreateReagent, fetchUpdateReagent, fetchDeleteReagent)
|
||||
|
||||
// ==================== SOP文档 ====================
|
||||
// (same pattern: fetchSopList, fetchAllSopDocuments, fetchCreateSop, fetchUpdateSop, fetchDeleteSop)
|
||||
|
||||
// ==================== 工艺工序分类 ====================
|
||||
// (same pattern: fetchProcessCategoryList, fetchAllProcessCategories, fetchCreateProcessCategory, ...)
|
||||
|
||||
// ==================== 工艺产出物类型 ====================
|
||||
// (same pattern: fetchOutputTypeList, fetchAllOutputTypes, fetchCreateOutputType, ...)
|
||||
|
||||
// ==================== 耗材包管理 ====================
|
||||
// (same pattern, but create/update body includes items array)
|
||||
|
||||
// ==================== 工艺库管理 ====================
|
||||
// (same pattern, but create/update body includes reagents, consumables, outputs arrays)
|
||||
```
|
||||
|
||||
**Important convention from codebase:** POST/PUT use `params` for JSON body, `showSuccessMessage: true` is NOT needed (messages shown in page component).
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/production.ts
|
||||
git commit -m "feat: add production management frontend API functions"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: Frontend Routes + Menu
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
- [ ] **Step 1: Add production route group to sqxp.ts**
|
||||
|
||||
Add a new top-level route entry. Use a unique ID (e.g., `'90000000000000000000000000000001'`). Follow the existing pattern of other top-level groups.
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '90000000000000000000000000000001',
|
||||
name: 'ProductionManagement',
|
||||
path: '/production',
|
||||
component: '/index/index',
|
||||
meta: { title: '生产管理', icon: 'ri:factory-line', keepAlive: false, roles: ['admin'] },
|
||||
children: [
|
||||
{
|
||||
id: '90000000000000000000000000000010',
|
||||
name: 'ProductionConsumable',
|
||||
path: 'consumable',
|
||||
component: '/production/consumable/index',
|
||||
meta: { title: '耗材管理', keepAlive: true, menuCode: 'production:consumable:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000020',
|
||||
name: 'ProductionReagent',
|
||||
path: 'reagent',
|
||||
component: '/production/reagent/index',
|
||||
meta: { title: '试剂管理', keepAlive: true, menuCode: 'production:reagent:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000030',
|
||||
name: 'ProductionSop',
|
||||
path: 'sop',
|
||||
component: '/production/sop/index',
|
||||
meta: { title: 'SOP文档', keepAlive: true, menuCode: 'production:sop:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000040',
|
||||
name: 'ProductionProcessCategory',
|
||||
path: 'process-category',
|
||||
component: '/production/process-category/index',
|
||||
meta: { title: '工艺工序分类', keepAlive: true, menuCode: 'production:process-category:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000050',
|
||||
name: 'ProductionOutputType',
|
||||
path: 'output-type',
|
||||
component: '/production/output-type/index',
|
||||
meta: { title: '工艺产出物类型', keepAlive: true, menuCode: 'production:output-type:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000060',
|
||||
name: 'ProductionConsumablePack',
|
||||
path: 'consumable-pack',
|
||||
component: '/production/consumable-pack/index',
|
||||
meta: { title: '耗材包管理', keepAlive: true, menuCode: 'production:consumable-pack:list' }
|
||||
},
|
||||
{
|
||||
id: '90000000000000000000000000000070',
|
||||
name: 'ProductionProcess',
|
||||
path: 'process',
|
||||
component: '/production/process/index',
|
||||
meta: { title: '工艺库管理', keepAlive: true, menuCode: 'production:process:list' }
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
NOTE: Add this to `sqxpAdminRoutes` array in `sqxp.ts`. Icon only on top-level (sidebar convention).
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/router/modules/sqxp.ts
|
||||
git commit -m "feat: add production management frontend routes"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: Frontend Pages — Batch 1 (5 simple CRUD pages)
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/production/consumable/index.vue`
|
||||
- Create: `web-admin/src/views/production/reagent/index.vue`
|
||||
- Create: `web-admin/src/views/production/sop/index.vue`
|
||||
- Create: `web-admin/src/views/production/process-category/index.vue`
|
||||
- Create: `web-admin/src/views/production/output-type/index.vue`
|
||||
|
||||
All 5 pages follow the **exact same pattern** as `web-admin/src/views/system/unit/index.vue` (327 lines). Read that file first and replicate its structure.
|
||||
|
||||
### Common page structure:
|
||||
```
|
||||
page-container
|
||||
page-head (h1 title + description)
|
||||
panel
|
||||
panel-top (title-bar-heading with green vertical bar)
|
||||
filter-block (keyword search + search/reset buttons)
|
||||
list-toolbar (selected count + add button)
|
||||
list-body/list-wrap (el-table with columns + pagination)
|
||||
el-dialog (add/edit form, label-position="top", form-grid-2)
|
||||
```
|
||||
|
||||
### Per-page differences:
|
||||
|
||||
- [ ] **Step 1: Create 耗材管理 page (`production/consumable/index.vue`)**
|
||||
|
||||
`defineOptions({ name: 'ProductionConsumable' })`
|
||||
- Table columns: 耗材编码, 耗材名称, 规格型号, 标准用量, 描述, 创建时间, 操作
|
||||
- Search keyword searches on: consumableCode, consumableName
|
||||
- Form fields: consumableCode (required), consumableName (required), specModel, standardUsage, description, remark
|
||||
- API: `fetchConsumableList, fetchCreateConsumable, fetchUpdateConsumable, fetchDeleteConsumable` from `@/api/production`
|
||||
|
||||
- [ ] **Step 2: Create 试剂管理 page (`production/reagent/index.vue`)**
|
||||
|
||||
`defineOptions({ name: 'ProductionReagent' })`
|
||||
- Table columns: 试剂编码, 试剂名称, 规格, 标准用量, 单位, 描述, 创建时间, 操作
|
||||
- Form fields: reagentCode (required), reagentName (required), spec, standardUsage, unit (el-select dropdown from item-unit API), description, remark
|
||||
- **Special**: "单位" field is an el-select that loads options from `fetchAllItemUnits()` (import from `@/api/admin`)
|
||||
- API: `fetchReagentList, fetchCreateReagent, fetchUpdateReagent, fetchDeleteReagent` from `@/api/production`
|
||||
|
||||
- [ ] **Step 3: Create SOP文档 page (`production/sop/index.vue`)**
|
||||
|
||||
`defineOptions({ name: 'ProductionSop' })`
|
||||
- Table columns: SOP编号, SOP文档名称, 版本号, 附件数, 创建时间, 操作
|
||||
- Form fields: sopCode (required), sopName (required), versionNo, sopAttachments (file upload card)
|
||||
- **Special**: File upload using the card layout pattern from `ProtocolFormDialog.vue`:
|
||||
- Use `el-upload` with `:auto-upload="false"`, `@change="handleFileChange"`
|
||||
- Upload via `fetchUploadAttachment(formData)` from `@/api/business`
|
||||
- Store comma-separated URLs in `sopAttachments` field
|
||||
- Display attachment count in table
|
||||
- API: `fetchSopList, fetchCreateSop, fetchUpdateSop, fetchDeleteSop` from `@/api/production`
|
||||
|
||||
- [ ] **Step 4: Create 工艺工序分类 page (`production/process-category/index.vue`)**
|
||||
|
||||
`defineOptions({ name: 'ProductionProcessCategory' })`
|
||||
- Table columns: 分类编码, 分类名称, 创建时间, 操作
|
||||
- Form fields: categoryCode (required), categoryName (required), remark
|
||||
- Simplest page — identical to unit template
|
||||
- API: `fetchProcessCategoryList, fetchCreateProcessCategory, fetchUpdateProcessCategory, fetchDeleteProcessCategory` from `@/api/production`
|
||||
|
||||
- [ ] **Step 5: Create 工艺产出物类型 page (`production/output-type/index.vue`)**
|
||||
|
||||
`defineOptions({ name: 'ProductionOutputType' })`
|
||||
- Table columns: 类型编码, 类型名称, 创建时间, 操作
|
||||
- Form fields: typeCode (required), typeName (required), remark
|
||||
- Same pattern as 工序分类 — very simple
|
||||
- API: `fetchOutputTypeList, fetchCreateOutputType, fetchUpdateOutputType, fetchDeleteOutputType` from `@/api/production`
|
||||
|
||||
- [ ] **Step 6: Verify all 5 pages load**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
Expected: Build succeeds with no errors.
|
||||
|
||||
- [ ] **Step 7: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/
|
||||
git commit -m "feat: add batch 1 frontend pages (consumable, reagent, sop, process-category, output-type)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: Frontend Page — 耗材包管理
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/production/consumable-pack/index.vue`
|
||||
|
||||
- [ ] **Step 1: Create 耗材包管理 page**
|
||||
|
||||
`defineOptions({ name: 'ProductionConsumablePack' })`
|
||||
|
||||
**List page**: Standard template with additional columns:
|
||||
- Table columns: 编号, 名称, 使用场景, 类型(display dict: bzhcb=标准耗材包, zdyhcb=自定义耗材包), 状态(el-switch or tag: 1=启用, 0=停用), 创建时间, 操作
|
||||
|
||||
**Add/Edit dialog**: Larger dialog with 2 sections:
|
||||
1. **基本信息**: packCode, packName, usageScene, packType (el-radio-group: bzhcb/zdyhcb), status (el-switch), remark
|
||||
2. **耗材明细**: Embedded el-table inside the dialog for managing pack items:
|
||||
- Each row: consumableCode, consumableName, specModel, standardUsage, remark
|
||||
- "添加耗材" button opens a sub-dialog to select from consumable list (use `fetchAllConsumables()` dropdown or table select)
|
||||
- After selecting, auto-fill code/name/spec from the consumable record
|
||||
- Row-level delete button
|
||||
- Inline editing for standardUsage
|
||||
|
||||
**Data flow**:
|
||||
- On dialog open (edit mode): Load pack detail which includes `items` array
|
||||
- On save: Submit main fields + items array together to create/update API
|
||||
|
||||
- [ ] **Step 2: Verify page loads**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/consumable-pack/
|
||||
git commit -m "feat: add consumable pack management frontend page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 10: Frontend Page — 工艺库管理
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/production/process/index.vue`
|
||||
|
||||
- [ ] **Step 1: Create 工艺库管理 page**
|
||||
|
||||
`defineOptions({ name: 'ProductionProcess' })`
|
||||
|
||||
**List page**: Standard template:
|
||||
- Table columns: 工序代码, 工序名称, 工序分类(resolve from category map), 描述, 设备名称, 预估耗时, 创建时间, 操作
|
||||
- On load: also fetch all categories, SOP docs for display resolution
|
||||
|
||||
**Add/Edit dialog**: Wide dialog (width="900px") with `el-tabs`:
|
||||
- **Tab 1 — 基本信息**: processCode, categoryId (el-select from fetchAllProcessCategories), processName, description, equipmentName, estimatedDuration, sopIds (el-select multiple from fetchAllSopDocuments), remark
|
||||
- **Tab 2 — 试剂关联**: el-table with rows:
|
||||
- Columns: reagentCode, reagentName, spec, standardUsage, unit, isKeyMaterial (el-switch/checkbox)
|
||||
- "添加试剂" button → select from reagent dropdown (fetchAllReagents), auto-fill code/name/spec/usage/unit
|
||||
- User can modify standardUsage and isKeyMaterial
|
||||
- Row delete button
|
||||
- **Tab 3 — 耗材关联**: el-table with rows:
|
||||
- Columns: consumableCode, consumableName, specModel, standardUsage, isRequired (el-switch), remark
|
||||
- Two add modes:
|
||||
1. "添加耗材" button → select from consumable dropdown
|
||||
2. "从耗材包导入" button → select pack (el-select from fetchAllConsumablePacks), then load pack items and merge into table
|
||||
- Row delete button
|
||||
- **Tab 4 — 产出物**: el-table with rows:
|
||||
- Columns: outputTypeId (display resolved name), outputName, outputBarcode
|
||||
- "添加产出物" button → row with el-select for output type + input for name
|
||||
- Row delete button
|
||||
|
||||
**Data flow**:
|
||||
- On dialog open (edit mode): Load process detail which includes reagents/consumables/outputs arrays
|
||||
- On tab switch: No special action needed (all data in local reactive state)
|
||||
- On save: Collect all 4 sections' data and submit together
|
||||
|
||||
**Key considerations**:
|
||||
- Load dropdown data (categories, reagents, consumables, SOP docs, output types, consumable packs) when dialog opens
|
||||
- Use `onMounted` or dialog open handler to pre-fetch reference data
|
||||
- Display category name in table by maintaining a category map `{id: name}`
|
||||
|
||||
- [ ] **Step 2: Verify page loads**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/process/
|
||||
git commit -m "feat: add process library management frontend page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 11: Final Verification
|
||||
|
||||
- [ ] **Step 1: Full frontend build**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: Exit code 0, no errors.
|
||||
|
||||
- [ ] **Step 2: Backend import check**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; print('Backend OK')"`
|
||||
|
||||
- [ ] **Step 3: Manual smoke test (if dev server available)**
|
||||
|
||||
1. Start backend: `cd backend && ./start-local.sh`
|
||||
2. Start frontend: `cd web-admin && pnpm dev`
|
||||
3. Navigate to each of the 7 pages under 生产管理 sidebar
|
||||
4. Test CRUD on each page (add, edit, delete, search)
|
||||
5. Test dropdown loading on 试剂 (unit dropdown), 工艺库 (category/reagent/consumable/SOP/output dropdowns)
|
||||
6. Test file upload on SOP文档
|
||||
7. Test耗材包 item management (add/remove items)
|
||||
8. Test工艺库 tab management (add/remove reagents, consumables, outputs)
|
||||
|
||||
---
|
||||
|
||||
## Dependency Graph
|
||||
|
||||
```
|
||||
Task 1 (SQL)
|
||||
↓
|
||||
Task 2 (Models)
|
||||
↓
|
||||
Task 3 (CRUD Batch 1) ← independent from Task 6/7
|
||||
↓
|
||||
Task 4 (CRUD Batch 2)
|
||||
↓
|
||||
Task 5 (API Routes) ← depends on Task 3 + 4
|
||||
↓
|
||||
Task 6 (Frontend API) ← independent, can parallel with Task 5
|
||||
Task 7 (Frontend Routes) ← independent, can parallel with Task 5
|
||||
↓
|
||||
Task 8 (Frontend Batch 1) ← depends on Task 5 + 6 + 7
|
||||
↓
|
||||
Task 9 (Frontend 耗材包) ← depends on Task 5 + 6 + 7
|
||||
Task 10 (Frontend 工艺库) ← depends on Task 5 + 6 + 7 + 8 (needs dropdowns from batch 1)
|
||||
↓
|
||||
Task 11 (Final Verification) ← depends on all above
|
||||
```
|
||||
|
||||
**Parallelization opportunities:**
|
||||
- Tasks 6 + 7 can run in parallel with Task 5
|
||||
- Tasks 8 + 9 can run in parallel (both depend on Task 5+6+7)
|
||||
- Task 10 should wait for Task 8 (needs dropdown APIs working)
|
||||
@@ -1,861 +0,0 @@
|
||||
# 采集协议单查看弹窗 方案D风格改造 实现计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 将 ProtocolViewDialog.vue 的查看弹窗 UI 改造为方案D风格(KPI摘要条 + 圆角卡片分区 + 🤱👨👶子卡片 + 3列网格),同时保留所有现有信息项不遗漏。
|
||||
|
||||
**Architecture:** 单文件改造,只改 `ProtocolViewDialog.vue` 的 `<template>` 和 `<style>` 部分。`<script>` 逻辑层不变(数据获取、格式化函数、computed 全部保留)。三个页面(采集协议单、缴费信息、采集协议单审核)复用同一个组件,改一个文件即全部生效。
|
||||
|
||||
**Tech Stack:** Vue 3 + Element Plus + SCSS (scoped)。组件内纯 CSS 改造,不引入新依赖。
|
||||
|
||||
**关键约束:**
|
||||
- 所有现有信息项不可遗漏(字段对齐现有 view-kv-grid 中的每个 dt/dd)
|
||||
- 保留 `showAuditHistory` prop 的条件展示逻辑
|
||||
- 保留文件预览/下载功能(ProtocolAttachmentReadonly、openPreview、downloadFile)
|
||||
- 保留 sticky tab 导航锚点
|
||||
- 保留附件卡片样式(ProtocolAttachmentReadonly 组件不变)
|
||||
- 配色严格遵循 Fresh Mint 色板:primary #10b981,dark #059669,禁止使用小程序色 #0a9f6d
|
||||
|
||||
---
|
||||
|
||||
## 文件变更清单
|
||||
|
||||
| 文件 | 操作 | 说明 |
|
||||
|------|------|------|
|
||||
| `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` | **修改** | template + style 全面改造,script 不动 |
|
||||
|
||||
---
|
||||
|
||||
## 参考设计对照表
|
||||
|
||||
### 现有字段 → 方案D映射
|
||||
|
||||
**Tab 1: 基本信息**
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 协议号 | KPI摘要卡 + 基本信息卡片 |
|
||||
| 协议状态 | KPI摘要卡(状态点) + 基本信息卡片(badge) |
|
||||
| 登记日期 | KPI摘要卡 + 基本信息卡片 |
|
||||
| 采集专员 | 基本信息卡片 |
|
||||
| 创建时间 | 基本信息卡片 |
|
||||
| 协议附件 | 基本信息卡片 — 附件行 |
|
||||
| 备注 | 基本信息卡片 — 备注行 |
|
||||
|
||||
**Tab 2: 客户信息**
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 母亲: 关联客户/姓名/电话/身份证/出生年月/民族/住址 | 🤱 母亲信息子卡片 (2列grid) |
|
||||
| 父亲: 姓名/电话/身份证 | 👨 父亲信息子卡片 (2列grid) |
|
||||
| 新生儿: 姓名/身份证/分娩时间/性别/分娩方式/胎次/体重/评分1min/评分5min | 👶 新生儿信息子卡片 (2列grid) |
|
||||
|
||||
**Tab 3: 采集信息**
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 采集地区/采集医院/采集医护/销售人员/样本采集时间/母血采集时间 | 白色卡片 — 3列grid |
|
||||
|
||||
**Tab 4: 样本及运输信息**
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 样本表格(11列) | 白色卡片 — el-table 保留,样式微调 |
|
||||
|
||||
**Tab 5: 缴费信息**
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 缴费模式/合同金额/分期相关字段 | 灰色卡片 — 缴费主表指标卡 |
|
||||
| 缴费明细卡片 | 灰色卡片 — 明细卡片区(含退费场景) |
|
||||
| 缴费流程轨道 | 灰色卡片 — mini-flow 横向节点 |
|
||||
|
||||
**Tab 6: 审核记录** (条件展示)
|
||||
| 现有字段 | 方案D位置 |
|
||||
|---------|----------|
|
||||
| 审核记录表格 | 白色卡片 — el-table 保留 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 改造 template — 添加 KPI 摘要条 + 整体结构
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` (template 部分)
|
||||
|
||||
- [ ] **Step 1: 在 `<div class="protocol-view-body">` 内、`<template v-if="bundle">` 之前,添加 KPI 摘要条**
|
||||
|
||||
用 4 个 `kpi-card` 替代之前无顶部摘要的设计。KPI 条显示:协议编号、协议状态(带状态点)、母亲姓名、登记日期。所有值来自 `protocol` 和 `partyCustomer` computed。
|
||||
|
||||
```html
|
||||
<!-- KPI Summary Strip -->
|
||||
<div v-if="bundle" class="kpi-strip">
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-label">协议编号</div>
|
||||
<div class="kpi-value">{{ dash(protocol?.protocolNo) }}</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-label">协议状态</div>
|
||||
<div class="kpi-value">
|
||||
<span class="status-dot" :class="statusDotClass(String(protocol?.protocolStatus || ''))" />
|
||||
{{ protocolStatusLabel(String(protocol?.protocolStatus || '')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-label">母亲姓名</div>
|
||||
<div class="kpi-value">{{ dash(partyCustomer?.motherName) }}</div>
|
||||
</div>
|
||||
<div class="kpi-card">
|
||||
<div class="kpi-label">登记日期</div>
|
||||
<div class="kpi-value">{{ formatYmd(protocol?.registerDate) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 script 中添加 `statusDotClass` 函数**
|
||||
|
||||
在现有 `protocolStatusLabel` 函数附近添加:
|
||||
|
||||
```typescript
|
||||
function statusDotClass(s: string): string {
|
||||
const m: Record<string, string> = {
|
||||
dsx: 'pending',
|
||||
sxz: 'active',
|
||||
ygq: 'expired',
|
||||
yzf: 'void',
|
||||
zky: 'research'
|
||||
}
|
||||
return m[s] || ''
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 将 `<template v-if="bundle">` 内的 6 个 section 改为卡片包裹**
|
||||
|
||||
每个 `form-tab-pane` 改为 `section-card` 结构。保留所有 `id="view-section-*"` 用于滚动锚点。
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 改造基本信息 section
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` (基本信息模板)
|
||||
|
||||
- [ ] **Step 1: 替换基本信息区域的 HTML 结构**
|
||||
|
||||
将现有的 `<div id="view-section-basic" class="form-tab-pane">` 替换为方案D卡片结构:
|
||||
|
||||
```html
|
||||
<!-- 基本信息 -->
|
||||
<div id="view-section-basic" class="section-card section-card--white">
|
||||
<div class="section-title"><h3>基本信息</h3></div>
|
||||
<div class="data-grid data-grid--3">
|
||||
<div class="data-item">
|
||||
<div class="data-label">协议号</div>
|
||||
<div class="data-value">{{ dash(protocol?.protocolNo) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">协议状态</div>
|
||||
<div class="data-value">
|
||||
<span class="badge" :class="statusBadgeClass(String(protocol?.protocolStatus || ''))">
|
||||
{{ protocolStatusLabel(String(protocol?.protocolStatus || '')) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">登记日期</div>
|
||||
<div class="data-value">{{ formatYmd(protocol?.registerDate) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">采集专员</div>
|
||||
<div class="data-value">{{ collectorDisplay }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">创建时间</div>
|
||||
<div class="data-value">{{ dash(protocol?.createTime) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 附件 -->
|
||||
<div class="attachment-row" v-if="protocolAttachments.length">
|
||||
<div class="data-label">协议附件</div>
|
||||
<ProtocolAttachmentReadonly
|
||||
:files="protocolAttachments"
|
||||
@preview="openPreview"
|
||||
@download="downloadFile"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 备注 -->
|
||||
<div class="remark-row" v-if="protocol?.remark">
|
||||
<div class="data-item data-item--full">
|
||||
<div class="data-label">备注</div>
|
||||
<div class="data-value data-value--muted">{{ dash(protocol?.remark) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 script 中添加 `statusBadgeClass` 函数**
|
||||
|
||||
```typescript
|
||||
function statusBadgeClass(s: string): string {
|
||||
const m: Record<string, string> = {
|
||||
dsx: 'badge--amber',
|
||||
sxz: 'badge--green',
|
||||
ygq: 'badge--gray',
|
||||
yzf: 'badge--red',
|
||||
zky: 'badge--purple'
|
||||
}
|
||||
return m[s] || 'badge--gray'
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 改造客户信息 section — 🤱👨👶 子卡片
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` (客户信息模板)
|
||||
|
||||
- [ ] **Step 1: 替换客户信息区域的 HTML 结构**
|
||||
|
||||
将现有 `view-section-party` 的 `form-tab-pane` + 虚线分隔 + `detail-section-title` 改为绿色卡片 + 3 列子卡片:
|
||||
|
||||
```html
|
||||
<!-- 客户信息 -->
|
||||
<div id="view-section-party" class="section-card section-card--green">
|
||||
<div class="section-title"><h3>客户信息</h3></div>
|
||||
<div class="client-sub-cards">
|
||||
<!-- 🤱 母亲信息 -->
|
||||
<div class="client-sub-card">
|
||||
<div class="sub-card-header">
|
||||
<span class="sub-card-icon">🤱</span>
|
||||
<h4>母亲信息</h4>
|
||||
</div>
|
||||
<div class="data-grid data-grid--2">
|
||||
<div class="data-item">
|
||||
<div class="data-label">关联客户</div>
|
||||
<div class="data-value">{{ partyCustomer?.customerId ? dash(partyCustomer?.motherName) : '—' }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">姓名</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.motherName) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">联系电话</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.motherPhone) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">身份证号</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.motherIdCard) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">出生年月</div>
|
||||
<div class="data-value">{{ formatYm(partyCustomer?.motherBirthYm) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">民族</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.motherEthnic) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sub-card-full-row">
|
||||
<div class="data-label">家庭住址</div>
|
||||
<div class="data-value data-value--muted">{{ dash(partyCustomer?.motherAddress) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 👨 父亲信息 -->
|
||||
<div class="client-sub-card">
|
||||
<div class="sub-card-header">
|
||||
<span class="sub-card-icon">👨</span>
|
||||
<h4>父亲信息</h4>
|
||||
</div>
|
||||
<div class="data-grid data-grid--2">
|
||||
<div class="data-item">
|
||||
<div class="data-label">姓名</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.fatherName) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">电话</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.fatherPhone) }}</div>
|
||||
</div>
|
||||
<div class="data-item data-item--full">
|
||||
<div class="data-label">身份证号</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.fatherIdCard) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 👶 新生儿信息 -->
|
||||
<div class="client-sub-card">
|
||||
<div class="sub-card-header">
|
||||
<span class="sub-card-icon">👶</span>
|
||||
<h4>新生儿信息</h4>
|
||||
</div>
|
||||
<div class="data-grid data-grid--2">
|
||||
<div class="data-item">
|
||||
<div class="data-label">姓名</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.newbornName) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">身份证</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.newbornIdCard) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">分娩时间</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.newbornDeliveryTime) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">性别</div>
|
||||
<div class="data-value">{{ newbornSexLabel(String(partyCustomer?.newbornSex || '')) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">分娩方式</div>
|
||||
<div class="data-value">{{ deliveryModeLabel(String(partyCustomer?.deliveryMode || '')) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">胎次</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.birthOrder) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">体重(克)</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.newbornWeightGram) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">评分1分钟</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.apgar1min) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">评分5分钟</div>
|
||||
<div class="data-value">{{ dash(partyCustomer?.apgar5min) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 改造采集信息 section
|
||||
|
||||
- [ ] **Step 1: 替换采集信息区域的 HTML 结构**
|
||||
|
||||
```html
|
||||
<!-- 采集信息 -->
|
||||
<div id="view-section-collection" class="section-card section-card--white">
|
||||
<div class="section-title"><h3>采集信息</h3></div>
|
||||
<div class="data-grid data-grid--3">
|
||||
<div class="data-item">
|
||||
<div class="data-label">采集地区</div>
|
||||
<div class="data-value">{{ regionDisplay }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">采集医院</div>
|
||||
<div class="data-value">{{ hospitalDisplay }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">采集医护</div>
|
||||
<div class="data-value">{{ dash(collectionInfo?.medicalStaff) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">销售人员</div>
|
||||
<div class="data-value">{{ salesDisplay }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">样本采集时间</div>
|
||||
<div class="data-value">{{ dash(collectionInfo?.sampleCollectTime) }}</div>
|
||||
</div>
|
||||
<div class="data-item">
|
||||
<div class="data-label">母血采集时间</div>
|
||||
<div class="data-value">{{ dash(collectionInfo?.maternalBloodCollectTime) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 改造样本及运输信息 section
|
||||
|
||||
- [ ] **Step 1: 包裹样本区域为白色卡片**
|
||||
|
||||
保留 el-table 和 el-empty,只改外层容器从 `form-tab-pane` 改为 `section-card section-card--white`:
|
||||
|
||||
```html
|
||||
<!-- 样本及运输信息 -->
|
||||
<div id="view-section-sample" class="section-card section-card--white">
|
||||
<div class="section-title"><h3>样本及运输信息</h3></div>
|
||||
<el-table :data="samples" row-key="id" stripe border size="small" class="sub-view-table">
|
||||
<!-- 保留所有现有 el-table-column 不变 -->
|
||||
</el-table>
|
||||
<el-empty v-if="!samples.length" description="暂无样本" :image-size="48" />
|
||||
</div>
|
||||
```
|
||||
|
||||
表格列完全保持原样(11列:样本类型/编码/采集量/单位/价格/存储年限/状态/运输类型/目的站点/预计到达/快递携带/备注),只改外层包裹。
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 改造缴费信息 section — 卡片 + 明细 + 退费流程
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` (缴费信息模板)
|
||||
|
||||
- [ ] **Step 1: 替换缴费信息区域为灰色卡片 + 指标卡 + 明细卡片**
|
||||
|
||||
将现有的 `view-section-payment` 改造。缴费主表改为 4 个 `payment-metric` 指标卡。缴费明细卡片保留现有卡片结构但加入退费样式(红色/琥珀色左边框、退费详情区、mini-flow 横向节点)。**所有现有字段必须保留**。
|
||||
|
||||
```html
|
||||
<!-- 缴费信息 -->
|
||||
<div id="view-section-payment" class="section-card section-card--gray">
|
||||
<div class="section-title"><h3>缴费信息</h3></div>
|
||||
|
||||
<!-- 缴费指标 -->
|
||||
<div class="payment-summary">
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">缴费模式</div>
|
||||
<div class="pm-value">{{ payModeLabel(String(payment?.payMode || '')) }}</div>
|
||||
</div>
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">合同金额</div>
|
||||
<div class="pm-value pm-value--amount">{{ dash(payment?.contractAmount) }}</div>
|
||||
</div>
|
||||
<template v-if="payment?.payMode === 'dj'">
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">趸交截止时间</div>
|
||||
<div class="pm-value">{{ formatYmd(payment?.lumpSumDeadline) }}</div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="payment?.payMode === 'fq'">
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">分期期数</div>
|
||||
<div class="pm-value">{{ dash(payment?.installmentCount) }}</div>
|
||||
</div>
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">每期间隔(月)</div>
|
||||
<div class="pm-value">{{ dash(payment?.installmentIntervalMonths) }}</div>
|
||||
</div>
|
||||
<div class="payment-metric">
|
||||
<div class="pm-label">分期开始时间</div>
|
||||
<div class="pm-value">{{ formatYmd(payment?.installmentStartDate) }}</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 缴费明细 -->
|
||||
<div class="section-subtitle">缴费明细</div>
|
||||
<div class="payment-details">
|
||||
<div
|
||||
v-for="(detail, dIdx) in paymentDetails"
|
||||
:key="detail.id || dIdx"
|
||||
class="payment-detail-card"
|
||||
:class="{
|
||||
'payment-detail-card--refunded': String(detail.payStatus) === 'ytf',
|
||||
'payment-detail-card--refund-pending': String(detail.payStatus) === 'tfqrz'
|
||||
}"
|
||||
>
|
||||
<!-- 保留现有 card header/body 结构,包含所有字段 -->
|
||||
<!-- 保留 payment-flow 横向节点 -->
|
||||
<!-- 保留所有附件展示 -->
|
||||
</div>
|
||||
</div>
|
||||
<el-empty v-else description="暂无缴费明细" :image-size="48" />
|
||||
</div>
|
||||
```
|
||||
|
||||
注意:缴费明细内的每一个字段(应缴费金额、转账方式、转账金额、转账时间、缴费状态、应缴费时间、转账凭证附件)和退费流程节点(缴费财务确认、退费申请、财务退费确认)**全部保留**,只改外层容器样式。
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 改造审核记录 section
|
||||
|
||||
- [ ] **Step 1: 包裹审核记录为白色卡片**
|
||||
|
||||
保留 el-table,只改外层容器:
|
||||
|
||||
```html
|
||||
<div v-if="showAuditHistory" id="view-section-audit" class="section-card section-card--white">
|
||||
<div class="section-title"><h3>审核记录</h3></div>
|
||||
<el-table ...>
|
||||
<!-- 保留所有现有列不变 -->
|
||||
</el-table>
|
||||
</div>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 替换整个 `<style>` 块为方案D风格 CSS
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` (style 部分)
|
||||
|
||||
- [ ] **Step 1: 删除现有 `<style scoped lang="scss">` 中的所有旧样式**
|
||||
|
||||
- [ ] **Step 2: 写入方案D风格的新 CSS**
|
||||
|
||||
以下是需要写入的完整新样式体系(从 demo-protocol-view-d.html 提取,适配 Vue scoped + Element Plus 共存):
|
||||
|
||||
**核心样式类:**
|
||||
|
||||
```scss
|
||||
/* ── Dialog Body ── */
|
||||
.protocol-view-body {
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
/* ── Sticky Tab Bar ── */
|
||||
.detail-tabs {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 100;
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
background: #f5f7fa;
|
||||
padding: 4px;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 16px;
|
||||
width: fit-content;
|
||||
isolation: isolate;
|
||||
}
|
||||
.detail-tab {
|
||||
padding: 10px 20px;
|
||||
cursor: pointer;
|
||||
border-radius: 6px;
|
||||
font-size: 14px;
|
||||
color: #64748b;
|
||||
transition: all 0.3s;
|
||||
&.active {
|
||||
background: #fff;
|
||||
color: #059669;
|
||||
font-weight: 500;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
&:hover:not(.active) {
|
||||
color: #059669;
|
||||
}
|
||||
}
|
||||
|
||||
/* ═══ KPI Summary Strip ═══ */
|
||||
.kpi-strip {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 16px;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
.kpi-card {
|
||||
background: #fff;
|
||||
border-radius: 12px;
|
||||
padding: 18px 20px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
||||
border-left: 3px solid #10b981;
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
&::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0; right: 0;
|
||||
width: 60px; height: 60px;
|
||||
background: radial-gradient(circle at top right, rgba(16,185,129,0.06), transparent 70%);
|
||||
pointer-events: none;
|
||||
}
|
||||
&:hover {
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 4px 12px rgba(16,185,129,0.1);
|
||||
}
|
||||
}
|
||||
.kpi-label {
|
||||
font-size: 12px;
|
||||
color: #94a3b8;
|
||||
margin-bottom: 6px;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
.kpi-value {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
}
|
||||
.status-dot {
|
||||
display: inline-block;
|
||||
width: 8px; height: 8px;
|
||||
border-radius: 50%;
|
||||
margin-right: 6px;
|
||||
vertical-align: middle;
|
||||
&.active {
|
||||
background: #10b981;
|
||||
box-shadow: 0 0 0 3px rgba(16,185,129,0.2);
|
||||
}
|
||||
&.pending { background: #f59e0b; box-shadow: 0 0 0 3px rgba(245,158,11,0.2); }
|
||||
&.expired { background: #94a3b8; }
|
||||
&.void { background: #dc2626; box-shadow: 0 0 0 3px rgba(220,38,38,0.2); }
|
||||
&.research { background: #7c3aed; box-shadow: 0 0 0 3px rgba(124,58,237,0.2); }
|
||||
}
|
||||
|
||||
/* ═══ Section Cards ═══ */
|
||||
.section-card {
|
||||
border-radius: 12px;
|
||||
padding: 22px 24px;
|
||||
margin-bottom: 20px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
&:hover {
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
&--white { background: #fff; }
|
||||
&--green { background: #f0fdf4; }
|
||||
&--gray { background: #f8fafc; }
|
||||
}
|
||||
|
||||
/* Section Title */
|
||||
.section-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 18px;
|
||||
padding-bottom: 12px;
|
||||
border-bottom: 1px solid #e2e8f0;
|
||||
&::before {
|
||||
content: '';
|
||||
width: 3px;
|
||||
height: 18px;
|
||||
background: #10b981;
|
||||
border-radius: 2px;
|
||||
margin-right: 10px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
h3 {
|
||||
font-size: 15px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
}
|
||||
}
|
||||
|
||||
.section-subtitle {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #334155;
|
||||
margin: 16px 0 12px;
|
||||
padding-left: 10px;
|
||||
border-left: 3px solid #10b981;
|
||||
}
|
||||
|
||||
/* ── Data Grid ── */
|
||||
.data-grid {
|
||||
display: grid;
|
||||
gap: 14px 20px;
|
||||
&--3 { grid-template-columns: repeat(3, 1fr); }
|
||||
&--2 { grid-template-columns: repeat(2, 1fr); }
|
||||
}
|
||||
.data-item {
|
||||
// no special styling needed
|
||||
}
|
||||
.data-item--full {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
.data-label {
|
||||
font-size: 12px;
|
||||
color: #94a3b8;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
.data-value {
|
||||
font-size: 14px;
|
||||
color: #1e293b;
|
||||
font-weight: 500;
|
||||
&--muted {
|
||||
font-weight: 400;
|
||||
color: #64748b;
|
||||
font-size: 13px;
|
||||
line-height: 1.5;
|
||||
}
|
||||
}
|
||||
|
||||
/* ── Badges ── */
|
||||
.badge {
|
||||
display: inline-block;
|
||||
padding: 2px 10px;
|
||||
border-radius: 20px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.badge--green { background: #ecfdf5; color: #059669; }
|
||||
.badge--amber { background: #fffbeb; color: #d97706; }
|
||||
.badge--gray { background: #f1f5f9; color: #64748b; }
|
||||
.badge--red { background: #fef2f2; color: #dc2626; }
|
||||
.badge--purple { background: #faf5ff; color: #7c3aed; }
|
||||
|
||||
/* ── Attachment Row ── */
|
||||
.attachment-row {
|
||||
margin-top: 16px;
|
||||
padding-top: 14px;
|
||||
border-top: 1px dashed #e2e8f0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* ── Remark Row ── */
|
||||
.remark-row {
|
||||
margin-top: 14px;
|
||||
padding-top: 14px;
|
||||
border-top: 1px dashed #e2e8f0;
|
||||
}
|
||||
|
||||
/* ═══ Client Sub Cards ═══ */
|
||||
.client-sub-cards {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
gap: 16px;
|
||||
}
|
||||
.client-sub-card {
|
||||
background: #fff;
|
||||
border-radius: 10px;
|
||||
padding: 18px 20px;
|
||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
|
||||
border: 1px solid rgba(0, 0, 0, 0.03);
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
&:hover {
|
||||
transform: translateY(-1px);
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.07);
|
||||
}
|
||||
}
|
||||
.sub-card-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin-bottom: 14px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #f1f5f9;
|
||||
.sub-card-icon {
|
||||
font-size: 22px;
|
||||
line-height: 1;
|
||||
}
|
||||
h4 {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: #1e293b;
|
||||
}
|
||||
}
|
||||
.sub-card-full-row {
|
||||
margin-top: 12px;
|
||||
padding-top: 10px;
|
||||
border-top: 1px solid #f1f5f9;
|
||||
}
|
||||
|
||||
/* ═══ Table Styles ═══ */
|
||||
.sub-view-table {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
/* ═══ Payment Section ═══ */
|
||||
.payment-summary {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 12px;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
.payment-metric {
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 12px 16px;
|
||||
border: 1px solid #e2e8f0;
|
||||
}
|
||||
.pm-label {
|
||||
font-size: 11px;
|
||||
color: #94a3b8;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
.pm-value {
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
color: #1e293b;
|
||||
&--amount { color: #059669; }
|
||||
}
|
||||
|
||||
.payment-details {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
margin-top: 14px;
|
||||
}
|
||||
.payment-detail-card {
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
padding: 14px 16px;
|
||||
border: 1px solid #e2e8f0;
|
||||
&--refunded {
|
||||
border-left: 3px solid #dc2626;
|
||||
}
|
||||
&--refund-pending {
|
||||
border-left: 3px solid #d97706;
|
||||
}
|
||||
}
|
||||
|
||||
/* 保留现有的 payment-flow 样式 */
|
||||
.payment-flow { /* ...existing... */ }
|
||||
|
||||
/* ═══ Responsive ═══ */
|
||||
@media (max-width: 1200px) {
|
||||
.data-grid--3,
|
||||
.data-grid--2 {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
}
|
||||
.client-sub-cards {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
.kpi-strip {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
}
|
||||
.payment-summary {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 9: 验证所有字段无遗漏 + 弹窗可正常工作
|
||||
|
||||
**Files:**
|
||||
- Verify: `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue`
|
||||
|
||||
- [ ] **Step 1: 字段清单核查**
|
||||
|
||||
逐项对照现有 `view-kv-grid` 中的 dt/dd,确保新模板中每个字段都存在:
|
||||
|
||||
基本信息(5+附件+备注): ✅ 协议号/状态/登记日期/采集专员/创建时间/附件/备注
|
||||
客户-母亲(7): ✅ 关联客户/姓名/电话/身份证/出生年月/民族/住址
|
||||
客户-父亲(3): ✅ 姓名/电话/身份证
|
||||
客户-新生儿(9): ✅ 姓名/身份证/分娩时间/性别/分娩方式/胎次/体重/评分1/评分5
|
||||
采集信息(6): ✅ 采集地区/医院/医护/销售/样本采集时间/母血采集时间
|
||||
样本表格(11列): ✅ 类型/编码/采集量/单位/价格/存储年限/状态/运输类型/目的站点/预计到达/快递携带/备注
|
||||
缴费主表(4-6): ✅ 缴费模式/合同金额/趸交截止|分期期数+间隔+开始时间
|
||||
缴费明细(每条6-8): ✅ 应缴金额/转账方式/转账金额/转账时间/缴费状态/应缴费时间/转账凭证附件
|
||||
缴费流程节点: ✅ 缴费财务确认/退费申请/财务退费确认(含金额/备注/附件)
|
||||
审核记录(5列): ✅ 序号/审核时间/审核状态/审核备注/审核人
|
||||
|
||||
- [ ] **Step 2: 运行 dev 服务器验证**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm dev
|
||||
```
|
||||
|
||||
打开 `/#/demo/protocol` 页面,点击「查看」按钮,验证:
|
||||
1. KPI 摘要条正确显示
|
||||
2. 卡片分区布局正确
|
||||
3. 🤱👨👶 子卡片渲染正常
|
||||
4. 所有字段数据显示正常
|
||||
5. 附件可预览/下载
|
||||
6. 退费状态卡片有红色/琥珀色边框
|
||||
7. 审核记录 tab 正确显示(采集协议单审核页)
|
||||
8. sticky tab 导航可滚动定位
|
||||
|
||||
- [ ] **Step 3: 在缴费信息页验证**
|
||||
|
||||
打开 `/#/cell-storage/payment-info` 页面,点击「查看」,确认弹窗正确渲染。
|
||||
|
||||
- [ ] **Step 4: 在审核页验证**
|
||||
|
||||
打开 `/#/cell-storage/protocol-audit` 页面,点击「查看」,确认审核记录 tab 显示。
|
||||
|
||||
- [ ] **Step 5: 修复 LSP 诊断**
|
||||
|
||||
```bash
|
||||
# 检查是否有 TypeScript 错误
|
||||
pnpm build:typecheck
|
||||
```
|
||||
@@ -1,993 +0,0 @@
|
||||
# 科研捐赠管理模块 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 实现科研捐赠管理模块——独立的新业务模块,支持协议 CRUD、审核、状态流转、与细胞存储的双向转化。
|
||||
|
||||
**Architecture:** 方案 C — 独立数据库表(6 张)+ 独立后端 API/CRUD + 独立前端页面,复用基础数据表和提取公共前端组件。不侵入现有细胞存储代码。
|
||||
|
||||
**Tech Stack:** MySQL 5.7 · SQLAlchemy · Pydantic v2 · FastAPI · Vue 3 · Element Plus · Tailwind CSS 4 · TypeScript
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-17-research-donation-module-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
### New Files (Backend)
|
||||
- `docs/sql/research_donation_tables.sql` — 6 张新建表 DDL
|
||||
- `backend/app/models/research_donation.py` — 6 个 SQLAlchemy Model(独立文件避免 models.py 过大)
|
||||
- `backend/app/schemas/research_donation.py` — Pydantic schemas(注意:细胞存储没有独立 schema 文件,但科研捐赠新建一个更清晰)
|
||||
- `backend/app/crud/research_donation.py` — CRUD/业务逻辑
|
||||
- `backend/app/api/research_donation.py` — API 路由
|
||||
|
||||
### Modified Files (Backend)
|
||||
- `backend/app/models/__init__.py` — import 新 models
|
||||
- `backend/app/api/__init__.py` — 注册新路由
|
||||
- `backend/app/main.py` — include 新路由
|
||||
|
||||
### New Files (Frontend)
|
||||
- `web-admin/src/api/research-donation.ts` — API 模块
|
||||
- `web-admin/src/views/research-donation/list/index.vue` — 捐赠协议列表页
|
||||
- `web-admin/src/views/research-donation/list/DonationFormDialog.vue` — 新增/编辑弹窗
|
||||
- `web-admin/src/views/research-donation/list/DonationViewDialog.vue` — 查看详情弹窗
|
||||
- `web-admin/src/views/research-donation/list/DonationAuditDialog.vue` — 审核弹窗
|
||||
- `web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue` — 状态变更弹窗
|
||||
- `web-admin/src/views/research-donation/audit/index.vue` — 审核管理页
|
||||
|
||||
### Modified Files (Frontend)
|
||||
- `web-admin/src/router/modules/sqxp.ts` — 新增科研捐赠菜单路由
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue` — 增加「转科研」操作
|
||||
|
||||
### Reference Files (DO NOT MODIFY — 用于参照模式)
|
||||
- `backend/app/models/models.py:707-937` — 细胞存储 Model 定义
|
||||
- `backend/app/api/collection_protocol.py` — 细胞存储 API 路由模式
|
||||
- `backend/app/crud/collection_protocol.py` — 细胞存储 CRUD 模式
|
||||
- `web-admin/src/views/cell-storage/protocol/index.vue` — 协议列表页模式
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue` — 表单弹窗模式
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue` — 查看弹窗模式
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolAuditDialog.vue` — 审核弹窗模式
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue` — 状态变更弹窗模式
|
||||
- `web-admin/src/views/cell-storage/protocol-audit/index.vue` — 审核管理页模式
|
||||
- `web-admin/src/api/collection-protocol.ts` — API 模块模式
|
||||
- `web-admin/src/router/modules/sqxp.ts:204-252` — 细胞存储路由注册
|
||||
|
||||
---
|
||||
|
||||
## Task 1: SQL 建表脚本
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/research_donation_tables.sql`
|
||||
|
||||
**Reference:** `docs/sql/qc_item_param_and_task_result.sql`(SQL 格式参考),`backend/app/models/models.py:707-937`(字段定义参考)
|
||||
|
||||
- [ ] **Step 1: 编写 6 张表的 DDL**
|
||||
|
||||
创建 `docs/sql/research_donation_tables.sql`,包含以下 6 张表的 `CREATE TABLE IF NOT EXISTS` 语句:
|
||||
|
||||
```sql
|
||||
-- ============================================================
|
||||
-- 科研捐赠管理模块 — 建表脚本
|
||||
-- ============================================================
|
||||
|
||||
-- 1. 科研捐赠主表
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`donation_no` varchar(64) NOT NULL COMMENT '捐赠协议编号',
|
||||
`donation_status` varchar(16) NOT NULL DEFAULT 'dsx' COMMENT '状态 dsx待生效 sxz生效中 ygq已过期 yzf已作废 zckc转细胞存储',
|
||||
`donation_date` char(8) DEFAULT NULL COMMENT '捐赠日期YYYYMMDD',
|
||||
`source_type` varchar(20) NOT NULL DEFAULT 'direct' COMMENT '来源类型 direct独立新建 from_storage从细胞存储转来',
|
||||
`source_protocol_id` varchar(64) DEFAULT NULL COMMENT '来源协议ID(from_storage时填源细胞存储协议ID)',
|
||||
`consent_form_urls` text DEFAULT NULL COMMENT '知情同意书附件URL(逗号分隔,必填)',
|
||||
`attachment_urls` text DEFAULT NULL COMMENT '其他附件URL(逗号分隔)',
|
||||
`collector_user_id` varchar(64) DEFAULT NULL COMMENT '采集专员用户ID',
|
||||
`effective_time` datetime DEFAULT NULL COMMENT '生效时间',
|
||||
`effective_desc` varchar(512) DEFAULT NULL COMMENT '生效描述',
|
||||
`expire_time` datetime DEFAULT NULL COMMENT '过期时间',
|
||||
`expire_desc` varchar(512) DEFAULT NULL COMMENT '过期描述',
|
||||
`void_time` datetime DEFAULT NULL COMMENT '作废时间',
|
||||
`void_desc` varchar(512) DEFAULT NULL COMMENT '作废描述',
|
||||
`to_storage_time` datetime DEFAULT NULL COMMENT '转存储时间',
|
||||
`to_storage_desc` varchar(512) DEFAULT NULL COMMENT '转存储描述',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注信息',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rd_tenant_status` (`tenant_no`, `donation_status`, `del_flag`),
|
||||
KEY `idx_rd_collector` (`collector_user_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠主表';
|
||||
|
||||
-- 2. 科研捐赠审核记录
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation_audit` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`research_donation_id` varchar(64) NOT NULL COMMENT '科研捐赠ID',
|
||||
`auditor_user_id` varchar(64) DEFAULT NULL COMMENT '审核人',
|
||||
`audit_remark` varchar(1000) DEFAULT NULL COMMENT '审核备注',
|
||||
`audit_status` varchar(16) NOT NULL COMMENT '审核状态 shtg审核通过 shth审核驳回',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rda_donation` (`research_donation_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠审核记录';
|
||||
|
||||
-- 3. 科研捐赠当事人信息
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation_party` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`research_donation_id` varchar(64) NOT NULL COMMENT '科研捐赠ID',
|
||||
`customer_id` varchar(64) DEFAULT NULL COMMENT '客户ID',
|
||||
`mother_name` varchar(100) DEFAULT NULL COMMENT '母亲姓名',
|
||||
`mother_phone` varchar(32) DEFAULT NULL COMMENT '母亲电话',
|
||||
`mother_id_card` varchar(32) DEFAULT NULL COMMENT '母亲身份证号',
|
||||
`mother_birth_ym` char(6) DEFAULT NULL COMMENT '母亲出生年月YYYYMM',
|
||||
`mother_ethnic` varchar(32) DEFAULT NULL COMMENT '母亲民族',
|
||||
`mother_address` varchar(512) DEFAULT NULL COMMENT '母亲地址',
|
||||
`father_name` varchar(100) DEFAULT NULL COMMENT '父亲姓名',
|
||||
`father_phone` varchar(32) DEFAULT NULL COMMENT '父亲电话',
|
||||
`father_id_card` varchar(32) DEFAULT NULL COMMENT '父亲身份证号',
|
||||
`newborn_name` varchar(100) DEFAULT NULL COMMENT '新生儿姓名',
|
||||
`newborn_id_card` varchar(32) DEFAULT NULL COMMENT '新生儿身份证号',
|
||||
`newborn_delivery_time` datetime DEFAULT NULL COMMENT '新生儿分娩时间',
|
||||
`newborn_sex` char(1) DEFAULT NULL COMMENT '新生儿性别',
|
||||
`delivery_mode` varchar(16) DEFAULT NULL COMMENT '分娩方式',
|
||||
`birth_order` int(11) DEFAULT NULL COMMENT '出生顺序',
|
||||
`newborn_weight_gram` int(11) DEFAULT NULL COMMENT '新生儿体重(克)',
|
||||
`apgar_1min` decimal(4,1) DEFAULT NULL COMMENT 'Apgar 1分钟评分',
|
||||
`apgar_5min` decimal(4,1) DEFAULT NULL COMMENT 'Apgar 5分钟评分',
|
||||
`collector_user_id` varchar(64) DEFAULT NULL COMMENT '采集专员用户ID',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rdp_donation` (`research_donation_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠当事人信息';
|
||||
|
||||
-- 4. 科研捐赠采集信息
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation_collection` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`research_donation_id` varchar(64) NOT NULL COMMENT '科研捐赠ID',
|
||||
`region_id` varchar(64) DEFAULT NULL COMMENT '区域ID',
|
||||
`hospital_id` varchar(64) DEFAULT NULL COMMENT '医院ID',
|
||||
`medical_staff` varchar(200) DEFAULT NULL COMMENT '医护人员',
|
||||
`sales_user_id` varchar(64) DEFAULT NULL COMMENT '销售人员用户ID',
|
||||
`sample_collect_time` datetime DEFAULT NULL COMMENT '样本采集时间',
|
||||
`maternal_blood_collect_time` datetime DEFAULT NULL COMMENT '母血采集时间',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rdc_donation` (`research_donation_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠采集信息';
|
||||
|
||||
-- 5. 科研捐赠样本信息(无金额字段)
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation_sample` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`research_donation_id` varchar(64) NOT NULL COMMENT '科研捐赠ID',
|
||||
`sample_type_id` varchar(64) DEFAULT NULL COMMENT '样本类型ID',
|
||||
`sample_code_id` varchar(64) DEFAULT NULL COMMENT '样本编码ID',
|
||||
`sample_code` varchar(32) DEFAULT NULL COMMENT '样本编码',
|
||||
`collect_amount` decimal(18,4) DEFAULT NULL COMMENT '采集量',
|
||||
`unit_id` varchar(64) DEFAULT NULL COMMENT '单位ID',
|
||||
`storage_years` int(11) DEFAULT NULL COMMENT '存储年限',
|
||||
`sample_status` varchar(16) DEFAULT NULL COMMENT '样本状态',
|
||||
`storage_in_date` char(8) DEFAULT NULL COMMENT '入库日期YYYYMMDD',
|
||||
`detect_start_date` char(8) DEFAULT NULL COMMENT '检测开始日期YYYYMMDD',
|
||||
`void_date` char(8) DEFAULT NULL COMMENT '作废日期YYYYMMDD',
|
||||
`storage_expire_date` char(8) DEFAULT NULL COMMENT '存储到期日期YYYYMMDD',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rds_donation` (`research_donation_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠样本信息';
|
||||
|
||||
-- 6. 科研捐赠样本运输
|
||||
CREATE TABLE IF NOT EXISTS `biz_research_donation_sample_transport` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`research_donation_id` varchar(64) NOT NULL COMMENT '科研捐赠ID',
|
||||
`sample_id` varchar(64) NOT NULL COMMENT '样本ID',
|
||||
`transport_type` varchar(16) NOT NULL COMMENT 'kdys快递运输 ryxd人员携带',
|
||||
`express_company_id` varchar(64) DEFAULT NULL COMMENT '快递公司ID',
|
||||
`waybill_no` varchar(128) DEFAULT NULL COMMENT '快递单号',
|
||||
`dest_site_id` varchar(64) DEFAULT NULL COMMENT '目的站点ID',
|
||||
`express_fee` decimal(18,2) DEFAULT NULL COMMENT '快递费用(元)',
|
||||
`eta_time` datetime DEFAULT NULL COMMENT '预计到达时间',
|
||||
`carrier_name` varchar(100) DEFAULT NULL COMMENT '携带人员姓名',
|
||||
`carrier_phone` varchar(32) DEFAULT NULL COMMENT '携带人员联系电话',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_rdst_donation` (`research_donation_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='科研捐赠样本运输';
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add docs/sql/research_donation_tables.sql
|
||||
git commit -m "feat: 科研捐赠管理模块建表脚本"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model 定义
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/models/research_donation.py`
|
||||
- Modify: `backend/app/models/__init__.py`
|
||||
|
||||
**Reference:** `backend/app/models/models.py:707-937`(细胞存储 Model 定义模式)
|
||||
|
||||
- [ ] **Step 1: 创建 research_donation.py Model 文件**
|
||||
|
||||
创建 `backend/app/models/research_donation.py`,包含 6 个 Model 类。模式完全对齐 `models.py` 中的细胞存储 Model(Column 定义风格、公共字段、default 值):
|
||||
|
||||
```python
|
||||
"""科研捐赠管理 — 数据模型"""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import Column, DateTime, Integer, Numeric, SmallInteger, String
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
|
||||
from app.models.base import Base
|
||||
|
||||
|
||||
class BizResearchDonation(Base):
|
||||
"""科研捐赠主表 biz_research_donation"""
|
||||
|
||||
__tablename__ = "biz_research_donation"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
donation_no = Column(String(64), nullable=False, comment="捐赠协议编号")
|
||||
donation_status = Column(String(16), nullable=False, default="dsx", comment="状态 dsx/sxz/ygq/yzf/zckc")
|
||||
donation_date = Column(String(8), nullable=True, comment="捐赠日期YYYYMMDD")
|
||||
source_type = Column(String(20), nullable=False, default="direct", comment="来源类型 direct/from_storage")
|
||||
source_protocol_id = Column(String(64), nullable=True, comment="来源协议ID")
|
||||
consent_form_urls = Column(String(4000), nullable=True, comment="知情同意书附件URL(逗号分隔)")
|
||||
attachment_urls = Column(String(4000), nullable=True, comment="其他附件URL(逗号分隔)")
|
||||
collector_user_id = Column(String(64), nullable=True, comment="采集专员用户ID")
|
||||
effective_time = Column(DateTime, nullable=True, comment="生效时间")
|
||||
effective_desc = Column(String(512), nullable=True, comment="生效描述")
|
||||
expire_time = Column(DateTime, nullable=True, comment="过期时间")
|
||||
expire_desc = Column(String(512), nullable=True, comment="过期描述")
|
||||
void_time = Column(DateTime, nullable=True, comment="作废时间")
|
||||
void_desc = Column(String(512), nullable=True, comment="作废描述")
|
||||
to_storage_time = Column(DateTime, nullable=True, comment="转存储时间")
|
||||
to_storage_desc = Column(String(512), nullable=True, comment="转存储描述")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注信息")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizResearchDonationAudit(Base):
|
||||
"""科研捐赠审核记录 biz_research_donation_audit"""
|
||||
|
||||
__tablename__ = "biz_research_donation_audit"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
research_donation_id = Column(String(64), nullable=False, comment="科研捐赠ID")
|
||||
auditor_user_id = Column(String(64), nullable=True, comment="审核人")
|
||||
audit_remark = Column(String(1000), nullable=True, comment="审核备注")
|
||||
audit_status = Column(String(16), nullable=False, comment="审核状态 shtg/shth")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizResearchDonationParty(Base):
|
||||
"""科研捐赠当事人信息 biz_research_donation_party"""
|
||||
|
||||
__tablename__ = "biz_research_donation_party"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
research_donation_id = Column(String(64), nullable=False, comment="科研捐赠ID")
|
||||
customer_id = Column(String(64), nullable=True, comment="客户ID")
|
||||
mother_name = Column(String(100), nullable=True, comment="母亲姓名")
|
||||
mother_phone = Column(String(32), nullable=True, comment="母亲电话")
|
||||
mother_id_card = Column(String(32), nullable=True, comment="母亲身份证号")
|
||||
mother_birth_ym = Column(String(6), nullable=True, comment="母亲出生年月YYYYMM")
|
||||
mother_ethnic = Column(String(32), nullable=True, comment="母亲民族")
|
||||
mother_address = Column(String(512), nullable=True, comment="母亲地址")
|
||||
father_name = Column(String(100), nullable=True, comment="父亲姓名")
|
||||
father_phone = Column(String(32), nullable=True, comment="父亲电话")
|
||||
father_id_card = Column(String(32), nullable=True, comment="父亲身份证号")
|
||||
newborn_name = Column(String(100), nullable=True, comment="新生儿姓名")
|
||||
newborn_id_card = Column(String(32), nullable=True, comment="新生儿身份证号")
|
||||
newborn_delivery_time = Column(DateTime, nullable=True, comment="新生儿分娩时间")
|
||||
newborn_sex = Column(String(1), nullable=True, comment="新生儿性别")
|
||||
delivery_mode = Column(String(16), nullable=True, comment="分娩方式")
|
||||
birth_order = Column(Integer, nullable=True, comment="出生顺序")
|
||||
newborn_weight_gram = Column(Integer, nullable=True, comment="新生儿体重(克)")
|
||||
apgar_1min = Column(Numeric(4, 1), nullable=True, comment="Apgar 1分钟评分")
|
||||
apgar_5min = Column(Numeric(4, 1), nullable=True, comment="Apgar 5分钟评分")
|
||||
collector_user_id = Column(String(64), nullable=True, comment="采集专员用户ID")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizResearchDonationCollection(Base):
|
||||
"""科研捐赠采集信息 biz_research_donation_collection"""
|
||||
|
||||
__tablename__ = "biz_research_donation_collection"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
research_donation_id = Column(String(64), nullable=False, comment="科研捐赠ID")
|
||||
region_id = Column(String(64), nullable=True, comment="区域ID")
|
||||
hospital_id = Column(String(64), nullable=True, comment="医院ID")
|
||||
medical_staff = Column(String(200), nullable=True, comment="医护人员")
|
||||
sales_user_id = Column(String(64), nullable=True, comment="销售人员用户ID")
|
||||
sample_collect_time = Column(DateTime, nullable=True, comment="样本采集时间")
|
||||
maternal_blood_collect_time = Column(DateTime, nullable=True, comment="母血采集时间")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizResearchDonationSample(Base):
|
||||
"""科研捐赠样本信息 biz_research_donation_sample(无金额字段)"""
|
||||
|
||||
__tablename__ = "biz_research_donation_sample"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
research_donation_id = Column(String(64), nullable=False, comment="科研捐赠ID")
|
||||
sample_type_id = Column(String(64), nullable=True, comment="样本类型ID")
|
||||
sample_code_id = Column(String(64), nullable=True, comment="样本编码ID")
|
||||
sample_code = Column(String(32), nullable=True, comment="样本编码")
|
||||
collect_amount = Column(Numeric(18, 4), nullable=True, comment="采集量")
|
||||
unit_id = Column(String(64), nullable=True, comment="单位ID")
|
||||
storage_years = Column(Integer, nullable=True, comment="存储年限")
|
||||
sample_status = Column(String(16), nullable=True, comment="样本状态")
|
||||
storage_in_date = Column(String(8), nullable=True, comment="入库日期YYYYMMDD")
|
||||
detect_start_date = Column(String(8), nullable=True, comment="检测开始日期YYYYMMDD")
|
||||
void_date = Column(String(8), nullable=True, comment="作废日期YYYYMMDD")
|
||||
storage_expire_date = Column(String(8), nullable=True, comment="存储到期日期YYYYMMDD")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizResearchDonationSampleTransport(Base):
|
||||
"""科研捐赠样本运输 biz_research_donation_sample_transport"""
|
||||
|
||||
__tablename__ = "biz_research_donation_sample_transport"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
research_donation_id = Column(String(64), nullable=False, comment="科研捐赠ID")
|
||||
sample_id = Column(String(64), nullable=False, comment="样本ID")
|
||||
transport_type = Column(String(16), nullable=False, comment="kdys快递运输 ryxd人员携带")
|
||||
express_company_id = Column(String(64), nullable=True, comment="快递公司ID")
|
||||
waybill_no = Column(String(128), nullable=True, comment="快递单号")
|
||||
dest_site_id = Column(String(64), nullable=True, comment="目的站点ID")
|
||||
express_fee = Column(Numeric(18, 2), nullable=True, comment="快递费用(元)")
|
||||
eta_time = Column(DateTime, nullable=True, comment="预计到达时间")
|
||||
carrier_name = Column(String(100), nullable=True, comment="携带人员姓名")
|
||||
carrier_phone = Column(String(32), nullable=True, comment="携带人员联系电话")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 models/__init__.py 中注册**
|
||||
|
||||
读取 `backend/app/models/__init__.py`,在 import 区增加:
|
||||
|
||||
```python
|
||||
from app.models.research_donation import ( # noqa: F401
|
||||
BizResearchDonation,
|
||||
BizResearchDonationAudit,
|
||||
BizResearchDonationParty,
|
||||
BizResearchDonationCollection,
|
||||
BizResearchDonationSample,
|
||||
BizResearchDonationSampleTransport,
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/research_donation.py backend/app/models/__init__.py
|
||||
git commit -m "feat: 科研捐赠管理模块 — SQLAlchemy Model 定义"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD 层
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/research_donation.py`
|
||||
|
||||
**Reference:** `backend/app/crud/collection_protocol.py`(CRUD 模式参考,但大幅简化:无缴费逻辑)
|
||||
|
||||
这是后端最核心的文件,包含以下功能模块:
|
||||
|
||||
### 功能清单
|
||||
|
||||
1. **列表查询** `list_donations(db, tenant_no, page, page_size, keyword, donation_status, collector_user_id)` — 分页、关键字搜索(编号/母亲姓名)、状态过滤、数据权限
|
||||
2. **详情查询** `get_donation_detail(db, donation_id)` — 主表 + 所有子资源(当事人、采集、样本+运输)
|
||||
3. **创建** `create_donation(db, data, tenant_no, user_id)` — 主表 + 子资源整体创建
|
||||
4. **更新** `update_donation(db, donation_id, data, tenant_no, user_id)` — 子资源 upsert(先删后插)
|
||||
5. **删除** `delete_donation(db, donation_id, tenant_no)` — 软删除主表 + 所有子资源
|
||||
6. **批量删除** `batch_delete_donations(db, ids, tenant_no)`
|
||||
7. **审核列表** `list_audits(db, tenant_no, page, page_size, keyword, audit_status)`
|
||||
8. **提交审核** `submit_audit(db, donation_id, audit_status, audit_remark, user_id, tenant_no)`
|
||||
9. **状态变更** `change_status(db, donation_id, new_status, desc, user_id, tenant_no)` — 含状态机校验
|
||||
10. **从细胞存储转化** `convert_from_storage(db, protocol_id, tenant_no, user_id)` — 读源协议 → 创建捐赠记录
|
||||
11. **转为细胞存储** `convert_to_storage(db, donation_id, tenant_no, user_id)` — 读捐赠 → 创建协议记录
|
||||
|
||||
### 关键模式(参照 collection_protocol.py)
|
||||
|
||||
- UUID 生成:`import uuid; uuid.uuid4().hex`
|
||||
- camelCase → snake_case 转换:参照 `_normalize_fields()` 模式
|
||||
- 附件处理:`urls_to_attachment_list()` 复用
|
||||
- 子资源 upsert:先删除旧数据 `del_flag=1`,再批量 insert 新数据
|
||||
- 租户隔离:所有查询加 `tenant_no` 过滤
|
||||
- 软删除:设置 `del_flag=1`,查询默认 `del_flag=0`
|
||||
|
||||
### 状态机
|
||||
|
||||
```
|
||||
合法转换:
|
||||
dsx → sxz(生效)
|
||||
dsx → yzf(作废)
|
||||
sxz → ygq(过期)
|
||||
sxz → yzf(作废)
|
||||
sxz → zckc(转细胞存储)
|
||||
```
|
||||
|
||||
> 注意:审核通过后才允许从 dsx → sxz。审核驳回后状态不变。
|
||||
|
||||
**实现指导:** 参照 `backend/app/crud/collection_protocol.py` 的整体结构,但去掉所有 payment/payment_detail/storage_cert 相关函数。CRUD 文件预计 600-800 行。
|
||||
|
||||
- [ ] **Step 1: 创建 crud/research_donation.py**
|
||||
|
||||
编写完整的 CRUD 文件,包含上述 11 个功能。关键点:
|
||||
- `create_donation` 接收一个包含所有子资源的 dict,在事务中创建主表 + party + collection + samples + transports
|
||||
- `update_donation` 对子资源使用"软删旧 + 插新"的 upsert 模式
|
||||
- `convert_from_storage` 读取 `BizCollectionProtocol` 及其子资源,映射到捐赠字段
|
||||
- `convert_to_storage` 反向操作
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/research_donation.py
|
||||
git commit -m "feat: 科研捐赠管理模块 — CRUD 业务逻辑层"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 API 路由
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/research_donation.py`
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
**Reference:** `backend/app/api/collection_protocol.py`(API 路由模式)
|
||||
|
||||
- [ ] **Step 1: 创建 API 路由文件**
|
||||
|
||||
创建 `backend/app/api/research_donation.py`:
|
||||
|
||||
```python
|
||||
"""科研捐赠管理 — API 路由"""
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from pydantic import BaseModel, Field
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.core.response import error_response, success_response
|
||||
from app.crud import research_donation as rd_svc
|
||||
from app.models.models import SysUser
|
||||
|
||||
router = APIRouter(prefix="/web/admin", tags=["科研捐赠管理"])
|
||||
```
|
||||
|
||||
端点定义(参照 collection_protocol.py 的装饰器模式):
|
||||
|
||||
| 端点 | 方法 | 路径 | 说明 |
|
||||
|---|---|---|---|
|
||||
| 列表 | GET | `/research-donations` | page/pageSize/keyword/donationStatus 参数 |
|
||||
| 详情 | GET | `/research-donations/{id}` | 返回主表 + 所有子资源 |
|
||||
| 创建 | POST | `/research-donations` | 整体提交含子资源 |
|
||||
| 更新 | PUT | `/research-donations/{id}` | 整体提交含子资源 |
|
||||
| 删除 | DELETE | `/research-donations/{id}` | 软删除 |
|
||||
| 批量删除 | POST | `/research-donations/batch-delete` | body: `{ids: []}` |
|
||||
| 审核列表 | GET | `/research-donations/audits` | page/pageSize/keyword/auditStatus |
|
||||
| 提交审核 | POST | `/research-donations/{id}/audit` | body: `{auditStatus, auditRemark}` |
|
||||
| 状态变更 | POST | `/research-donations/{id}/status-change` | body: `{donationStatus, desc, time}` |
|
||||
| 从存储转化 | POST | `/research-donations/convert-from-storage` | body: `{protocolId}` |
|
||||
| 转为存储 | POST | `/research-donations/{id}/convert-to-storage` | body: `{desc}` |
|
||||
|
||||
每个端点的模式:
|
||||
```python
|
||||
@router.get("/research-donations")
|
||||
def list_research_donations(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(20, ge=1, le=200),
|
||||
keyword: Optional[str] = Query(None),
|
||||
donationStatus: Optional[str] = Query(None),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
collector_user_id = _get_current_user_id(user)
|
||||
result = rd_svc.list_donations(db, tenant_no, page, pageSize, keyword, donationStatus, collector_user_id)
|
||||
return success_response(result)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 注册路由**
|
||||
|
||||
在 `backend/app/api/__init__.py` 增加:
|
||||
```python
|
||||
from app.api.research_donation import router as research_donation_router
|
||||
```
|
||||
并在 `__all__` 列表增加 `"research_donation_router"`。
|
||||
|
||||
在 `backend/app/main.py` 的 import 行和 include_router 行增加 `research_donation_router`。
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/research_donation.py backend/app/api/__init__.py backend/app/main.py
|
||||
git commit -m "feat: 科研捐赠管理模块 — API 路由定义与注册"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端路由与 API 模块
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/api/research-donation.ts`
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
**Reference:** `web-admin/src/api/collection-protocol.ts`(API 模式),`web-admin/src/router/modules/sqxp.ts:204-252`(路由注册模式)
|
||||
|
||||
- [ ] **Step 1: 创建 API 模块**
|
||||
|
||||
创建 `web-admin/src/api/research-donation.ts`:
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/http'
|
||||
|
||||
type PageList<T> = {
|
||||
list: T[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
totalPages: number
|
||||
}
|
||||
|
||||
export type ResearchDonationRow = Record<string, unknown>
|
||||
|
||||
// 列表
|
||||
export function fetchResearchDonationList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
donationStatus?: string
|
||||
}) {
|
||||
return request.get<PageList<ResearchDonationRow>>({
|
||||
url: '/web/admin/research-donations',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
// 详情
|
||||
export function fetchResearchDonationDetail(id: string) {
|
||||
return request.get<{
|
||||
donation: Record<string, unknown>
|
||||
party: Record<string, unknown> | null
|
||||
collection: Record<string, unknown> | null
|
||||
samples: Array<Record<string, unknown>> | null
|
||||
attachments?: Array<Record<string, unknown>>
|
||||
}>({
|
||||
url: `/web/admin/research-donations/${id}`
|
||||
})
|
||||
}
|
||||
|
||||
// 创建
|
||||
export function fetchCreateResearchDonation(data: Record<string, unknown>) {
|
||||
return request.post({
|
||||
url: '/web/admin/research-donations',
|
||||
data,
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 更新
|
||||
export function fetchUpdateResearchDonation(id: string, data: Record<string, unknown>) {
|
||||
return request.put({
|
||||
url: `/web/admin/research-donations/${id}`,
|
||||
data,
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 删除
|
||||
export function fetchDeleteResearchDonation(id: string) {
|
||||
return request.del({
|
||||
url: `/web/admin/research-donations/${id}`,
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 批量删除
|
||||
export function fetchBatchDeleteResearchDonation(ids: string[]) {
|
||||
return request.post({
|
||||
url: '/web/admin/research-donations/batch-delete',
|
||||
data: { ids },
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 审核列表
|
||||
export function fetchResearchDonationAuditList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
auditStatus?: string
|
||||
}) {
|
||||
return request.get<PageList<Record<string, unknown>>>({
|
||||
url: '/web/admin/research-donations/audits',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
// 提交审核
|
||||
export function fetchSubmitDonationAudit(
|
||||
donationId: string,
|
||||
data: { auditStatus: string; auditRemark?: string },
|
||||
options?: { showSuccessMessage?: boolean }
|
||||
) {
|
||||
return request.post({
|
||||
url: `/web/admin/research-donations/${donationId}/audit`,
|
||||
data,
|
||||
showSuccessMessage: options?.showSuccessMessage ?? true
|
||||
})
|
||||
}
|
||||
|
||||
// 状态变更
|
||||
export function fetchDonationStatusChange(
|
||||
donationId: string,
|
||||
data: { donationStatus: string; desc?: string; time?: string }
|
||||
) {
|
||||
return request.post({
|
||||
url: `/web/admin/research-donations/${donationId}/status-change`,
|
||||
data,
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 从细胞存储转化
|
||||
export function fetchConvertFromStorage(protocolId: string) {
|
||||
return request.post({
|
||||
url: '/web/admin/research-donations/convert-from-storage',
|
||||
data: { protocolId },
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
|
||||
// 转为细胞存储
|
||||
export function fetchConvertToStorage(
|
||||
donationId: string,
|
||||
data?: { desc?: string }
|
||||
) {
|
||||
return request.post({
|
||||
url: `/web/admin/research-donations/${donationId}/convert-to-storage`,
|
||||
data: data || {},
|
||||
showSuccessMessage: true
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 添加路由定义**
|
||||
|
||||
在 `web-admin/src/router/modules/sqxp.ts` 的细胞存储路由组之后(约 line 252),增加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '60000000000000000000000000000001',
|
||||
name: 'ResearchDonation',
|
||||
path: '/research-donation',
|
||||
component: '/index/index',
|
||||
meta: {
|
||||
title: '科研捐赠管理',
|
||||
icon: 'ri:hand-heart-line',
|
||||
keepAlive: false,
|
||||
roles: ['admin']
|
||||
},
|
||||
children: [
|
||||
{
|
||||
id: '60000000000000000000000000000002',
|
||||
name: 'ResearchDonationList',
|
||||
path: 'list',
|
||||
component: '/research-donation/list/index',
|
||||
meta: { title: '捐赠协议单', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '60000000000000000000000000000003',
|
||||
name: 'ResearchDonationAudit',
|
||||
path: 'audit',
|
||||
component: '/research-donation/audit/index',
|
||||
meta: { title: '捐赠协议审核', keepAlive: true }
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/research-donation.ts web-admin/src/router/modules/sqxp.ts
|
||||
git commit -m "feat: 科研捐赠管理模块 — 前端 API 模块与路由定义"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端 — 捐赠协议列表页
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/research-donation/list/index.vue`
|
||||
|
||||
**Reference:** `web-admin/src/views/cell-storage/protocol/index.vue`(列表页模式)
|
||||
|
||||
**实现指导:**
|
||||
|
||||
参照 `cell-storage/protocol/index.vue` 的完整模式创建列表页,关键差异:
|
||||
|
||||
1. **搜索条件**:关键字(编号/母亲姓名)+ 状态下拉(dsx/sxz/ygq/yzf/zckc)
|
||||
2. **表格列**:捐赠编号、捐赠日期、母亲姓名、状态、来源类型、采集专员、创建时间、操作
|
||||
3. **操作按钮**:新增、批量删除、导出(可选)
|
||||
4. **行操作**:查看、编辑、审核、状态变更、删除
|
||||
5. **状态标签颜色**:dsx=info, sxz=success, ygq=warning, yzf=danger, zckc=primary
|
||||
6. **无缴费相关按钮和筛选**(与细胞存储的关键区别)
|
||||
|
||||
组件导入:DonationFormDialog, DonationViewDialog, DonationAuditDialog, DonationStatusChangeDialog
|
||||
|
||||
- [ ] **Step 1: 创建列表页**
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/research-donation/list/index.vue
|
||||
git commit -m "feat: 科研捐赠管理模块 — 捐赠协议列表页"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端 — 新增/编辑弹窗
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/research-donation/list/DonationFormDialog.vue`
|
||||
|
||||
**Reference:** `web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue`(表单弹窗模式)
|
||||
|
||||
**实现指导:**
|
||||
|
||||
参照 ProtocolFormDialog.vue 的模式,5 个 Tab:
|
||||
|
||||
| Tab | 字段 | 说明 |
|
||||
|---|---|---|
|
||||
| 基本信息 | donationNo, donationDate, sourceType, remark | 编号自动/手动、日期、来源类型只读 |
|
||||
| 当事人信息 | 母亲/父亲/新生儿全部字段 | 与细胞存储一致 |
|
||||
| 采集信息 | 区域/医院/采集人/时间 | 与细胞存储一致 |
|
||||
| 样本信息 | 样本类型/编码/数量/储存年限(**无 price 字段**) | 可多行添加删除 |
|
||||
| 附件 | 知情同意书(**必传**)+ 其他附件 | 知情同意书独立上传区域 |
|
||||
|
||||
关键点:
|
||||
- 宽度 `1200px`,`label-position="top"`
|
||||
- 知情同意书 Tab 中分两个区域:必传的知情同意书 + 可选的其他附件
|
||||
- 提交时校验 `consentFormUrls` 不能为空
|
||||
- 样本 Tab 无金额/费用相关字段
|
||||
|
||||
- [ ] **Step 1: 创建表单弹窗组件**
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/research-donation/list/DonationFormDialog.vue
|
||||
git commit -m "feat: 科研捐赠管理模块 — 新增/编辑弹窗(5 Tab)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端 — 查看/审核/状态变更弹窗
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/research-donation/list/DonationViewDialog.vue`
|
||||
- Create: `web-admin/src/views/research-donation/list/DonationAuditDialog.vue`
|
||||
- Create: `web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue`
|
||||
|
||||
**Reference:**
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue`
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolAuditDialog.vue`
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue`
|
||||
|
||||
- [ ] **Step 1: 创建 DonationViewDialog.vue**
|
||||
|
||||
参照 ProtocolViewDialog.vue,5 个 Tab 只读展示。宽度 `1600px`。
|
||||
|
||||
- [ ] **Step 2: 创建 DonationAuditDialog.vue**
|
||||
|
||||
参照 ProtocolAuditDialog.vue。审核状态选择(shtg/shth)+ 备注。支持批量。
|
||||
|
||||
- [ ] **Step 3: 创建 DonationStatusChangeDialog.vue**
|
||||
|
||||
参照 ProtocolStatusChangeDialog.vue。支持的操作:
|
||||
- 生效(dsx → sxz)
|
||||
- 过期(sxz → ygq)
|
||||
- 作废(dsx/sxz → yzf)
|
||||
- **转细胞存储**(sxz → zckc)— 新增操作
|
||||
|
||||
每个操作有时间 + 描述字段。
|
||||
|
||||
- [ ] **Step 4: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/research-donation/list/DonationViewDialog.vue \
|
||||
web-admin/src/views/research-donation/list/DonationAuditDialog.vue \
|
||||
web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue
|
||||
git commit -m "feat: 科研捐赠管理模块 — 查看/审核/状态变更弹窗"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 前端 — 审核管理页
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/research-donation/audit/index.vue`
|
||||
|
||||
**Reference:** `web-admin/src/views/cell-storage/protocol-audit/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建审核管理页**
|
||||
|
||||
参照 protocol-audit/index.vue 模式:
|
||||
- 列表展示待审核/已审核的捐赠记录
|
||||
- 批量审核、批量生效、批量作废等操作
|
||||
- 调用 `fetchResearchDonationAuditList` API
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/research-donation/audit/index.vue
|
||||
git commit -m "feat: 科研捐赠管理模块 — 审核管理页"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 细胞存储端 — 增加「转科研」操作
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue`
|
||||
|
||||
**Reference:** 读取现有文件,在状态变更操作中增加 `zky`(转科研)选项
|
||||
|
||||
- [ ] **Step 1: 修改 ProtocolStatusChangeDialog.vue**
|
||||
|
||||
在现有的状态变更操作中增加「转科研」选项:
|
||||
- 操作类型增加 `zky`
|
||||
- 调用 `fetchConvertFromStorage(protocolId)` API(从 research-donation.ts 导入)
|
||||
- 成功后刷新列表
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue
|
||||
git commit -m "feat: 细胞存储协议 — 增加转科研操作"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 11: 联调与验证
|
||||
|
||||
- [ ] **Step 1: 后端验证**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
python -c "from app.models.research_donation import *; print('Models OK')"
|
||||
python -c "from app.api.research_donation import router; print('Router OK')"
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 前端验证**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm build
|
||||
```
|
||||
|
||||
预期:构建通过,无 TS 错误。
|
||||
|
||||
- [ ] **Step 3: 数据库建表**
|
||||
|
||||
在开发环境执行 `docs/sql/research_donation_tables.sql`。
|
||||
|
||||
- [ ] **Step 4: 功能验证清单**
|
||||
|
||||
| 功能 | 验证方式 |
|
||||
|------|---------|
|
||||
| 列表展示 | 访问 `/#/research-donation/list` |
|
||||
| 新增捐赠 | 填写 5 个 Tab,提交 |
|
||||
| 知情同意书必填校验 | 不传知情同意书,提交应报错 |
|
||||
| 编辑捐赠 | 修改后保存 |
|
||||
| 查看详情 | 5 Tab 只读展示 |
|
||||
| 删除(单个/批量) | 软删除 |
|
||||
| 审核流程 | 审核页面操作 |
|
||||
| 状态变更 | 生效/过期/作废 |
|
||||
| 转细胞存储 | 捐赠 → 细胞存储协议 |
|
||||
| 细胞存储转科研 | 细胞存储 → 科研捐赠 |
|
||||
@@ -1,553 +0,0 @@
|
||||
# 体检机构项目套餐(Phase 1)Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在体检机构维度维护「项目套餐」(主子表),套餐总价为明细费用之和,明细价可编辑;机构项目软删除不阻断、不级联套餐行。
|
||||
|
||||
**Architecture:** 新增 `biz_checkup_institution_package` + `_package_item` 两张表;CRUD 追加到 `pilot_service.py`;API 在 `pilot_service.py` 路由文件增加 5 个端点,POST/PUT 一次提交 `items[]` 并在事务内全量替换明细;前端在 `checkup-institution/index.vue` 的「项目价格配置」弹窗内用 Tab 分离「项目列表 / 套餐管理」,套餐编辑交互对齐 `project-price-system` 主子表弹窗。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2;Vue 3 / Element Plus / TypeScript;MySQL 5.7
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-18-checkup-project-package-design.md`
|
||||
|
||||
**SQL:** `docs/sql/checkup_institution_package.sql`
|
||||
|
||||
**Out of Scope (Phase 2):** 中试申请单体检「从套餐添加」展开预约明细
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| # | 文件 | 操作 | 职责 |
|
||||
|---|------|------|------|
|
||||
| 1 | `docs/sql/checkup_institution_package.sql` | 已有 | 建表 DDL(实施前在目标库执行) |
|
||||
| 2 | `docs/sql/zkxw.sql` | 追加 | 基线库同步两张新表(与增量 SQL 一致) |
|
||||
| 3 | `backend/app/models/models.py` | 追加 | `BizCheckupInstitutionPackage` / `Item` |
|
||||
| 4 | `backend/app/crud/pilot_service.py` | 追加 | 套餐 CRUD + 校验辅助函数 |
|
||||
| 5 | `backend/app/api/pilot_service.py` | 追加 | 路由 + Pydantic Body |
|
||||
| 6 | `web-admin/src/api/admin.ts` | 追加 | 5 个 fetch 函数 |
|
||||
| 7 | `web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue` | 新建 | 套餐 Tab:列表 + 主子表弹窗 + 选项目子弹窗 |
|
||||
| 8 | `web-admin/src/views/pilot-service/checkup-institution/index.vue` | 修改 | 项目配置弹窗改为 `el-tabs`;引入套餐面板 |
|
||||
| 9 | `web-admin/src/App.vue` | 按需 | 若套餐弹窗标题需竖条,在 `panelTitleBarTextRules` 登记(可选) |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 数据库
|
||||
|
||||
**Files:**
|
||||
- Execute: `docs/sql/checkup_institution_package.sql`
|
||||
- Modify: `docs/sql/zkxw.sql`(在 `biz_checkup_institution_project` 表定义之后插入两张新表,内容与增量 SQL 一致)
|
||||
|
||||
- [ ] **Step 1: 在开发/测试库执行增量 SQL**
|
||||
|
||||
```bash
|
||||
mysql -h127.0.0.1 -uroot -p zkxw < docs/sql/checkup_institution_package.sql
|
||||
```
|
||||
|
||||
Expected: `Query OK`,`SHOW TABLES LIKE 'biz_checkup_institution_package%'` 返回 2 行。
|
||||
|
||||
- [ ] **Step 2: 将建表语句合并进 `docs/sql/zkxw.sql`**
|
||||
|
||||
在 `biz_checkup_institution_project` 段落后、`biz_clean_room` 之前插入 `checkup_institution_package.sql` 中两张 `CREATE TABLE`(勿重复 DROP 破坏全量脚本顺序时可只保留 CREATE)。
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/checkup_institution_package.sql docs/sql/zkxw.sql
|
||||
git commit -m "feat(db): add checkup institution package tables"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py`(在 `BizCheckupInstitutionProject` 类之后、`# 生产管理` 注释之前)
|
||||
|
||||
- [ ] **Step 1: 追加两个 Model 类**
|
||||
|
||||
```python
|
||||
class BizCheckupInstitutionPackage(Base):
|
||||
"""体检机构项目套餐 biz_checkup_institution_package"""
|
||||
|
||||
__tablename__ = "biz_checkup_institution_package"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
checkup_institution_id = Column(String(64), nullable=False, comment="体检机构ID")
|
||||
package_name = Column(String(200), nullable=False, comment="套餐名称")
|
||||
package_code = Column(String(64), nullable=False, comment="套餐编码")
|
||||
status = Column(CHAR(1), nullable=False, default="1", comment="1正常 0停用")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
|
||||
|
||||
class BizCheckupInstitutionPackageItem(Base):
|
||||
"""体检机构项目套餐明细 biz_checkup_institution_package_item"""
|
||||
|
||||
__tablename__ = "biz_checkup_institution_package_item"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
package_id = Column(String(64), nullable=False, comment="套餐ID")
|
||||
checkup_institution_project_id = Column(String(64), nullable=False, comment="机构项目ID")
|
||||
project_name = Column(String(200), nullable=False, comment="项目名称快照")
|
||||
project_fee = Column(Numeric(18, 2), nullable=True, comment="套餐内项目费用(元)")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 `pilot_service.py` CRUD 顶部 import**
|
||||
|
||||
在 `backend/app/crud/pilot_service.py` 的 `from app.models.models import (` 中追加:
|
||||
|
||||
```python
|
||||
BizCheckupInstitutionPackage,
|
||||
BizCheckupInstitutionPackageItem,
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证 import**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.models.models import BizCheckupInstitutionPackage, BizCheckupInstitutionPackageItem; print('OK')"
|
||||
```
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py backend/app/crud/pilot_service.py
|
||||
git commit -m "feat: add SQLAlchemy models for checkup institution packages"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_service.py`(在 `soft_delete_checkup_institution_project` 之后、`# Shared utility` 之前新增 Entity 14 段)
|
||||
|
||||
- [ ] **Step 1: 实现字典转换与辅助函数**
|
||||
|
||||
新增函数(命名固定,便于 API 层调用):
|
||||
|
||||
| 函数 | 职责 |
|
||||
|------|------|
|
||||
| `_row_to_dict_checkup_institution_package(row, *, total_fee=None, item_count=None)` | 头表 camelCase + `totalFee` / `itemCount` |
|
||||
| `_row_to_dict_checkup_institution_package_item(row, *, source_project_deleted=False)` | 明细 + `sourceProjectDeleted` |
|
||||
| `_sum_package_item_fees(items)` | `sum(project_fee or 0)` |
|
||||
| `checkup_package_code_exists(db, institution_id, code, tenant_no, exclude_id=None)` | 同机构 `del_flag=0` 编码唯一 |
|
||||
| `_get_checkup_project_for_package(db, project_id, institution_id, tenant_no)` | 查源项目,不存在返回 None |
|
||||
| `_validate_package_items_for_save(db, institution_id, items, tenant_no, existing_item_project_ids=None)` | 见下方规则 |
|
||||
|
||||
**`_validate_package_items_for_save` 规则:**
|
||||
|
||||
1. `items` 至少 1 条;同一请求内 `checkup_institution_project_id` 不重复。
|
||||
2. 对每条明细:
|
||||
- 若 `project_id` 属于 `existing_item_project_ids`(更新时保留的历史行):允许源项目 `del_flag=1`,但须校验曾属于本机构。
|
||||
- 否则:源项目须 `del_flag=0`、`status=1`、且 `checkup_institution_id` 匹配。
|
||||
3. 若任一新添加行源项目 `status=0`:抛出 `ValueError("套餐不能包含已停用的体检项目")`。
|
||||
|
||||
- [ ] **Step 2: 实现列表 / 详情 / 创建 / 更新 / 删除**
|
||||
|
||||
```python
|
||||
def list_checkup_institution_packages(db, checkup_institution_id, tenant_no=None) -> List[Dict[str, Any]]:
|
||||
# 查头表 del_flag=0,按 create_time desc
|
||||
# 对每个 package 查明细 del_flag=0,计算 totalFee、itemCount
|
||||
...
|
||||
|
||||
def get_checkup_institution_package(db, package_id, tenant_no=None):
|
||||
# 头表单条,不存在返回 None
|
||||
...
|
||||
|
||||
def get_checkup_institution_package_detail(db, package_id, tenant_no=None) -> Optional[Dict[str, Any]]:
|
||||
# 头表 dict + items[](join 源项目 del_flag 填 sourceProjectDeleted)
|
||||
...
|
||||
|
||||
def create_checkup_institution_package(
|
||||
db, *, checkup_institution_id, package_name, package_code, status="1",
|
||||
items, tenant_no, order_num=None, remark=None, user_id=None,
|
||||
):
|
||||
# 1. checkup_package_code_exists → ValueError
|
||||
# 2. _validate_package_items_for_save(..., existing_item_project_ids=None)
|
||||
# 3. 插入头表 + 循环插入明细(project_name 优先 body,否则源项目名)
|
||||
# 4. commit;返回 get_checkup_institution_package_detail(...)
|
||||
...
|
||||
|
||||
def update_checkup_institution_package(
|
||||
db, package_id, *, package_name=None, package_code=None, status=None,
|
||||
items=None, order_num=None, remark=None, user_id=None, tenant_no=None,
|
||||
):
|
||||
# 1. get 头表
|
||||
# 2. 若改 package_code 做唯一校验
|
||||
# 3. 若 items is not None:
|
||||
# - 读取旧明细 project_id 集合 → existing_item_project_ids
|
||||
# - _validate_package_items_for_save(..., existing_item_project_ids=...)
|
||||
# - 旧明细全部 soft_delete (del_flag=1)
|
||||
# - 插入新明细行(新 id)
|
||||
# 4. commit;返回 detail
|
||||
...
|
||||
|
||||
def soft_delete_checkup_institution_package(db, package_id, tenant_no=None):
|
||||
# 头表 del_flag=1;其下明细 del_flag=1
|
||||
...
|
||||
```
|
||||
|
||||
**机构项目删除:** 确认 `soft_delete_checkup_institution_project` **不增加**套餐引用检查(保持现状即可,在 commit message 中注明符合设计)。
|
||||
|
||||
- [ ] **Step 3: 本地 CRUD 冒烟(可选,Django shell 等价)**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python - <<'PY'
|
||||
from app.core.database import SessionLocal
|
||||
from app.crud import pilot_service as ps
|
||||
db = SessionLocal()
|
||||
# 替换为库内真实 institution_id / project_id
|
||||
inst_id = "REPLACE"
|
||||
proj_id = "REPLACE"
|
||||
try:
|
||||
detail = ps.create_checkup_institution_package(
|
||||
db,
|
||||
checkup_institution_id=inst_id,
|
||||
package_name="基础套餐",
|
||||
package_code="PKG_BASE_01",
|
||||
status="1",
|
||||
items=[{"checkup_institution_project_id": proj_id, "project_name": "血常规", "project_fee": 100.0}],
|
||||
tenant_no="zkxw",
|
||||
user_id="admin",
|
||||
)
|
||||
print("totalFee", detail.get("totalFee"), "items", len(detail.get("items", [])))
|
||||
finally:
|
||||
db.close()
|
||||
PY
|
||||
```
|
||||
|
||||
Expected: 打印 `totalFee 100.0 items 1`(无异常;测试后可软删该套餐)
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_service.py
|
||||
git commit -m "feat: add CRUD for checkup institution project packages"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 API 路由
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/pilot_service.py`(在体检机构项目路由段之后追加)
|
||||
|
||||
- [ ] **Step 1: 定义 Pydantic Body**
|
||||
|
||||
```python
|
||||
class CheckupPackageItemBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
checkup_institution_project_id: str = Field(..., alias="checkupInstitutionProjectId")
|
||||
project_name: Optional[str] = Field(None, alias="projectName")
|
||||
project_fee: Optional[float] = Field(None, alias="projectFee")
|
||||
order_num: Optional[int] = Field(None, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
|
||||
|
||||
class CheckupInstitutionPackageCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
package_name: str = Field(..., alias="packageName")
|
||||
package_code: str = Field(..., alias="packageCode")
|
||||
status: Optional[str] = Field("1", alias="status")
|
||||
order_num: Optional[int] = Field(0, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
items: List[CheckupPackageItemBody] = Field(default_factory=list)
|
||||
|
||||
|
||||
class CheckupInstitutionPackageUpdateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
package_name: Optional[str] = Field(None, alias="packageName")
|
||||
package_code: Optional[str] = Field(None, alias="packageCode")
|
||||
status: Optional[str] = Field(None, alias="status")
|
||||
order_num: Optional[int] = Field(None, alias="orderNum")
|
||||
remark: Optional[str] = None
|
||||
items: Optional[List[CheckupPackageItemBody]] = None
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 注册 5 个路由**
|
||||
|
||||
| 方法 | 路径 | 处理 |
|
||||
|------|------|------|
|
||||
| GET | `/checkup-institutions/{institution_id}/packages` | `list_checkup_institution_packages` → `success_response(list)` |
|
||||
| POST | `/checkup-institutions/{institution_id}/packages` | `create_checkup_institution_package`,body 转 `items` 为 dict 列表 |
|
||||
| GET | `/checkup-institution-packages/{package_id}` | `get_checkup_institution_package_detail` |
|
||||
| PUT | `/checkup-institution-packages/{package_id}` | `update_checkup_institution_package` |
|
||||
| DELETE | `/checkup-institution-packages/{package_id}` | `soft_delete_checkup_institution_package` |
|
||||
|
||||
权限:`require_admin_or_super_admin`;`tenant_no = _get_tenant_no(db, user)`。
|
||||
|
||||
- [ ] **Step 3: 启动后端并用 curl 验证(需有效 JWT)**
|
||||
|
||||
```bash
|
||||
# 登录后替换 TOKEN、INSTITUTION_ID
|
||||
curl -s -H "Authorization: Bearer TOKEN" \
|
||||
"http://127.0.0.1:8000/api/web/admin/checkup-institutions/INSTITUTION_ID/packages" | head -c 500
|
||||
```
|
||||
|
||||
Expected: `code:200`,`data` 为数组(可为 `[]`)。
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/pilot_service.py
|
||||
git commit -m "feat: add REST API for checkup institution project packages"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 API
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`(在 `fetchDeleteCheckupInstitutionProject` 之后)
|
||||
|
||||
- [ ] **Step 1: 追加 5 个函数**
|
||||
|
||||
```typescript
|
||||
// 中试服务管理 — 体检机构项目套餐
|
||||
export function fetchCheckupInstitutionPackages(institutionId: string) {
|
||||
return request.get({ url: `/web/admin/checkup-institutions/${institutionId}/packages` })
|
||||
}
|
||||
|
||||
export function fetchCheckupInstitutionPackageDetail(packageId: string) {
|
||||
return request.get({ url: `/web/admin/checkup-institution-packages/${packageId}` })
|
||||
}
|
||||
|
||||
export function fetchCreateCheckupInstitutionPackage(
|
||||
institutionId: string,
|
||||
data: Record<string, unknown>
|
||||
) {
|
||||
return request.post({
|
||||
url: `/web/admin/checkup-institutions/${institutionId}/packages`,
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchUpdateCheckupInstitutionPackage(
|
||||
packageId: string,
|
||||
data: Record<string, unknown>
|
||||
) {
|
||||
return request.put({ url: `/web/admin/checkup-institution-packages/${packageId}`, params: data })
|
||||
}
|
||||
|
||||
export function fetchDeleteCheckupInstitutionPackage(packageId: string) {
|
||||
return request.del({ url: `/web/admin/checkup-institution-packages/${packageId}` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/admin.ts
|
||||
git commit -m "feat(web-admin): add API helpers for checkup institution packages"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端 — `CheckupPackagePanel.vue`
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue`
|
||||
|
||||
**Props:**
|
||||
|
||||
```typescript
|
||||
const props = defineProps<{
|
||||
institutionId: string
|
||||
institutionName: string
|
||||
}>()
|
||||
```
|
||||
|
||||
- [ ] **Step 1: 套餐列表区**
|
||||
|
||||
- 工具栏:已选 N 项 +「新增套餐」(唯一 `type="primary"`)
|
||||
- 表格列:序号、套餐名称、套餐编码、项目数(`itemCount`)、合计费用(`totalFee`)、状态(tag)、备注、操作(编辑/删除)
|
||||
- `loadPackages()` → `fetchCheckupInstitutionPackages(props.institutionId)`,解析 `Array.isArray(res) ? res : res?.list ?? []`
|
||||
|
||||
- [ ] **Step 2: 套餐新增/编辑弹窗(主子表)**
|
||||
|
||||
对齐 `project-price-system/index.vue`:
|
||||
|
||||
**头部表单**(`form-grid-2`,`label-position="top"`):
|
||||
|
||||
| 字段 | 校验 |
|
||||
|------|------|
|
||||
| packageName | required |
|
||||
| packageCode | required |
|
||||
| status | `1` / `0` |
|
||||
| remark | 可选 |
|
||||
|
||||
**明细区**:
|
||||
|
||||
- 按钮「添加项目」→ 打开子弹窗
|
||||
- 表格列:序号、项目名称(+ `sourceProjectDeleted` 时 `<span class="form-label-tip">源项目已删除</span>`)、项目费用(可编辑 `el-input-number`)、操作(删除行)
|
||||
- 底部:`套餐合计:¥ {{ packageTotalFee }}`(computed,`detailItems` 的 `projectFee` 求和)
|
||||
|
||||
**提交 payload:**
|
||||
|
||||
```typescript
|
||||
{
|
||||
packageName: string,
|
||||
packageCode: string,
|
||||
status: string,
|
||||
remark?: string,
|
||||
items: detailItems.value.map((row, idx) => ({
|
||||
checkupInstitutionProjectId: row.checkupInstitutionProjectId,
|
||||
projectName: row.projectName,
|
||||
projectFee: row.projectFee,
|
||||
orderNum: idx + 1
|
||||
}))
|
||||
}
|
||||
```
|
||||
|
||||
- 新增:`fetchCreateCheckupInstitutionPackage(institutionId, payload)`
|
||||
- 编辑:`fetchUpdateCheckupInstitutionPackage(id, payload)`;打开时 `fetchCheckupInstitutionPackageDetail(id)` 填充 `detailItems`
|
||||
|
||||
- [ ] **Step 3: 「添加项目」子弹窗**
|
||||
|
||||
- 调用已有 `fetchCheckupInstitutionProjects(props.institutionId)`
|
||||
- 仅展示 `status == '1'` 且未在 `detailItems` 中的项目
|
||||
- 多选确认后 push:
|
||||
|
||||
```typescript
|
||||
{
|
||||
checkupInstitutionProjectId: row.id,
|
||||
projectName: row.projectName,
|
||||
projectFee: row.projectFee ?? 0,
|
||||
sourceProjectDeleted: false
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 删除套餐**
|
||||
|
||||
`ElMessageBox.confirm` → `fetchDeleteCheckupInstitutionPackage` → `loadPackages()`
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue
|
||||
git commit -m "feat(web-admin): add checkup package panel component"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端 — 接入 `index.vue` Tab
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/checkup-institution/index.vue`
|
||||
|
||||
- [ ] **Step 1: 将「项目价格配置」弹窗正文改为 `el-tabs`**
|
||||
|
||||
```vue
|
||||
<el-tabs v-model="itemConfigTab" class="item-config-tabs">
|
||||
<el-tab-pane label="项目列表" name="projects">
|
||||
<!-- 现有 list-toolbar + el-table + 项目嵌套弹窗 移入此 pane -->
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="套餐管理" name="packages">
|
||||
<CheckupPackagePanel
|
||||
v-if="itemConfigTab === 'packages' && currentInstitutionId"
|
||||
:institution-id="currentInstitutionId"
|
||||
:institution-name="currentInstitutionName"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: script 增加**
|
||||
|
||||
```typescript
|
||||
import CheckupPackagePanel from './CheckupPackagePanel.vue'
|
||||
const itemConfigTab = ref<'projects' | 'packages'>('projects')
|
||||
```
|
||||
|
||||
- `openItemDialog` 时重置 `itemConfigTab = 'projects'`
|
||||
|
||||
- [ ] **Step 3: 弹窗宽度**
|
||||
|
||||
项目配置弹窗 `width` 调至 `960px` 或 `1000px`,避免 Tab 内表格拥挤。
|
||||
|
||||
- [ ] **Step 4: 机构操作列(可选)**
|
||||
|
||||
主列表操作列可增加「套餐配置」按钮,`openItemDialog(row)` 且 `itemConfigTab = 'packages'`(非必须,Tab 已可达)。
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-institution/index.vue
|
||||
git commit -m "feat(web-admin): integrate package tab in checkup institution config dialog"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 联调与验收
|
||||
|
||||
- [ ] **Step 1: 后端 lint / 启动**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.api.pilot_service import router; print('routes OK')"
|
||||
cd web-admin && pnpm lint
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 手工验收清单(Phase 1)**
|
||||
|
||||
| # | 场景 | 预期 |
|
||||
|---|------|------|
|
||||
| 1 | 新增套餐,编码必填,选 2 个项目并改价 | 保存成功;列表 `totalFee` = 两行费用之和 |
|
||||
| 2 | 同机构重复套餐编码 | 接口 400,提示编码已存在 |
|
||||
| 3 | 套餐含停用项目(新加行) | 保存失败 |
|
||||
| 4 | 编辑套餐:删除一行、改价 | 合计随动;保存后列表更新 |
|
||||
| 5 | 软删除某机构项目(被套餐引用) | 删除成功;编辑套餐见「源项目已删除」,合计仍含该行 |
|
||||
| 6 | 删除套餐 | 列表不再显示 |
|
||||
|
||||
- [ ] **Step 3: Commit(若有验收期小修)**
|
||||
|
||||
```bash
|
||||
git commit -m "fix: checkup package QA adjustments after manual test"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Spec Coverage(自检)
|
||||
|
||||
| 设计要求 | 任务 |
|
||||
|----------|------|
|
||||
| 套餐编码必填、机构内唯一 | Task 3 `checkup_package_code_exists`;Task 6 表单校验 |
|
||||
| 总价 = 明细之和、不落库 | Task 3 `_sum_package_item_fees`;Task 6 computed |
|
||||
| 明细价可改、不回写机构项目 | Task 3 只写 package_item;Task 6 可编辑列 |
|
||||
| 机构项目软删不拦截、明细保留 | Task 3 校验 + `sourceProjectDeleted`;Task 3 不改 delete 逻辑 |
|
||||
| 含停用项禁止保存(新行) | Task 3 `_validate_package_items_for_save` |
|
||||
| 5 个 API 端点 | Task 4 |
|
||||
| Tab:项目 / 套餐 | Task 7 |
|
||||
| Phase 2 从套餐带入 | **未纳入本计划** |
|
||||
|
||||
---
|
||||
|
||||
## Phase 2 备忘(本计划不实施)
|
||||
|
||||
中试申请单体检模块开发时:
|
||||
|
||||
- 选机构 →「从套餐添加」→ 仅展开 `del_flag=0 && status=1` 的源项目行
|
||||
- 写入 `biz_pilot_checkup_reserve_item` 快照
|
||||
|
||||
详见设计文档 §6。
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,278 +0,0 @@
|
||||
# Web 管理端 Token 自动续期 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在 Access Token 过期时通过 Refresh Token 静默续期并重试请求,避免用户操作中被误踢登录。
|
||||
|
||||
**Architecture:** 新建 `token-refresh.ts` 负责单飞刷新与请求队列;`http/index.ts` 在 401 时先刷新再重试;修复 `fetchRefreshToken` 为 JSON body。首期不做多 Tab 广播与定时主动刷新。
|
||||
|
||||
**Tech Stack:** Vue 3 / Pinia / Axios / FastAPI JWT + Redis 会话
|
||||
|
||||
**Design Doc:** `docs/superpowers/specs/2026-05-20-web-token-auto-refresh-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure Map
|
||||
|
||||
| File | Responsibility |
|
||||
|------|----------------|
|
||||
| `web-admin/src/utils/http/token-refresh.ts` | **新建** — 单飞 refresh、队列、URL 白名单、从 refreshToken 解析 userId |
|
||||
| `web-admin/src/utils/http/index.ts` | **修改** — 401 走刷新队列;重试原请求;刷新失败再 logOut |
|
||||
| `web-admin/src/api/auth.ts` | **修改** — `fetchRefreshToken` body 传参;静默错误提示选项 |
|
||||
| `web-admin/src/store/modules/user.ts` | **复用** — `setToken` / `refreshToken` / `logOut` |
|
||||
| `backend/.env.example` | **可选** — 注释说明 ACCESS_TOKEN 与 refresh 关系 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 修复 refresh API 契约
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/auth.ts`
|
||||
|
||||
- [ ] **Step 1: 修改 `fetchRefreshToken` 使用 JSON body**
|
||||
|
||||
```typescript
|
||||
export function fetchRefreshToken(refreshToken: string) {
|
||||
return request.post<{
|
||||
token: string
|
||||
refreshToken: string
|
||||
expiresIn: number
|
||||
}>({
|
||||
url: '/web/auth/refresh-token',
|
||||
data: { refreshToken },
|
||||
showErrorMessage: false
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 手动验证**
|
||||
|
||||
在浏览器 Network 中触发一次 refresh(可用临时按钮或控制台调用),确认 Request Payload 为 `{"refreshToken":"..."}` 且非 query string。
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 实现 token-refresh 模块
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/utils/http/token-refresh.ts`
|
||||
|
||||
- [ ] **Step 1: 创建模块骨架**
|
||||
|
||||
```typescript
|
||||
import type { InternalAxiosRequestConfig } from 'axios'
|
||||
import { fetchRefreshToken } from '@/api/auth'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
|
||||
const AUTH_SKIP_REFRESH_URLS = [
|
||||
'/web/auth/login',
|
||||
'/web/auth/refresh-token',
|
||||
'/web/auth/logout'
|
||||
]
|
||||
|
||||
let refreshPromise: Promise<void> | null = null
|
||||
|
||||
export function shouldSkipTokenRefresh(url?: string): boolean {
|
||||
if (!url) return false
|
||||
return AUTH_SKIP_REFRESH_URLS.some((p) => url.includes(p))
|
||||
}
|
||||
|
||||
export function parseSubFromJwt(token: string): string {
|
||||
if (!token || token.split('.').length < 2) return ''
|
||||
try {
|
||||
const payload = token.split('.')[1]
|
||||
const b64 = payload.replace(/-/g, '+').replace(/_/g, '/')
|
||||
const pad = '='.repeat((4 - (b64.length % 4)) % 4)
|
||||
const json = atob(b64 + pad)
|
||||
const obj = JSON.parse(json)
|
||||
return String(obj?.sub || '')
|
||||
} catch {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
|
||||
export async function refreshAccessTokenOnce(): Promise<void> {
|
||||
if (refreshPromise) return refreshPromise
|
||||
|
||||
refreshPromise = (async () => {
|
||||
const userStore = useUserStore()
|
||||
const rt = userStore.refreshToken
|
||||
if (!rt) throw new Error('NO_REFRESH_TOKEN')
|
||||
|
||||
const res = await fetchRefreshToken(rt)
|
||||
userStore.setToken(res.token, res.refreshToken)
|
||||
})().finally(() => {
|
||||
refreshPromise = null
|
||||
})
|
||||
|
||||
return refreshPromise
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 添加请求队列类型(供 index.ts 使用)**
|
||||
|
||||
在同一文件导出:
|
||||
|
||||
```typescript
|
||||
type RetryFn = () => Promise<unknown>
|
||||
const pendingRetries: RetryFn[] = []
|
||||
|
||||
export function enqueueAfterRefresh(fn: RetryFn): Promise<unknown> {
|
||||
return new Promise((resolve, reject) => {
|
||||
pendingRetries.push(async () => {
|
||||
try {
|
||||
resolve(await fn())
|
||||
} catch (e) {
|
||||
reject(e)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
export async function flushPendingRetries(): Promise<void> {
|
||||
const fns = pendingRetries.splice(0, pendingRetries.length)
|
||||
for (const fn of fns) {
|
||||
await fn()
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
(实现时可改为「刷新成功后逐个 resolve 队列」,与 `index.ts` 协调,避免过度设计。)
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 接入 HTTP 拦截器
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/http/index.ts`
|
||||
|
||||
- [ ] **Step 1: 扩展 `ExtendedAxiosRequestConfig`**
|
||||
|
||||
```typescript
|
||||
interface ExtendedAxiosRequestConfig extends AxiosRequestConfig {
|
||||
showErrorMessage?: boolean
|
||||
showSuccessMessage?: boolean
|
||||
_skipTokenRefresh?: boolean
|
||||
_retriedAfterRefresh?: boolean
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 抽取 `tryRefreshAndRetry`**
|
||||
|
||||
在 `handleUnauthorizedError` 之前新增:
|
||||
|
||||
```typescript
|
||||
async function tryRefreshAndRetry(
|
||||
config: ExtendedAxiosRequestConfig,
|
||||
message?: string
|
||||
): Promise<AxiosResponse | never> {
|
||||
const userStore = useUserStore()
|
||||
if (config._skipTokenRefresh || shouldSkipTokenRefresh(config.url)) {
|
||||
return handleUnauthorizedError(message)
|
||||
}
|
||||
if (!userStore.refreshToken) {
|
||||
return handleUnauthorizedError(message)
|
||||
}
|
||||
if (config._retriedAfterRefresh) {
|
||||
return handleUnauthorizedError(message)
|
||||
}
|
||||
|
||||
await refreshAccessTokenOnce()
|
||||
config._retriedAfterRefresh = true
|
||||
return axiosInstance.request(config)
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 修改响应成功拦截器**
|
||||
|
||||
当 `code === ApiStatus.unauthorized` 时,若可刷新则 `return tryRefreshAndRetry(response.config, msg)`,否则 `handleUnauthorizedError`。
|
||||
|
||||
注意:`response.config` 需转为 `InternalAxiosRequestConfig` 并保留原 `data`。
|
||||
|
||||
- [ ] **Step 4: 修改响应错误拦截器**
|
||||
|
||||
`error.response?.status === 401` 时同样调用 `tryRefreshAndRetry(error.config, ...)`。
|
||||
|
||||
- [ ] **Step 5: refresh 专用调用**
|
||||
|
||||
`fetchRefreshToken` 内部 request 走同一 axios 时,为 refresh 请求设置 `_skipTokenRefresh: true`(在 auth.ts 的 request 配置传入,需 api 层支持透传;或在 `token-refresh.ts` 用裸 axios 调 `/web/auth/refresh-token` 并手动带加密逻辑)。
|
||||
|
||||
**推荐最小实现:** 在 `getEncryptSkipReason` 或请求 config 上,对 `refresh-token` URL 设置 `_skipTokenRefresh`,且 refresh 失败不进入 `tryRefreshAndRetry`。
|
||||
|
||||
- [ ] **Step 6: 单飞并发验证**
|
||||
|
||||
本地 `ACCESS_TOKEN_EXPIRE_MINUTES=1`,登录后等待过期,快速点击多个菜单,Network 中 `refresh-token` 仅 1 次。
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 加密场景 userId 后备
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/http/index.ts` — `resolveUserId`
|
||||
|
||||
- [ ] **Step 1: accessToken 无 sub 时用 refreshToken 解 sub**
|
||||
|
||||
```typescript
|
||||
function resolveUserId(userStore: ReturnType<typeof useUserStore>): string {
|
||||
const info = userStore.info || ({} as any)
|
||||
const fromInfo = String(info.id || info.userId || '')
|
||||
if (fromInfo) return fromInfo
|
||||
const fromAccess = parseUserIdFromToken(userStore.accessToken)
|
||||
if (fromAccess) return fromAccess
|
||||
return parseSubFromJwt(userStore.refreshToken)
|
||||
}
|
||||
```
|
||||
|
||||
(`parseSubFromJwt` 从 `token-refresh.ts` 导入。)
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 文档与配置说明
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/.env.example`
|
||||
- Modify: `backend/README.md`(可选一句)
|
||||
|
||||
- [ ] **Step 1: 在 `.env.example` JWT 段补充**
|
||||
|
||||
```env
|
||||
# Access Token 有效期(分钟)。过短会导致频繁走 refresh;建议生产 120+。
|
||||
# Refresh Token / Redis 会话均为 7 天,需前端自动 refresh(web-admin 已实现)。
|
||||
# ACCESS_TOKEN_EXPIRE_MINUTES=120
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 回归测试清单
|
||||
|
||||
- [ ] 正常登录 → 列表加载
|
||||
- [ ] Access 过期 + Refresh 有效 → 自动续期
|
||||
- [ ] Refresh 无效 → 登出 + 提示
|
||||
- [ ] 登录页 / 登出接口不触发 refresh
|
||||
- [ ] 生产加密开关 ON 时 refresh 成功
|
||||
- [ ] 修复前「操作中突然 token 无效」场景复测
|
||||
|
||||
---
|
||||
|
||||
## Self-Review(计划 vs 设计)
|
||||
|
||||
| 设计要求 | 对应任务 |
|
||||
|----------|----------|
|
||||
| 401 被动刷新 + 单飞 | Task 2, 3 |
|
||||
| 修复 body 传参 | Task 1 |
|
||||
| 防死循环 | Task 3 `_skipTokenRefresh` / `_retriedAfterRefresh` |
|
||||
| 加密 userId | Task 4 |
|
||||
| 多 Tab 首期不处理 | 设计文档已说明,无任务 |
|
||||
| 方案 C 后端滑动会话 | 未纳入本期(可选后续) |
|
||||
|
||||
---
|
||||
|
||||
## Execution Handoff
|
||||
|
||||
Plan complete: `docs/superpowers/plans/2026-05-20-web-token-auto-refresh.md`
|
||||
|
||||
**执行方式:**
|
||||
|
||||
1. **Subagent-Driven** — 每 Task 独立子代理 + 步骤间审查(推荐)
|
||||
2. **Inline Execution** — 本会话按 Task 顺序实现,检查点人工确认
|
||||
|
||||
设计文档:`docs/superpowers/specs/2026-05-20-web-token-auto-refresh-design.md` — 请先审阅设计,再按本计划落地。
|
||||
@@ -1,913 +0,0 @@
|
||||
# 细胞产品库字段重设计 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 为细胞产品库新增代次、冻存日期、预计细胞数量、活性字段,重新定义状态枚举,实现产品编码自动生成,产品图片改为上传方式,新增查看弹窗。
|
||||
|
||||
**Architecture:** 后端在现有 Model/Schema/CRUD/API 层增量修改;前端全面重写 cell-product/index.vue 页面(表格列、搜索栏、新增/编辑弹窗、查看弹窗)。编码生成采用实时自增模式(参考 `_generate_work_order_no`)。
|
||||
|
||||
**Tech Stack:** Python 3.9 + FastAPI + SQLAlchemy + Pydantic v2(后端);Vue 3 + TypeScript + Element Plus + Tailwind CSS 4(前端)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-21-cell-product-library-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| 操作 | 文件路径 | 职责 |
|
||||
|------|---------|------|
|
||||
| 新增 | `docs/sql/2026-05-21-cell-product-alter.sql` | 数据库迁移:新增 4 字段 + 更新状态默认值 |
|
||||
| 修改 | `backend/app/models/models.py` (BizCellProduct 类, L2122-2149) | 新增 4 个 Column,更新 product_status 默认值 |
|
||||
| 修改 | `backend/app/schemas/cell_product.py` | Create/Update schema 新增字段 + 状态校验 |
|
||||
| 修改 | `backend/app/crud/cell_product.py` | _row_to_dict 新增映射 + create/update 新增字段 + 新增 get_next_code |
|
||||
| 修改 | `backend/app/api/production.py` (L1550-1632) | 新增 next-code 端点 + update 端点增加状态校验 |
|
||||
| 修改 | `web-admin/src/api/cell-product.ts` | 新增 fetchNextCellProductCode 接口 |
|
||||
| 重写 | `web-admin/src/views/production/cell-product/index.vue` | 表格列 + 搜索 + 弹窗 + 查看弹窗 全面重写 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 数据库迁移 SQL
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/2026-05-21-cell-product-alter.sql`
|
||||
|
||||
- [ ] **Step 1: 编写 ALTER TABLE SQL**
|
||||
|
||||
```sql
|
||||
-- 细胞产品库字段重设计迁移
|
||||
-- 日期: 2026-05-21
|
||||
|
||||
-- 1. 新增 4 个业务字段(放在 storage_slot_id 之后,product_status 之前)
|
||||
ALTER TABLE biz_cell_product
|
||||
ADD COLUMN `passage` VARCHAR(8) DEFAULT NULL COMMENT '代次(P1~P8)' AFTER `storage_slot_id`,
|
||||
ADD COLUMN `freeze_date` DATETIME DEFAULT NULL COMMENT '冻存日期' AFTER `passage`,
|
||||
ADD COLUMN `expected_cell_count` DECIMAL(18,4) DEFAULT NULL COMMENT '预计细胞数量(单位:亿)' AFTER `freeze_date`,
|
||||
ADD COLUMN `viability` DECIMAL(5,2) DEFAULT NULL COMMENT '活性(百分比,0~100)' AFTER `expected_cell_count`;
|
||||
|
||||
-- 2. 更新 product_status 默认值和注释
|
||||
ALTER TABLE biz_cell_product
|
||||
MODIFY COLUMN `product_status` VARCHAR(16) DEFAULT 'frozen' COMMENT '状态: frozen已冻存/sold已售卖/used已使用';
|
||||
|
||||
-- 3. 迁移旧状态数据(如有)
|
||||
UPDATE biz_cell_product SET product_status = 'frozen' WHERE product_status = 'zk';
|
||||
UPDATE biz_cell_product SET product_status = 'sold' WHERE product_status = 'yc';
|
||||
UPDATE biz_cell_product SET product_status = 'used' WHERE product_status = 'ysy';
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库执行 SQL(由 DBA 或手动执行)**
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add docs/sql/2026-05-21-cell-product-alter.sql
|
||||
git commit -m "feat(cell-product): add migration SQL for new fields and status enum"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 后端 Model 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (BizCellProduct 类, 约第 2122-2149 行)
|
||||
|
||||
- [ ] **Step 1: 在 BizCellProduct 类中新增 4 个 Column,更新 product_status 默认值**
|
||||
|
||||
在 `storage_slot_id` 行之后、`product_status` 行之前插入新字段,同时更新 `product_status` 默认值:
|
||||
|
||||
```python
|
||||
# 在 storage_slot_id 行之后新增:
|
||||
passage = Column(String(8), nullable=True, comment="代次(P1~P8)")
|
||||
freeze_date = Column(DateTime, nullable=True, comment="冻存日期")
|
||||
expected_cell_count = Column(Numeric(18, 4), nullable=True, comment="预计细胞数量(单位:亿)")
|
||||
viability = Column(Numeric(5, 2), nullable=True, comment="活性(百分比,0~100)")
|
||||
|
||||
# 修改 product_status 行:
|
||||
product_status = Column(String(16), nullable=True, default="frozen", comment="产品状态 frozen已冻存/sold已售卖/used已使用")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizCellProduct; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py
|
||||
git commit -m "feat(cell-product): add passage, freeze_date, expected_cell_count, viability columns to model"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 后端 Schema 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/schemas/cell_product.py`
|
||||
|
||||
- [ ] **Step 1: 更新 CellProductCreate、CellProductUpdate、CellProductListQuery**
|
||||
|
||||
完整替换 `backend/app/schemas/cell_product.py`:
|
||||
|
||||
```python
|
||||
from pydantic import BaseModel, field_validator
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
|
||||
|
||||
class CellProductCreate(BaseModel):
|
||||
product_code: str
|
||||
product_name: str
|
||||
product_type_id: Optional[str] = None
|
||||
spec_id: Optional[str] = None
|
||||
batch_no: Optional[str] = None
|
||||
storage_slot_id: Optional[str] = None
|
||||
passage: Optional[str] = None
|
||||
freeze_date: Optional[datetime] = None
|
||||
expected_cell_count: Optional[float] = None
|
||||
viability: Optional[float] = None
|
||||
product_status: Optional[str] = 'frozen'
|
||||
source_type: Optional[str] = 'manual'
|
||||
quantity: Optional[float] = None
|
||||
unit: Optional[str] = None
|
||||
expiry_date: Optional[datetime] = None
|
||||
product_images: Optional[str] = None
|
||||
remark: Optional[str] = None
|
||||
|
||||
@field_validator('viability')
|
||||
@classmethod
|
||||
def validate_viability(cls, v):
|
||||
if v is not None and (v < 0 or v > 100):
|
||||
raise ValueError('活性必须在 0~100 之间')
|
||||
return v
|
||||
|
||||
@field_validator('passage')
|
||||
@classmethod
|
||||
def validate_passage(cls, v):
|
||||
if v is not None:
|
||||
valid = {f'P{i}' for i in range(1, 9)}
|
||||
if v.upper() not in valid:
|
||||
raise ValueError('代次必须为 P1~P8')
|
||||
return v.upper()
|
||||
return v
|
||||
|
||||
|
||||
class CellProductUpdate(BaseModel):
|
||||
product_name: Optional[str] = None
|
||||
product_type_id: Optional[str] = None
|
||||
spec_id: Optional[str] = None
|
||||
batch_no: Optional[str] = None
|
||||
storage_slot_id: Optional[str] = None
|
||||
passage: Optional[str] = None
|
||||
freeze_date: Optional[datetime] = None
|
||||
expected_cell_count: Optional[float] = None
|
||||
viability: Optional[float] = None
|
||||
product_status: Optional[str] = None
|
||||
quantity: Optional[float] = None
|
||||
unit: Optional[str] = None
|
||||
expiry_date: Optional[datetime] = None
|
||||
product_images: Optional[str] = None
|
||||
remark: Optional[str] = None
|
||||
|
||||
@field_validator('viability')
|
||||
@classmethod
|
||||
def validate_viability(cls, v):
|
||||
if v is not None and (v < 0 or v > 100):
|
||||
raise ValueError('活性必须在 0~100 之间')
|
||||
return v
|
||||
|
||||
@field_validator('passage')
|
||||
@classmethod
|
||||
def validate_passage(cls, v):
|
||||
if v is not None:
|
||||
valid = {f'P{i}' for i in range(1, 9)}
|
||||
if v.upper() not in valid:
|
||||
raise ValueError('代次必须为 P1~P8')
|
||||
return v.upper()
|
||||
return v
|
||||
|
||||
@field_validator('product_status')
|
||||
@classmethod
|
||||
def validate_status(cls, v):
|
||||
if v is not None and v not in ('frozen', 'sold', 'used'):
|
||||
raise ValueError('状态必须为 frozen/sold/used')
|
||||
return v
|
||||
|
||||
|
||||
class CellProductListQuery(BaseModel):
|
||||
page: int = 1
|
||||
page_size: int = 20
|
||||
product_code: Optional[str] = None
|
||||
product_name: Optional[str] = None
|
||||
product_type_id: Optional[str] = None
|
||||
product_status: Optional[str] = None
|
||||
passage: Optional[str] = None
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.schemas.cell_product import CellProductCreate, CellProductUpdate; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/schemas/cell_product.py
|
||||
git commit -m "feat(cell-product): update schemas with new fields, status validation, and passage validator"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 后端 CRUD 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/cell_product.py`
|
||||
|
||||
- [ ] **Step 1: 更新 `_row_to_dict` 新增 4 个字段映射**
|
||||
|
||||
在 `_row_to_dict` 函数中,在 `"storageSlotId"` 之后新增:
|
||||
|
||||
```python
|
||||
"passage": c.passage or "",
|
||||
"freezeDate": c.freeze_date.strftime("%Y-%m-%d %H:%M:%S") if c.freeze_date else "",
|
||||
"expectedCellCount": float(c.expected_cell_count) if c.expected_cell_count is not None else None,
|
||||
"viability": float(c.viability) if c.viability is not None else None,
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 `create_cell_product` 新增字段写入**
|
||||
|
||||
在 `create_cell_product` 函数的 `BizCellProduct(...)` 构造中,在 `storage_slot_id=` 之后新增:
|
||||
|
||||
```python
|
||||
passage=(data.passage or "").strip() or None if hasattr(data, "passage") and data.passage else None,
|
||||
freeze_date=data.freeze_date if hasattr(data, "freeze_date") else None,
|
||||
expected_cell_count=data.expected_cell_count if hasattr(data, "expected_cell_count") else None,
|
||||
viability=data.viability if hasattr(data, "viability") else None,
|
||||
```
|
||||
|
||||
同时更新 `product_status` 默认值:
|
||||
```python
|
||||
product_status=data.product_status or "frozen",
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 更新 `update_cell_product` 新增字段处理 + 状态校验**
|
||||
|
||||
在 `update_cell_product` 函数中,在 `storage_slot_id` 处理之后新增:
|
||||
|
||||
```python
|
||||
if hasattr(data, "passage") and data.passage is not None:
|
||||
obj.passage = (data.passage or "").strip() or None
|
||||
if hasattr(data, "freeze_date") and data.freeze_date is not None:
|
||||
obj.freeze_date = data.freeze_date
|
||||
if hasattr(data, "expected_cell_count") and data.expected_cell_count is not None:
|
||||
obj.expected_cell_count = data.expected_cell_count
|
||||
if hasattr(data, "viability") and data.viability is not None:
|
||||
obj.viability = data.viability
|
||||
```
|
||||
|
||||
在 `product_status` 处理处增加状态流转校验:
|
||||
|
||||
```python
|
||||
if data.product_status is not None and data.product_status != obj.product_status:
|
||||
# 状态流转校验:只允许 frozen → sold/used,不可回退,不可互转
|
||||
allowed = {"frozen": {"sold", "used"}}
|
||||
from_status = obj.product_status
|
||||
to_status = data.product_status
|
||||
if from_status not in allowed or to_status not in allowed[from_status]:
|
||||
raise ValueError(f"不允许从状态 {from_status} 变更为 {to_status}")
|
||||
obj.product_status = data.product_status
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 新增 `get_next_code` 方法**
|
||||
|
||||
在文件末尾 `total_pages` 函数之前新增:
|
||||
|
||||
```python
|
||||
def get_next_code(db: Session, tenant_no: str) -> str:
|
||||
"""生成下一个产品编码: CP + YYYYMMDD + 6位序列号"""
|
||||
today_str = datetime.now().strftime("%Y%m%d")
|
||||
prefix = f"CP{today_str}"
|
||||
last = (
|
||||
db.query(BizCellProduct)
|
||||
.filter(
|
||||
BizCellProduct.tenant_no == tenant_no,
|
||||
BizCellProduct.product_code.like(f"{prefix}%"),
|
||||
BizCellProduct.del_flag == 0,
|
||||
)
|
||||
.order_by(BizCellProduct.product_code.desc())
|
||||
.first()
|
||||
)
|
||||
seq = 1
|
||||
if last and last.product_code:
|
||||
try:
|
||||
seq = int(last.product_code[-6:]) + 1
|
||||
except (ValueError, IndexError):
|
||||
seq = 1
|
||||
return f"{prefix}{seq:06d}"
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 更新 `list_cell_products` 支持 passage 筛选**
|
||||
|
||||
在 `list_cell_products` 函数签名中新增 `passage` 参数,在筛选逻辑中新增:
|
||||
|
||||
```python
|
||||
passage: Optional[str] = None,
|
||||
```
|
||||
|
||||
在 `product_status` 筛选之后新增:
|
||||
|
||||
```python
|
||||
if passage:
|
||||
q0 = q0.filter(BizCellProduct.passage == passage)
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud.cell_product import get_next_code, list_cell_products; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 7: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/cell_product.py
|
||||
git commit -m "feat(cell-product): update CRUD with new fields, status validation, next-code generation"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 后端 API 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/production.py` (约第 1550-1632 行)
|
||||
|
||||
- [ ] **Step 1: 新增 `GET /cell-products/next-code` 端点**
|
||||
|
||||
在 `list_cell_products` 端点(`@router.get("/cell-products")`)**之前**新增:
|
||||
|
||||
```python
|
||||
@router.get("/cell-products/next-code")
|
||||
async def get_next_cell_product_code(
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
code = cell_product_svc.get_next_code(db, tenant_no)
|
||||
return success_response({"code": code})
|
||||
```
|
||||
|
||||
**重要**: 此端点必须放在 `/cell-products` 之前(FastAPI 路由匹配顺序),否则 `{product_id}` 会匹配到 `next-code`。
|
||||
|
||||
- [ ] **Step 2: 更新 `list_cell_products` 端点新增 passage 参数**
|
||||
|
||||
在端点签名中新增:
|
||||
|
||||
```python
|
||||
passage: Optional[str] = None,
|
||||
```
|
||||
|
||||
在调用 `cell_product_svc.list_cell_products` 时新增参数:
|
||||
|
||||
```python
|
||||
passage=passage,
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证 API 启动无报错**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.api.production import router; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 4: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/production.py
|
||||
git commit -m "feat(cell-product): add next-code endpoint and passage filter to list API"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 前端 API 层更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/cell-product.ts`
|
||||
|
||||
- [ ] **Step 1: 新增 `fetchNextCellProductCode` 接口**
|
||||
|
||||
在文件末尾新增:
|
||||
|
||||
```typescript
|
||||
export function fetchNextCellProductCode() {
|
||||
return request.get<{ code: string }>({ url: '/web/admin/cell-products/next-code' })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/cell-product.ts
|
||||
git commit -m "feat(cell-product): add fetchNextCellProductCode API"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 前端页面全面重写
|
||||
|
||||
**Files:**
|
||||
- Rewrite: `web-admin/src/views/production/cell-product/index.vue`
|
||||
|
||||
**参考模板**: `src/views/system/order/index.vue`(复杂列表模式)
|
||||
**参考组件**: `src/views/cell-storage/protocol/ProtocolFormDialog.vue`(附件上传卡片样式)
|
||||
**下拉数据来源**:
|
||||
- 产品类型: `fetchCellProductTypeList` from `@/api/admin`
|
||||
- 规格: `fetchCellProductSpecList` from `@/api/admin`
|
||||
- 储物格: `fetchStorageSlotList` from `@/api/admin`
|
||||
- 代次: 前端硬编码 P1~P8
|
||||
|
||||
- [ ] **Step 1: 重写 `<template>` 部分**
|
||||
|
||||
主要改动点:
|
||||
1. **搜索栏**: 新增代次下拉筛选(P1~P8),状态选项改为 frozen/sold/used
|
||||
2. **表格列**: 新增代次、预计细胞数量(亿)、活性(%) 三列;状态 Tag 映射更新
|
||||
3. **新增/编辑弹窗**: 新增代次(下拉 P1~P8)、冻存日期(日期选择器)、预计细胞数量(数字输入)、活性(数字输入 0~100)、状态(编辑时可选);产品图片改为上传方式;产品编码新增时自动填充可编辑、编辑时只读
|
||||
4. **查看弹窗**: SystemViewDialog 新增代次、冻存日期、预计细胞数量、活性字段
|
||||
|
||||
**搜索栏状态选项更新**:
|
||||
```html
|
||||
<el-option label="已冻存" value="frozen" />
|
||||
<el-option label="已售卖" value="sold" />
|
||||
<el-option label="已使用" value="used" />
|
||||
```
|
||||
|
||||
**新增代次搜索筛选项**:
|
||||
```html
|
||||
<el-form-item label="代次">
|
||||
<el-select v-model="searchForm.passage" placeholder="全部" clearable style="width: 100%">
|
||||
<el-option v-for="i in 8" :key="i" :label="`P${i}`" :value="`P${i}`" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
**表格新增列**(插在批次号之后、储物格位置之后):
|
||||
```html
|
||||
<el-table-column prop="passage" label="代次" width="80" align="center" />
|
||||
<el-table-column prop="expectedCellCount" label="预计细胞数量(亿)" min-width="140" align="center">
|
||||
<template #default="{ row }">
|
||||
{{ row.expectedCellCount ?? '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="viability" label="活性(%)" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
{{ row.viability != null ? row.viability : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
**状态 Tag 映射更新**:
|
||||
```typescript
|
||||
function productStatusTag(status: string) {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
frozen: { label: '已冻存', type: 'success' },
|
||||
sold: { label: '已售卖', type: 'warning' },
|
||||
used: { label: '已使用', type: 'info' },
|
||||
}
|
||||
return map[status] || { label: status, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
**表单新增字段**(在储物格之后插入新行):
|
||||
```html
|
||||
<el-form-item label="代次" prop="passage">
|
||||
<el-select v-model="formData.passage" placeholder="请选择代次" clearable style="width: 100%">
|
||||
<el-option v-for="i in 8" :key="i" :label="`P${i}`" :value="`P${i}`" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="预计细胞数量(亿)" prop="expectedCellCount">
|
||||
<el-input-number v-model="formData.expectedCellCount" :min="0" :precision="4" controls-position="right" style="width: 100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="活性(%)" prop="viability">
|
||||
<el-input-number v-model="formData.viability" :min="0" :max="100" :precision="1" controls-position="right" style="width: 100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="冻存日期" prop="freezeDate">
|
||||
<el-date-picker v-model="formData.freezeDate" type="date" placeholder="请选择冻存日期" value-format="YYYY-MM-DD" style="width: 100%" />
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
**状态字段(编辑时)**:
|
||||
```html
|
||||
<el-form-item v-if="isEdit" label="状态" prop="productStatus">
|
||||
<el-select v-model="formData.productStatus" :disabled="formData.productStatus !== 'frozen'" style="width: 100%">
|
||||
<el-option label="已冻存" value="frozen" :disabled="true" />
|
||||
<el-option label="已售卖" value="sold" />
|
||||
<el-option label="已使用" value="used" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
**产品编码字段**(新增时可编辑,编辑时只读):
|
||||
```html
|
||||
<el-form-item label="产品编码" prop="productCode">
|
||||
<el-input v-model="formData.productCode" placeholder="自动生成,可修改" :readonly="isEdit" />
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
**产品图片改为上传方式**(参考 ProtocolFormDialog 附件上传卡片样式):
|
||||
|
||||
```html
|
||||
<el-form-item label="产品图片" class="form-col-span-2">
|
||||
<div class="image-upload">
|
||||
<div class="image-list">
|
||||
<el-upload
|
||||
ref="imageUploadRef"
|
||||
:auto-upload="false"
|
||||
:show-file-list="false"
|
||||
:multiple="true"
|
||||
accept="image/*"
|
||||
@change="handleImageChange"
|
||||
>
|
||||
<div class="upload-card">
|
||||
<el-icon :size="28" color="#10b981"><Plus /></el-icon>
|
||||
<span class="upload-card-text">上传图片</span>
|
||||
</div>
|
||||
</el-upload>
|
||||
<div
|
||||
v-for="(img, index) in imageList"
|
||||
:key="img.id || index"
|
||||
class="image-item"
|
||||
>
|
||||
<div class="image-preview" @click="handlePreviewImage(img)">
|
||||
<el-image :src="img.fileUrl" fit="cover" class="preview-img" />
|
||||
</div>
|
||||
<div class="image-footer">
|
||||
<span class="image-name">{{ img.fileName }}</span>
|
||||
<div class="image-actions">
|
||||
<el-icon class="action-icon" @click="handleDeleteImage(index)"><Close /></el-icon>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 重写 `<script setup>` 部分**
|
||||
|
||||
主要改动点:
|
||||
1. **import 新增**: `fetchNextCellProductCode` from `@/api/cell-product`;`fetchCellProductTypeList, fetchCellProductSpecList, fetchStorageSlotList` from `@/api/admin`;`fetchUploadAttachment` from `@/api/business`
|
||||
2. **formData 新增字段**: `passage`, `freezeDate`, `expectedCellCount`, `viability`, `productStatus`
|
||||
3. **searchForm 新增**: `passage`
|
||||
4. **下拉数据加载**: `onMounted` 中调用三个下拉接口填充 `productTypeOptions`、`specOptions`、`storageSlotOptions`
|
||||
5. **产品编码自动生成**: `handleAdd` 中调用 `fetchNextCellProductCode` 填充
|
||||
6. **图片上传**: 新增 `imageList` ref、`handleImageChange`、`handleDeleteImage`、`handlePreviewImage`
|
||||
7. **查看弹窗 sections**: 新增代次、冻存日期、预计细胞数量、活性字段
|
||||
8. **编辑时填充新字段**: `handleEdit` 中填充 passage/freezeDate/expectedCellCount/viability/productStatus
|
||||
9. **提交 payload**: 包含新字段
|
||||
10. **图片列表与 formData.productImages 的同步**: 上传/删除时同步更新逗号分隔 URL 字符串
|
||||
|
||||
**下拉数据加载**:
|
||||
```typescript
|
||||
async function loadOptions() {
|
||||
try {
|
||||
const [typeRes, specRes, slotRes] = await Promise.all([
|
||||
fetchCellProductTypeList({ page: 1, pageSize: 999 }),
|
||||
fetchCellProductSpecList({ page: 1, pageSize: 999 }),
|
||||
fetchStorageSlotList(),
|
||||
])
|
||||
productTypeOptions.value = (typeRes as any)?.list || []
|
||||
specOptions.value = (specRes as any)?.list || []
|
||||
storageSlotOptions.value = Array.isArray(slotRes) ? slotRes : (slotRes as any)?.list || []
|
||||
} catch { /* 静默 */ }
|
||||
}
|
||||
```
|
||||
|
||||
**编码自动生成**:
|
||||
```typescript
|
||||
async function handleAdd() {
|
||||
isEdit.value = false
|
||||
dialogTitle.value = '新增产品'
|
||||
resetForm()
|
||||
dialogVisible.value = true
|
||||
formRef.value?.clearValidate?.()
|
||||
// 自动生成编码
|
||||
try {
|
||||
const res = await fetchNextCellProductCode()
|
||||
formData.productCode = res.code || ''
|
||||
} catch { /* 静默 */ }
|
||||
}
|
||||
```
|
||||
|
||||
**图片上传处理**:
|
||||
```typescript
|
||||
const imageList = ref<Array<{ id: string; fileName: string; fileUrl: string; _uploading?: boolean }>>([])
|
||||
|
||||
async function handleImageChange(uploadFile: any) {
|
||||
const file = uploadFile.raw || uploadFile
|
||||
if (!file) return
|
||||
if (file.size / 1024 / 1024 > 10) {
|
||||
ElMessage.error('图片大小不能超过 10MB')
|
||||
return
|
||||
}
|
||||
const tempId = `temp_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`
|
||||
imageList.value.push({ id: tempId, fileName: file.name, fileUrl: '', _uploading: true })
|
||||
const idx = imageList.value.length - 1
|
||||
try {
|
||||
const fd = new FormData()
|
||||
fd.append('folder', 'cell-product')
|
||||
fd.append('file', file)
|
||||
const res = await fetchUploadAttachment(fd)
|
||||
imageList.value[idx] = { id: res.id, fileName: res.fileName, fileUrl: res.fileUrl, _uploading: false }
|
||||
} catch {
|
||||
imageList.value.splice(idx, 1)
|
||||
ElMessage.error('图片上传失败')
|
||||
}
|
||||
}
|
||||
|
||||
function handleDeleteImage(index: number) {
|
||||
imageList.value.splice(index, 1)
|
||||
}
|
||||
|
||||
function handlePreviewImage(img: any) {
|
||||
if (img.fileUrl) window.open(img.fileUrl, '_blank')
|
||||
}
|
||||
|
||||
// 同步图片 URL 到 formData
|
||||
function syncImagesToForm() {
|
||||
formData.productImages = imageList.value.map((img) => img.fileUrl).filter(Boolean).join(',')
|
||||
}
|
||||
|
||||
// 从 formData.productImages 还原 imageList
|
||||
function syncFormToImages(imagesStr: string) {
|
||||
if (!imagesStr) { imageList.value = []; return }
|
||||
imageList.value = imagesStr.split(',').filter(Boolean).map((url, i) => ({
|
||||
id: `img_${i}`,
|
||||
fileName: url.split('/').pop() || `图片${i + 1}`,
|
||||
fileUrl: url,
|
||||
}))
|
||||
}
|
||||
```
|
||||
|
||||
**查看弹窗 sections 更新**:
|
||||
```typescript
|
||||
const viewSections = computed(() => {
|
||||
if (!viewRow.value) return []
|
||||
const row = viewRow.value
|
||||
return [
|
||||
{
|
||||
title: '基本信息',
|
||||
fields: [
|
||||
{ label: '产品编码', value: row.productCode },
|
||||
{ label: '产品名称', value: row.productName },
|
||||
{ label: '产品类型', value: row.productTypeName || '—' },
|
||||
{ label: '规格', value: row.specName || '—' },
|
||||
{ label: '代次', value: row.passage || '—' },
|
||||
{ label: '批次号', value: row.batchNo },
|
||||
{ label: '储物格位置', value: row.storageSlotName || '—' },
|
||||
{ label: '预计细胞数量(亿)', value: row.expectedCellCount ?? '—' },
|
||||
{ label: '活性(%)', value: row.viability != null ? row.viability : '—' },
|
||||
{ label: '数量', value: row.quantity ?? '—' },
|
||||
{ label: '单位', value: row.unit || '—' },
|
||||
{ label: '冻存日期', value: row.freezeDate || '—' },
|
||||
{ label: '有效期', value: row.expiryDate || '—' },
|
||||
{
|
||||
label: '状态',
|
||||
value: productStatusTag(row.productStatus).label,
|
||||
tagType: productStatusTag(row.productStatus).type,
|
||||
},
|
||||
{ label: '备注', value: row.remark || '—', span: true },
|
||||
],
|
||||
},
|
||||
]
|
||||
})
|
||||
```
|
||||
|
||||
**提交时同步图片**:
|
||||
```typescript
|
||||
async function handleSubmit() {
|
||||
await formRef.value?.validate?.()
|
||||
submitLoading.value = true
|
||||
try {
|
||||
syncImagesToForm()
|
||||
const payload = {
|
||||
productCode: formData.productCode.trim(),
|
||||
productName: formData.productName.trim(),
|
||||
productTypeId: formData.productTypeId || undefined,
|
||||
specId: formData.specId || undefined,
|
||||
batchNo: formData.batchNo.trim(),
|
||||
storageSlotId: formData.storageSlotId || undefined,
|
||||
passage: formData.passage || undefined,
|
||||
freezeDate: formData.freezeDate || undefined,
|
||||
expectedCellCount: formData.expectedCellCount ?? undefined,
|
||||
viability: formData.viability ?? undefined,
|
||||
productStatus: isEdit.value ? formData.productStatus || undefined : 'frozen',
|
||||
quantity: formData.quantity,
|
||||
unit: formData.unit?.trim() || undefined,
|
||||
expiryDate: formData.expiryDate || undefined,
|
||||
productImages: formData.productImages?.trim() || undefined,
|
||||
remark: formData.remark?.trim() || undefined,
|
||||
}
|
||||
if (isEdit.value && editingId.value) {
|
||||
await fetchUpdateCellProduct(editingId.value, payload)
|
||||
} else {
|
||||
await fetchCreateCellProduct(payload)
|
||||
}
|
||||
ElMessage.success(isEdit.value ? '更新成功' : '创建成功')
|
||||
dialogVisible.value = false
|
||||
await loadData()
|
||||
} catch {
|
||||
/* 校验或接口错误已由全局处理 */
|
||||
} finally {
|
||||
submitLoading.value = false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
**编辑时填充新字段**(在 `handleEdit` 中):
|
||||
```typescript
|
||||
formData.passage = row.passage || ''
|
||||
formData.freezeDate = row.freezeDate || ''
|
||||
formData.expectedCellCount = row.expectedCellCount ?? undefined
|
||||
formData.viability = row.viability ?? undefined
|
||||
formData.productStatus = row.productStatus || 'frozen'
|
||||
syncFormToImages(row.productImages || '')
|
||||
```
|
||||
|
||||
**resetForm 新增字段重置**:
|
||||
```typescript
|
||||
function resetForm() {
|
||||
// ...existing fields...
|
||||
formData.passage = ''
|
||||
formData.freezeDate = ''
|
||||
formData.expectedCellCount = undefined
|
||||
formData.viability = undefined
|
||||
formData.productStatus = 'frozen'
|
||||
imageList.value = []
|
||||
editingId.value = null
|
||||
}
|
||||
```
|
||||
|
||||
**搜索参数传递更新**(在 `loadData` 中):
|
||||
```typescript
|
||||
const res = await fetchCellProductList({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
keyword: searchForm.keyword || undefined,
|
||||
productStatus: searchForm.productStatus || undefined,
|
||||
passage: searchForm.passage || undefined,
|
||||
})
|
||||
```
|
||||
|
||||
注意:需更新 `fetchCellProductList` 的 params 类型以支持 `productStatus` 和 `passage`。
|
||||
|
||||
- [ ] **Step 3: 编写 `<style>` 部分(图片上传卡片样式)**
|
||||
|
||||
在现有样式基础上新增图片上传卡片样式(参考 ProtocolFormDialog):
|
||||
|
||||
```scss
|
||||
.image-upload {
|
||||
.image-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.upload-card {
|
||||
width: 140px;
|
||||
height: 96px;
|
||||
border: 2px dashed #a7f3d0;
|
||||
border-radius: 8px;
|
||||
background: #f0fdf4;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
transition: border-color 0.2s;
|
||||
&:hover {
|
||||
border-color: #10b981;
|
||||
}
|
||||
.upload-card-text {
|
||||
margin-top: 4px;
|
||||
font-size: 12px;
|
||||
color: #64748b;
|
||||
}
|
||||
}
|
||||
|
||||
.image-item {
|
||||
width: 140px;
|
||||
border: 1px solid #e2e8f0;
|
||||
border-radius: 8px;
|
||||
overflow: hidden;
|
||||
transition: border-color 0.2s;
|
||||
&:hover {
|
||||
border-color: #10b981;
|
||||
}
|
||||
}
|
||||
|
||||
.image-preview {
|
||||
width: 140px;
|
||||
height: 68px;
|
||||
background: #f8fafc;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
.preview-img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.image-footer {
|
||||
padding: 4px 8px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.image-name {
|
||||
font-size: 11px;
|
||||
color: #64748b;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
max-width: 90px;
|
||||
}
|
||||
.action-icon {
|
||||
cursor: pointer;
|
||||
color: #94a3b8;
|
||||
&:hover { color: #ef4444; }
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 更新 `fetchCellProductList` 参数类型**
|
||||
|
||||
修改 `web-admin/src/api/cell-product.ts` 中的参数类型:
|
||||
|
||||
```typescript
|
||||
export function fetchCellProductList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
productStatus?: string
|
||||
passage?: string
|
||||
}) {
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 验证前端编译无报错**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: 构建成功
|
||||
|
||||
- [ ] **Step 6: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/cell-product/index.vue web-admin/src/api/cell-product.ts
|
||||
git commit -m "feat(cell-product): rewrite page with new fields, image upload, view dialog, and status lifecycle"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 更新知识图谱
|
||||
|
||||
**Files:**
|
||||
- 执行: `./scripts/update-graph.sh all`
|
||||
|
||||
- [ ] **Step 1: 更新前后端知识图谱**
|
||||
|
||||
Run: `./scripts/update-graph.sh all`
|
||||
Expected: 图谱更新成功
|
||||
|
||||
- [ ] **Step 2: 提交图谱更新**
|
||||
|
||||
```bash
|
||||
git add backend/graphify-out/ web-admin/graphify-out/
|
||||
git commit -m "chore: update knowledge graphs after cell-product redesign"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Self-Review Checklist
|
||||
|
||||
### 1. Spec Coverage
|
||||
| Spec 需求 | 对应 Task |
|
||||
|-----------|----------|
|
||||
| 代次 P1~P8 下拉 | Task 2(Model) + Task 3(Schema) + Task 7(Frontend) |
|
||||
| 冻存日期 | Task 2 + Task 3 + Task 7 |
|
||||
| 预计细胞数量(亿) | Task 2 + Task 3 + Task 7 |
|
||||
| 活性(%) 0~100 | Task 2 + Task 3(Schema validator) + Task 7 |
|
||||
| 状态 frozen/sold/used | Task 1(SQL) + Task 2(Model) + Task 3(Schema) + Task 4(CRUD validation) + Task 7(Frontend) |
|
||||
| 产品编码自动生成 CP+YYYYMMDD+6位 | Task 4(get_next_code) + Task 5(API) + Task 6(Frontend API) + Task 7(handleAdd) |
|
||||
| 产品图片上传 | Task 7(Frontend image upload + SCSS) |
|
||||
| 查看弹窗 | Task 7(viewSections) |
|
||||
| 状态单向流转 | Task 4(update_cell_product status validation) |
|
||||
| 下拉数据来源(类型/规格/储物格) | Task 7(loadOptions) |
|
||||
| 搜索筛选(关键词+状态+代次) | Task 4(list_cell_products passage filter) + Task 5(API) + Task 7 |
|
||||
|
||||
### 2. Placeholder Scan
|
||||
- 无 TBD/TODO
|
||||
- 所有代码步骤均包含完整代码
|
||||
|
||||
### 3. Type Consistency
|
||||
- `passage`: Model `String(8)` → Schema `Optional[str]` → CRUD `str` → Frontend `string`
|
||||
- `freeze_date`: Model `DateTime` → Schema `Optional[datetime]` → Frontend `string(YYYY-MM-DD)`
|
||||
- `expected_cell_count`: Model `Numeric(18,4)` → Schema `Optional[float]` → CRUD `float()` → Frontend `number`
|
||||
- `viability`: Model `Numeric(5,2)` → Schema `Optional[float]` (validator 0~100) → Frontend `number`
|
||||
- `product_status`: Model `String(16) default='frozen'` → Schema `Optional[str]` (validator) → Frontend `string`
|
||||
- `_row_to_dict` 输出 camelCase key 与前端 formData 一致
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,843 +0,0 @@
|
||||
# 入库放行审核 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在质检任务菜单下新增"入库放行审核"功能,实现样本级别的放行审核和入库操作。
|
||||
|
||||
**Architecture:** 新建独立审核表 `biz_storage_release_review`,在样本接收完成时自动创建审核记录。后端新建完整的 Model → Schema → CRUD → API 路由链路。前端参照 `protocol-audit` 模式构建列表页 + 查看弹窗 + 审核弹窗。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy + Pydantic v2(后端),Vue 3 + Element Plus + TypeScript(前端)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-23-storage-release-review-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| 操作 | 文件路径 | 职责 |
|
||||
|------|----------|------|
|
||||
| 新增 | `docs/sql/biz_storage_release_review.sql` | DDL + 菜单 SQL |
|
||||
| 修改 | `backend/app/models/models.py` | 新增 BizStorageReleaseReview 模型 |
|
||||
| 新增 | `backend/app/schemas/storage_release_review.py` | Pydantic schemas |
|
||||
| 新增 | `backend/app/crud/storage_release_review.py` | CRUD + 聚合查询 |
|
||||
| 新增 | `backend/app/api/storage_release_review.py` | API 路由 |
|
||||
| 修改 | `backend/app/api/__init__.py` | 注册新路由 |
|
||||
| 修改 | `backend/app/main.py` | 注册新路由 |
|
||||
| 修改 | `backend/app/crud/sample_reception.py` | 接收完成时自动创建审核记录 |
|
||||
| 新增 | `web-admin/src/api/storage-release-review.ts` | 前端 API 模块 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/index.vue` | 列表页 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseViewDialog.vue` | 查看弹窗 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseReviewDialog.vue` | 审核弹窗 |
|
||||
| 修改 | `web-admin/src/router/modules/sqxp.ts` | 添加路由 |
|
||||
| 修改 | `web-admin/src/utils/status-tag-registry.ts` | 注册状态标签 |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: SQL DDL + 菜单 SQL
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/biz_storage_release_review.sql`
|
||||
|
||||
- [ ] **Step 1: 创建 SQL 文件**
|
||||
|
||||
创建 `docs/sql/biz_storage_release_review.sql`,包含建表 DDL 和菜单插入语句:
|
||||
|
||||
```sql
|
||||
-- 入库放行审核表
|
||||
CREATE TABLE `biz_storage_release_review` (
|
||||
`id` VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
`sample_code` VARCHAR(64) NOT NULL COMMENT '样本编码(关联键)',
|
||||
`reception_source` VARCHAR(32) NOT NULL COMMENT '来源:cell_storage=采集/research_donation=捐赠',
|
||||
`protocol_id` VARCHAR(64) DEFAULT NULL COMMENT '协议单ID',
|
||||
`reception_id` VARCHAR(64) DEFAULT NULL COMMENT '样本接收记录ID',
|
||||
`protocol_no` VARCHAR(64) DEFAULT NULL COMMENT '协议编号',
|
||||
`sample_name` VARCHAR(128) DEFAULT NULL COMMENT '样本名称',
|
||||
`review_conclusion` VARCHAR(16) DEFAULT NULL COMMENT '审核结论:tg=通过/btg=不通过/NULL=待审核',
|
||||
`review_remark` VARCHAR(512) DEFAULT NULL COMMENT '审核备注',
|
||||
`review_attachments` VARCHAR(4000) DEFAULT NULL COMMENT '审核附件(逗号分隔URL)',
|
||||
`review_by` VARCHAR(64) DEFAULT NULL COMMENT '审核人ID',
|
||||
`review_by_name` VARCHAR(64) DEFAULT NULL COMMENT '审核人姓名',
|
||||
`review_time` DATETIME DEFAULT NULL COMMENT '审核时间',
|
||||
`storage_status` VARCHAR(16) NOT NULL DEFAULT 'drk' COMMENT '入库状态:drk=待入库/yrk=已入库',
|
||||
`storage_by` VARCHAR(64) DEFAULT NULL COMMENT '入库操作人ID',
|
||||
`storage_by_name` VARCHAR(64) DEFAULT NULL COMMENT '入库操作人姓名',
|
||||
`storage_time` DATETIME DEFAULT NULL COMMENT '入库时间',
|
||||
`tenant_no` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
`order_num` INT(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` VARCHAR(64) DEFAULT NULL COMMENT '创建人ID',
|
||||
`create_dept_id` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` VARCHAR(64) DEFAULT NULL COMMENT '更新人ID',
|
||||
`update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` TINYINT(4) NOT NULL DEFAULT 0 COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_srr_sample` (`tenant_no`, `sample_code`, `del_flag`),
|
||||
KEY `idx_srr_protocol` (`tenant_no`, `protocol_id`, `del_flag`),
|
||||
KEY `idx_srr_status` (`tenant_no`, `review_conclusion`, `storage_status`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='入库放行审核';
|
||||
```
|
||||
|
||||
菜单 SQL 需要在 `sys_menu` 表中插入一条记录,参照现有质检任务子菜单的 ID 规则(如 `70000000000000000000000000000008` 为质检任务)。新菜单 ID 使用 `70000000000000000000000000000011`(递增),parent_id 为质量检测节点 `70000000000000000000000000000001`。
|
||||
|
||||
- [ ] **Step 2: 在数据库中执行建表语句**
|
||||
|
||||
在开发环境的 MySQL 中执行 DDL,确认表创建成功。
|
||||
|
||||
- [ ] **Step 3: 验证**
|
||||
|
||||
Run: 检查表是否创建成功
|
||||
```sql
|
||||
SHOW CREATE TABLE biz_storage_release_review;
|
||||
```
|
||||
Expected: 表结构正确,索引存在
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model(SQLAlchemy)
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py`
|
||||
|
||||
**模板参照:** 同文件中 `BizProtocolAudit` 类(line 743-761)
|
||||
|
||||
- [ ] **Step 1: 在 models.py 中新增 BizStorageReleaseReview 模型**
|
||||
|
||||
在 `BizProtocolAudit` 类定义之后(约 line 762)添加:
|
||||
|
||||
```python
|
||||
class BizStorageReleaseReview(Base):
|
||||
"""入库放行审核 biz_storage_release_review"""
|
||||
|
||||
__tablename__ = "biz_storage_release_review"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
sample_code = Column(String(64), nullable=False, comment="样本编码")
|
||||
reception_source = Column(String(32), nullable=False, comment="来源:cell_storage/research_donation")
|
||||
protocol_id = Column(String(64), nullable=True, comment="协议单ID")
|
||||
reception_id = Column(String(64), nullable=True, comment="样本接收记录ID")
|
||||
protocol_no = Column(String(64), nullable=True, comment="协议编号")
|
||||
sample_name = Column(String(128), nullable=True, comment="样本名称")
|
||||
review_conclusion = Column(String(16), nullable=True, comment="审核结论:tg/btg/NULL")
|
||||
review_remark = Column(String(512), nullable=True, comment="审核备注")
|
||||
review_attachments = Column(String(4000), nullable=True, comment="审核附件(逗号分隔URL)")
|
||||
review_by = Column(String(64), nullable=True, comment="审核人ID")
|
||||
review_by_name = Column(String(64), nullable=True, comment="审核人姓名")
|
||||
review_time = Column(DateTime, nullable=True, comment="审核时间")
|
||||
storage_status = Column(String(16), nullable=False, default="drk", comment="入库状态:drk/yrk")
|
||||
storage_by = Column(String(64), nullable=True, comment="入库操作人ID")
|
||||
storage_by_name = Column(String(64), nullable=True, comment="入库操作人姓名")
|
||||
storage_time = Column(DateTime, nullable=True, comment="入库时间")
|
||||
tenant_no = Column(String(64), nullable=False, default="", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人ID")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人ID")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && python -c "from app.models.models import BizStorageReleaseReview; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 Schema(Pydantic)
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/schemas/storage_release_review.py`
|
||||
|
||||
**模板参照:** 同目录下的其他 schema 文件,如 `order.py`(含 Base/Create/Update/Response 模式)
|
||||
|
||||
- [ ] **Step 1: 创建 Schema 文件**
|
||||
|
||||
创建 `backend/app/schemas/storage_release_review.py`,包含:
|
||||
|
||||
```python
|
||||
"""入库放行审核 Pydantic schemas"""
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
class StorageReleaseReviewBase(BaseModel):
|
||||
sample_code: str = Field(..., description="样本编码")
|
||||
reception_source: str = Field(..., description="来源:cell_storage/research_donation")
|
||||
protocol_id: Optional[str] = Field(None, description="协议单ID")
|
||||
reception_id: Optional[str] = Field(None, description="样本接收记录ID")
|
||||
protocol_no: Optional[str] = Field(None, description="协议编号")
|
||||
sample_name: Optional[str] = Field(None, description="样本名称")
|
||||
|
||||
|
||||
class StorageReleaseReviewListQuery(BaseModel):
|
||||
"""列表查询参数"""
|
||||
page: int = Field(1, ge=1)
|
||||
pageSize: int = Field(20, ge=1, le=200)
|
||||
reception_source: Optional[str] = Field(None, description="来源筛选")
|
||||
review_conclusion: Optional[str] = Field(None, description="审核结论筛选")
|
||||
storage_status: Optional[str] = Field(None, description="入库状态筛选")
|
||||
keyword: Optional[str] = Field(None, description="关键词搜索")
|
||||
|
||||
|
||||
class ReviewSubmitBody(BaseModel):
|
||||
"""审核提交请求体"""
|
||||
review_conclusion: str = Field(..., description="审核结论:tg/btg")
|
||||
review_remark: Optional[str] = Field(None, description="审核备注")
|
||||
review_attachments: Optional[str] = Field(None, description="审核附件(逗号分隔URL)")
|
||||
|
||||
|
||||
class BatchReviewBody(BaseModel):
|
||||
"""批量审核请求体"""
|
||||
ids: List[str] = Field(..., description="审核记录ID列表")
|
||||
review_conclusion: str = Field(..., description="审核结论:tg/btg")
|
||||
review_remark: Optional[str] = Field(None, description="审核备注")
|
||||
review_attachments: Optional[str] = Field(None, description="审核附件(逗号分隔URL)")
|
||||
|
||||
|
||||
class BatchStoreBody(BaseModel):
|
||||
"""批量入库请求体"""
|
||||
ids: List[str] = Field(..., description="入库记录ID列表")
|
||||
|
||||
|
||||
class StorageReleaseReviewListItem(BaseModel):
|
||||
"""列表项"""
|
||||
id: str
|
||||
sample_code: str
|
||||
reception_source: str
|
||||
protocol_no: Optional[str] = None
|
||||
sample_name: Optional[str] = None
|
||||
review_conclusion: Optional[str] = None
|
||||
review_remark: Optional[str] = None
|
||||
review_attachments: Optional[str] = None
|
||||
review_by_name: Optional[str] = None
|
||||
review_time: Optional[datetime] = None
|
||||
storage_status: str = "drk"
|
||||
storage_by_name: Optional[str] = None
|
||||
storage_time: Optional[datetime] = None
|
||||
create_time: Optional[datetime] = None
|
||||
|
||||
|
||||
class StorageReleaseReviewDetail(BaseModel):
|
||||
"""详情(含聚合信息)"""
|
||||
review: Dict[str, Any] = {}
|
||||
protocol_info: Optional[Dict[str, Any]] = None
|
||||
transport_info: Optional[Dict[str, Any]] = None
|
||||
reception_info: Optional[Dict[str, Any]] = None
|
||||
qc_info: Optional[Dict[str, Any]] = None
|
||||
production_info: Optional[Dict[str, Any]] = None
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证导入无错误**
|
||||
|
||||
Run: `cd backend && python -c "from app.schemas.storage_release_review import StorageReleaseReviewBase; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 CRUD
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/storage_release_review.py`
|
||||
|
||||
**模板参照:**
|
||||
- `backend/app/crud/qc_work_order.py` — 跨表聚合查询模式(含 `_RECEPTION_SOURCE_LABELS`、`urls_to_attachment_list`)
|
||||
- `backend/app/crud/sample_reception.py` — 租户隔离 + 分页模式(`_page_payload`)
|
||||
|
||||
- [ ] **Step 1: 创建 CRUD 文件**
|
||||
|
||||
创建 `backend/app/crud/storage_release_review.py`,实现以下函数:
|
||||
|
||||
```python
|
||||
"""入库放行审核 CRUD"""
|
||||
from __future__ import annotations
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from sqlalchemy import and_, func, or_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.utils import generate_uuid
|
||||
from app.models.models import (
|
||||
BizStorageReleaseReview,
|
||||
BizSampleReception,
|
||||
BizCollectionProtocol,
|
||||
BizProtocolSample,
|
||||
BizProtocolSampleTransport,
|
||||
BizProtocolPartyCustomer,
|
||||
BizQcWorkOrder,
|
||||
BizQcTask,
|
||||
BizProductionWorkOrder,
|
||||
BizProductionTask,
|
||||
SysUser,
|
||||
)
|
||||
from app.models.research_donation import (
|
||||
BizResearchDonation,
|
||||
BizResearchDonationSample,
|
||||
BizResearchDonationSampleTransport,
|
||||
BizResearchDonationParty,
|
||||
)
|
||||
```
|
||||
|
||||
**核心函数清单:**
|
||||
|
||||
1. `create_review_from_reception(db, *, reception, protocol_no, sample_name, tenant_no, user_id, create_dept_id) -> BizStorageReleaseReview`
|
||||
- 在样本接收完成时调用
|
||||
- INSERT 一条新记录,review_conclusion=NULL, storage_status='drk'
|
||||
- 冗余写入 sample_code, reception_source, protocol_id, reception_id, protocol_no, sample_name
|
||||
|
||||
2. `list_reviews(db, *, tenant_no, page, page_size, reception_source=None, review_conclusion=None, storage_status=None, keyword=None) -> dict`
|
||||
- 分页查询 `biz_storage_release_review`
|
||||
- 支持筛选和关键词搜索(protocol_no / sample_code / sample_name)
|
||||
- 默认排序 create_time DESC
|
||||
- 返回 `{list, total, page, pageSize, totalPages}` 格式
|
||||
|
||||
3. `get_review_detail(db, review_id, tenant_no) -> dict`
|
||||
- 聚合查询全链路信息
|
||||
- 根据 reception_source JOIN 不同的协议表和运输表
|
||||
- JOIN sample_reception 获取接收信息
|
||||
- JOIN qc_work_order + qc_task 获取质检信息
|
||||
- JOIN production_work_order + production_task 获取生产信息
|
||||
- 返回结构: `{review, protocol_info, transport_info, reception_info, qc_info, production_info}`
|
||||
|
||||
4. `submit_review(db, review_id, *, review_conclusion, review_remark, review_attachments, tenant_no, user_id) -> dict`
|
||||
- 验证记录存在 + 租户隔离
|
||||
- UPDATE review_conclusion, review_remark, review_attachments, review_by, review_by_name, review_time
|
||||
- 支持反复修改
|
||||
|
||||
5. `batch_submit_review(db, ids, *, review_conclusion, review_remark, review_attachments, tenant_no, user_id) -> dict`
|
||||
- 批量 UPDATE,逐条处理
|
||||
- 返回成功数量
|
||||
|
||||
6. `store_sample(db, review_id, *, tenant_no, user_id) -> dict`
|
||||
- 前置条件:review_conclusion='tg' AND storage_status='drk'
|
||||
- UPDATE storage_status='yrk', storage_by, storage_by_name, storage_time
|
||||
- 同步 UPDATE biz_protocol_sample.sample_status='yrk'(仅采集协议,通过 sample_code + tenant_no 关联)
|
||||
|
||||
7. `batch_store_samples(db, ids, *, tenant_no, user_id) -> dict`
|
||||
- 批量入库,逐条检查前置条件
|
||||
- 返回成功/失败数量
|
||||
|
||||
**辅助函数:**
|
||||
|
||||
```python
|
||||
_RECEPTION_SOURCE_LABELS = {"cell_storage": "采集协议", "research_donation": "捐赠协议"}
|
||||
_CONCLUSION_LABELS = {"tg": "通过", "btg": "不通过"}
|
||||
_STORAGE_STATUS_LABELS = {"drk": "待入库", "yrk": "已入库"}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证导入无错误**
|
||||
|
||||
Run: `cd backend && python -c "from app.crud.storage_release_review import list_reviews; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 后端 API 路由
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/storage_release_review.py`
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
**模板参照:** `backend/app/api/sample_reception.py` — 路由定义模式、`_get_tenant_no`、`_get_current_user_id`、`success_response`、`error_response`、`_page_payload`
|
||||
|
||||
- [ ] **Step 1: 创建 API 路由文件**
|
||||
|
||||
创建 `backend/app/api/storage_release_review.py`,参照 `sample_reception.py` 的模式:
|
||||
|
||||
```python
|
||||
"""入库放行审核 API"""
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.database import get_db
|
||||
from app.core.auth import require_admin_or_super_admin
|
||||
from app.schemas.storage_release_review import (
|
||||
ReviewSubmitBody,
|
||||
BatchReviewBody,
|
||||
BatchStoreBody,
|
||||
)
|
||||
from app.crud import storage_release_review as svc
|
||||
# ... 导入辅助函数
|
||||
|
||||
router = APIRouter(prefix="/storage-release-reviews", tags=["入库放行审核"])
|
||||
```
|
||||
|
||||
**端点清单:**
|
||||
|
||||
```python
|
||||
@router.get("")
|
||||
async def list_storage_release_reviews(
|
||||
page: int = Query(1), pageSize: int = Query(20),
|
||||
reception_source: str = Query(None),
|
||||
review_conclusion: str = Query(None),
|
||||
storage_status: str = Query(None),
|
||||
keyword: str = Query(None),
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""分页列表"""
|
||||
...
|
||||
|
||||
@router.get("/{review_id}/detail")
|
||||
async def get_storage_release_review_detail(
|
||||
review_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""详情(聚合全链路)"""
|
||||
...
|
||||
|
||||
@router.post("/{review_id}/review")
|
||||
async def submit_review(
|
||||
review_id: str, body: ReviewSubmitBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""提交/修改审核"""
|
||||
...
|
||||
|
||||
@router.post("/batch-review")
|
||||
async def batch_review(
|
||||
body: BatchReviewBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""批量审核"""
|
||||
...
|
||||
|
||||
@router.post("/{review_id}/store")
|
||||
async def store_sample(
|
||||
review_id: str,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""样本入库"""
|
||||
...
|
||||
|
||||
@router.post("/batch-store")
|
||||
async def batch_store(
|
||||
body: BatchStoreBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
):
|
||||
"""批量入库"""
|
||||
...
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 注册路由**
|
||||
|
||||
修改 `backend/app/api/__init__.py`:
|
||||
```python
|
||||
from app.api.storage_release_review import router as storage_release_review_router
|
||||
# 添加到 __all__ 列表
|
||||
```
|
||||
|
||||
修改 `backend/app/main.py`:
|
||||
```python
|
||||
# 导入行添加
|
||||
from app.api import ..., storage_release_review_router
|
||||
# 注册行添加
|
||||
app.include_router(storage_release_review_router, prefix=settings.API_V1_PREFIX)
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证路由注册成功**
|
||||
|
||||
Run: `cd backend && python -c "from app.main import app; routes = [r.path for r in app.routes if hasattr(r, 'path')]; print([r for r in routes if 'storage' in r])"`
|
||||
Expected: 包含 `/api/storage-release-reviews` 相关路径
|
||||
|
||||
- [ ] **Step 4: 验证 Swagger 文档**
|
||||
|
||||
启动后端服务,访问 `/docs`,确认"入库放行审核"分组下有 6 个端点。
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 后端触发器 — 样本接收时自动创建审核记录
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/sample_reception.py`
|
||||
|
||||
**修改位置:** `create_sample_reception` 函数中,`conclusion == "js"` 分支内(约 line 784-802),在创建 QC 工单和生产工单之后添加审核记录创建逻辑。
|
||||
|
||||
- [ ] **Step 1: 在 sample_reception.py 的 create_sample_reception 函数中添加触发逻辑**
|
||||
|
||||
在 line 802(`prod_wo_svc.create_production_work_order_from_reception(...)` 之后)添加:
|
||||
|
||||
```python
|
||||
# 自动创建入库放行审核记录
|
||||
from app.crud import storage_release_review as srr_svc
|
||||
|
||||
# 获取协议编号和样本名称
|
||||
_protocol_no = ""
|
||||
_sample_name = ""
|
||||
if source == "cell_storage":
|
||||
cp = (
|
||||
db.query(BizCollectionProtocol)
|
||||
.filter(BizCollectionProtocol.id == collection_protocol_id)
|
||||
.first()
|
||||
)
|
||||
if cp:
|
||||
_protocol_no = cp.protocol_no or ""
|
||||
if sample:
|
||||
_sample_name = sample.sample_name or sample.sample_code or ""
|
||||
else:
|
||||
rd = (
|
||||
db.query(BizResearchDonation)
|
||||
.filter(BizResearchDonation.id == _research_donation_id)
|
||||
.first()
|
||||
)
|
||||
if rd:
|
||||
_protocol_no = rd.protocol_no or ""
|
||||
if dsample:
|
||||
_sample_name = dsample.sample_name or dsample.sample_code or ""
|
||||
|
||||
srr_svc.create_review_from_reception(
|
||||
db,
|
||||
reception=obj,
|
||||
protocol_no=_protocol_no,
|
||||
sample_name=_sample_name,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=create_dept_id or "",
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证**
|
||||
|
||||
Run: `cd backend && python -c "from app.crud.sample_reception import create_sample_reception; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端 API 模块
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/api/storage-release-review.ts`
|
||||
|
||||
**模板参照:** `web-admin/src/api/qc-task.ts` 或 `web-admin/src/api/collection-protocol.ts`
|
||||
|
||||
- [ ] **Step 1: 创建前端 API 文件**
|
||||
|
||||
创建 `web-admin/src/api/storage-release-review.ts`:
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/request'
|
||||
|
||||
const BASE = '/api/admin/storage-release-reviews'
|
||||
|
||||
/** 分页列表 */
|
||||
export function fetchStorageReleaseReviewList(params: {
|
||||
page: number
|
||||
pageSize: number
|
||||
receptionSource?: string
|
||||
reviewConclusion?: string
|
||||
storageStatus?: string
|
||||
keyword?: string
|
||||
}) {
|
||||
return request({ url: BASE, method: 'get', params })
|
||||
}
|
||||
|
||||
/** 详情(聚合全链路) */
|
||||
export function fetchStorageReleaseReviewDetail(id: string) {
|
||||
return request({ url: `${BASE}/${id}/detail`, method: 'get' })
|
||||
}
|
||||
|
||||
/** 提交/修改审核 */
|
||||
export function submitStorageReleaseReview(
|
||||
id: string,
|
||||
data: {
|
||||
reviewConclusion: string
|
||||
reviewRemark?: string
|
||||
reviewAttachments?: string
|
||||
},
|
||||
) {
|
||||
return request({ url: `${BASE}/${id}/review`, method: 'post', data })
|
||||
}
|
||||
|
||||
/** 批量审核 */
|
||||
export function batchReviewStorageRelease(data: {
|
||||
ids: string[]
|
||||
reviewConclusion: string
|
||||
reviewRemark?: string
|
||||
reviewAttachments?: string
|
||||
}) {
|
||||
return request({ url: `${BASE}/batch-review`, method: 'post', data })
|
||||
}
|
||||
|
||||
/** 样本入库 */
|
||||
export function storeSample(id: string) {
|
||||
return request({ url: `${BASE}/${id}/store`, method: 'post' })
|
||||
}
|
||||
|
||||
/** 批量入库 */
|
||||
export function batchStoreSample(data: { ids: string[] }) {
|
||||
return request({ url: `${BASE}/batch-store`, method: 'post', data })
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端状态标签注册
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/status-tag-registry.ts`
|
||||
|
||||
- [ ] **Step 1: 添加入库放行审核的状态标签**
|
||||
|
||||
在 `status-tag-registry.ts` 中新增:
|
||||
|
||||
```typescript
|
||||
// 入库放行审核结论
|
||||
storageReleaseConclusion: {
|
||||
tg: { label: '通过', type: 'success' },
|
||||
btg: { label: '不通过', type: 'danger' },
|
||||
} as Record<string, { label: string; type: string }>,
|
||||
|
||||
// 入库状态
|
||||
storageStatus: {
|
||||
drk: { label: '待入库', type: 'warning' },
|
||||
yrk: { label: '已入库', type: 'success' },
|
||||
} as Record<string, { label: string; type: string }>,
|
||||
```
|
||||
|
||||
同时添加协议类别标签:
|
||||
|
||||
```typescript
|
||||
// 协议类别
|
||||
receptionSource: {
|
||||
cell_storage: { label: '采集协议', type: 'primary' },
|
||||
research_donation: { label: '捐赠协议', type: 'success' },
|
||||
} as Record<string, { label: string; type: string }>,
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 前端列表页
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/quality-inspection/storage-release-review/index.vue`
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
**模板参照(严格遵循):**
|
||||
- `web-admin/src/views/cell-storage/protocol-audit/index.vue` — 列表页结构(筛选 + 多选 + 批量审核工具栏)
|
||||
- `web-admin/src/views/quality-inspection/qc-task/index.vue` — 质检任务列表(状态标签、操作按钮条件显示)
|
||||
- `web-admin/src/views/system/unit/index.vue` — 标准列表页模板
|
||||
|
||||
**UI 规范约束(来自 AGENTS.md):**
|
||||
- 列表面板标题用 `panel-top` + `h2.title-bar-heading`,显示绿色竖线
|
||||
- 工具栏:"已选 N 项"在前,然后主操作按钮(只有一个 `type="primary"`),不用 `space-between`
|
||||
- 表格操作列 `fixed="right"`,`min-width >= 260px`
|
||||
- 状态字段用 `<el-tag>` + 语义颜色
|
||||
- 排序字段默认不展示
|
||||
|
||||
- [ ] **Step 1: 在 sqxp.ts 中添加路由**
|
||||
|
||||
在质量检测(QualityInspection)路由组的 children 数组末尾(`qc-material-usage` 之后)添加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '70000000000000000000000000000011',
|
||||
name: 'QualityInspectionStorageReleaseReview',
|
||||
path: 'storage-release-review',
|
||||
component: '/quality-inspection/storage-release-review/index',
|
||||
meta: {
|
||||
title: '入库放行审核',
|
||||
keepAlive: true,
|
||||
menuCode: 'biz:storageReleaseReview:list',
|
||||
}
|
||||
},
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建列表页组件**
|
||||
|
||||
创建 `web-admin/src/views/quality-inspection/storage-release-review/index.vue`。
|
||||
|
||||
核心结构:
|
||||
|
||||
**筛选区域:**
|
||||
- 协议类别(el-select):全部 / 采集协议(cell_storage) / 捐赠协议(research_donation)
|
||||
- 审核状态(el-select):全部 / 待审核(null) / 通过(tg) / 不通过(btg)
|
||||
- 入库状态(el-select):全部 / 待入库(drk) / 已入库(yrk)
|
||||
- 搜索关键词(el-input)
|
||||
|
||||
**工具栏:**
|
||||
- 已选 N 项
|
||||
- [批量审核](type="primary")
|
||||
- [批量入库](plain)
|
||||
|
||||
**表格列(el-table):**
|
||||
- type=selection
|
||||
- 协议编号 (protocol_no, width=160)
|
||||
- 样本编码 (sample_code, width=140)
|
||||
- 样本名称 (sample_name, width=140)
|
||||
- 协议类别 (reception_source → el-tag: primary/success, width=100)
|
||||
- 审核结论 (review_conclusion → el-tag: null→info"待审核", tg→success, btg→danger, width=100)
|
||||
- 入库状态 (storage_status → el-tag: drk→warning"待入库", yrk→success"已入库", width=100)
|
||||
- 审核人 (review_by_name, width=100)
|
||||
- 审核时间 (review_time, width=170)
|
||||
- 操作 (fixed=right, min-width=260)
|
||||
- [查看] — 始终
|
||||
- [审核] — 始终
|
||||
- [样本入库] — 仅 review_conclusion==='tg' && storage_status==='drk'
|
||||
|
||||
**组件交互:**
|
||||
- 点击[查看] → 打开 `StorageReleaseViewDialog`
|
||||
- 点击[审核] → 打开 `StorageReleaseReviewDialog`
|
||||
- 点击[样本入库] → 确认弹窗 → 调用 `storeSample` API → 刷新列表
|
||||
- 批量审核 → 打开 `StorageReleaseReviewDialog`(批量模式)
|
||||
- 批量入库 → 确认弹窗 → 调用 `batchStoreSample` API → 刷新列表
|
||||
|
||||
- [ ] **Step 3: 验证页面加载**
|
||||
|
||||
启动前端 dev server,访问 `/#/quality-inspection/storage-release-review`,确认页面渲染正常,表格显示。
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 前端查看弹窗
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseViewDialog.vue`
|
||||
|
||||
**模板参照:**
|
||||
- `web-admin/src/components/business/qc-task-view-dialog/index.vue` — 多分区信息展示弹窗
|
||||
- `web-admin/src/components/business/sample-qc-info-cards/index.vue` — QC 信息卡片组件
|
||||
- `web-admin/src/components/business/system-view-dialog/index.vue` — 通用查看弹窗
|
||||
|
||||
**UI 规范约束:**
|
||||
- Dialog forms: `label-position="top"`
|
||||
- 无 backdrop blur (`backdrop-filter: none`)
|
||||
- 使用 `.dialog-form-layout` 布局
|
||||
|
||||
- [ ] **Step 1: 创建查看弹窗组件**
|
||||
|
||||
创建 `StorageReleaseViewDialog.vue`,props:
|
||||
```typescript
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
reviewId: string
|
||||
}>()
|
||||
const emit = defineEmits(['update:visible'])
|
||||
```
|
||||
|
||||
加载详情数据:调用 `fetchStorageReleaseReviewDetail(reviewId)`
|
||||
|
||||
**内部分区(每个分区用 `▎` 标题栏样式):**
|
||||
|
||||
1. **▎基础信息** — 协议编号、协议类别(el-tag)、样本编码、样本名称、客户姓名、联系电话
|
||||
2. **▎运输信息** — 运输方式、运输温度、运输时长、运输公司
|
||||
3. **▎接收信息** — 接收时间、接收人、接收结论(el-tag: js→success/bj→danger)、检查项表格
|
||||
4. **▎质检信息** — 使用 `SampleQcInfoCards` 或自定义卡片展示工单+任务列表
|
||||
5. **▎生产信息** — 生产工单编号、工单状态(el-tag)、任务列表(名称+状态el-tag)
|
||||
6. **▎放行审核** — 审核结论(el-tag)、审核人、审核时间、审核备注、审核附件(预览/下载)
|
||||
|
||||
所有区域只读展示。
|
||||
|
||||
底部按钮:[关闭]
|
||||
|
||||
- [ ] **Step 2: 在列表页中引入并测试**
|
||||
|
||||
在 `index.vue` 中引入 `StorageReleaseViewDialog`,点击[查看]时传入 reviewId 并打开弹窗。
|
||||
|
||||
---
|
||||
|
||||
## Task 11: 前端审核弹窗
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseReviewDialog.vue`
|
||||
|
||||
**模板参照:**
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolAuditDialog.vue` — 审核弹窗模式(结论 radio + 备注 textarea + 批量支持)
|
||||
- `web-admin/src/views/research-donation/list/DonationAuditDialog.vue` — 捐赠审核弹窗(同模式)
|
||||
|
||||
**UI 规范约束:**
|
||||
- Dialog forms: `label-position="top"`
|
||||
- 无 backdrop blur
|
||||
- 附件上传使用卡片化布局
|
||||
|
||||
- [ ] **Step 1: 创建审核弹窗组件**
|
||||
|
||||
创建 `StorageReleaseReviewDialog.vue`,props:
|
||||
```typescript
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
reviewIds: string[] // 支持单条和批量
|
||||
}>()
|
||||
const emit = defineEmits(['update:visible', 'submitted'])
|
||||
```
|
||||
|
||||
**模式切换:**
|
||||
- `reviewIds.length === 1` → 单条模式:上方展示详情信息(同查看弹窗)+ 下方审核表单
|
||||
- `reviewIds.length > 1` → 批量模式:仅显示审核表单
|
||||
|
||||
**审核表单:**
|
||||
- 审核结论: `el-radio-group`
|
||||
- `el-radio value="tg"` 通过
|
||||
- `el-radio value="btg"` 不通过
|
||||
- 备注: `el-input type="textarea" :rows="3"`
|
||||
- 附件: 使用现有上传组件,参照 `ProtocolFinanceConfirmFields` 的模式
|
||||
- 上传触发为卡片(140×96px, 虚线边框 `#a7f3d0`)
|
||||
- inline 排列在已上传附件同一行
|
||||
- 选择文件后立即上传
|
||||
|
||||
底部按钮:[取消] [确定]
|
||||
|
||||
**提交逻辑:**
|
||||
- 单条:调用 `submitStorageReleaseReview(id, data)`
|
||||
- 批量:调用 `batchReviewStorageReview({ ids, ...data })`
|
||||
- 成功后 emit `submitted`,父组件刷新列表
|
||||
|
||||
- [ ] **Step 2: 在列表页中引入并测试**
|
||||
|
||||
在 `index.vue` 中引入 `StorageReleaseReviewDialog`,点击[审核]或[批量审核]时传入 reviewIds 并打开弹窗。
|
||||
|
||||
---
|
||||
|
||||
## Task 12: 端到端验证
|
||||
|
||||
- [ ] **Step 1: 后端 API 验证**
|
||||
|
||||
启动后端,通过 Swagger `/docs` 测试所有 6 个端点:
|
||||
1. GET 列表 — 返回分页数据
|
||||
2. GET 详情 — 返回聚合信息
|
||||
3. POST 审核 — 更新结论
|
||||
4. POST 批量审核 — 批量更新
|
||||
5. POST 入库 — 更新状态
|
||||
6. POST 批量入库 — 批量更新状态
|
||||
|
||||
- [ ] **Step 2: 前端功能验证**
|
||||
|
||||
1. 创建一个采集协议单 → 添加样本 → 样本接收(结论=接收)
|
||||
2. 确认"入库放行审核"列表中出现该样本
|
||||
3. 点击[查看] → 确认所有信息区域正确展示
|
||||
4. 点击[审核] → 填写结论和备注 → 提交 → 确认列表更新
|
||||
5. 点击[样本入库] → 确认状态变为"已入库"
|
||||
6. 测试批量审核和批量入库
|
||||
7. 测试修改已审核的记录
|
||||
|
||||
- [ ] **Step 3: 更新知识图谱**
|
||||
|
||||
Run: `./scripts/update-graph.sh all`
|
||||
Expected: 图谱增量更新完成
|
||||
|
||||
- [ ] **Step 4: 提交**
|
||||
|
||||
```bash
|
||||
git add docs/sql/biz_storage_release_review.sql
|
||||
git add backend/app/models/models.py
|
||||
git add backend/app/schemas/storage_release_review.py
|
||||
git add backend/app/crud/storage_release_review.py
|
||||
git add backend/app/api/storage_release_review.py
|
||||
git add backend/app/api/__init__.py
|
||||
git add backend/app/main.py
|
||||
git add backend/app/crud/sample_reception.py
|
||||
git add web-admin/src/api/storage-release-review.ts
|
||||
git add web-admin/src/views/quality-inspection/storage-release-review/
|
||||
git add web-admin/src/router/modules/sqxp.ts
|
||||
git add web-admin/src/utils/status-tag-registry.ts
|
||||
git commit -m "feat: add storage release review module (入库放行审核)"
|
||||
```
|
||||
@@ -1,729 +0,0 @@
|
||||
# 细胞产品库 — 来源链路展示 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在细胞产品库列表页展示来源信息(来源类型、协议号、工单号、任务号),并在查看弹窗中展示完整的双向溯源链路图(祖先 + 子代)。
|
||||
|
||||
**Architecture:** 后端在现有列表 API 中批量富化来源字段,新增 `/cell-products/{id}/chain` 链路 API。前端列表新增 4 列 + 1 个筛选,查看弹窗新增 `SourceChainGraph.vue` 组件(CSS 绘制横向 DAG)。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy + Pydantic v2(后端),Vue 3 + Element Plus + SCSS(前端)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-24-cell-product-source-chain-design.md`
|
||||
**Demo:** `docs/demo-source-chain-graph.html`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| Action | File | Responsibility |
|
||||
|--------|------|----------------|
|
||||
| Modify | `backend/app/crud/cell_product.py` | 来源富化查询 + 链路递归函数 |
|
||||
| Modify | `backend/app/schemas/cell_product.py` | CellProductListQuery 新增 source_type |
|
||||
| Modify | `backend/app/api/production.py` | 列表路由传 source_type + 新增 chain 路由 |
|
||||
| Modify | `web-admin/src/api/cell-product.ts` | 新增 fetchCellProductChain + list 参数扩展 |
|
||||
| Modify | `web-admin/src/views/production/cell-product/index.vue` | 列表新增列/筛选 + 查看弹窗集成链路图 |
|
||||
| Create | `web-admin/src/views/production/cell-product/SourceChainGraph.vue` | 链路图组件 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 后端 — Schema 新增 source_type 筛选参数
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/schemas/cell_product.py:127-137`
|
||||
|
||||
- [ ] **Step 1: 在 CellProductListQuery 中新增 source_type 字段**
|
||||
|
||||
在 `backend/app/schemas/cell_product.py` 的 `CellProductListQuery` 类末尾追加:
|
||||
|
||||
```python
|
||||
source_type: Optional[str] = Field(None, alias="sourceType")
|
||||
```
|
||||
|
||||
完整的 `CellProductListQuery` 应变为:
|
||||
|
||||
```python
|
||||
class CellProductListQuery(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
page: int = 1
|
||||
page_size: int = Field(20, alias="pageSize")
|
||||
keyword: Optional[str] = None
|
||||
product_code: Optional[str] = Field(None, alias="productCode")
|
||||
product_name: Optional[str] = Field(None, alias="productName")
|
||||
product_type_id: Optional[str] = Field(None, alias="productTypeId")
|
||||
product_status: Optional[str] = Field(None, alias="productStatus")
|
||||
passage: Optional[str] = None
|
||||
source_type: Optional[str] = Field(None, alias="sourceType")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.schemas.cell_product import CellProductListQuery; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 后端 — 列表 API 增加 source_type 筛选
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/production.py:1941-1966`
|
||||
- Modify: `backend/app/crud/cell_product.py:150-208`
|
||||
|
||||
- [ ] **Step 1: API 路由层新增 sourceType 参数**
|
||||
|
||||
在 `backend/app/api/production.py` 的 `list_cell_products` 函数中:
|
||||
1. 在参数列表 `passage` 之后新增:`sourceType: Optional[str] = None,`
|
||||
2. 在 `cell_product_svc.list_cell_products(...)` 调用中新增:`source_type=sourceType,`
|
||||
|
||||
修改后的函数签名和调用:
|
||||
|
||||
```python
|
||||
@router.get("/cell-products")
|
||||
async def list_cell_products(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(10, ge=1, le=100, alias="pageSize"),
|
||||
keyword: Optional[str] = None,
|
||||
productCode: Optional[str] = None,
|
||||
productName: Optional[str] = None,
|
||||
productTypeId: Optional[str] = None,
|
||||
productStatus: Optional[str] = None,
|
||||
passage: Optional[str] = None,
|
||||
sourceType: Optional[str] = None,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = cell_product_svc.list_cell_products(
|
||||
db, tenant_no=tenant_no, page=page, page_size=pageSize,
|
||||
keyword=keyword,
|
||||
product_code=productCode, product_name=productName,
|
||||
product_type_id=productTypeId, product_status=productStatus,
|
||||
passage=passage, source_type=sourceType,
|
||||
user_info=user,
|
||||
)
|
||||
items = result.get("items", [])
|
||||
total = result.get("total", 0)
|
||||
tp = cell_product_svc.total_pages(total, pageSize)
|
||||
return success_response({"list": items, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: CRUD 层 list_cell_products 新增 source_type 过滤**
|
||||
|
||||
在 `backend/app/crud/cell_product.py` 的 `list_cell_products` 函数中:
|
||||
1. 在参数列表 `passage` 之后新增:`source_type: Optional[str] = None,`
|
||||
2. 在 `_filtered()` 内部、`if passage:` 块之后新增:
|
||||
|
||||
```python
|
||||
if source_type:
|
||||
q0 = q0.filter(BizCellProduct.source_type == source_type)
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证无语法错误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud.cell_product import list_cell_products; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 后端 — 列表富化查询新增来源字段
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/cell_product.py:72-142`(`_enrich_product_dicts` 函数)
|
||||
|
||||
- [ ] **Step 1: 在 `_enrich_product_dicts` 中新增来源信息批量富化**
|
||||
|
||||
在 `_enrich_product_dicts` 函数中,在 `slot_map` 查询之后、`for item in items:` 循环之前,新增以下代码块:
|
||||
|
||||
```python
|
||||
# --- 来源信息富化 ---
|
||||
from app.models.models import BizProductionTask, BizProductionWorkOrder
|
||||
|
||||
task_ids = {i.get("productionTaskId") for i in items if i.get("productionTaskId")}
|
||||
task_map: Dict[str, Any] = {}
|
||||
task_to_wo: Dict[str, str] = {}
|
||||
wo_map: Dict[str, Any] = {}
|
||||
|
||||
if task_ids:
|
||||
tasks = (
|
||||
db.query(BizProductionTask)
|
||||
.filter(
|
||||
BizProductionTask.id.in_(task_ids),
|
||||
BizProductionTask.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
for t in tasks:
|
||||
task_map[t.id] = t
|
||||
if t.work_order_id:
|
||||
task_to_wo[t.id] = t.work_order_id
|
||||
|
||||
wo_ids = set(task_to_wo.values())
|
||||
if wo_ids:
|
||||
wos = (
|
||||
db.query(BizProductionWorkOrder)
|
||||
.filter(
|
||||
BizProductionWorkOrder.id.in_(wo_ids),
|
||||
BizProductionWorkOrder.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
wo_map = {w.id: w for w in wos}
|
||||
|
||||
source_type_labels = {"production": "生产入库", "manual": "手动录入"}
|
||||
```
|
||||
|
||||
然后在 `for item in items:` 循环内,在 `item["storageSlotName"] = ...` 之后追加:
|
||||
|
||||
```python
|
||||
# 来源信息
|
||||
src_type = item.get("sourceType", "")
|
||||
item["sourceTypeLabel"] = source_type_labels.get(src_type, src_type or "")
|
||||
tid = item.get("productionTaskId") or ""
|
||||
if tid and tid in task_map:
|
||||
t_obj = task_map[tid]
|
||||
item["sourceTaskNo"] = t_obj.task_no or ""
|
||||
wo_id = task_to_wo.get(tid)
|
||||
if wo_id and wo_id in wo_map:
|
||||
wo_obj = wo_map[wo_id]
|
||||
item["sourceWorkOrderNo"] = wo_obj.work_order_no or ""
|
||||
item["sourceProtocolNo"] = wo_obj.protocol_no or ""
|
||||
item["sourceReceptionSource"] = wo_obj.reception_source or ""
|
||||
else:
|
||||
item["sourceWorkOrderNo"] = ""
|
||||
item["sourceProtocolNo"] = ""
|
||||
item["sourceReceptionSource"] = ""
|
||||
else:
|
||||
item["sourceTaskNo"] = ""
|
||||
item["sourceWorkOrderNo"] = ""
|
||||
item["sourceProtocolNo"] = ""
|
||||
item["sourceReceptionSource"] = ""
|
||||
```
|
||||
|
||||
注意:需要确保 `_row_to_dict` 不需要修改 — 它已经返回 `sourceType` 和 `productionTaskId`,新的富化字段是在 `_enrich_product_dicts` 中动态追加的。
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "from app.crud.cell_product import _enrich_product_dicts; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: 启动后端验证列表 API**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "
|
||||
from app.core.database import SessionLocal
|
||||
from app.crud.cell_product import list_cell_products
|
||||
db = SessionLocal()
|
||||
try:
|
||||
result = list_cell_products(db, tenant_no='zkxw', page=1, page_size=3)
|
||||
for item in result.get('items', []):
|
||||
print(f\"{item.get('productCode')} | src={item.get('sourceTypeLabel')} | proto={item.get('sourceProtocolNo')} | wo={item.get('sourceWorkOrderNo')} | task={item.get('sourceTaskNo')}\")
|
||||
finally:
|
||||
db.close()
|
||||
"`
|
||||
Expected: 每行输出产品编码及来源字段(可能为空字符串)
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 后端 — 新增链路 API
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/cell_product.py`(文件末尾追加)
|
||||
- Modify: `backend/app/api/production.py`(在 `GET /cell-products/{product_id}` 路由之后追加)
|
||||
|
||||
- [ ] **Step 1: 在 `cell_product.py` 末尾新增链路递归查询函数**
|
||||
|
||||
在 `backend/app/crud/cell_product.py` 文件末尾追加:
|
||||
|
||||
```python
|
||||
# ---------------------------------------------------------------------------
|
||||
# 来源链路 API
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
_MAX_CHAIN_DEPTH = 10
|
||||
|
||||
_SOURCE_TYPE_LABELS = {"production": "生产入库", "manual": "手动录入"}
|
||||
|
||||
|
||||
def _product_node(obj: BizCellProduct, is_current: bool = False) -> Dict[str, Any]:
|
||||
return {
|
||||
"id": obj.id,
|
||||
"productCode": obj.product_code or "",
|
||||
"productName": obj.product_name or "",
|
||||
"nodeType": "cell_product",
|
||||
"productStatus": obj.product_status or "",
|
||||
"passage": obj.passage or "",
|
||||
"isCurrent": is_current,
|
||||
}
|
||||
|
||||
|
||||
def _build_ancestor_chain(
|
||||
db: Session, product: BizCellProduct, depth: int
|
||||
) -> List[Dict[str, Any]]:
|
||||
if depth >= _MAX_CHAIN_DEPTH:
|
||||
return []
|
||||
task_id = product.production_task_id
|
||||
if not task_id:
|
||||
return []
|
||||
|
||||
from app.models.models import BizProductionTask, BizProductionWorkOrder
|
||||
from app.models.models import BizProductionTaskInput
|
||||
|
||||
task = (
|
||||
db.query(BizProductionTask)
|
||||
.filter(BizProductionTask.id == task_id, BizProductionTask.del_flag == 0)
|
||||
.first()
|
||||
)
|
||||
if not task:
|
||||
return []
|
||||
|
||||
wo = None
|
||||
edge: Dict[str, Any] = {"workOrderNo": "", "workOrderType": "", "taskNo": task.task_no or "", "taskName": task.task_name or ""}
|
||||
if task.work_order_id:
|
||||
wo = (
|
||||
db.query(BizProductionWorkOrder)
|
||||
.filter(BizProductionWorkOrder.id == task.work_order_id, BizProductionWorkOrder.del_flag == 0)
|
||||
.first()
|
||||
)
|
||||
if wo:
|
||||
edge["workOrderNo"] = wo.work_order_no or ""
|
||||
edge["workOrderType"] = wo.reception_source or ""
|
||||
|
||||
# 检查投入物中是否有父细胞产品
|
||||
parent_input = (
|
||||
db.query(BizProductionTaskInput)
|
||||
.filter(
|
||||
BizProductionTaskInput.task_id == task_id,
|
||||
BizProductionTaskInput.input_type == "cell_product",
|
||||
BizProductionTaskInput.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if parent_input and parent_input.input_id:
|
||||
parent_product = (
|
||||
db.query(BizCellProduct)
|
||||
.filter(BizCellProduct.id == parent_input.input_id, BizCellProduct.del_flag == 0)
|
||||
.first()
|
||||
)
|
||||
if parent_product:
|
||||
return [{"node": _product_node(parent_product), "edge": edge, "parent": _build_ancestor_chain(db, parent_product, depth + 1)}]
|
||||
|
||||
# 检查投入物中是否有样本(终止节点)
|
||||
sample_input = (
|
||||
db.query(BizProductionTaskInput)
|
||||
.filter(
|
||||
BizProductionTaskInput.task_id == task_id,
|
||||
BizProductionTaskInput.input_type == "sample",
|
||||
BizProductionTaskInput.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if sample_input and sample_input.input_id:
|
||||
from app.models.models import BizProtocolSample
|
||||
sample = (
|
||||
db.query(BizProtocolSample)
|
||||
.filter(BizProtocolSample.id == sample_input.input_id, BizProtocolSample.del_flag == 0)
|
||||
.first()
|
||||
)
|
||||
if sample:
|
||||
sample_node = {
|
||||
"id": sample.id,
|
||||
"productCode": sample.sample_code or "",
|
||||
"productName": "",
|
||||
"nodeType": "sample",
|
||||
"sampleCode": sample.sample_code or "",
|
||||
"sampleType": sample.sample_type or "",
|
||||
"isCurrent": False,
|
||||
}
|
||||
return [{"node": sample_node, "edge": edge, "parent": None}]
|
||||
|
||||
return []
|
||||
|
||||
|
||||
def _build_descendant_chain(
|
||||
db: Session, product_id: str, depth: int
|
||||
) -> List[Dict[str, Any]]:
|
||||
if depth >= _MAX_CHAIN_DEPTH:
|
||||
return []
|
||||
|
||||
from app.models.models import BizProductionTaskInput, BizProductionTaskOutput, BizProductionTask, BizProductionWorkOrder
|
||||
|
||||
# 找到引用此产品作为投入物的所有任务
|
||||
input_rows = (
|
||||
db.query(BizProductionTaskInput)
|
||||
.filter(
|
||||
BizProductionTaskInput.input_type == "cell_product",
|
||||
BizProductionTaskInput.input_id == product_id,
|
||||
BizProductionTaskInput.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
if not input_rows:
|
||||
return []
|
||||
|
||||
task_ids = list({r.task_id for r in input_rows})
|
||||
tasks = (
|
||||
db.query(BizProductionTask)
|
||||
.filter(BizProductionTask.id.in_(task_ids), BizProductionTask.del_flag == 0)
|
||||
.all()
|
||||
)
|
||||
task_by_id = {t.id: t for t in tasks}
|
||||
|
||||
wo_ids = list({t.work_order_id for t in tasks if t.work_order_id})
|
||||
wo_by_id: Dict[str, Any] = {}
|
||||
if wo_ids:
|
||||
wos = (
|
||||
db.query(BizProductionWorkOrder)
|
||||
.filter(BizProductionWorkOrder.id.in_(wo_ids), BizProductionWorkOrder.del_flag == 0)
|
||||
.all()
|
||||
)
|
||||
wo_by_id = {w.id: w for w in wos}
|
||||
|
||||
# 对每个任务,找产出
|
||||
result: List[Dict[str, Any]] = []
|
||||
output_rows = (
|
||||
db.query(BizProductionTaskOutput)
|
||||
.filter(
|
||||
BizProductionTaskOutput.task_id.in_(task_ids),
|
||||
BizProductionTaskOutput.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
|
||||
child_product_ids = list({o.cell_product_id for o in output_rows if o.cell_product_id})
|
||||
child_products = {}
|
||||
if child_product_ids:
|
||||
cps = (
|
||||
db.query(BizCellProduct)
|
||||
.filter(BizCellProduct.id.in_(child_product_ids), BizCellProduct.del_flag == 0)
|
||||
.all()
|
||||
)
|
||||
child_products = {cp.id: cp for cp in cps}
|
||||
|
||||
for o in output_rows:
|
||||
cp = child_products.get(o.cell_product_id)
|
||||
if not cp:
|
||||
continue
|
||||
t = task_by_id.get(o.task_id)
|
||||
edge: Dict[str, Any] = {"workOrderNo": "", "workOrderType": "", "taskNo": "", "taskName": ""}
|
||||
if t:
|
||||
edge["taskNo"] = t.task_no or ""
|
||||
edge["taskName"] = t.task_name or ""
|
||||
if t.work_order_id and t.work_order_id in wo_by_id:
|
||||
wo_obj = wo_by_id[t.work_order_id]
|
||||
edge["workOrderNo"] = wo_obj.work_order_no or ""
|
||||
edge["workOrderType"] = wo_obj.reception_source or ""
|
||||
|
||||
result.append({
|
||||
"node": _product_node(cp),
|
||||
"edge": edge,
|
||||
"children": _build_descendant_chain(db, cp.id, depth + 1),
|
||||
})
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def get_product_chain(db: Session, product_id: str, tenant_no: str) -> Optional[Dict[str, Any]]:
|
||||
product = get_cell_product(db, product_id, tenant_no)
|
||||
if not product:
|
||||
return None
|
||||
|
||||
return {
|
||||
"current": _product_node(product, is_current=True),
|
||||
"ancestors": _build_ancestor_chain(db, product, 0),
|
||||
"descendants": _build_descendant_chain(db, product.id, 0),
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 production.py 新增链路路由**
|
||||
|
||||
在 `backend/app/api/production.py` 的 `@router.get("/cell-products/{product_id}")` 路由之后(约 line 1979 之后)追加新路由:
|
||||
|
||||
```python
|
||||
@router.get("/cell-products/{product_id}/chain")
|
||||
async def get_cell_product_chain(
|
||||
product_id: str,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
chain = cell_product_svc.get_product_chain(db, product_id, tenant_no)
|
||||
if not chain:
|
||||
raise HTTPException(status_code=404, detail="细胞产品不存在")
|
||||
return success_response(chain)
|
||||
```
|
||||
|
||||
注意:此路由必须放在 `@router.get("/cell-products/{product_id}")` 之前或之后都可以,因为 FastAPI 按注册顺序匹配,`/cell-products/next-code` 已经在前面。但 `/chain` 是固定路径不会与 `{product_id}` 冲突 — 实际上 `/cell-products/{product_id}/chain` 和 `/cell-products/{product_id}` 是不同的路径模式,不存在冲突。
|
||||
|
||||
- [ ] **Step 3: 验证链路 API**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/backend && source venv/bin/activate && python -c "
|
||||
from app.core.database import SessionLocal
|
||||
from app.crud.cell_product import get_product_chain
|
||||
db = SessionLocal()
|
||||
try:
|
||||
from app.crud.cell_product import list_cell_products
|
||||
prods = list_cell_products(db, tenant_no='zkxw', page=1, page_size=1)
|
||||
items = prods.get('items', [])
|
||||
if items:
|
||||
pid = items[0]['id']
|
||||
chain = get_product_chain(db, pid, 'zkxw')
|
||||
if chain:
|
||||
cur = chain['current']
|
||||
print(f'Current: {cur[\"productCode\"]}')
|
||||
print(f'Ancestors: {len(chain[\"ancestors\"])} levels')
|
||||
print(f'Descendants: {len(chain[\"descendants\"])} branches')
|
||||
else:
|
||||
print('No chain data')
|
||||
else:
|
||||
print('No products found')
|
||||
finally:
|
||||
db.close()
|
||||
"`
|
||||
Expected: 输出当前产品的链路信息(祖先层数和子代分支数)
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 前端 — API 层扩展
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/cell-product.ts`
|
||||
|
||||
- [ ] **Step 1: 新增 fetchCellProductChain 函数 + fetchCellProductList 参数扩展**
|
||||
|
||||
将 `web-admin/src/api/cell-product.ts` 完整替换为:
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/http'
|
||||
|
||||
export function fetchCellProductList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
productStatus?: string
|
||||
passage?: string
|
||||
sourceType?: string
|
||||
}) {
|
||||
return request.get<{
|
||||
list: any[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
totalPages: number
|
||||
}>({ url: '/web/admin/cell-products', params })
|
||||
}
|
||||
|
||||
export function fetchCellProductDetail(id: string) {
|
||||
return request.get<any>({ url: `/web/admin/cell-products/${id}` })
|
||||
}
|
||||
|
||||
export function fetchCreateCellProduct(data: Record<string, any>) {
|
||||
return request.post({ url: '/web/admin/cell-products', params: data })
|
||||
}
|
||||
|
||||
export function fetchUpdateCellProduct(id: string, data: Record<string, any>) {
|
||||
return request.put({ url: `/web/admin/cell-products/${id}`, params: data })
|
||||
}
|
||||
|
||||
export function fetchDeleteCellProduct(id: string) {
|
||||
return request.del({ url: `/web/admin/cell-products/${id}` })
|
||||
}
|
||||
|
||||
export function fetchNextCellProductCode(count = 1) {
|
||||
return request.get<{ code: string; codes?: string[] }>({
|
||||
url: '/web/admin/cell-products/next-code',
|
||||
params: count > 1 ? { count } : undefined
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchCellProductChain(productId: string) {
|
||||
return request.get<any>({ url: `/web/admin/cell-products/${productId}/chain` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无 TS 错误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && npx vue-tsc --noEmit --pretty 2>&1 | head -20`
|
||||
Expected: 无新增错误(可能有预存的)
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 前端 — 列表页新增列和筛选
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/production/cell-product/index.vue`
|
||||
|
||||
- [ ] **Step 1: 搜索表单新增来源类型筛选**
|
||||
|
||||
在 `index.vue` 的搜索表单中找到 `productStatus` 的 `el-select` 之后,新增一个筛选下拉:
|
||||
|
||||
```html
|
||||
<el-select v-model="searchForm.sourceType" placeholder="来源类型" clearable style="width: 130px">
|
||||
<el-option label="生产入库" value="production" />
|
||||
<el-option label="手动录入" value="manual" />
|
||||
</el-select>
|
||||
```
|
||||
|
||||
同时在 `searchForm` 的响应式定义中增加 `sourceType: ''` 字段。
|
||||
|
||||
在调用 `fetchCellProductList` 时传入 `sourceType: searchForm.sourceType || undefined`。
|
||||
|
||||
- [ ] **Step 2: 表格新增 4 列**
|
||||
|
||||
在 `el-table` 中 `productStatus`(状态)列之后,新增:
|
||||
|
||||
```html
|
||||
<el-table-column label="来源类型" prop="sourceTypeLabel" min-width="120">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.sourceTypeLabel" :type="row.sourceType === 'production' ? 'success' : 'info'" size="small">
|
||||
{{ row.sourceTypeLabel }}
|
||||
</el-tag>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="来源协议号" prop="sourceProtocolNo" min-width="160" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.sourceProtocolNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="来源工单号" prop="sourceWorkOrderNo" min-width="140" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.sourceWorkOrderNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="来源任务号" prop="sourceTaskNo" min-width="140" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.sourceTaskNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证列表页渲染**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && pnpm dev`
|
||||
|
||||
浏览器访问 `http://localhost:3006/#/production/cell-product`,确认:
|
||||
1. 列表新增 4 列可见
|
||||
2. 搜索栏有「来源类型」下拉
|
||||
3. 选择「生产入库」筛选后列表正确过滤
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 前端 — 新增 SourceChainGraph 链路图组件
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/production/cell-product/SourceChainGraph.vue`
|
||||
|
||||
- [ ] **Step 1: 创建链路图组件**
|
||||
|
||||
新建 `web-admin/src/views/production/cell-product/SourceChainGraph.vue`,实现以下功能:
|
||||
- 接收 `productId` 和 `visible` props
|
||||
- `visible` 变为 true 时调用 `fetchCellProductChain(productId)` 获取链路数据
|
||||
- 渲染横向 DAG:祖先节点 → 当前节点 → 子代节点
|
||||
- 节点卡片样式区分:样本(浅蓝)、细胞产品(浅绿)、当前产品(深绿边框 + 角标)
|
||||
- 节点之间用 CSS border + 伪元素画水平连线和箭头
|
||||
- 连线上方显示工单号和任务号标签
|
||||
- 1对多分支使用竖线 + 横线分叉
|
||||
- 手动录入产品(起源节点)无祖先但可能有子代,只有**既无祖先又无子代的孤立产品**才显示空状态文字「该产品暂无来源及衍生链路信息」
|
||||
- 节点 hover 时用 `el-popover` 显示详情
|
||||
|
||||
组件核心模板结构:
|
||||
|
||||
```vue
|
||||
<template>
|
||||
<div class="source-chain-graph" v-loading="loading">
|
||||
<div v-if="chainData" class="chain-container">
|
||||
<div class="chain-section-title">来源链路</div>
|
||||
|
||||
<template v-if="chainData.ancestors.length || chainData.descendants.length">
|
||||
<div class="chain-row">
|
||||
<template v-for="(ancestor, idx) in flattenedAncestors" :key="'a-' + idx">
|
||||
<ChainNodeCard :node="ancestor.node" />
|
||||
<ChainConnector :edge="ancestor.edge" />
|
||||
</template>
|
||||
|
||||
<ChainNodeCard :node="chainData.current" :is-current="true" />
|
||||
|
||||
<template v-if="chainData.descendants.length">
|
||||
<ForkBranch :items="chainData.descendants" />
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<div v-else class="empty-state">该产品暂无来源及衍生链路信息</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
```
|
||||
|
||||
注意:实际实现中 `ChainNodeCard`、`ChainConnector`、`ForkBranch` 可以是同文件内的子组件或直接内联模板。核心样式参考 `docs/demo-source-chain-graph.html`。
|
||||
|
||||
- [ ] **Step 2: 验证组件无 TS 错误**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw/web-admin && npx vue-tsc --noEmit --pretty 2>&1 | head -20`
|
||||
Expected: 无新增错误
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 前端 — 查看弹窗集成链路图
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/production/cell-product/index.vue`
|
||||
|
||||
- [ ] **Step 1: 在查看弹窗中集成 SourceChainGraph**
|
||||
|
||||
在 `index.vue` 中:
|
||||
|
||||
1. 导入组件:
|
||||
```typescript
|
||||
import SourceChainGraph from './SourceChainGraph.vue'
|
||||
```
|
||||
|
||||
2. 在 `SystemViewDialog` 的 sections 配置中新增第三个 section(在产品图片 section 之后):
|
||||
```typescript
|
||||
{
|
||||
label: '来源链路',
|
||||
slot: 'sourceChain',
|
||||
}
|
||||
```
|
||||
|
||||
3. 在 `SystemViewDialog` 的模板中新增 slot:
|
||||
```html
|
||||
<template #sourceChain>
|
||||
<SourceChainGraph :product-id="currentRow?.id" :visible="viewDialogVisible" />
|
||||
</template>
|
||||
```
|
||||
|
||||
注意:需要确认 `SystemViewDialog` 组件是否支持 `slot` 类型的 section。如果不支持,需要查看该组件源码并添加 slot 支持(通常是在 section 渲染时判断 `slot` 字段,用 `<slot :name="section.slot" />` 渲染自定义内容)。
|
||||
|
||||
- [ ] **Step 2: 端到端验证**
|
||||
|
||||
1. 启动后端:`cd backend && source venv/bin/activate && ./start-local.sh`
|
||||
2. 启动前端:`cd web-admin && pnpm dev`
|
||||
3. 浏览器访问 `http://localhost:3006/#/production/cell-product`
|
||||
4. 点击任意产品的「查看」按钮
|
||||
5. 确认查看弹窗中有「来源链路」tab/section
|
||||
6. 确认链路图正确展示节点和连线
|
||||
7. 确认节点点击可显示详情 Popover
|
||||
8. 确认手动录入产品显示空状态
|
||||
|
||||
---
|
||||
|
||||
### Task 9: 提交
|
||||
|
||||
- [ ] **Step 1: 检查变更范围**
|
||||
|
||||
Run: `cd /Users/wuzilong/work/00code/zkxw && git status`
|
||||
Expected: 仅涉及以下文件:
|
||||
- `backend/app/crud/cell_product.py`
|
||||
- `backend/app/schemas/cell_product.py`
|
||||
- `backend/app/api/production.py`
|
||||
- `web-admin/src/api/cell-product.ts`
|
||||
- `web-admin/src/views/production/cell-product/index.vue`
|
||||
- `web-admin/src/views/production/cell-product/SourceChainGraph.vue`(新建)
|
||||
- `docs/demo-source-chain-graph.html`
|
||||
- `docs/superpowers/specs/2026-05-24-cell-product-source-chain-design.md`
|
||||
- `docs/superpowers/plans/2026-05-24-cell-product-source-chain.md`
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/cell_product.py backend/app/schemas/cell_product.py backend/app/api/production.py web-admin/src/api/cell-product.ts web-admin/src/views/production/cell-product/ docs/
|
||||
git commit -m "feat(cell-product): 添加细胞产品来源链路展示功能
|
||||
|
||||
列表新增来源类型、来源协议号、来源工单号、来源任务号四列,
|
||||
支持来源类型筛选。查看弹窗新增来源链路图,展示祖先-当前-子代
|
||||
双向追溯链路(横向 DAG,CSS 绘制连线),支持1对多分叉。"
|
||||
```
|
||||
@@ -1,633 +0,0 @@
|
||||
# 渠道服务订单多次操作流水模型 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 将渠道服务订单从单次操作模型改造为多次操作流水模型,支持多次充值、退款、购买产品、按份数退订。
|
||||
|
||||
**Architecture:** 订单主表(biz_channel_service_order)管汇总,新增操作流水表(biz_channel_service_order_txn)管每笔操作的明细和财务确认流程,产品持仓表(biz_channel_service_order_product)改造为追踪累计购买/退订/当前持有份数。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2 / MySQL 5.7 / Vue 3 / Element Plus / TypeScript
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-24-channel-service-order-multi-txn-design.md`
|
||||
|
||||
---
|
||||
|
||||
## 文件结构
|
||||
|
||||
### 新增文件
|
||||
- `docs/sql/channel-service-order-txn-migration.sql` — 数据库迁移 SQL
|
||||
- `backend/app/models/channel_service_order_txn.py` — 流水 Model(或合并到 models.py)
|
||||
|
||||
### 修改文件
|
||||
- `backend/app/models/models.py` — 新增 BizChannelServiceOrderTxn model,改造 BizChannelServiceOrder/BizChannelServiceOrderProduct
|
||||
- `backend/app/crud/pilot_service.py` — 新增流水 CRUD + 改造订单 CRUD
|
||||
- `backend/app/api/pilot_service.py` — 新增流水 API + Pydantic schemas
|
||||
- `web-admin/src/api/admin.ts` — 新增流水相关 API 调用函数
|
||||
- `web-admin/src/views/pilot-service/channel-service-order/index.vue` — 订单管理页改造
|
||||
- `web-admin/src/views/pilot-service/channel-service-order-finance/index.vue` — 财务确认页改造
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 数据库迁移 — 流水表 + 主表改造 + 产品表改造
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/channel-service-order-txn-migration.sql`
|
||||
|
||||
- [ ] **Step 1: 编写迁移 SQL**
|
||||
|
||||
```sql
|
||||
-- ============================================================
|
||||
-- 渠道服务订单:多次操作流水模型迁移
|
||||
-- ============================================================
|
||||
|
||||
-- 1. 新增操作流水表
|
||||
CREATE TABLE `biz_channel_service_order_txn` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`service_order_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '关联订单ID',
|
||||
`txn_type` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'recharge/refund/purchase/unsubscribe',
|
||||
`amount` decimal(18,2) DEFAULT NULL COMMENT '本次操作金额',
|
||||
`txn_status` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'dsx' COMMENT 'dsx待生效 dqr待财务确认 yqr已确认 yzf已作废',
|
||||
`products_json` text COLLATE utf8mb4_unicode_ci COMMENT '产品明细JSON(purchase/unsubscribe类型)',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`finance_submit_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发起确认人ID',
|
||||
`finance_submit_time` datetime DEFAULT NULL COMMENT '发起确认时间',
|
||||
`finance_submit_remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发起确认备注',
|
||||
`finance_submit_attachments` text COLLATE utf8mb4_unicode_ci COMMENT '发起确认附件',
|
||||
`finance_confirm_time` datetime DEFAULT NULL COMMENT '财务确认时间',
|
||||
`finance_confirm_attachments` text COLLATE utf8mb4_unicode_ci COMMENT '财务确认附件',
|
||||
`finance_remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '财务确认备注',
|
||||
`balance_before` decimal(18,2) DEFAULT NULL COMMENT '操作前余额(yfk类型)',
|
||||
`balance_after` decimal(18,2) DEFAULT NULL COMMENT '操作后余额(yfk类型)',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_txn_order` (`service_order_id`, `del_flag`),
|
||||
KEY `idx_txn_status` (`txn_status`, `tenant_no`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渠道服务订单操作流水';
|
||||
|
||||
-- 2. 订单主表新增汇总字段
|
||||
ALTER TABLE `biz_channel_service_order`
|
||||
ADD COLUMN `total_recharge_amount` decimal(18,2) NOT NULL DEFAULT 0.00 COMMENT '累计充值总额' AFTER `channel_agreement_id`,
|
||||
ADD COLUMN `total_refund_amount` decimal(18,2) NOT NULL DEFAULT 0.00 COMMENT '累计退款总额' AFTER `total_recharge_amount`,
|
||||
ADD COLUMN `current_balance` decimal(18,2) NOT NULL DEFAULT 0.00 COMMENT '当前余额' AFTER `total_refund_amount`;
|
||||
|
||||
-- 3. 产品持仓表新增字段
|
||||
ALTER TABLE `biz_channel_service_order_product`
|
||||
ADD COLUMN `total_buy_qty` decimal(18,4) NOT NULL DEFAULT 0.0000 COMMENT '累计购买数量' AFTER `buy_amount`,
|
||||
ADD COLUMN `total_unsubscribe_qty` decimal(18,4) NOT NULL DEFAULT 0.0000 COMMENT '累计退订数量' AFTER `total_buy_qty`,
|
||||
ADD COLUMN `current_qty` decimal(18,4) NOT NULL DEFAULT 0.0000 COMMENT '当前持有数量' AFTER `total_unsubscribe_qty`,
|
||||
ADD COLUMN `total_unsubscribe_amount` decimal(18,2) NOT NULL DEFAULT 0.00 COMMENT '累计退订金额' AFTER `current_qty`;
|
||||
|
||||
-- 4. 迁移现有订单数据到流水表(一次性,保留历史数据)
|
||||
-- 注意:仅迁移有操作记录的订单(有 finance_submit_time 或 refund_apply_time 的)
|
||||
INSERT INTO `biz_channel_service_order_txn` (
|
||||
`id`, `service_order_id`, `txn_type`, `amount`, `txn_status`,
|
||||
`remark`,
|
||||
`finance_submit_by`, `finance_submit_time`, `finance_submit_remark`, `finance_submit_attachments`,
|
||||
`finance_confirm_time`, `finance_confirm_attachments`, `finance_remark`,
|
||||
`balance_before`, `balance_after`,
|
||||
`tenant_no`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
)
|
||||
SELECT
|
||||
UUID_SHORT() AS `id`,
|
||||
o.`id` AS `service_order_id`,
|
||||
'recharge' AS `txn_type`,
|
||||
o.`prepay_amount` AS `amount`,
|
||||
CASE
|
||||
WHEN o.`finance_confirm_time` IS NOT NULL THEN 'yqr'
|
||||
WHEN o.`finance_submit_time` IS NOT NULL THEN 'dqr'
|
||||
ELSE 'dsx'
|
||||
END AS `txn_status`,
|
||||
o.`remark`,
|
||||
o.`finance_submit_by`, o.`finance_submit_time`, o.`finance_submit_remark`, o.`finance_submit_attachments`,
|
||||
o.`finance_confirm_time`, o.`finance_confirm_attachments`, o.`finance_remark`,
|
||||
o.`balance_before`, o.`balance_after`,
|
||||
o.`tenant_no`, o.`create_by`, o.`create_dept_id`, o.`create_time`, o.`update_by`, o.`update_time`, o.`del_flag`
|
||||
FROM `biz_channel_service_order` o
|
||||
WHERE o.`finance_submit_time` IS NOT NULL OR o.`prepay_amount` IS NOT NULL;
|
||||
|
||||
-- 5. 迁移退款记录到流水表
|
||||
INSERT INTO `biz_channel_service_order_txn` (
|
||||
`id`, `service_order_id`, `txn_type`, `amount`, `txn_status`,
|
||||
`remark`,
|
||||
`finance_submit_by`, `finance_submit_time`, `finance_submit_remark`, `finance_submit_attachments`,
|
||||
`finance_confirm_time`, `finance_confirm_attachments`, `finance_remark`,
|
||||
`tenant_no`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
)
|
||||
SELECT
|
||||
UUID_SHORT() AS `id`,
|
||||
o.`id` AS `service_order_id`,
|
||||
'refund' AS `txn_type`,
|
||||
o.`refund_amount` AS `amount`,
|
||||
CASE
|
||||
WHEN o.`refund_finance_confirm_time` IS NOT NULL THEN 'yqr'
|
||||
ELSE 'dqr'
|
||||
END AS `txn_status`,
|
||||
o.`refund_remark` AS `remark`,
|
||||
o.`refund_apply_by` AS `finance_submit_by`,
|
||||
o.`refund_apply_time` AS `finance_submit_time`,
|
||||
o.`refund_remark` AS `finance_submit_remark`,
|
||||
o.`refund_attachments` AS `finance_submit_attachments`,
|
||||
o.`refund_finance_confirm_time` AS `finance_confirm_time`,
|
||||
o.`refund_finance_confirm_attachments` AS `finance_confirm_attachments`,
|
||||
o.`refund_finance_remark` AS `finance_remark`,
|
||||
o.`tenant_no`, o.`refund_apply_by` AS `create_by`, o.`create_dept_id`,
|
||||
COALESCE(o.`refund_apply_time`, o.`update_time`) AS `create_time`,
|
||||
o.`update_by`, o.`update_time`, o.`del_flag`
|
||||
FROM `biz_channel_service_order` o
|
||||
WHERE o.`refund_amount` IS NOT NULL AND o.`refund_amount` > 0;
|
||||
|
||||
-- 6. 回填主表汇总字段
|
||||
UPDATE `biz_channel_service_order` o
|
||||
SET
|
||||
`total_recharge_amount` = COALESCE(o.`prepay_amount`, 0),
|
||||
`total_refund_amount` = COALESCE(o.`refund_amount`, 0),
|
||||
`current_balance` = COALESCE(o.`prepay_amount`, 0) - COALESCE(o.`refund_amount`, 0)
|
||||
WHERE o.`order_type` = 'yfk' AND o.`prepay_amount` IS NOT NULL;
|
||||
|
||||
-- 7. 回填产品持仓表的累计字段
|
||||
UPDATE `biz_channel_service_order_product` p
|
||||
SET
|
||||
`total_buy_qty` = COALESCE(p.`buy_qty`, 0),
|
||||
`current_qty` = COALESCE(p.`buy_qty`, 0);
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库执行迁移**
|
||||
|
||||
Run: 手动在 MySQL 中执行上述 SQL,或逐步执行确认无误。
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model — 新增流水 Model + 改造主表/产品 Model
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (line ~1762, BizChannelServiceOrder class)
|
||||
|
||||
- [ ] **Step 1: 在 models.py 中 BizChannelServiceOrder 类新增字段**
|
||||
|
||||
在 `BizChannelServiceOrder` 类的 `channel_agreement_id` 字段后面添加三个汇总字段:
|
||||
|
||||
```python
|
||||
total_recharge_amount = Column(Numeric(18, 2), nullable=False, default=0, comment="累计充值总额")
|
||||
total_refund_amount = Column(Numeric(18, 2), nullable=False, default=0, comment="累计退款总额")
|
||||
current_balance = Column(Numeric(18, 2), nullable=False, default=0, comment="当前余额")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 BizChannelServiceOrderProduct 类新增字段**
|
||||
|
||||
在 `buy_amount` 字段后面添加:
|
||||
|
||||
```python
|
||||
total_buy_qty = Column(Numeric(18, 4), nullable=False, default=0, comment="累计购买数量")
|
||||
total_unsubscribe_qty = Column(Numeric(18, 4), nullable=False, default=0, comment="累计退订数量")
|
||||
current_qty = Column(Numeric(18, 4), nullable=False, default=0, comment="当前持有数量")
|
||||
total_unsubscribe_amount = Column(Numeric(18, 2), nullable=False, default=0, comment="累计退订金额")
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 在 BizChannelServiceOrderProduct 类后面新增 BizChannelServiceOrderTxn 类**
|
||||
|
||||
```python
|
||||
class BizChannelServiceOrderTxn(Base):
|
||||
"""渠道服务订单操作流水 biz_channel_service_order_txn"""
|
||||
|
||||
__tablename__ = "biz_channel_service_order_txn"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
service_order_id = Column(String(64), nullable=False, comment="关联订单ID")
|
||||
txn_type = Column(String(16), nullable=False, comment="recharge/refund/purchase/unsubscribe")
|
||||
amount = Column(Numeric(18, 2), nullable=True, comment="本次操作金额")
|
||||
txn_status = Column(String(16), nullable=False, default="dsx", comment="dsx待生效 dqr待财务确认 yqr已确认 yzf已作废")
|
||||
products_json = Column(Text, nullable=True, comment="产品明细JSON(purchase/unsubscribe类型)")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
finance_submit_by = Column(String(64), nullable=True, comment="发起确认人ID")
|
||||
finance_submit_time = Column(DateTime, nullable=True, comment="发起确认时间")
|
||||
finance_submit_remark = Column(String(512), nullable=True, comment="发起确认备注")
|
||||
finance_submit_attachments = Column(Text, nullable=True, comment="发起确认附件")
|
||||
finance_confirm_time = Column(DateTime, nullable=True, comment="财务确认时间")
|
||||
finance_confirm_attachments = Column(Text, nullable=True, comment="财务确认附件")
|
||||
finance_remark = Column(String(512), nullable=True, comment="财务确认备注")
|
||||
balance_before = Column(Numeric(18, 2), nullable=True, comment="操作前余额")
|
||||
balance_after = Column(Numeric(18, 2), nullable=True, comment="操作后余额")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark_col = Column("remark", String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
注意:Model 中 `remark` 字段和表里的 `remark` 列名冲突(流水表有两个 remark 用途)—— 实际上流水表只有一个 `remark` 列。Model 中只保留一个 `remark` 即可,去掉上面的 `remark_col`,直接用 `remark`。
|
||||
|
||||
- [ ] **Step 4: 验证 import**
|
||||
|
||||
确保 `models.py` 文件头部已有 `from sqlalchemy import ... Column, String, Numeric, Text, DateTime, SmallInteger, Integer` 等导入。
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD — 流水 CRUD + 订单 CRUD 改造
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_service.py` (line ~2513+)
|
||||
|
||||
- [ ] **Step 1: 新增流水 _row_to_dict 函数**
|
||||
|
||||
在 `_row_to_dict_service_order_product` 函数后面添加:
|
||||
|
||||
```python
|
||||
def _row_to_dict_service_order_txn(row, db=None, tenant_no=None) -> Dict[str, Any]:
|
||||
tn = tenant_no or row.tenant_no
|
||||
d = {
|
||||
"id": row.id,
|
||||
"serviceOrderId": row.service_order_id or "",
|
||||
"txnType": row.txn_type or "",
|
||||
"amount": float(row.amount) if row.amount else 0,
|
||||
"txnStatus": row.txn_status or "",
|
||||
"productsJson": row.products_json or "",
|
||||
"remark": row.remark or "",
|
||||
"financeSubmitBy": row.finance_submit_by or "",
|
||||
"financeSubmitTime": row.finance_submit_time.strftime("%Y-%m-%d %H:%M:%S") if row.finance_submit_time else "",
|
||||
"financeSubmitRemark": row.finance_submit_remark or "",
|
||||
"financeSubmitAttachments": row.finance_submit_attachments or "",
|
||||
"financeSubmitAttachmentFiles": urls_to_attachment_list(row.finance_submit_attachments, db, tn) if db and row.finance_submit_attachments else [],
|
||||
"financeConfirmTime": row.finance_confirm_time.strftime("%Y-%m-%d %H:%M:%S") if row.finance_confirm_time else "",
|
||||
"financeConfirmAttachments": row.finance_confirm_attachments or "",
|
||||
"financeConfirmAttachmentFiles": urls_to_attachment_list(row.finance_confirm_attachments, db, tn) if db and row.finance_confirm_attachments else [],
|
||||
"financeRemark": row.finance_remark or "",
|
||||
"balanceBefore": float(row.balance_before) if row.balance_before else 0,
|
||||
"balanceAfter": float(row.balance_after) if row.balance_after else 0,
|
||||
"tenantNo": row.tenant_no or "",
|
||||
"createBy": row.create_by or "",
|
||||
"createTime": row.create_time.strftime("%Y-%m-%d %H:%M:%S") if row.create_time else "",
|
||||
"updateTime": row.update_time.strftime("%Y-%m-%d %H:%M:%S") if row.update_time else "",
|
||||
}
|
||||
if row.products_json:
|
||||
try:
|
||||
d["products"] = json.loads(row.products_json)
|
||||
except Exception:
|
||||
d["products"] = []
|
||||
else:
|
||||
d["products"] = []
|
||||
return d
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 改造 _row_to_dict_service_order,新增汇总字段、移除旧字段**
|
||||
|
||||
将 `prepayAmount`、`purchaseTotalAmount` 等保留但标记为兼容字段(从汇总计算),新增:
|
||||
- `totalRechargeAmount`
|
||||
- `totalRefundAmount`
|
||||
- `currentBalance`
|
||||
- `transactions`(列表,由调用方填充)
|
||||
- `products`(列表,由调用方填充)
|
||||
|
||||
同时在详情查询时附带流水列表和产品持仓列表。
|
||||
|
||||
- [ ] **Step 3: 新增流水 CRUD 函数**
|
||||
|
||||
```python
|
||||
def list_service_order_txns(db, *, service_order_id=None, txn_status=None, txn_type=None, page=1, page_size=20, tenant_no=None):
|
||||
"""查询操作流水列表"""
|
||||
...
|
||||
|
||||
def get_service_order_txn(db, txn_id, *, tenant_no=None):
|
||||
"""获取单条流水"""
|
||||
...
|
||||
|
||||
def create_recharge_txn(db, order_id, *, amount, remark=None, tenant_no=None, user_id=None):
|
||||
"""创建充值流水(yfk订单)"""
|
||||
...
|
||||
|
||||
def create_refund_txn(db, order_id, *, amount, remark=None, tenant_no=None, user_id=None):
|
||||
"""创建退款流水(yfk订单),校验 amount <= current_balance"""
|
||||
...
|
||||
|
||||
def create_purchase_txn(db, order_id, *, products, remark=None, tenant_no=None, user_id=None):
|
||||
"""创建购买产品流水(gmcp订单),同时创建/更新产品持仓"""
|
||||
...
|
||||
|
||||
def create_unsubscribe_txn(db, order_id, *, products, remark=None, tenant_no=None, user_id=None):
|
||||
"""创建退订产品流水(gmcp订单),校验退订份数 <= current_qty"""
|
||||
...
|
||||
|
||||
def submit_txn_finance(db, txn_id, *, finance_submit_remark=None, finance_submit_attachments=None, tenant_no=None, user_id=None):
|
||||
"""发起流水财务确认:dsx → dqr"""
|
||||
...
|
||||
|
||||
def confirm_txn(db, txn_id, *, finance_remark=None, finance_confirm_attachments=None, tenant_no=None, user_id=None):
|
||||
"""财务确认流水:dqr → yqr,更新主表汇总和产品持仓"""
|
||||
...
|
||||
|
||||
def void_txn(db, txn_id, *, tenant_no=None, user_id=None):
|
||||
"""作废流水:dsx → yzf"""
|
||||
...
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 改造 _row_to_dict_service_order_product,新增持仓字段**
|
||||
|
||||
在返回字典中新增:
|
||||
```python
|
||||
"totalBuyQty": float(row.total_buy_qty) if row.total_buy_qty else 0,
|
||||
"totalUnsubscribeQty": float(row.total_unsubscribe_qty) if row.total_unsubscribe_qty else 0,
|
||||
"currentQty": float(row.current_qty) if row.current_qty else 0,
|
||||
"totalUnsubscribeAmount": float(row.total_unsubscribe_amount) if row.total_unsubscribe_amount else 0,
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 API — 流水接口 + Pydantic Schemas
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/pilot_service.py` (line ~1552+)
|
||||
|
||||
- [ ] **Step 1: 新增 Pydantic Schemas**
|
||||
|
||||
在现有 `RefundConfirmBody` 后面添加:
|
||||
|
||||
```python
|
||||
class TxnRechargeBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
amount: float = Field(..., gt=0, alias="amount")
|
||||
remark: Optional[str] = Field(None, alias="remark")
|
||||
|
||||
class TxnRefundBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
amount: float = Field(..., gt=0, alias="amount")
|
||||
remark: Optional[str] = Field(None, alias="remark")
|
||||
|
||||
class TxnProductItem(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
project_code: Optional[str] = Field(None, alias="projectCode")
|
||||
project_name: Optional[str] = Field(None, alias="projectName")
|
||||
cell_type: Optional[str] = Field(None, alias="cellType")
|
||||
spec_text: Optional[str] = Field(None, alias="specText")
|
||||
agreement_unit_price: Optional[float] = Field(None, alias="agreementUnitPrice")
|
||||
qty: Optional[float] = Field(None, alias="qty")
|
||||
amount: Optional[float] = Field(None, alias="amount")
|
||||
|
||||
class TxnPurchaseBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
products: List[TxnProductItem] = Field(..., alias="products")
|
||||
remark: Optional[str] = Field(None, alias="remark")
|
||||
|
||||
class TxnUnsubscribeBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
products: List[TxnProductItem] = Field(..., alias="products")
|
||||
remark: Optional[str] = Field(None, alias="remark")
|
||||
|
||||
class TxnFinanceSubmitBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
finance_submit_remark: Optional[str] = Field(None, alias="financeSubmitRemark")
|
||||
finance_submit_attachments: Optional[str] = Field(None, alias="financeSubmitAttachments")
|
||||
|
||||
class TxnFinanceConfirmBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
finance_remark: Optional[str] = Field(None, alias="financeRemark")
|
||||
finance_confirm_attachments: Optional[str] = Field(None, alias="financeConfirmAttachments")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 新增流水 API 路由**
|
||||
|
||||
```python
|
||||
@router.get("/channel-service-order-txns")
|
||||
async def list_txns(...) # 列表查询,支持 status/type/order_id 筛选
|
||||
|
||||
@router.get("/channel-service-order-txns/{txn_id}")
|
||||
async def get_txn_detail(...) # 流水详情
|
||||
|
||||
@router.post("/channel-service-orders/{order_id}/recharge")
|
||||
async def create_recharge(...) # 创建充值流水
|
||||
|
||||
@router.post("/channel-service-orders/{order_id}/refund")
|
||||
async def create_refund(...) # 创建退款流水
|
||||
|
||||
@router.post("/channel-service-orders/{order_id}/purchase")
|
||||
async def create_purchase(...) # 创建购买流水
|
||||
|
||||
@router.post("/channel-service-orders/{order_id}/unsubscribe")
|
||||
async def create_unsubscribe(...) # 创建退订流水
|
||||
|
||||
@router.post("/channel-service-order-txns/{txn_id}/submit-finance")
|
||||
async def submit_txn_finance(...) # 发起财务确认
|
||||
|
||||
@router.post("/channel-service-order-txns/{txn_id}/confirm")
|
||||
async def confirm_txn(...) # 财务确认
|
||||
|
||||
@router.put("/channel-service-order-txns/{txn_id}/void")
|
||||
async def void_txn(...) # 作废流水
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 改造订单详情 API**
|
||||
|
||||
修改 `get_channel_service_order_detail` 接口,在返回数据中附带:
|
||||
- `transactions`: 该订单的所有流水列表
|
||||
- `products`: 该订单的产品持仓列表(gmcp)
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 API — 新增流水相关调用函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts` (line ~1900+)
|
||||
|
||||
- [ ] **Step 1: 新增流水 API 函数**
|
||||
|
||||
在现有 `fetchVoidServiceOrder` 后面添加:
|
||||
|
||||
```typescript
|
||||
// ========== 渠道服务订单操作流水 ==========
|
||||
|
||||
/** 流水列表 */
|
||||
export function fetchServiceOrderTxnList(params?: Record<string, any>) {
|
||||
return request.get({ url: '/web/admin/channel-service-order-txns', params })
|
||||
}
|
||||
|
||||
/** 流水详情 */
|
||||
export function fetchServiceOrderTxnDetail(txnId: string) {
|
||||
return request.get({ url: `/web/admin/channel-service-order-txns/${txnId}` })
|
||||
}
|
||||
|
||||
/** 发起充值 */
|
||||
export function fetchCreateRechargeTxn(orderId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-orders/${orderId}/recharge`, params: data })
|
||||
}
|
||||
|
||||
/** 申请退款 */
|
||||
export function fetchCreateRefundTxn(orderId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-orders/${orderId}/refund`, params: data })
|
||||
}
|
||||
|
||||
/** 购买产品 */
|
||||
export function fetchCreatePurchaseTxn(orderId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-orders/${orderId}/purchase`, params: data })
|
||||
}
|
||||
|
||||
/** 退订产品 */
|
||||
export function fetchCreateUnsubscribeTxn(orderId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-orders/${orderId}/unsubscribe`, params: data })
|
||||
}
|
||||
|
||||
/** 流水发起财务确认 */
|
||||
export function fetchSubmitTxnFinance(txnId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-order-txns/${txnId}/submit-finance`, params: data })
|
||||
}
|
||||
|
||||
/** 流水财务确认 */
|
||||
export function fetchConfirmTxn(txnId: string, data: Record<string, any>) {
|
||||
return request.post({ url: `/web/admin/channel-service-order-txns/${txnId}/confirm`, params: data })
|
||||
}
|
||||
|
||||
/** 作废流水 */
|
||||
export function fetchVoidTxn(txnId: string) {
|
||||
return request.put({ url: `/web/admin/channel-service-order-txns/${txnId}/void` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 保留旧 API 函数但标记废弃**
|
||||
|
||||
不删除 `fetchSubmitServiceOrderFinanceConfirm`、`fetchConfirmServiceOrderReceipt`、`fetchSubmitServiceOrderRefund`、`fetchConfirmServiceOrderRefund`,保持向后兼容,但前端页面不再调用。
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端订单管理页改造
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/channel-service-order/index.vue`
|
||||
|
||||
这是改动最大的文件,核心变更:
|
||||
|
||||
- [ ] **Step 1: 更新 import**
|
||||
|
||||
新增导入流水相关 API 函数:`fetchCreateRechargeTxn`, `fetchCreateRefundTxn`, `fetchCreatePurchaseTxn`, `fetchCreateUnsubscribeTxn`, `fetchSubmitTxnFinance`,移除旧的 `fetchSubmitServiceOrderFinanceConfirm`, `fetchSubmitServiceOrderRefund` 调用。
|
||||
|
||||
- [ ] **Step 2: 更新操作按钮**
|
||||
|
||||
将操作列的按钮替换为:
|
||||
- yfk + dsx → 编辑、删除、**发起充值**
|
||||
- yfk + sxz → **发起充值**、**申请退款**
|
||||
- gmcp + dsx → 编辑、删除、**购买产品**
|
||||
- gmcp + sxz → **购买产品**、**退订产品**
|
||||
- 任意 + yzf → 仅查看
|
||||
|
||||
- [ ] **Step 3: 改造详情弹窗(SystemViewDialog)**
|
||||
|
||||
在 viewSections computed 中:
|
||||
- 基本信息section 新增 `currentBalance`(yfk)或产品持仓汇总(gmcp)
|
||||
- 移除旧的"发起财务确认""财务确认信息""退款信息"平铺 sections
|
||||
- 新增"操作记录"section,用 inner-table 展示流水列表(类型Tag、金额、状态Tag、时间)
|
||||
- gmcp 类型新增"产品持仓"section,显示各产品当前持有份数
|
||||
|
||||
- [ ] **Step 4: 替换弹窗**
|
||||
|
||||
移除旧的"发起财务确认"弹窗和"申请退款"弹窗,新增:
|
||||
- **发起充值弹窗**:金额输入、备注、凭证上传
|
||||
- **申请退款弹窗**:金额输入(max=当前余额)、备注、凭证上传
|
||||
- **购买产品弹窗**:选项目/规格、输入份数、自动算金额(类似现有的新增订单弹窗中产品明细部分)
|
||||
- **退订产品弹窗**:选已持有项目(下拉,显示当前份数)、输入退订份数(≤持有量)、自动算退款金额
|
||||
|
||||
- [ ] **Step 5: 操作按钮点击后,可选择是否立即发起财务确认**
|
||||
|
||||
创建流水后,弹出提示"是否立即发起财务确认?",用户点确认则调用 `fetchSubmitTxnFinance`。
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端财务确认页改造
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/channel-service-order-finance/index.vue`
|
||||
|
||||
- [ ] **Step 1: 改为查流水表**
|
||||
|
||||
将 `fetchChannelServiceOrderList` 替换为 `fetchServiceOrderTxnList`,参数传递 `txnStatus=dqr`(待处理)或 `txnStatus=yqr`(已处理)。
|
||||
|
||||
- [ ] **Step 2: 表格列调整**
|
||||
|
||||
列表表格列改为:
|
||||
- 序号、渠道名称、订单类型Tag、流水类型Tag(充值/退款/购买/退订)、金额、状态Tag、提交人、提交时间、操作
|
||||
|
||||
流水类型标签映射:
|
||||
```typescript
|
||||
const txnTypeLabel = (t: string) => {
|
||||
const map: Record<string, string> = { recharge: '充值', refund: '退款', purchase: '购买产品', unsubscribe: '退订产品' }
|
||||
return map[t] || t
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Tab 切换调整**
|
||||
|
||||
已有两 tab(待处理/已处理),改为:
|
||||
- 待处理:`txnStatus=dqr`
|
||||
- 已处理:`txnStatus=yqr`
|
||||
|
||||
- [ ] **Step 4: 确认弹窗改造**
|
||||
|
||||
"确认收款"弹窗和"确认退款"弹窗合并为一个"确认操作"弹窗:
|
||||
- 上半部分展示流水详情(渠道、金额/产品明细、提交人/时间/备注/凭证)
|
||||
- 下半部分输入财务确认备注 + 上传确认凭证
|
||||
- 调用 `fetchConfirmTxn(txnId, data)`
|
||||
|
||||
- [ ] **Step 5: 详情弹窗**
|
||||
|
||||
保留 SystemViewDialog 查看详情,展示流水完整信息。
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 状态标签注册更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/status-tag-registry.ts`
|
||||
|
||||
- [ ] **Step 1: 新增流水类型标签**
|
||||
|
||||
在 `status-tag-registry.ts` 中新增:
|
||||
```typescript
|
||||
// 流水类型
|
||||
export const txnTypeLabel = (type: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
recharge: '充值',
|
||||
refund: '退款',
|
||||
purchase: '购买产品',
|
||||
unsubscribe: '退订产品',
|
||||
}
|
||||
return map[type] || type
|
||||
}
|
||||
|
||||
export const txnTypeTagType = (type: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
recharge: '',
|
||||
refund: 'danger',
|
||||
purchase: 'success',
|
||||
unsubscribe: 'warning',
|
||||
}
|
||||
return map[type] || 'info'
|
||||
}
|
||||
|
||||
// 流水状态
|
||||
export const txnStatusLabel = (status: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
dsx: '待生效',
|
||||
dqr: '待财务确认',
|
||||
yqr: '已确认',
|
||||
yzf: '已作废',
|
||||
}
|
||||
return map[status] || status
|
||||
}
|
||||
|
||||
export const txnStatusTagType = (status: string): string => {
|
||||
const map: Record<string, string> = {
|
||||
dsx: 'info',
|
||||
dqr: 'warning',
|
||||
yqr: 'success',
|
||||
yzf: 'danger',
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
```
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,305 +0,0 @@
|
||||
# 工单表合并重构实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 将入库+临时工单表合并为单表(`work_order_type` 字段区分类型),彻底消除多表 JOIN 复杂度。
|
||||
|
||||
**Architecture:** 质检工单合并为 `biz_qc_work_order`(加 `work_order_type`),生产工单合并为 `biz_production_work_order`(加 `work_order_type`)。任务表保持不变(`biz_qc_task` / `biz_production_task` 的 `order_source` 保留)。前端每个工单类型一个页面,根据 `work_order_type` 条件展示不同字段。
|
||||
|
||||
**Tech Stack:** MySQL 5.7 DDL / Python 3.9 FastAPI SQLAlchemy / Vue 3 TypeScript Element Plus
|
||||
|
||||
---
|
||||
|
||||
## 影响文件清单
|
||||
|
||||
### 删除(合并后不再需要)
|
||||
- `backend/app/models/models.py` 中 `BizTempQcWorkOrder`、`BizTempProductionWorkOrder` 两个 class
|
||||
- `backend/app/schemas/temp_qc_work_order.py`
|
||||
- `backend/app/schemas/temp_production_work_order.py`
|
||||
- `backend/app/crud/temp_qc_work_order.py`
|
||||
- `backend/app/crud/temp_production_work_order.py`
|
||||
- `web-admin/src/api/temp-qc-work-order.ts`
|
||||
- `web-admin/src/api/temp-production-work-order.ts`
|
||||
- `web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue`
|
||||
- `web-admin/src/views/production/temp-production-work-order/index.vue`
|
||||
- `web-admin/src/router/modules/sqxp.ts` 中临时工单路由条目
|
||||
|
||||
### 修改
|
||||
- `docs/sql/` — 新建迁移 SQL
|
||||
- `backend/app/models/models.py` — 加 `work_order_type`,reception 字段改 nullable,删 temp model
|
||||
- `backend/app/crud/qc_work_order.py` — 合并临时工单的创建/配置/完成逻辑
|
||||
- `backend/app/crud/production_work_order.py` — 合并临时工单的创建/配置/完成逻辑
|
||||
- `backend/app/crud/qc_task.py` — **恢复** INNER JOIN(不再需要 LEFT JOIN + 子查询 hack)
|
||||
- `backend/app/crud/production_task.py` — 同上,简化批量查询
|
||||
- `backend/app/api/qc.py` — 合并临时工单 API 端点,删除 temp import
|
||||
- `backend/app/api/production.py` — 同上
|
||||
- `backend/app/schemas/qc_work_order.py` — 新增 `work_order_type` 字段
|
||||
- `web-admin/src/api/qc-work-order.ts` 或 `business.ts` — 新增临时工单 API
|
||||
- `web-admin/src/views/quality-inspection/qc-work-order/index.vue` — 支持临时工单创建/筛选
|
||||
- `web-admin/src/views/production/production-work-order/index.vue` — 同上
|
||||
|
||||
---
|
||||
|
||||
## Task 1: DDL 迁移 SQL
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/merge_work_order_tables.sql`
|
||||
|
||||
- [ ] **Step 1: 编写迁移 SQL**
|
||||
|
||||
```sql
|
||||
-- ============================================================
|
||||
-- 工单表合并迁移:入库+临时 → 单表 + work_order_type
|
||||
-- Date: 2026-05-24
|
||||
-- 执行顺序:必须先执行,再部署后端代码
|
||||
-- ============================================================
|
||||
|
||||
-- 1. biz_qc_work_order: 加 work_order_type,现有数据全部设 inbound
|
||||
ALTER TABLE biz_qc_work_order
|
||||
ADD COLUMN work_order_type VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单类型: inbound=入库, temporary=临时' AFTER work_order_no;
|
||||
|
||||
-- 2. biz_qc_work_order: reception 关联字段改为可空(临时工单不需要)
|
||||
ALTER TABLE biz_qc_work_order
|
||||
MODIFY COLUMN reception_id VARCHAR(64) NULL COMMENT '样本接收ID',
|
||||
MODIFY COLUMN protocol_sample_id VARCHAR(64) NULL COMMENT '协议样本ID',
|
||||
MODIFY COLUMN collection_protocol_id VARCHAR(64) NULL COMMENT '采集协议ID',
|
||||
MODIFY COLUMN reception_source VARCHAR(20) NULL DEFAULT 'cell_storage' COMMENT '来源: cell_storage/research_donation';
|
||||
|
||||
-- 3. 迁移临时质检工单数据到主表
|
||||
INSERT INTO biz_qc_work_order (
|
||||
id, work_order_no, work_order_type, work_order_status,
|
||||
has_lab, has_third_party, third_party_fee_total,
|
||||
configured_time, configured_by,
|
||||
tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
id, work_order_no, 'temporary', work_order_status,
|
||||
has_lab, has_third_party, third_party_fee_total,
|
||||
configured_time, configured_by,
|
||||
tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
FROM biz_temp_qc_work_order;
|
||||
|
||||
-- 4. biz_production_work_order: 加 work_order_type
|
||||
ALTER TABLE biz_production_work_order
|
||||
ADD COLUMN work_order_type VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单类型: inbound=入库, temporary=临时' AFTER work_order_no;
|
||||
|
||||
-- 5. biz_production_work_order: 加 configured_time/configured_by(临时工单需要)
|
||||
ALTER TABLE biz_production_work_order
|
||||
ADD COLUMN configured_time DATETIME NULL COMMENT '配置时间' AFTER work_order_status,
|
||||
ADD COLUMN configured_by VARCHAR(64) NULL COMMENT '配置人' AFTER configured_time;
|
||||
|
||||
-- 6. biz_production_work_order: reception 关联字段改为可空
|
||||
ALTER TABLE biz_production_work_order
|
||||
MODIFY COLUMN reception_id VARCHAR(64) NULL COMMENT '样本接收ID',
|
||||
MODIFY COLUMN protocol_sample_id VARCHAR(64) NULL COMMENT '协议样本ID',
|
||||
MODIFY COLUMN collection_protocol_id VARCHAR(64) NULL COMMENT '采集协议ID',
|
||||
MODIFY COLUMN reception_source VARCHAR(20) NULL DEFAULT 'cell_storage' COMMENT '来源';
|
||||
|
||||
-- 7. 迁移临时生产工单数据到主表
|
||||
INSERT INTO biz_production_work_order (
|
||||
id, work_order_no, work_order_type, work_order_status,
|
||||
configured_time, configured_by,
|
||||
tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
)
|
||||
SELECT
|
||||
id, work_order_no, 'temporary', work_order_status,
|
||||
configured_time, configured_by,
|
||||
tenant_no, order_num, remark,
|
||||
create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
FROM biz_temp_production_work_order;
|
||||
|
||||
-- 8. 删除临时表(确认数据迁移成功后执行)
|
||||
DROP TABLE IF EXISTS biz_temp_qc_work_order;
|
||||
DROP TABLE IF EXISTS biz_temp_production_work_order;
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 手动执行前备份**
|
||||
```bash
|
||||
mysqldump -u root -p zkxw biz_qc_work_order biz_temp_qc_work_order biz_production_work_order biz_temp_production_work_order > /tmp/work_order_backup_$(date +%Y%m%d).sql
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py`
|
||||
|
||||
- [ ] **Step 1: 更新 BizQcWorkOrder 模型**
|
||||
- 在 `work_order_no` 后加 `work_order_type = Column(String(20), nullable=False, default="inbound")`
|
||||
- 将 `reception_id`、`protocol_sample_id`、`collection_protocol_id` 改为 `nullable=True`
|
||||
- 将 `reception_source` 改为 `nullable=True`
|
||||
|
||||
- [ ] **Step 2: 更新 BizProductionWorkOrder 模型**
|
||||
- 加 `work_order_type = Column(String(20), nullable=False, default="inbound")`
|
||||
- 加 `configured_time = Column(DateTime, nullable=True)`
|
||||
- 加 `configured_by = Column(String(64), nullable=True)`
|
||||
- 将 `reception_id`、`protocol_sample_id`、`collection_protocol_id` 改为 `nullable=True`
|
||||
- 将 `reception_source` 改为 `nullable=True`
|
||||
|
||||
- [ ] **Step 3: 删除 BizTempQcWorkOrder 和 BizTempProductionWorkOrder 类**
|
||||
|
||||
- [ ] **Step 4: 验证 import**
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.main import app; print('OK')"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD 合并 — 质检工单
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_work_order.py`
|
||||
- Delete: `backend/app/crud/temp_qc_work_order.py`
|
||||
|
||||
- [ ] **Step 1: 在 qc_work_order.py 中新增临时工单函数**
|
||||
- 将 `temp_qc_work_order.py` 中的 `create_temp_qc_work_order`、`configure_temp_qc_work_order`、`list_temp_qc_work_orders`、`get_temp_qc_work_order_detail`、`try_complete_temp_qc_work_order`、`delete_temp_qc_work_order` 合并进 `qc_work_order.py`
|
||||
- 修改工单号生成逻辑:根据 `work_order_type` 选择前缀(inbound=ZJ,temporary=LSZJ)
|
||||
- 修改 list 查询:加 `work_order_type` 过滤
|
||||
- 修改 configure 逻辑:使用同一个 `BizQcWorkOrder` 模型
|
||||
- 修改 task 生成:保持 `order_source` 逻辑不变
|
||||
|
||||
- [ ] **Step 2: 删除 temp_qc_work_order.py**
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 CRUD 合并 — 生产工单
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/production_work_order.py`
|
||||
- Delete: `backend/app/crud/temp_production_work_order.py`
|
||||
|
||||
- [ ] **Step 1: 合并临时生产工单函数**
|
||||
- 同 Task 3 思路:将 temp 函数合并进主文件
|
||||
- 工单号前缀:inbound=SC,temporary=LSSC
|
||||
- 保留工艺路线克隆逻辑
|
||||
- 保留 `order_source` 逻辑
|
||||
|
||||
- [ ] **Step 2: 删除 temp_production_work_order.py**
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 后端 API + Schema 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/qc.py`
|
||||
- Modify: `backend/app/api/production.py`
|
||||
- Modify: `backend/app/schemas/qc_work_order.py`
|
||||
- Delete: `backend/app/schemas/temp_qc_work_order.py`
|
||||
- Delete: `backend/app/schemas/temp_production_work_order.py`
|
||||
|
||||
- [ ] **Step 1: 更新 qc_work_order schema**
|
||||
- 在 `QcWorkOrderCreateBody` 中加 `work_order_type: str = "inbound"`
|
||||
- 新增 `TempQcWorkOrderCreateBody`(remark only)或复用现有 schema
|
||||
- 新增 `QcWorkOrderConfigureBody`(合并临时工单配置的 schema)
|
||||
|
||||
- [ ] **Step 2: 合并 qc.py API 端点**
|
||||
- 将临时质检工单的 5 个端点合并到现有工单端点
|
||||
- 新增 `POST /web/admin/qc-work-orders` 支持 `work_order_type` 参数
|
||||
- 新增 `GET /web/admin/qc-work-orders` 支持 `work_order_type` 过滤
|
||||
- 新增 `POST /web/admin/qc-work-orders/{id}/configure` 端点(从 temp 端点移过来)
|
||||
- 删除 temp 相关 import 和端点
|
||||
|
||||
- [ ] **Step 3: 合并 production.py API 端点**
|
||||
- 同上思路
|
||||
|
||||
- [ ] **Step 4: 删除 temp schema 文件**
|
||||
|
||||
- [ ] **Step 5: 验证 import**
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 恢复 qc_task.py 的简单 INNER JOIN
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_task.py`
|
||||
|
||||
- [ ] **Step 1: 恢复 list_tasks 为 INNER JOIN**
|
||||
- 将 `outerjoin(BizQcWorkOrder, ...)` 恢复为 `join(BizQcWorkOrder, ...)`
|
||||
- 删除 `BizTempQcWorkOrder` import
|
||||
- 删除临时工单子查询(`temp_wo_sq`)
|
||||
- 删除临时工单后处理(`temp_wo_ids`、`temp_wo_map`、if/elif 分支)
|
||||
- 恢复原来的 ORDER BY 子句(含 `BizQcWorkOrder.work_order_no.desc()`)
|
||||
|
||||
- [ ] **Step 2: 验证**
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.crud.qc_task import list_tasks; print('OK')"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 简化 production_task.py
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/production_task.py`
|
||||
|
||||
- [ ] **Step 1: 简化 list_tasks 批量查询**
|
||||
- 删除 `BizTempProductionWorkOrder` import
|
||||
- 删除临时工单子查询和批量补充逻辑
|
||||
- 恢复为只查 `BizProductionWorkOrder` 的简单模式
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端 API + 页面合并
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/qc-work-order.ts` 或 `business.ts`
|
||||
- Modify: `web-admin/src/api/production-work-order.ts` 或 `business.ts`
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-work-order/index.vue`
|
||||
- Modify: `web-admin/src/views/production/production-work-order/index.vue`
|
||||
- Delete: `web-admin/src/api/temp-qc-work-order.ts`
|
||||
- Delete: `web-admin/src/api/temp-production-work-order.ts`
|
||||
- Delete: `web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue`
|
||||
- Delete: `web-admin/src/views/production/temp-production-work-order/index.vue`
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
- [ ] **Step 1: 将临时工单 API 合并到主 API 模块**
|
||||
- 在 qc-work-order API 中新增 configure 端点调用
|
||||
- 新增 work_order_type 参数支持
|
||||
- 删除 temp API 文件
|
||||
|
||||
- [ ] **Step 2: 更新 qc-work-order/index.vue**
|
||||
- 新增"工单类型"筛选(入库/临时)
|
||||
- 新增创建时选择类型(入库走接收流程,临时直接创建)
|
||||
- 新增配置检测弹窗(从 temp 页面移植)
|
||||
- 条件显示 reception 相关列(仅入库类型显示样本编码、协议号等)
|
||||
|
||||
- [ ] **Step 3: 更新 production-work-order/index.vue**
|
||||
- 同上思路
|
||||
|
||||
- [ ] **Step 4: 更新路由 sqxp.ts**
|
||||
- 删除临时工单路由条目
|
||||
- 主工单路由保持不变
|
||||
|
||||
- [ ] **Step 5: 删除临时工单页面和 API 文件**
|
||||
|
||||
- [ ] **Step 6: 前端构建验证**
|
||||
```bash
|
||||
cd web-admin && pnpm build
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 全局验证
|
||||
|
||||
- [ ] **Step 1: 后端 import 验证**
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && python -c "from app.main import app; print('OK')"
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 前端构建验证**
|
||||
```bash
|
||||
cd web-admin && pnpm build
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 手动测试流程**
|
||||
- 创建入库质检工单 → 配置 → 生成任务 ✓
|
||||
- 创建临时质检工单 → 配置 → 生成任务 ✓
|
||||
- 质检任务列表显示两种来源 ✓
|
||||
- 创建入库生产工单 → 配置 → 生成任务 ✓
|
||||
- 创建临时生产工单 → 配置 → 生成任务 ✓
|
||||
@@ -1,585 +0,0 @@
|
||||
# 中试服务申请单 Phase 1 实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 实现中试服务申请单的完整 CRUD、患者信息管理、输注方案/计划管理,含后端 API + 前端列表页+详情Tab页。
|
||||
|
||||
**Architecture:** 独立后端模块方案(方案A)。新建 `crud/pilot_application.py` 和 `api/pilot_application.py`,在 `models.py` 中新增 4 个 Model。前端新增列表页+详情页,路由追加到 `sqxp.ts`。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2 / Vue 3 / TypeScript / Element Plus / Tailwind CSS 4
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-05-24-pilot-application-phase1-design.md`
|
||||
|
||||
---
|
||||
|
||||
## Task 1: SQL 迁移文件 + Backend Models
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/pilot-application-migration.sql`
|
||||
- Modify: `backend/app/models/models.py`
|
||||
|
||||
- [ ] **Step 1: 创建 SQL 迁移文件**
|
||||
|
||||
创建 `docs/sql/pilot-application-migration.sql`,内容为 ALTER `biz_pilot_application` 增加 4 个字段 + 唯一索引:
|
||||
|
||||
```sql
|
||||
-- 中试服务申请单 Phase 1 迁移
|
||||
-- 为 biz_pilot_application 增加申请单号、状态、渠道缓存字段
|
||||
|
||||
ALTER TABLE biz_pilot_application
|
||||
ADD COLUMN application_no VARCHAR(64) DEFAULT NULL
|
||||
COMMENT '申请单号(自动生成,前缀ZSSQ)' AFTER id,
|
||||
ADD COLUMN application_status VARCHAR(16) NOT NULL DEFAULT 'dks'
|
||||
COMMENT 'dks待开始 jxz进行中 ywc已完成 yzf已作废' AFTER application_no,
|
||||
ADD COLUMN channel_id VARCHAR(64) DEFAULT NULL
|
||||
COMMENT '渠道ID(缓存自服务订单)' AFTER channel_service_order_id,
|
||||
ADD COLUMN channel_name VARCHAR(200) DEFAULT NULL
|
||||
COMMENT '渠道名称(缓存)' AFTER channel_id;
|
||||
|
||||
ALTER TABLE biz_pilot_application
|
||||
ADD UNIQUE KEY uk_application_no (application_no, del_flag);
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 models.py 末尾(BizChannelServiceOrderTxn 之后)新增 4 个 Model**
|
||||
|
||||
遵循项目已有 Model 模式(参考 `BizChannelServiceOrder` 在 L1761 的写法):
|
||||
- 字段顺序:id → 业务字段 → public 字段(tenant_no / order_num / remark / create_by / create_dept_id / create_time / update_by / update_time / del_flag)
|
||||
- 类型映射:VARCHAR→String, INT→Integer, TINYINT→SmallInteger, DATETIME→DateTime, DECIMAL→Numeric
|
||||
- 添加 `__tablename__` 和中文注释
|
||||
|
||||
新增的 4 个 Model:
|
||||
|
||||
**BizPilotApplication** → `biz_pilot_application`
|
||||
- id, application_no, application_status(default='dks'), channel_service_order_id, channel_id, channel_name
|
||||
- + public fields
|
||||
|
||||
**BizPilotPatient** → `biz_pilot_patient`
|
||||
- id, pilot_application_id, customer_id, patient_name, sex, age, id_card_no, phone_no, emergency_contact, emergency_phone, clinical_diagnosis, diagnosis_attachments, need_checkup(default=1)
|
||||
- + public fields
|
||||
|
||||
**BizPilotInfusionPlan** → `biz_pilot_infusion_plan`
|
||||
- id, pilot_application_id, cell_type, spec_text, total_course_count, course_interval, infusion_route, infusion_start_date
|
||||
- + public fields
|
||||
|
||||
**BizPilotInfusionSchedule** → `biz_pilot_infusion_schedule`
|
||||
- id, infusion_plan_id, cell_type, spec_text, infusion_time, schedule_status(default=''), attachments
|
||||
- + public fields
|
||||
|
||||
- [ ] **Step 3: 验证**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizPilotApplication, BizPilotPatient, BizPilotInfusionPlan, BizPilotInfusionSchedule; print('Models imported OK')"`
|
||||
Expected: `Models imported OK`
|
||||
|
||||
- [ ] **Step 4: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on `backend/app/models/models.py` — expect 0 errors.
|
||||
|
||||
---
|
||||
|
||||
## Task 2: Backend CRUD
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/pilot_application.py`
|
||||
|
||||
- [ ] **Step 1: 创建 CRUD 文件**
|
||||
|
||||
创建 `backend/app/crud/pilot_application.py`,遵循 `crud/pilot_service.py` 的模式(`_row_to_dict_*` + 分页列表 + CRUD 函数)。
|
||||
|
||||
**import 部分:**
|
||||
```python
|
||||
import uuid
|
||||
import json
|
||||
from datetime import datetime, date
|
||||
from typing import Dict, List, Optional, Any
|
||||
from sqlalchemy.orm import Session
|
||||
from sqlalchemy import and_
|
||||
from app.models.models import (
|
||||
BizPilotApplication, BizPilotPatient, BizPilotInfusionPlan, BizPilotInfusionSchedule,
|
||||
BizChannelServiceOrder, BizChannelServiceOrderProduct, BizCustomer
|
||||
)
|
||||
from app.core.database import get_db
|
||||
```
|
||||
|
||||
**_row_to_dict 函数(4 个):**
|
||||
|
||||
1. `_row_to_dict_application(row, db=None, tenant_no=None)`:
|
||||
- 基础字段:id, applicationNo, applicationStatus, channelServiceOrderId, channelId, channelName, remark, createTime, updateTime
|
||||
- 扩展字段(需 db 查询):
|
||||
- patientName: 从 BizPilotPatient 查询(WHERE pilot_application_id=row.id AND del_flag=0)
|
||||
- infusionPlanCount: 从 BizPilotInfusionPlan COUNT(WHERE pilot_application_id=row.id AND del_flag=0)
|
||||
- serviceOrderNo: 从 BizChannelServiceOrder 查询(WHERE id=row.channel_service_order_id)取其关联的订单信息
|
||||
- orderType: 同上,服务订单的 order_type
|
||||
|
||||
2. `_row_to_dict_patient(row)`:
|
||||
- id, pilotApplicationId, customerId, patientName, sex, age, idCardNo, phoneNo, emergencyContact, emergencyPhone, clinicalDiagnosis, diagnosisAttachments, needCheckup, remark, createTime, updateTime
|
||||
|
||||
3. `_row_to_dict_infusion_plan(row, db=None, tenant_no=None)`:
|
||||
- id, pilotApplicationId, cellType, specText, totalCourseCount, courseInterval, infusionRoute, infusionStartDate, remark, createTime, updateTime
|
||||
- 扩展:scheduleCount (COUNT schedules), completedCount (COUNT WHERE schedule_status='ywc')
|
||||
|
||||
4. `_row_to_dict_infusion_schedule(row)`:
|
||||
- id, infusionPlanId, cellType, specText, infusionTime, scheduleStatus, attachments, remark, createTime, updateTime
|
||||
|
||||
**CRUD 函数(16 个):**
|
||||
|
||||
**Application(8 个):**
|
||||
- `list_applications(db, tenant_no, page, page_size, channel_id=None, application_status=None, channel_service_order_id=None)` — 分页列表,按 create_time DESC 排序
|
||||
- `get_application(db, app_id, tenant_no)` — 获取详情
|
||||
- `create_application(db, data, tenant_no, user_id, dept_id)` — 校验服务订单存在且 status='sxz',从服务订单缓存 channel_id/channel_name,生成 application_no(ZSSQ+YYYYMMDD+4位序列)
|
||||
- `update_application(db, app_id, data, tenant_no)` — 仅 dks 状态可编辑
|
||||
- `soft_delete_application(db, app_id, tenant_no)` — 仅 dks 状态
|
||||
- `start_application(db, app_id, tenant_no, user_id)` — dks→jxz
|
||||
- `complete_application(db, app_id, tenant_no, user_id)` — jxz→ywc
|
||||
- `void_application(db, app_id, tenant_no, user_id)` — dks或jxz→yzf
|
||||
|
||||
**Patient(2 个):**
|
||||
- `get_patient_by_application(db, app_id, tenant_no)`
|
||||
- `save_patient(db, app_id, data, tenant_no, user_id, dept_id)` — 如果有 customer_id 则更新 biz_customer;如果无则新建 biz_customer 并回填 customer_id。然后用 upsert 逻辑保存 biz_pilot_patient(先查再更新或新建)。
|
||||
|
||||
**InfusionPlan(4 个):**
|
||||
- `list_infusion_plans(db, app_id, tenant_no)` — 按 order_num / create_time ASC
|
||||
- `create_infusion_plan(db, app_id, data, tenant_no, user_id, dept_id)`
|
||||
- `update_infusion_plan(db, plan_id, data, tenant_no)`
|
||||
- `soft_delete_infusion_plan(db, plan_id, tenant_no)` — 级联软删除其下所有 schedule
|
||||
|
||||
**InfusionSchedule(6 个):**
|
||||
- `list_schedules_by_plan(db, plan_id, tenant_no)` — 按 order_num ASC
|
||||
- `auto_generate_schedules(db, plan_id, tenant_no, user_id, dept_id)` — 读取 plan.total_course_count,批量插入 N 条 schedule
|
||||
- `create_schedule(db, plan_id, data, tenant_no, user_id, dept_id)` — 手动添加单条
|
||||
- `update_schedule(db, schedule_id, data, tenant_no)`
|
||||
- `soft_delete_schedule(db, schedule_id, tenant_no)`
|
||||
- `mark_schedule_complete(db, schedule_id, tenant_no, user_id)` — schedule_status='ywc'
|
||||
|
||||
**application_no 生成逻辑:**
|
||||
```python
|
||||
def _generate_application_no(db, tenant_no):
|
||||
today_str = datetime.now().strftime('%Y%m%d')
|
||||
prefix = f'ZSSQ{today_str}'
|
||||
# 查今天已有的最大序号
|
||||
existing = db.query(BizPilotApplication.application_no).filter(
|
||||
BizPilotApplication.tenant_no == tenant_no,
|
||||
BizPilotApplication.application_no.like(f'{prefix}%'),
|
||||
BizPilotApplication.del_flag == 0
|
||||
).order_by(BizPilotApplication.application_no.desc()).first()
|
||||
seq = 1
|
||||
if existing and existing[0]:
|
||||
seq = int(existing[0][-4:]) + 1
|
||||
return f'{prefix}{seq:04d}'
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证导入**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud.pilot_application import list_applications; print('CRUD imported OK')"`
|
||||
Expected: `CRUD imported OK`
|
||||
|
||||
- [ ] **Step 3: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on `backend/app/crud/pilot_application.py` — expect 0 errors.
|
||||
|
||||
---
|
||||
|
||||
## Task 3: Backend API Routes + Router Registration
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/pilot_application.py`
|
||||
- Modify: `backend/app/api/__init__.py`
|
||||
- Modify: `backend/app/main.py`
|
||||
|
||||
- [ ] **Step 1: 创建 API 路由文件**
|
||||
|
||||
创建 `backend/app/api/pilot_application.py`,遵循 `api/pilot_service.py` 的模式(Pydantic schemas 内联 + 路由函数)。
|
||||
|
||||
**import 部分:**
|
||||
```python
|
||||
from fastapi import APIRouter, Depends, Query, Request
|
||||
from sqlalchemy.orm import Session
|
||||
from pydantic import BaseModel, Field
|
||||
from typing import Optional, List
|
||||
from app.core.database import get_db
|
||||
from app.core.menu_guard import require_admin_or_super_admin
|
||||
from app.crud import pilot_application
|
||||
```
|
||||
|
||||
**Pydantic Schemas(6 个):**
|
||||
|
||||
```python
|
||||
class ApplicationCreateBody(BaseModel):
|
||||
channel_service_order_id: str
|
||||
remark: Optional[str] = None
|
||||
|
||||
class ApplicationUpdateBody(BaseModel):
|
||||
remark: Optional[str] = None
|
||||
|
||||
class PatientSaveBody(BaseModel):
|
||||
customer_id: Optional[str] = None
|
||||
patient_name: str
|
||||
sex: Optional[str] = None
|
||||
age: Optional[int] = None
|
||||
id_card_no: Optional[str] = None
|
||||
phone_no: Optional[str] = None
|
||||
emergency_contact: Optional[str] = None
|
||||
emergency_phone: Optional[str] = None
|
||||
clinical_diagnosis: Optional[str] = None
|
||||
diagnosis_attachments: Optional[str] = None
|
||||
need_checkup: int = 1
|
||||
|
||||
class InfusionPlanCreateBody(BaseModel):
|
||||
pilot_application_id: str
|
||||
cell_type: str
|
||||
spec_text: Optional[str] = None
|
||||
total_course_count: int
|
||||
course_interval: Optional[str] = None
|
||||
infusion_route: Optional[str] = None
|
||||
infusion_start_date: Optional[str] = None
|
||||
|
||||
class InfusionPlanUpdateBody(BaseModel):
|
||||
cell_type: Optional[str] = None
|
||||
spec_text: Optional[str] = None
|
||||
total_course_count: Optional[int] = None
|
||||
course_interval: Optional[str] = None
|
||||
infusion_route: Optional[str] = None
|
||||
infusion_start_date: Optional[str] = None
|
||||
|
||||
class InfusionScheduleUpdateBody(BaseModel):
|
||||
infusion_time: Optional[str] = None
|
||||
remark: Optional[str] = None
|
||||
attachments: Optional[str] = None
|
||||
```
|
||||
|
||||
**Router:**
|
||||
```python
|
||||
router = APIRouter(prefix="/web/admin", tags=["中试服务申请单管理"])
|
||||
```
|
||||
|
||||
**API 路由(19 个):**
|
||||
|
||||
| 方法 | 路径 | 函数名 | 依赖 | 说明 |
|
||||
|------|------|--------|------|------|
|
||||
| GET | `/pilot-application/list` | api_list_applications | require_admin | 分页列表,query params: page/page_size/channel_id/application_status/channel_service_order_id |
|
||||
| GET | `/pilot-application/detail` | api_get_application | require_admin | query param: id |
|
||||
| POST | `/pilot-application/create` | api_create_application | require_admin | body: ApplicationCreateBody |
|
||||
| PUT | `/pilot-application/update` | api_update_application | require_admin | body: ApplicationUpdateBody + id |
|
||||
| DELETE | `/pilot-application/delete` | api_delete_application | require_admin | body: {id} |
|
||||
| POST | `/pilot-application/start` | api_start_application | require_admin | body: {id} |
|
||||
| POST | `/pilot-application/complete` | api_complete_application | require_admin | body: {id} |
|
||||
| POST | `/pilot-application/void` | api_void_application | require_admin | body: {id} |
|
||||
| GET | `/pilot-patient/detail` | api_get_patient | require_admin | query param: application_id |
|
||||
| POST | `/pilot-patient/save` | api_save_patient | require_admin | body: PatientSaveBody + application_id |
|
||||
| GET | `/pilot-infusion-plan/list` | api_list_plans | require_admin | query param: application_id |
|
||||
| POST | `/pilot-infusion-plan/create` | api_create_plan | require_admin | body: InfusionPlanCreateBody |
|
||||
| PUT | `/pilot-infusion-plan/update` | api_update_plan | require_admin | body: InfusionPlanUpdateBody + id |
|
||||
| DELETE | `/pilot-infusion-plan/delete` | api_delete_plan | require_admin | body: {id} |
|
||||
| POST | `/pilot-infusion-schedule/auto-generate` | api_auto_generate | require_admin | body: {plan_id} |
|
||||
| POST | `/pilot-infusion-schedule/create` | api_create_schedule | require_admin | body: {plan_id, infusion_time?, remark?} |
|
||||
| PUT | `/pilot-infusion-schedule/update` | api_update_schedule | require_admin | body: InfusionScheduleUpdateBody + id |
|
||||
| DELETE | `/pilot-infusion-schedule/delete` | api_delete_schedule | require_admin | body: {id} |
|
||||
| POST | `/pilot-infusion-schedule/mark-complete` | api_mark_complete | require_admin | body: {id} |
|
||||
|
||||
每个路由函数结构:
|
||||
```python
|
||||
@router.get("/pilot-application/list")
|
||||
def api_list_applications(
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=100),
|
||||
channel_id: Optional[str] = Query(None),
|
||||
application_status: Optional[str] = Query(None),
|
||||
channel_service_order_id: Optional[str] = Query(None),
|
||||
_user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _user["tenant_no"]
|
||||
result = pilot_application.list_applications(db, tenant_no, page, page_size, channel_id, application_status, channel_service_order_id)
|
||||
return {"code": 0, "data": result}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 注册路由**
|
||||
|
||||
在 `backend/app/api/__init__.py` 中追加:
|
||||
```python
|
||||
from app.api.pilot_application import router as pilot_application_router
|
||||
```
|
||||
并在 `routers` 列表中追加 `pilot_application_router`。
|
||||
|
||||
在 `backend/app/main.py` 中追加路由 include(参考已有的 `pilot_service_router` 注册方式)。
|
||||
|
||||
- [ ] **Step 3: 验证**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.api.pilot_application import router; print(f'Routes: {len(router.routes)}')"`
|
||||
Expected: `Routes: 19`
|
||||
|
||||
- [ ] **Step 4: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on `backend/app/api/pilot_application.py`, `backend/app/api/__init__.py`, `backend/app/main.py` — expect 0 errors on all.
|
||||
|
||||
---
|
||||
|
||||
## Task 4: Frontend API 函数 + 状态标签 + 路由
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`
|
||||
- Modify: `web-admin/src/utils/status-tag-registry.ts`
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
- [ ] **Step 1: 在 admin.ts 末尾追加 19 个 API 函数**
|
||||
|
||||
遵循文件中已有函数模式(参考 `fetchPilotApplicationList` 风格),追加以下函数:
|
||||
|
||||
```typescript
|
||||
// ==================== 中试服务申请单 ====================
|
||||
|
||||
export function fetchPilotApplicationList(params: any) {
|
||||
return request({ url: '/pilot-application/list', method: 'get', params })
|
||||
}
|
||||
export function fetchPilotApplicationDetail(params: any) {
|
||||
return request({ url: '/pilot-application/detail', method: 'get', params })
|
||||
}
|
||||
export function createPilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/create', method: 'post', data })
|
||||
}
|
||||
export function updatePilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/update', method: 'put', data })
|
||||
}
|
||||
export function deletePilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/delete', method: 'delete', data })
|
||||
}
|
||||
export function startPilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/start', method: 'post', data })
|
||||
}
|
||||
export function completePilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/complete', method: 'post', data })
|
||||
}
|
||||
export function voidPilotApplication(data: any) {
|
||||
return request({ url: '/pilot-application/void', method: 'post', data })
|
||||
}
|
||||
|
||||
// 患者信息
|
||||
export function fetchPilotPatient(params: any) {
|
||||
return request({ url: '/pilot-patient/detail', method: 'get', params })
|
||||
}
|
||||
export function savePilotPatient(data: any) {
|
||||
return request({ url: '/pilot-patient/save', method: 'post', data })
|
||||
}
|
||||
|
||||
// 输注方案
|
||||
export function fetchPilotInfusionPlanList(params: any) {
|
||||
return request({ url: '/pilot-infusion-plan/list', method: 'get', params })
|
||||
}
|
||||
export function createPilotInfusionPlan(data: any) {
|
||||
return request({ url: '/pilot-infusion-plan/create', method: 'post', data })
|
||||
}
|
||||
export function updatePilotInfusionPlan(data: any) {
|
||||
return request({ url: '/pilot-infusion-plan/update', method: 'put', data })
|
||||
}
|
||||
export function deletePilotInfusionPlan(data: any) {
|
||||
return request({ url: '/pilot-infusion-plan/delete', method: 'delete', data })
|
||||
}
|
||||
|
||||
// 输注计划
|
||||
export function fetchPilotInfusionScheduleList(params: any) {
|
||||
return request({ url: '/pilot-infusion-schedule/list', method: 'get', params })
|
||||
}
|
||||
export function autoGenerateSchedules(data: any) {
|
||||
return request({ url: '/pilot-infusion-schedule/auto-generate', method: 'post', data })
|
||||
}
|
||||
export function updatePilotInfusionSchedule(data: any) {
|
||||
return request({ url: '/pilot-infusion-schedule/update', method: 'put', data })
|
||||
}
|
||||
export function deletePilotInfusionSchedule(data: any) {
|
||||
return request({ url: '/pilot-infusion-schedule/delete', method: 'delete', data })
|
||||
}
|
||||
export function markScheduleComplete(data: any) {
|
||||
return request({ url: '/pilot-infusion-schedule/mark-complete', method: 'post', data })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 status-tag-registry.ts 追加申请单状态标签函数**
|
||||
|
||||
```typescript
|
||||
/** 中试申请单状态 */
|
||||
export function applicationStatusLabel(status: string): string {
|
||||
const map: Record<string, string> = { dks: '待开始', jxz: '进行中', ywc: '已完成', yzf: '已作废' }
|
||||
return map[status] || status || '-'
|
||||
}
|
||||
export function applicationStatusTagType(status: string): '' | 'success' | 'warning' | 'danger' | 'info' {
|
||||
const map: Record<string, '' | 'success' | 'warning' | 'danger' | 'info'> = {
|
||||
dks: 'info', jxz: '', ywc: 'success', yzf: 'danger'
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 在 sqxp.ts 追加 2 个路由**
|
||||
|
||||
在 PilotService 的 children 数组末尾追加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
path: 'pilot-application',
|
||||
name: 'PilotApplication',
|
||||
component: () => import('@views/pilot-service/pilot-application/index.vue'),
|
||||
meta: { title: '中试服务申请单', icon: 'i-ep:document' }
|
||||
},
|
||||
{
|
||||
path: 'pilot-application/detail',
|
||||
name: 'PilotApplicationDetail',
|
||||
component: () => import('@views/pilot-service/pilot-application/ApplicationDetail.vue'),
|
||||
meta: { title: '申请单详情', hidden: true }
|
||||
},
|
||||
```
|
||||
|
||||
注意:路由 ID 需要根据现有 PilotService 的 ID 段确定,查看 sqxp.ts 中已有的路由 ID 模式。中试服务模块 ID 段为 8000...,检查当前已使用的最大 ID 后递增。
|
||||
|
||||
- [ ] **Step 4: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on all 3 modified files — expect 0 errors.
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端列表页
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/pilot-application/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建列表页**
|
||||
|
||||
创建目录 `web-admin/src/views/pilot-service/pilot-application/` 和 `index.vue`。
|
||||
|
||||
**参考模板页:** `src/views/system/order/index.vue`(复杂列表页)
|
||||
|
||||
**页面结构:**
|
||||
- 筛选区:申请单号(el-input)、渠道(el-select,数据源 fetchChannelList)、服务订单(el-select,联动渠道)、状态(el-radio-group 或 tag 按钮)
|
||||
- 操作栏:新增按钮(el-button type="primary")
|
||||
- 表格(el-table):列如 spec 中定义
|
||||
- 分页(el-pagination)
|
||||
|
||||
**关键交互:**
|
||||
- 新增:弹窗(el-dialog),选择渠道 → 联动加载该渠道的服务订单(调用已有的 fetchServiceOrderList,传入 channel_id 筛选)→ 选择服务订单 → 填写备注 → 提交 → 成功后 router.push 到详情页
|
||||
- 状态操作:根据 applicationStatus 动态显示按钮
|
||||
- dks:显示"开始"(primary) + "作废"(danger)
|
||||
- jxz:显示"完成"(primary) + "作废"(danger)
|
||||
- ywc/yzf:无按钮
|
||||
- 编辑/删除:仅 dks 状态可操作
|
||||
- 行点击:router.push({ name: 'PilotApplicationDetail', query: { id: row.id } })
|
||||
- 状态列用 el-tag + applicationStatusLabel/applicationStatusTagType
|
||||
|
||||
**数据加载:** onMounted 调用 fetchPilotApplicationList,筛选变更时重新加载。
|
||||
|
||||
**样式:** 遵循项目 Fresh Mint 色系(--primary #10b981),使用已有的 SCSS 变量和 mixin。
|
||||
|
||||
- [ ] **Step 2: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on `web-admin/src/views/pilot-service/pilot-application/index.vue` — expect 0 errors.
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端详情页 — 基本信息 Tab + 输注方案 Tab
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/pilot-application/ApplicationDetail.vue`
|
||||
|
||||
- [ ] **Step 1: 创建详情页**
|
||||
|
||||
**参考模板页:** `src/views/system/product/index.vue`(含详情展示的复杂页面)
|
||||
|
||||
**页面结构:**
|
||||
- 顶部:返回按钮 + 申请单号 + 状态标签 + 操作按钮(开始/完成/作废,根据状态显示)
|
||||
- el-tabs:4 个 tab(基本信息 / 输注方案 / 体检信息-locked / 交付信息-locked)
|
||||
|
||||
**基本信息 Tab:**
|
||||
- 上半区:el-descriptions 展示申请单信息(只读)
|
||||
- 申请单号、渠道名称、关联服务订单、状态、创建时间、备注
|
||||
- 下半区:患者信息面板(el-card)
|
||||
- "选择客户"按钮 → el-dialog 弹窗展示客户列表(调用已有 API 获取 biz_customer 列表,支持姓名/手机搜索)
|
||||
- 选中后自动填充表单字段
|
||||
- 表单字段:patientName, sex, age, idCardNo, phoneNo, emergencyContact, emergencyPhone, clinicalDiagnosis, diagnosisAttachments(附件上传), needCheckup(el-switch)
|
||||
- "保存患者信息"按钮
|
||||
|
||||
**输注方案 Tab:**
|
||||
- 工具栏:"新增输注方案"按钮
|
||||
- 方案列表用 el-table,每行显示方案的完整信息
|
||||
- 最后一列加 expand 展开行,展开后显示该方案的输注计划列表
|
||||
- 展开行内的计划列表(el-table):
|
||||
- 列:序号、细胞类型、规格、输注时间(可编辑)、状态、操作
|
||||
- 操作:编辑(弹窗修改时间/备注)、删除、标记完成
|
||||
- "手动添加计划"按钮在展开行内
|
||||
|
||||
**新增/编辑输注方案弹窗(el-dialog):**
|
||||
- 表单字段:cell_type(el-select,数据源从细胞产品类型 API)、spec_text、total_course_count(el-input-number)、course_interval、infusion_route、infusion_start_date(el-date-picker)
|
||||
- label-position="top",遵循 .form-grid-2 两列布局
|
||||
- 保存成功后 ElMessageBox.confirm("是否立即生成 N 条输注计划?"),确认则调用 autoGenerateSchedules
|
||||
|
||||
**数据加载:** onMounted 根据 route.query.id 调用 fetchPilotApplicationDetail 获取详情(含患者+方案),同时 fetchPilotInfusionPlanList 获取方案列表,每个方案再 fetchPilotInfusionScheduleList 获取计划。
|
||||
|
||||
**样式约定:**
|
||||
- Dialog forms: `label-position="top"`, `.dialog-form-layout`, `.form-grid-2`
|
||||
- 无 backdrop blur: `backdrop-filter: none`
|
||||
- Panel heading: `.title-bar-heading` + `::before` 竖线
|
||||
- 状态 Tag: el-tag + semantic colors
|
||||
|
||||
- [ ] **Step 2: 运行 LSP 诊断**
|
||||
|
||||
Run `lsp_diagnostics` on `web-admin/src/views/pilot-service/pilot-application/ApplicationDetail.vue` — expect 0 errors.
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 集成验证
|
||||
|
||||
**Files:** 无新文件
|
||||
|
||||
- [ ] **Step 1: 后端启动验证**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "
|
||||
from app.main import app
|
||||
routes = [r.path for r in app.routes if hasattr(r, 'path')]
|
||||
pilot_routes = [r for r in routes if 'pilot-application' in r or 'pilot-patient' in r or 'pilot-infusion' in r]
|
||||
print(f'Pilot application routes: {len(pilot_routes)}')
|
||||
for r in sorted(pilot_routes): print(f' {r}')
|
||||
"`
|
||||
Expected: 19 routes listed
|
||||
|
||||
- [ ] **Step 2: 前端构建验证**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: Build succeeds with exit code 0
|
||||
|
||||
- [ ] **Step 3: 前端 LSP 全量诊断**
|
||||
|
||||
Run `lsp_diagnostics` on directory `web-admin/src/views/pilot-service/pilot-application/` — expect 0 errors.
|
||||
|
||||
- [ ] **Step 4: 更新知识图谱**
|
||||
|
||||
Run: `./scripts/update-graph.sh backend frontend`
|
||||
Expected: 知识图谱更新完成
|
||||
|
||||
---
|
||||
|
||||
## 自审检查
|
||||
|
||||
### Spec Coverage
|
||||
|
||||
| Spec 需求 | 对应 Task |
|
||||
|-----------|----------|
|
||||
| ALTER biz_pilot_application | Task 1 |
|
||||
| 4 个 Model 类 | Task 1 |
|
||||
| Application CRUD 8 个函数 | Task 2 |
|
||||
| Patient save/get 2 个函数 | Task 2 |
|
||||
| InfusionPlan CRUD 4 个函数 | Task 2 |
|
||||
| InfusionSchedule 6 个函数 | Task 2 |
|
||||
| API routes 19 个 | Task 3 |
|
||||
| Router registration | Task 3 |
|
||||
| 19 个前端 API 函数 | Task 4 |
|
||||
| 状态标签函数 | Task 4 |
|
||||
| 路由追加 | Task 4 |
|
||||
| 列表页 | Task 5 |
|
||||
| 详情页(基本信息+输注方案) | Task 6 |
|
||||
| 集成验证 | Task 7 |
|
||||
|
||||
### Placeholder 扫描
|
||||
|
||||
无 TBD/TODO/占位符。所有步骤含具体代码或明确指令。
|
||||
|
||||
### Type 一致性
|
||||
|
||||
- Model 字段名与 CRUD _row_to_dict 输出的 camelCase key 一致
|
||||
- API 路径与前端 request URL 一致
|
||||
- Pydantic schema 字段与 CRUD 函数参数一致
|
||||
@@ -1,911 +0,0 @@
|
||||
# 临时工单模块实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 新增临时质检工单和临时生产工单两个模块,复用现有任务生成机制,在任务表中记录工单来源。
|
||||
|
||||
**Architecture:** 新建 2 张独立临时工单表(极简字段),现有任务表新增 `order_source` 字段区分入库/临时来源。后端 CRUD 独立,复用现有任务创建函数。前端新增 2 个标准列表页,现有任务列表新增"来源"Tag 列。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / Pydantic v2 / MySQL 5.7 / Vue 3 / TypeScript / Element Plus / Tailwind CSS 4
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-24-temporary-work-order-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Map
|
||||
|
||||
### 新建文件
|
||||
|
||||
| 文件 | 职责 |
|
||||
|------|------|
|
||||
| `backend/app/crud/temp_qc_work_order.py` | 临时质检工单 CRUD(创建、列表、详情、配置检测项目→生成任务、删除) |
|
||||
| `backend/app/crud/temp_production_work_order.py` | 临时生产工单 CRUD(创建、列表、详情、配置→生成任务、删除) |
|
||||
| `backend/app/schemas/temp_qc_work_order.py` | 临时质检工单 Pydantic Schema |
|
||||
| `backend/app/schemas/temp_production_work_order.py` | 临时生产工单 Pydantic Schema |
|
||||
| `web-admin/src/api/temp-qc-work-order.ts` | 临时质检工单前端 API 类型+函数 |
|
||||
| `web-admin/src/api/temp-production-work-order.ts` | 临时生产工单前端 API 类型+函数 |
|
||||
| `web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue` | 临时质检工单列表页 |
|
||||
| `web-admin/src/views/production/temp-production-work-order/index.vue` | 临时生产工单列表页 |
|
||||
| `docs/sql/temp_work_order_tables.sql` | 新建表 + ALTER 语句 |
|
||||
|
||||
### 修改文件
|
||||
|
||||
| 文件 | 修改内容 |
|
||||
|------|---------|
|
||||
| `backend/app/models/models.py` | 新增 2 个模型类;4 个现有模型新增 `order_source` 列 |
|
||||
| `backend/app/crud/qc_task.py` | `create_task_for_line()` 新增 `order_source` 参数;`_task_to_dict()` 序列化 `order_source`;`list_tasks()` 支持按 `order_source` 过滤 |
|
||||
| `backend/app/crud/production_task.py` | `create_production_task()` 新增 `order_source` 参数;序列化 `order_source`;列表支持按来源过滤 |
|
||||
| `backend/app/api/qc.py` | 新增临时质检工单路由组(5 个端点) |
|
||||
| `backend/app/api/production.py` | 新增临时生产工单路由组(5 个端点) |
|
||||
| `web-admin/src/api/qc-task.ts` | 类型新增 `orderSource` 字段 |
|
||||
| `web-admin/src/api/production-task.ts` | 类型新增 `orderSource` 字段 |
|
||||
| `web-admin/src/views/quality-inspection/qc-task/index.vue` | 列表新增"来源"Tag 列 |
|
||||
| `web-admin/src/views/production/production-task/index.vue` | 列表新增"来源"Tag 列 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 数据库 DDL — 新建表 + ALTER 语句
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/temp_work_order_tables.sql`
|
||||
|
||||
- [ ] **Step 1: 创建 SQL 文件**
|
||||
|
||||
```sql
|
||||
-- ============================================================
|
||||
-- 临时工单模块 DDL
|
||||
-- Date: 2026-05-24
|
||||
-- ============================================================
|
||||
|
||||
-- 1. 新建临时质检工单表
|
||||
DROP TABLE IF EXISTS biz_temp_qc_work_order;
|
||||
CREATE TABLE biz_temp_qc_work_order (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
work_order_no VARCHAR(64) NOT NULL COMMENT '工单号(LSZJ+日期+序号)',
|
||||
work_order_status VARCHAR(20) NOT NULL DEFAULT 'dpz' COMMENT '状态: dpz=待配置, ypz=已配置, ywc=已完成',
|
||||
configured_time DATETIME DEFAULT NULL COMMENT '配置时间',
|
||||
configured_by VARCHAR(64) DEFAULT NULL COMMENT '配置人',
|
||||
has_lab TINYINT DEFAULT 0 COMMENT '是否含实验室自检: 0=否, 1=是',
|
||||
has_third_party TINYINT DEFAULT 0 COMMENT '是否含第三方检测: 0=否, 1=是',
|
||||
third_party_fee_total DECIMAL(12,2) DEFAULT NULL COMMENT '第三方费用合计',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标记: 0=正常, 1=已删除',
|
||||
PRIMARY KEY (id),
|
||||
KEY idx_temp_qc_wo_tenant (tenant_no, del_flag),
|
||||
KEY idx_temp_qc_wo_no (work_order_no, tenant_no)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='临时质检工单';
|
||||
|
||||
-- 2. 新建临时生产工单表
|
||||
DROP TABLE IF EXISTS biz_temp_production_work_order;
|
||||
CREATE TABLE biz_temp_production_work_order (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
work_order_no VARCHAR(64) NOT NULL COMMENT '工单号(LSSC+日期+序号)',
|
||||
work_order_status VARCHAR(20) NOT NULL DEFAULT 'dpz' COMMENT '状态: dpz=待配置, jxz=进行中, ywc=已完成',
|
||||
configured_time DATETIME DEFAULT NULL COMMENT '配置时间',
|
||||
configured_by VARCHAR(64) DEFAULT NULL COMMENT '配置人',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标记: 0=正常, 1=已删除',
|
||||
PRIMARY KEY (id),
|
||||
KEY idx_temp_prod_wo_tenant (tenant_no, del_flag),
|
||||
KEY idx_temp_prod_wo_no (work_order_no, tenant_no)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='临时生产工单';
|
||||
|
||||
-- 3. 质检任务表新增来源字段
|
||||
ALTER TABLE biz_qc_task
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
|
||||
-- 4. 生产任务表新增来源字段
|
||||
ALTER TABLE biz_production_task
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
|
||||
-- 5. 实验室项目明细表新增来源字段
|
||||
ALTER TABLE biz_qc_work_order_lab_item
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
|
||||
-- 6. 第三方项目明细表新增来源字段
|
||||
ALTER TABLE biz_qc_work_order_third_item
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库执行 DDL**
|
||||
|
||||
Run: `mysql -u root -p zkxw < docs/sql/temp_work_order_tables.sql`
|
||||
Expected: 所有表和字段创建成功,无错误
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/temp_work_order_tables.sql
|
||||
git commit -m "feat(db): add temp work order tables and order_source columns"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 后端 Model — 新增模型类 + 修改现有模型
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py`
|
||||
|
||||
- [ ] **Step 1: 在 BizQcTask 模型中新增 `order_source` 列**
|
||||
|
||||
在 `BizQcTask` 类中,`work_order_id` 行之后添加:
|
||||
|
||||
```python
|
||||
class BizQcTask(Base):
|
||||
"""质检任务 biz_qc_task"""
|
||||
|
||||
__tablename__ = "biz_qc_task"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
work_order_id = Column(String(64), nullable=False, comment="工单ID")
|
||||
order_source = Column(String(20), nullable=False, default="inbound", comment="工单来源: inbound=入库, temporary=临时")
|
||||
task_no = Column(String(32), nullable=False, comment="任务号")
|
||||
# ... 其余字段保持不变
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 BizProductionTask 模型中新增 `order_source` 列**
|
||||
|
||||
在 `BizProductionTask` 类中,`work_order_id` 行之后添加:
|
||||
|
||||
```python
|
||||
class BizProductionTask(Base):
|
||||
"""生产任务 biz_production_task"""
|
||||
|
||||
__tablename__ = "biz_production_task"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
task_no = Column(String(32), nullable=False, comment="任务号")
|
||||
work_order_id = Column(String(64), nullable=False, comment="工单ID")
|
||||
order_source = Column(String(20), nullable=False, default="inbound", comment="工单来源: inbound=入库, temporary=临时")
|
||||
task_type = Column(String(20), nullable=False, default="cell_storage", comment="任务类型")
|
||||
# ... 其余字段保持不变
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 在 BizQcWorkOrderLabItem 模型中新增 `order_source` 列**
|
||||
|
||||
在 `BizQcWorkOrderLabItem` 类中,`work_order_id` 行之后添加:
|
||||
|
||||
```python
|
||||
class BizQcWorkOrderLabItem(Base):
|
||||
"""质检工单-实验室项目明细 biz_qc_work_order_lab_item"""
|
||||
|
||||
__tablename__ = "biz_qc_work_order_lab_item"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
work_order_id = Column(String(64), nullable=False, comment="工单ID")
|
||||
order_source = Column(String(20), nullable=False, default="inbound", comment="工单来源: inbound=入库, temporary=临时")
|
||||
lab_test_item_id = Column(String(64), nullable=False, comment="实验室项目ID")
|
||||
# ... 其余字段保持不变
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 在 BizQcWorkOrderThirdItem 模型中新增 `order_source` 列**
|
||||
|
||||
在 `BizQcWorkOrderThirdItem` 类中,`work_order_id` 行之后添加:
|
||||
|
||||
```python
|
||||
class BizQcWorkOrderThirdItem(Base):
|
||||
"""质检工单-第三方项目明细 biz_qc_work_order_third_item"""
|
||||
|
||||
__tablename__ = "biz_qc_work_order_third_item"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
work_order_id = Column(String(64), nullable=False, comment="工单ID")
|
||||
order_source = Column(String(20), nullable=False, default="inbound", comment="工单来源: inbound=入库, temporary=临时")
|
||||
third_party_item_id = Column(String(64), nullable=False, comment="第三方项目ID")
|
||||
# ... 其余字段保持不变
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 新增 BizTempQcWorkOrder 模型类**
|
||||
|
||||
在 `BizQcWorkOrder` 类定义之后(约行 1253)添加:
|
||||
|
||||
```python
|
||||
class BizTempQcWorkOrder(Base):
|
||||
"""临时质检工单 biz_temp_qc_work_order"""
|
||||
|
||||
__tablename__ = "biz_temp_qc_work_order"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
work_order_no = Column(String(64), nullable=False, comment="工单号(LSZJ+日期+序号)")
|
||||
work_order_status = Column(String(20), nullable=False, default="dpz", comment="状态: dpz=待配置, ypz=已配置, ywc=已完成")
|
||||
configured_time = Column(DateTime, nullable=True, comment="配置时间")
|
||||
configured_by = Column(String(64), nullable=True, comment="配置人")
|
||||
has_lab = Column(SmallInteger, nullable=False, default=0, comment="是否含实验室自检")
|
||||
has_third_party = Column(SmallInteger, nullable=False, default=0, comment="是否含第三方检测")
|
||||
third_party_fee_total = Column(Numeric(18, 2), nullable=True, comment="第三方费用合计")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 新增 BizTempProductionWorkOrder 模型类**
|
||||
|
||||
在 `BizProductionWorkOrder` 类定义之后(约行 2292)添加:
|
||||
|
||||
```python
|
||||
class BizTempProductionWorkOrder(Base):
|
||||
"""临时生产工单 biz_temp_production_work_order"""
|
||||
|
||||
__tablename__ = "biz_temp_production_work_order"
|
||||
|
||||
id = Column(String(64), primary_key=True, comment="主键ID")
|
||||
work_order_no = Column(String(64), nullable=False, comment="工单号(LSSC+日期+序号)")
|
||||
work_order_status = Column(String(20), nullable=False, default="dpz", comment="状态: dpz=待配置, jxz=进行中, ywc=已完成")
|
||||
configured_time = Column(DateTime, nullable=True, comment="配置时间")
|
||||
configured_by = Column(String(64), nullable=True, comment="配置人")
|
||||
tenant_no = Column(String(64), nullable=False, default="zkxw", comment="租户编号")
|
||||
order_num = Column(Integer, nullable=True, comment="排序号")
|
||||
remark = Column(String(512), nullable=True, comment="备注")
|
||||
create_by = Column(String(64), nullable=True, comment="创建人id")
|
||||
create_dept_id = Column(String(64), nullable=False, default="", comment="创建人部门ID")
|
||||
create_time = Column(DateTime, nullable=False, default=datetime.now, comment="创建时间")
|
||||
update_by = Column(String(64), nullable=True, comment="更新人id")
|
||||
update_time = Column(DateTime, nullable=False, default=datetime.now, onupdate=datetime.now, comment="更新时间")
|
||||
del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记")
|
||||
```
|
||||
|
||||
- [ ] **Step 7: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py
|
||||
git commit -m "feat(models): add temp work order models and order_source columns to task models"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 后端 — 修改现有 qc_task CRUD 支持 order_source
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_task.py`
|
||||
|
||||
- [ ] **Step 1: `create_task_for_line()` 新增 `order_source` 参数**
|
||||
|
||||
将函数签名改为:
|
||||
|
||||
```python
|
||||
def create_task_for_line(
|
||||
db: Session,
|
||||
*,
|
||||
work_order, # BizQcWorkOrder 或 BizTempQcWorkOrder
|
||||
task_type: str,
|
||||
source_line_id: str,
|
||||
item_code: str,
|
||||
item_name: str,
|
||||
tenant_no: str,
|
||||
user_id: Optional[str] = None,
|
||||
create_dept_id: str = "",
|
||||
seq: int = 1,
|
||||
company_id: Optional[str] = None,
|
||||
company_name: Optional[str] = None,
|
||||
fee_amount: Optional[Decimal] = None,
|
||||
order_source: str = "inbound", # 新增参数
|
||||
) -> BizQcTask:
|
||||
obj = BizQcTask(
|
||||
id=generate_uuid(),
|
||||
work_order_id=work_order.id,
|
||||
order_source=order_source, # 新增
|
||||
task_no=_gen_task_no(db, work_order, seq),
|
||||
task_type=task_type,
|
||||
source_line_id=source_line_id,
|
||||
sample_code=getattr(work_order, "sample_code", None) or None,
|
||||
item_code=item_code,
|
||||
item_name=item_name,
|
||||
company_id=company_id,
|
||||
company_name=company_name,
|
||||
fee_amount=fee_amount,
|
||||
task_status="dzx",
|
||||
tenant_no=tenant_no,
|
||||
order_num=seq,
|
||||
create_by=user_id,
|
||||
create_dept_id=create_dept_id or "",
|
||||
create_time=datetime.now(),
|
||||
update_by=user_id,
|
||||
update_time=datetime.now(),
|
||||
del_flag=0,
|
||||
)
|
||||
db.add(obj)
|
||||
db.flush()
|
||||
return obj
|
||||
```
|
||||
|
||||
- [ ] **Step 2: `_task_to_dict()` 序列化 `order_source`**
|
||||
|
||||
在 `_task_to_dict` 返回的字典中添加 `"orderSource"` 字段:
|
||||
|
||||
```python
|
||||
def _task_to_dict(
|
||||
t: BizQcTask,
|
||||
work_order_no: str = "",
|
||||
db: Optional[Session] = None,
|
||||
tenant_no: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
tn = tenant_no or t.tenant_no
|
||||
return {
|
||||
"id": t.id,
|
||||
"workOrderId": t.work_order_id,
|
||||
"orderSource": getattr(t, "order_source", "inbound") or "inbound", # 新增
|
||||
"workOrderNo": work_order_no,
|
||||
# ... 其余字段保持不变
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/qc_task.py
|
||||
git commit -m "feat(qc-task): support order_source parameter for task creation"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 后端 — 修改现有 production_task CRUD 支持 order_source
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/production_task.py`
|
||||
|
||||
- [ ] **Step 1: `create_production_task()` 新增 `order_source` 参数**
|
||||
|
||||
在函数签名中添加 `order_source: str = "inbound"` 参数,在创建 BizProductionTask 时设置:
|
||||
|
||||
```python
|
||||
# 在创建 task 对象时添加 order_source
|
||||
task = BizProductionTask(
|
||||
id=generate_uuid(),
|
||||
task_no=task_no,
|
||||
work_order_id=data.get("work_order_id", ""),
|
||||
order_source=order_source, # 新增
|
||||
task_type=data.get("task_type") or "cell_storage",
|
||||
# ... 其余保持不变
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 任务序列化函数添加 `orderSource` 字段**
|
||||
|
||||
在 `_task_to_dict()` 或相应的序列化函数中添加 `"orderSource"` 字段。
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/production_task.py
|
||||
git commit -m "feat(production-task): support order_source parameter for task creation"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 后端 — 临时质检工单 Schema + CRUD + API
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/schemas/temp_qc_work_order.py`
|
||||
- Create: `backend/app/crud/temp_qc_work_order.py`
|
||||
- Modify: `backend/app/api/qc.py`
|
||||
|
||||
- [ ] **Step 1: 创建 Schema**
|
||||
|
||||
Create `backend/app/schemas/temp_qc_work_order.py`:
|
||||
|
||||
```python
|
||||
"""临时质检工单 Schema"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import List, Optional
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
|
||||
class TempQcWorkOrderCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
remark: Optional[str] = Field("", alias="remark")
|
||||
|
||||
|
||||
class TempQcWorkOrderConfigureBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
has_lab: bool = Field(False, alias="hasLab")
|
||||
has_third_party: bool = Field(False, alias="hasThirdParty")
|
||||
lab_item_ids: List[str] = Field(default_factory=list, alias="labItemIds")
|
||||
third_party_item_ids: List[str] = Field(default_factory=list, alias="thirdPartyItemIds")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建 CRUD**
|
||||
|
||||
Create `backend/app/crud/temp_qc_work_order.py`。核心函数:
|
||||
|
||||
1. `_gen_daily_no(db, tenant_no)` — 生成 `LSZJ{YYYYMMDD}{序号:04d}`
|
||||
2. `_wo_to_dict(wo)` — 序列化(极简字段)
|
||||
3. `create_temp_qc_work_order(db, *, tenant_no, user_id, create_dept_id, remark)` — 创建
|
||||
4. `list_temp_qc_work_orders(db, *, page, page_size, keyword, work_order_status, tenant_no, user_info)` — 列表
|
||||
5. `get_temp_qc_work_order(db, id, tenant_no)` — 获取单条
|
||||
6. `get_temp_qc_work_order_detail(db, id, tenant_no)` — 详情(含 labItems, thirdPartyItems, tasks)
|
||||
7. `configure_temp_qc_work_order(db, id, *, has_lab, has_third_party, lab_item_ids, third_party_item_ids, tenant_no, user_id, create_dept_id)` — 配置检测项目→自动生成任务(复用 `qc_task.create_task_for_line(order_source='temporary')`)
|
||||
8. `try_complete_temp_qc_work_order(db, work_order_id, tenant_no)` — 所有临时任务完成时标记工单完成
|
||||
9. `delete_temp_qc_work_order(db, id, tenant_no, user_id)` — 软删除
|
||||
|
||||
配置逻辑参照现有 `qc_work_order.configure_work_order()`,区别:
|
||||
- 创建 BizQcWorkOrderLabItem/BizQcWorkOrderThirdItem 时设 `order_source='temporary'`
|
||||
- 调用 `task_svc.create_task_for_line(order_source='temporary')`
|
||||
- `try_complete` 查询时过滤 `order_source='temporary'`
|
||||
|
||||
- [ ] **Step 3: 在 api/qc.py 中新增路由组**
|
||||
|
||||
在文件末尾添加 5 个路由端点:
|
||||
|
||||
```python
|
||||
# ---------- 临时质检工单 ----------
|
||||
|
||||
@router.post("/temp-qc-work-orders")
|
||||
async def create_temp_qc_work_order(
|
||||
body: TempQcWorkOrderCreateBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:tempQcWorkOrder:list")),
|
||||
):
|
||||
...
|
||||
|
||||
@router.get("/temp-qc-work-orders")
|
||||
async def list_temp_qc_work_orders(...):
|
||||
...
|
||||
|
||||
@router.get("/temp-qc-work-orders/{work_order_id}")
|
||||
async def get_temp_qc_work_order_detail(...):
|
||||
...
|
||||
|
||||
@router.delete("/temp-qc-work-orders/{work_order_id}")
|
||||
async def delete_temp_qc_work_order(...):
|
||||
...
|
||||
|
||||
@router.post("/temp-qc-work-orders/{work_order_id}/configure")
|
||||
async def configure_temp_qc_work_order(
|
||||
work_order_id: str,
|
||||
body: TempQcWorkOrderConfigureBody,
|
||||
db: Session = Depends(get_db),
|
||||
user: dict = Depends(require_menu_code("biz:tempQcWorkOrder:list")),
|
||||
):
|
||||
...
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 启动后端验证 API 可达**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; print('OK')"`
|
||||
Expected: OK,无 import 错误
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/schemas/temp_qc_work_order.py backend/app/crud/temp_qc_work_order.py backend/app/api/qc.py
|
||||
git commit -m "feat(temp-qc): add temp QC work order backend (schema, CRUD, API)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 后端 — 临时生产工单 Schema + CRUD + API
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/schemas/temp_production_work_order.py`
|
||||
- Create: `backend/app/crud/temp_production_work_order.py`
|
||||
- Modify: `backend/app/api/production.py`
|
||||
|
||||
- [ ] **Step 1: 创建 Schema**
|
||||
|
||||
Create `backend/app/schemas/temp_production_work_order.py`:
|
||||
|
||||
```python
|
||||
"""临时生产工单 Schema"""
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
|
||||
class TempProductionWorkOrderCreateBody(BaseModel):
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
remark: Optional[str] = Field("", alias="remark")
|
||||
|
||||
|
||||
class TempProductionWorkOrderConfigureBody(BaseModel):
|
||||
"""配置→创建生产任务(与入库生产工单一致:选择工艺路线+克隆步骤)"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
|
||||
task_name: Optional[str] = Field("", alias="taskName")
|
||||
task_type: Optional[str] = Field("cell_storage", alias="taskType")
|
||||
route_id: Optional[str] = Field(None, alias="routeId")
|
||||
description: Optional[str] = Field("", alias="description")
|
||||
remark: Optional[str] = Field("", alias="remark")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建 CRUD**
|
||||
|
||||
Create `backend/app/crud/temp_production_work_order.py`。核心函数:
|
||||
|
||||
1. `_gen_daily_no(db, tenant_no)` — 生成 `LSSC{YYYYMMDD}{序号:04d}`
|
||||
2. `_wo_to_dict(wo)` — 序列化
|
||||
3. `create_temp_production_work_order(db, *, tenant_no, user_id, create_dept_id, remark)` — 创建
|
||||
4. `list_temp_production_work_orders(db, *, page, page_size, keyword, work_order_status, tenant_no, user_info)` — 列表
|
||||
5. `get_temp_production_work_order(db, id, tenant_no)` — 获取单条
|
||||
6. `get_temp_production_work_order_detail(db, id, tenant_no)` — 详情(含 tasks,每个 task 含 steps+子表)
|
||||
7. `configure_temp_production_work_order(db, id, *, task_name, task_type, route_id, description, remark, tenant_no, user_id, create_dept_id)` — 配置→创建生产任务,**复用 `production_task.create_production_task(order_source='temporary')`,自动触发 `_clone_route_to_task()` 克隆工艺路线步骤+4类子表**
|
||||
8. `delete_temp_production_work_order(db, id, tenant_no, user_id)` — 软删除
|
||||
|
||||
关键:`configure_temp_production_work_order` 直接调用 `production_task.create_production_task()`,传入 `order_source='temporary'` 和 `route_id`,由 `create_production_task` 内部自动执行 `_clone_route_to_task()` 克隆路线步骤。
|
||||
|
||||
同时需要调用 `sync_production_work_order_status_from_tasks` 的临时版本来同步工单状态。
|
||||
|
||||
- [ ] **Step 3: 在 api/production.py 中新增路由组**
|
||||
|
||||
添加 5 个路由端点(POST/GET/GET/{id}/DELETE/{id}/POST/{id}/configure),路由路径前缀 `/temp-production-work-orders`。
|
||||
|
||||
- [ ] **Step 4: 启动后端验证 API 可达**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; print('OK')"`
|
||||
Expected: OK
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/schemas/temp_production_work_order.py backend/app/crud/temp_production_work_order.py backend/app/api/production.py
|
||||
git commit -m "feat(temp-production): add temp production work order with route cloning support"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 前端 — 临时质检工单页面
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/api/temp-qc-work-order.ts`
|
||||
- Create: `web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建 API 文件**
|
||||
|
||||
Create `web-admin/src/api/temp-qc-work-order.ts`,参照 `api/qc-work-order.ts` 简化版:
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/http'
|
||||
|
||||
type PageList<T> = {
|
||||
list: T[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
totalPages: number
|
||||
}
|
||||
|
||||
export type TempQcWorkOrder = {
|
||||
id: string
|
||||
workOrderNo: string
|
||||
workOrderStatus: string
|
||||
hasLab: boolean
|
||||
hasThirdParty: boolean
|
||||
configuredTime?: string
|
||||
configuredBy?: string
|
||||
thirdPartyFeeTotal?: number
|
||||
remark?: string
|
||||
createTime?: string
|
||||
updateTime?: string
|
||||
}
|
||||
|
||||
export type TempQcWorkOrderDetail = TempQcWorkOrder & {
|
||||
labItems?: Array<{ id: string; labTestItemId: string; itemCode: string; itemName: string }>
|
||||
thirdPartyItems?: Array<{
|
||||
id: string
|
||||
thirdPartyItemId: string
|
||||
companyId: string
|
||||
companyName: string
|
||||
itemCode: string
|
||||
itemName: string
|
||||
feeAmount: number
|
||||
}>
|
||||
tasks?: Array<{
|
||||
id: string
|
||||
taskNo: string
|
||||
taskType: string
|
||||
itemCode?: string
|
||||
itemName?: string
|
||||
taskStatus: string
|
||||
conclusion?: string
|
||||
conclusionLabel?: string
|
||||
}>
|
||||
}
|
||||
|
||||
export function fetchTempQcWorkOrderList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
workOrderStatus?: string
|
||||
}) {
|
||||
return request.get<PageList<TempQcWorkOrder>>({
|
||||
url: '/web/admin/temp-qc-work-orders',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchTempQcWorkOrderDetail(id: string) {
|
||||
return request.get<TempQcWorkOrderDetail>({
|
||||
url: `/web/admin/temp-qc-work-orders/${id}`
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchCreateTempQcWorkOrder(data: { remark?: string }) {
|
||||
return request.post<TempQcWorkOrder>({
|
||||
url: '/web/admin/temp-qc-work-orders',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchConfigureTempQcWorkOrder(
|
||||
id: string,
|
||||
data: {
|
||||
hasLab: boolean
|
||||
hasThirdParty: boolean
|
||||
labItemIds: string[]
|
||||
thirdPartyItemIds: string[]
|
||||
}
|
||||
) {
|
||||
return request.post<TempQcWorkOrder>({
|
||||
url: `/web/admin/temp-qc-work-orders/${id}/configure`,
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchDeleteTempQcWorkOrder(id: string) {
|
||||
return request.del({ url: `/web/admin/temp-qc-work-orders/${id}` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建列表页面**
|
||||
|
||||
Create `web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue`
|
||||
|
||||
参照模板页 `src/views/system/unit/index.vue`(标准列表页模式),包含:
|
||||
- **列表列**:工单号、状态(Tag: dpz→info/ypz→warning/ywc→success)、是否含实验室自检、是否含第三方、配置时间、创建时间、操作
|
||||
- **创建弹窗**:仅备注字段(el-input type="textarea")
|
||||
- **配置弹窗**:复用现有配置检测项目组件逻辑(选择实验室自检/第三方检测项目)
|
||||
- **详情弹窗**:工单基本信息 + 关联任务列表
|
||||
- **Toolbar**:搜索(keyword)、状态筛选、新增按钮
|
||||
- **注意**:遵循 AGENTS.md UI 规范(Tag 用 el-tag、dialog label-position="top"、2列 form-grid 等)
|
||||
|
||||
- [ ] **Step 3: 验证前端编译**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: 构建成功,无 TypeScript 错误
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/temp-qc-work-order.ts web-admin/src/views/quality-inspection/temp-qc-work-order/index.vue
|
||||
git commit -m "feat(temp-qc): add temp QC work order frontend page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 前端 — 临时生产工单页面
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/api/temp-production-work-order.ts`
|
||||
- Create: `web-admin/src/views/production/temp-production-work-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建 API 文件**
|
||||
|
||||
Create `web-admin/src/api/temp-production-work-order.ts`,参照 `api/production-work-order.ts` 简化版:
|
||||
|
||||
```typescript
|
||||
import request from '@/utils/http'
|
||||
|
||||
type PageList<T> = {
|
||||
list: T[]
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
totalPages: number
|
||||
}
|
||||
|
||||
export type TempProductionWorkOrder = {
|
||||
id: string
|
||||
workOrderNo: string
|
||||
workOrderStatus: string
|
||||
configuredTime?: string
|
||||
configuredBy?: string
|
||||
remark?: string
|
||||
createTime?: string
|
||||
updateTime?: string
|
||||
}
|
||||
|
||||
export type TempProductionWorkOrderDetail = TempProductionWorkOrder & {
|
||||
tasks?: Array<{
|
||||
id: string
|
||||
taskNo: string
|
||||
taskType: string
|
||||
taskName?: string
|
||||
taskStatus: string
|
||||
}>
|
||||
}
|
||||
|
||||
export function fetchTempProductionWorkOrderList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
workOrderStatus?: string
|
||||
}) {
|
||||
return request.get<PageList<TempProductionWorkOrder>>({
|
||||
url: '/web/admin/temp-production-work-orders',
|
||||
params
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchTempProductionWorkOrderDetail(id: string) {
|
||||
return request.get<TempProductionWorkOrderDetail>({
|
||||
url: `/web/admin/temp-production-work-orders/${id}`
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchCreateTempProductionWorkOrder(data: { remark?: string }) {
|
||||
return request.post<TempProductionWorkOrder>({
|
||||
url: '/web/admin/temp-production-work-orders',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchConfigureTempProductionWorkOrder(
|
||||
id: string,
|
||||
data: {
|
||||
taskName?: string
|
||||
taskType?: string
|
||||
routeId?: string
|
||||
description?: string
|
||||
remark?: string
|
||||
}
|
||||
) {
|
||||
return request.post<TempProductionWorkOrder>({
|
||||
url: `/web/admin/temp-production-work-orders/${id}/configure`,
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function fetchDeleteTempProductionWorkOrder(id: string) {
|
||||
return request.del({ url: `/web/admin/temp-production-work-orders/${id}` })
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建列表页面**
|
||||
|
||||
Create `web-admin/src/views/production/temp-production-work-order/index.vue`
|
||||
|
||||
参照模板页 `src/views/system/unit/index.vue`(标准列表页),包含:
|
||||
- **列表列**:工单号、状态(Tag: dpz→info/jxz→primary/ywc→success)、配置时间、创建时间、操作
|
||||
- **创建弹窗**:仅备注字段
|
||||
- **配置弹窗**:与入库生产工单的 DispatchTaskDialog 类似,包含任务名称(task_name)、任务类型(task_type cell_storage/outbound)、**工艺路线选择(route_id,选择后自动克隆步骤)**、描述(description)、备注(remark)。参照 `views/production/production-work-order/DispatchTaskDialog.vue` 的表单结构。
|
||||
- **详情弹窗**:工单基本信息 + 关联任务列表
|
||||
- **遵循 UI 规范**
|
||||
|
||||
- [ ] **Step 3: 验证前端编译**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: 构建成功
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/temp-production-work-order.ts web-admin/src/views/production/temp-production-work-order/index.vue
|
||||
git commit -m "feat(temp-production): add temp production work order frontend page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 9: 前端 — 现有任务列表新增"来源"Tag 列
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/qc-task.ts`
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-task/index.vue`
|
||||
- Modify: `web-admin/src/api/production-task.ts`
|
||||
- Modify: `web-admin/src/views/production/production-task/index.vue`
|
||||
|
||||
- [ ] **Step 1: qc-task.ts 类型新增 orderSource**
|
||||
|
||||
在 `QcTask` 类型定义中添加:
|
||||
|
||||
```typescript
|
||||
export type QcTask = {
|
||||
// ... 现有字段
|
||||
orderSource?: string // 'inbound' | 'temporary'
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 质检任务列表新增"来源"列**
|
||||
|
||||
在 `quality-inspection/qc-task/index.vue` 的 el-table 中添加列:
|
||||
|
||||
```vue
|
||||
<el-table-column label="来源" prop="orderSource" min-width="100">
|
||||
<template #default="{ row }">
|
||||
<el-tag
|
||||
:type="row.orderSource === 'temporary' ? 'warning' : 'success'"
|
||||
size="small"
|
||||
>
|
||||
{{ row.orderSource === 'temporary' ? '临时' : '入库' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
位置放在"工单号"列之后。
|
||||
|
||||
- [ ] **Step 3: production-task.ts 类型新增 orderSource**
|
||||
|
||||
同 Step 1,在 ProductionTask 类型中添加 `orderSource`。
|
||||
|
||||
- [ ] **Step 4: 生产任务列表新增"来源"列**
|
||||
|
||||
同 Step 2,在 `production/production-task/index.vue` 的 el-table 中添加来源 Tag 列。
|
||||
|
||||
- [ ] **Step 5: 验证前端编译**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: 构建成功
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/qc-task.ts web-admin/src/views/quality-inspection/qc-task/index.vue web-admin/src/api/production-task.ts web-admin/src/views/production/production-task/index.vue
|
||||
git commit -m "feat(tasks): add orderSource column with tag display to task lists"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 10: 菜单配置 + 最终验证
|
||||
|
||||
**Files:**
|
||||
- Modify: 数据库 `sys_menu` 表(通过 SQL INSERT)
|
||||
|
||||
- [ ] **Step 1: 插入菜单记录**
|
||||
|
||||
在数据库中执行 SQL,为临时质检工单和临时生产工单各插入菜单记录。具体 menu_id 和 parent_id 需要根据现有菜单树确定。INSERT 语句参考现有菜单数据格式。
|
||||
|
||||
- [ ] **Step 2: 全栈验证**
|
||||
|
||||
1. 启动后端:`cd backend && source venv/bin/activate && ./start-local.sh`
|
||||
2. 启动前端:`cd web-admin && pnpm dev`
|
||||
3. 登录系统,导航到临时质检工单页面
|
||||
4. 测试:创建工单 → 配置检测项目 → 查看生成任务 → 完成任务 → 工单自动完成
|
||||
5. 导航到临时生产工单页面
|
||||
6. 测试:创建工单 → 配置生成任务 → 查看任务
|
||||
7. 导航到质检任务/生产任务页面,确认"来源"Tag 列正确显示
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/temp_work_order_tables.sql
|
||||
git commit -m "feat(menu): add temp work order menu items"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Self-Review Checklist
|
||||
|
||||
- [x] **Spec coverage**: 每个设计文档章节都有对应 Task(数据库→Task1/2,后端→Task3/4/5/6,前端→Task7/8/9,菜单→Task10)
|
||||
- [x] **Placeholder scan**: 无 TBD/TODO,所有步骤有具体代码或指令
|
||||
- [x] **Type consistency**: order_source 字段名在 model/schema/crud/api/typescript 中一致使用
|
||||
@@ -1,176 +0,0 @@
|
||||
# 金额/单价千分位输入与展示 — Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在 web-admin 统一金额/单价的「聚焦纯数字、失焦千分位、提交数值」交互,并统一只读列表/详情的千分位展示。
|
||||
|
||||
**Architecture:** 抽取 `money-format.ts` 纯函数 + `AmountInput` 封装 `el-input`;业务页替换金额类 `el-input-number` 与局部重复逻辑;只读处使用 `formatMoneyDisplay`。
|
||||
|
||||
**Tech Stack:** Vue 3、Element Plus、TypeScript、现有 Prettier/ESLint 规范。
|
||||
|
||||
**Design spec:** `docs/superpowers/specs/2026-05-25-money-input-thousand-separator-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File map
|
||||
|
||||
| 操作 | 路径 |
|
||||
|------|------|
|
||||
| Create | `web-admin/src/utils/money-format.ts` |
|
||||
| Create | `web-admin/src/components/common/amount-input/index.vue` |
|
||||
| Modify | `web-admin/src/views/pilot-service/channel-service-order/index.vue` |
|
||||
| Modify | `web-admin/src/views/pilot-service/channel-service-order-finance/index.vue` |
|
||||
| Modify | `openspec/changes/zkxw-engineering-standards/specs/ui-conventions/spec.md` |
|
||||
| Later P1+ | `channel/index.vue`, `cell-product-price/index.vue`, `project-price-system/index.vue`, `ProtocolFormDialog.vue`, `payment-info/index.vue`, … |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 金额格式化工具
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/utils/money-format.ts`
|
||||
|
||||
- [ ] **Step 1: 实现三个导出函数**
|
||||
|
||||
```typescript
|
||||
export function addThousandSeparators(intStr: string): string { /* 字符串分段,无前瞻正则 */ }
|
||||
|
||||
export function sanitizeMoneyInput(value: string, precision = 2): string { /* 去逗号、单小数点、截断小数 */ }
|
||||
|
||||
export function formatMoneyDisplay(value: string | number | null | undefined, precision = 2): string
|
||||
|
||||
export function parseMoneyToNumber(value: string, precision = 2): number | null
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 本地快速验证**
|
||||
|
||||
在 Node 或浏览器控制台执行:
|
||||
|
||||
```javascript
|
||||
formatMoneyDisplay(1234567.89) // '1,234,567.89'
|
||||
parseMoneyToNumber('1,234.56') // 1234.56
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: AmountInput 组件
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/components/common/amount-input/index.vue`
|
||||
|
||||
- [ ] **Step 1: 实现组件**
|
||||
|
||||
- `defineModel<number | null>()` 或 `modelValue` + `emit('update:modelValue')`
|
||||
- 内部 `displayText`,`watch(modelValue)` 在非聚焦时同步为 `formatMoneyDisplay`
|
||||
- `@focus` → sanitize 展示
|
||||
- `@input` → `sanitizeMoneyInput` 写回 `displayText`
|
||||
- `@blur` → `parseMoneyToNumber` → emit;`displayText = formatMoneyDisplay`
|
||||
- Props: `min`, `max`, `precision`, `placeholder`, `disabled`, `clearable`
|
||||
|
||||
- [ ] **Step 2: 在渠道服务订单页面临时引用验证**
|
||||
|
||||
仅 import 一个弹窗字段 smoke test(Task 3 会全量替换)。
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 渠道服务订单页(P0)
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/channel-service-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 删除页面内重复函数**
|
||||
|
||||
移除 `addThousandSeparators`、`formatRechargeAmountDisplay`、`sanitizeRechargeAmountInput`、`parseRechargeAmountInput`、`parseAmountInputToNumber`(若仅用于充值)、`rechargeAmountInput` 及相关 handler。
|
||||
|
||||
- [ ] **Step 2: 替换可编辑金额**
|
||||
|
||||
| 位置 | 替换为 |
|
||||
|------|--------|
|
||||
| 发起充值 | `<AmountInput v-model="rechargeForm.amount" :min="0.01" />` |
|
||||
| 申请退款 | `<AmountInput v-model="refundTxnForm.amount" :min="0.01" :max="currentBalance" />` |
|
||||
| 新增/编辑 产品明细单价 | `<AmountInput v-model="row.unitPrice" :min="0" @change="calcItemAmount(row)" />` |
|
||||
|
||||
- [ ] **Step 3: 只读展示**
|
||||
|
||||
将列表/查看/合计中的 `formatAmount`(金额类)改为 `formatMoneyDisplay`,或:
|
||||
|
||||
```typescript
|
||||
const formatAmount = (v: any) => formatMoneyDisplay(v, 2)
|
||||
```
|
||||
|
||||
仅当该文件内 `formatAmount` 全部用于金额时方可整文件替换。
|
||||
|
||||
- [ ] **Step 4: 手工验收**
|
||||
|
||||
按 spec 第 6 节 5 条检查;提交充值/退款 payload 为 number。
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 财务确认页只读列(P1 片段)
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/channel-service-order-finance/index.vue`
|
||||
|
||||
- [ ] **Step 1: `formatAmount` → `formatMoneyDisplay`**
|
||||
|
||||
列表金额、详情单价/金额、确认弹窗中的金额文案。
|
||||
|
||||
---
|
||||
|
||||
### Task 5: UI 规范 OpenSpec
|
||||
|
||||
**Files:**
|
||||
- Modify: `openspec/changes/zkxw-engineering-standards/specs/ui-conventions/spec.md`
|
||||
|
||||
- [ ] **Step 1: 新增 Requirement「金额与单价千分位」**
|
||||
|
||||
SHALL 行为表 + `AmountInput` + `formatMoneyDisplay` 路径说明。
|
||||
|
||||
---
|
||||
|
||||
### Task 6: P1 中试服务其余页(可并行子任务)
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/pilot-service/channel/index.vue`(协议价行内)
|
||||
- Modify: `web-admin/src/views/pilot-service/cell-product-price/index.vue`
|
||||
- Modify: `web-admin/src/views/pilot-service/project-price-system/index.vue`
|
||||
- Modify: `web-admin/src/views/pilot-service/checkup-institution/index.vue`、`CheckupPackagePanel.vue`
|
||||
|
||||
每文件重复 Task 3 的替换模式:金额类 `el-input-number` → `AmountInput`;只读 → `formatMoneyDisplay`。
|
||||
|
||||
---
|
||||
|
||||
### Task 7: P2 细胞存储(后续迭代)
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue`
|
||||
- Modify: `web-admin/src/views/cell-storage/payment-info/index.vue`
|
||||
- 只读:`ProtocolViewDialog.vue`、payment/refund confirm 列表
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 图谱更新(Agent 规则)
|
||||
|
||||
- [ ] **Step 1:** `./scripts/update-graph.sh frontend`(完成 P0 后)
|
||||
|
||||
---
|
||||
|
||||
## Self-review(plan ↔ spec)
|
||||
|
||||
| Spec 要求 | Task |
|
||||
|-----------|------|
|
||||
| 聚焦/失焦/提交行为 | Task 1–2 |
|
||||
| 只读千分位 | Task 3–4, 6–7 |
|
||||
| 禁止页面内复制正则 | Task 3 删除重复 |
|
||||
| 数量字段排除 | 各 Task 仅改单价/金额 |
|
||||
| OpenSpec | Task 5 |
|
||||
| 分期 P0–P3 | Task 3–7 |
|
||||
|
||||
## 执行选项
|
||||
|
||||
Plan 已保存至 `docs/superpowers/plans/2026-05-25-money-input-thousand-separator.md`。
|
||||
|
||||
1. **Subagent-Driven** — 按 Task 派发子代理,逐 Task 评审
|
||||
2. **Inline Execution** — 当前会话按 Task 1→3 连续实现(建议先 P0)
|
||||
|
||||
请告知:是否批准设计 spec,以及希望先执行 **P0(工具 + 组件 + 渠道服务订单)** 还是全量分期推进。
|
||||
@@ -1,167 +0,0 @@
|
||||
# ToolbarAction 组件实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 封装 ToolbarAction 可复用组件,将操作按钮从表格操作列移至工具栏,通过勾选行激活操作。
|
||||
|
||||
**Architecture:** 新建 `src/components/common/toolbar-action/` 组件,接收 `selected`(已选行)和 `actions`(操作列表),根据选中数量和操作模式(batch/single)自动控制按钮禁用状态。复用现有 `.btn-ghost` 样式。
|
||||
|
||||
**Tech Stack:** Vue 3 + TypeScript + Element Plus
|
||||
|
||||
---
|
||||
|
||||
## 文件结构
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 创建 | `src/components/common/toolbar-action/types.ts` | ToolbarActionItem 类型定义 |
|
||||
| 创建 | `src/components/common/toolbar-action/index.vue` | 组件本体(模板 + 逻辑 + scoped 样式) |
|
||||
| 删除 | `web-admin/demo-action-column.html` | 之前的演示文件 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 创建类型定义
|
||||
|
||||
**Files:**
|
||||
- Create: `src/components/common/toolbar-action/types.ts`
|
||||
|
||||
- [ ] **Step 1: 创建类型文件**
|
||||
|
||||
```ts
|
||||
import type { Component } from 'vue'
|
||||
|
||||
export interface ToolbarActionItem {
|
||||
label: string
|
||||
icon?: Component
|
||||
handler: (rows: any[]) => void
|
||||
mode: 'batch' | 'single'
|
||||
danger?: boolean
|
||||
disabled?: boolean
|
||||
visible?: boolean
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 创建 ToolbarAction 组件
|
||||
|
||||
**Files:**
|
||||
- Create: `src/components/common/toolbar-action/index.vue`
|
||||
- Reference: `src/components/common/amount-input/index.vue`(组件结构参考)
|
||||
- Reference: `src/views/production/consumable/index.vue:46-72`(工具栏按钮布局参考)
|
||||
- Reference: `src/assets/styles/core/el-ui.scss:987-995`(`.btn-ghost` 样式)
|
||||
|
||||
- [ ] **Step 1: 创建组件文件**
|
||||
|
||||
组件关键行为:
|
||||
- 过滤 `visible !== false` 的 actions
|
||||
- `selected.length === 0`:所有按钮 disabled
|
||||
- `selected.length === 1`:所有按钮可用
|
||||
- `selected.length > 1 && mode === 'single'`:disabled + tooltip「请选择单条记录」
|
||||
- `danger=true`:`type="danger"` 样式
|
||||
- `disabled=true`(调用方传入):始终禁用
|
||||
- 非 danger 按钮:`btn-ghost` class
|
||||
|
||||
```vue
|
||||
<template>
|
||||
<template v-for="action in visibleActions" :key="action.label">
|
||||
<el-tooltip
|
||||
v-if="isSingleDisabled(action)"
|
||||
content="请选择单条记录"
|
||||
placement="top"
|
||||
>
|
||||
<span class="toolbar-action-disabled-wrap">
|
||||
<el-button
|
||||
class="btn-ghost"
|
||||
:type="action.danger ? 'danger' : undefined"
|
||||
disabled
|
||||
>
|
||||
<el-icon v-if="action.icon"><component :is="action.icon" /></el-icon>
|
||||
{{ action.label }}
|
||||
</el-button>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<el-button
|
||||
v-else
|
||||
class="btn-ghost"
|
||||
:type="action.danger ? 'danger' : undefined"
|
||||
:disabled="isDisabled(action)"
|
||||
@click="action.handler(selected)"
|
||||
>
|
||||
<el-icon v-if="action.icon"><component :is="action.icon" /></el-icon>
|
||||
{{ action.label }}
|
||||
</el-button>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { ToolbarActionItem } from './types'
|
||||
|
||||
defineOptions({ name: 'ToolbarAction' })
|
||||
|
||||
interface Props {
|
||||
selected: any[]
|
||||
actions: ToolbarActionItem[]
|
||||
}
|
||||
|
||||
const props = defineProps<Props>()
|
||||
|
||||
const visibleActions = computed(() =>
|
||||
props.actions.filter((a) => a.visible !== false),
|
||||
)
|
||||
|
||||
const selectedCount = computed(() => props.selected.length)
|
||||
|
||||
function isDisabled(action: ToolbarActionItem): boolean {
|
||||
if (action.disabled) return true
|
||||
if (selectedCount.value === 0) return true
|
||||
if (action.mode === 'single' && selectedCount.value > 1) return true
|
||||
return false
|
||||
}
|
||||
|
||||
function isSingleDisabled(action: ToolbarActionItem): boolean {
|
||||
return (
|
||||
!action.disabled &&
|
||||
action.mode === 'single' &&
|
||||
selectedCount.value > 1
|
||||
)
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.toolbar-action-disabled-wrap {
|
||||
display: inline-flex;
|
||||
margin-left: 12px;
|
||||
}
|
||||
</style>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 验证构建
|
||||
|
||||
**Files:** 无新增修改
|
||||
|
||||
- [ ] **Step 1: 运行构建**
|
||||
|
||||
Run: `cd web-admin && pnpm build`
|
||||
Expected: 构建成功
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 清理演示文件
|
||||
|
||||
**Files:**
|
||||
- Delete: `web-admin/demo-action-column.html`
|
||||
|
||||
- [ ] **Step 1: 删除演示文件**
|
||||
|
||||
Run: `rm web-admin/demo-action-column.html`
|
||||
|
||||
---
|
||||
|
||||
## 不在本计划范围
|
||||
|
||||
- 改造现有页面的操作列(后续按需逐步替换)
|
||||
- 全局注册组件(按需 import 即可)
|
||||
- 修改全局样式(使用 ToolbarAction 的页面移除操作列后,`min-width: 260px` 规则自动失效)
|
||||
@@ -1,941 +0,0 @@
|
||||
# 体检管理页面实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 新增独立的体检管理页面,以患者为维度管理中试服务体检全流程(登记、上传报告、费用结算)。
|
||||
|
||||
**Architecture:** 在现有 `biz_pilot_checkup` 表新增 `pilot_patient_id` 字段实现患者维度关联。后端新增 3 个 API(分页列表、待登记患者、批量创建),前端新增 3 个 Vue 文件(列表页 + 登记弹窗 + 详情弹窗)。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy(后端)、Vue 3 + Element Plus + TypeScript(前端)
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-26-checkup-management-page-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Map
|
||||
|
||||
### Backend — 新建/修改
|
||||
|
||||
| 文件 | 操作 | 职责 |
|
||||
|------|------|------|
|
||||
| `docs/sql/2026-05-26-add-pilot-patient-id-to-checkup.sql` | 新建 | ALTER TABLE 迁移 SQL |
|
||||
| `backend/app/models/models.py:2913-2938` | 修改 | `BizPilotCheckup` 新增 `pilot_patient_id` 字段 |
|
||||
| `backend/app/crud/pilot_checkup.py` | 修改 | 新增 3 个函数 + 更新现有 `_row_to_dict_checkup`/`create_checkup` |
|
||||
| `backend/app/api/pilot_checkup.py` | 修改 | 新增 3 个端点 + 更新 `CheckupSaveBody` |
|
||||
|
||||
### Frontend — 新建/修改
|
||||
|
||||
| 文件 | 操作 | 职责 |
|
||||
|------|------|------|
|
||||
| `web-admin/src/api/admin.ts` | 修改 | 新增 3 个 API 函数 |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | 修改 | 新增路由 |
|
||||
| `web-admin/src/views/pilot-service/checkup-management/index.vue` | 新建 | 主列表页 |
|
||||
| `web-admin/src/views/pilot-service/checkup-management/CheckupRegisterDialog.vue` | 新建 | 批量登记体检弹窗 |
|
||||
| `web-admin/src/views/pilot-service/checkup-management/CheckupDetailDialog.vue` | 新建 | 详情弹窗(报告上传 + 实际项目) |
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 数据库迁移 SQL
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/2026-05-26-add-pilot-patient-id-to-checkup.sql`
|
||||
|
||||
- [ ] **Step 1: 创建迁移 SQL 文件**
|
||||
|
||||
```sql
|
||||
-- 2026-05-26: biz_pilot_checkup 新增 pilot_patient_id 字段
|
||||
-- 用于体检管理页面按患者维度管理体检记录
|
||||
|
||||
ALTER TABLE biz_pilot_checkup
|
||||
ADD COLUMN pilot_patient_id VARCHAR(64) DEFAULT NULL COMMENT '中试患者ID'
|
||||
AFTER pilot_application_id;
|
||||
|
||||
-- 为已有数据补充 pilot_patient_id(通过申请单关联患者)
|
||||
-- 注意:一个申请单可能对应多个患者,这里仅标记第一个需要体检的患者
|
||||
-- 新数据将通过 API 正确设置
|
||||
CREATE INDEX idx_pilot_checkup_patient_id ON biz_pilot_checkup(pilot_patient_id);
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库执行迁移**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
python -c "
|
||||
from app.core.database import engine
|
||||
from sqlalchemy import text
|
||||
with engine.connect() as conn:
|
||||
conn.execute(text('ALTER TABLE biz_pilot_checkup ADD COLUMN pilot_patient_id VARCHAR(64) DEFAULT NULL COMMENT \"中试患者ID\" AFTER pilot_application_id'))
|
||||
conn.execute(text('CREATE INDEX idx_pilot_checkup_patient_id ON biz_pilot_checkup(pilot_patient_id)'))
|
||||
conn.commit()
|
||||
print('Migration done')
|
||||
"
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add docs/sql/2026-05-26-add-pilot-patient-id-to-checkup.sql
|
||||
git commit -m "feat(checkup): add pilot_patient_id column to biz_pilot_checkup table"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (line ~2913, `BizPilotCheckup` class)
|
||||
|
||||
- [ ] **Step 1: 在 `BizPilotCheckup` 类中新增字段**
|
||||
|
||||
在 `pilot_application_id` 字段之后(约 line 2919 后)添加:
|
||||
|
||||
```python
|
||||
pilot_patient_id = Column(String(64), nullable=True, comment="中试患者ID")
|
||||
```
|
||||
|
||||
完整上下文:找到 `BizPilotCheckup` 类中的 `pilot_application_id` 行,在其下一行添加 `pilot_patient_id`。
|
||||
|
||||
- [ ] **Step 2: 验证 Model 能正常加载**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
python -c "from app.models.models import BizPilotCheckup; print([c.name for c in BizPilotCheckup.__table__.columns])"
|
||||
```
|
||||
|
||||
预期输出包含 `pilot_patient_id`。
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py
|
||||
git commit -m "feat(checkup): add pilot_patient_id to BizPilotCheckup model"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD 层更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_checkup.py`
|
||||
|
||||
- [ ] **Step 1: 更新 `_row_to_dict_checkup` 函数 — 添加 `pilotPatientId` 字段**
|
||||
|
||||
在 `_row_to_dict_checkup` 函数的字典构建中,`"pilotApplicationId"` 行之后添加:
|
||||
|
||||
```python
|
||||
"pilotPatientId": row.pilot_patient_id or "",
|
||||
```
|
||||
|
||||
同时,在 `if db and tenant_no:` 块内(`institutionName` 查找之后),添加患者信息关联查询:
|
||||
|
||||
```python
|
||||
# patientName / sex / age / phoneNo — from BizPilotPatient
|
||||
from app.models.models import BizPilotPatient, BizPilotApplication
|
||||
if row.pilot_patient_id:
|
||||
patient = (
|
||||
db.query(BizPilotPatient)
|
||||
.filter(
|
||||
BizPilotPatient.id == row.pilot_patient_id,
|
||||
BizPilotPatient.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if patient:
|
||||
d["patientName"] = patient.patient_name or ""
|
||||
d["sex"] = patient.sex or ""
|
||||
d["age"] = patient.age
|
||||
d["phoneNo"] = patient.phone_no or ""
|
||||
else:
|
||||
d["patientName"] = ""
|
||||
d["sex"] = ""
|
||||
d["age"] = None
|
||||
d["phoneNo"] = ""
|
||||
else:
|
||||
d["patientName"] = ""
|
||||
d["sex"] = ""
|
||||
d["age"] = None
|
||||
d["phoneNo"] = ""
|
||||
|
||||
# applicationNo / channelName — from BizPilotApplication
|
||||
if row.pilot_application_id:
|
||||
app = (
|
||||
db.query(BizPilotApplication)
|
||||
.filter(
|
||||
BizPilotApplication.id == row.pilot_application_id,
|
||||
BizPilotApplication.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if app:
|
||||
d["applicationNo"] = app.application_no or ""
|
||||
d["channelName"] = app.channel_name or ""
|
||||
else:
|
||||
d["applicationNo"] = ""
|
||||
d["channelName"] = ""
|
||||
else:
|
||||
d["applicationNo"] = ""
|
||||
d["channelName"] = ""
|
||||
```
|
||||
|
||||
注意:`from app.models.models import BizPilotPatient, BizPilotApplication` 已在文件顶部 import 区域(如果不存在需添加)。当前文件顶部已有:
|
||||
|
||||
```python
|
||||
from app.models.models import (
|
||||
BizCheckupInstitution,
|
||||
BizPilotCheckup,
|
||||
BizPilotCheckupActualItem,
|
||||
BizPilotCheckupReserveItem,
|
||||
)
|
||||
```
|
||||
|
||||
需要改为:
|
||||
|
||||
```python
|
||||
from app.models.models import (
|
||||
BizCheckupInstitution,
|
||||
BizPilotApplication,
|
||||
BizPilotCheckup,
|
||||
BizPilotCheckupActualItem,
|
||||
BizPilotCheckupReserveItem,
|
||||
BizPilotPatient,
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 `create_checkup` 函数 — 支持 `pilot_patient_id`**
|
||||
|
||||
在 `create_checkup` 函数中,`BizPilotCheckup(...)` 构造参数里添加:
|
||||
|
||||
```python
|
||||
pilot_patient_id=data.get("pilotPatientId") or None,
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 新增 `list_checkups_paginated` 函数**
|
||||
|
||||
在文件末尾(`delete_actual_item` 函数之后)添加:
|
||||
|
||||
```python
|
||||
# ────────────────────────────────────────────
|
||||
# Checkup List (Paginated)
|
||||
# ────────────────────────────────────────────
|
||||
|
||||
|
||||
def list_checkups_paginated(
|
||||
db: Session,
|
||||
tenant_no: str,
|
||||
page: int = 1,
|
||||
page_size: int = 10,
|
||||
checkup_status: Optional[str] = None,
|
||||
fee_status: Optional[str] = None,
|
||||
checkup_institution_id: Optional[str] = None,
|
||||
application_no: Optional[str] = None,
|
||||
patient_name: Optional[str] = None,
|
||||
channel_id: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
q = db.query(BizPilotCheckup).filter(
|
||||
BizPilotCheckup.tenant_no == tenant_no,
|
||||
BizPilotCheckup.del_flag == 0,
|
||||
)
|
||||
|
||||
if checkup_status:
|
||||
statuses = [s.strip() for s in checkup_status.split(",") if s.strip()]
|
||||
if statuses:
|
||||
q = q.filter(BizPilotCheckup.checkup_status.in_(statuses))
|
||||
|
||||
if fee_status:
|
||||
statuses = [s.strip() for s in fee_status.split(",") if s.strip()]
|
||||
if statuses:
|
||||
q = q.filter(BizPilotCheckup.fee_status.in_(statuses))
|
||||
|
||||
if checkup_institution_id:
|
||||
q = q.filter(BizPilotCheckup.checkup_institution_id == checkup_institution_id)
|
||||
|
||||
if application_no:
|
||||
app_subq = (
|
||||
db.query(BizPilotApplication.id)
|
||||
.filter(
|
||||
BizPilotApplication.application_no.like(f"%{application_no}%"),
|
||||
BizPilotApplication.del_flag == 0,
|
||||
)
|
||||
.subquery()
|
||||
)
|
||||
q = q.filter(BizPilotCheckup.pilot_application_id.in_(app_subq))
|
||||
|
||||
if patient_name:
|
||||
patient_subq = (
|
||||
db.query(BizPilotPatient.id)
|
||||
.filter(
|
||||
BizPilotPatient.patient_name.like(f"%{patient_name}%"),
|
||||
BizPilotPatient.del_flag == 0,
|
||||
)
|
||||
.subquery()
|
||||
)
|
||||
q = q.filter(BizPilotCheckup.pilot_patient_id.in_(patient_subq))
|
||||
|
||||
if channel_id:
|
||||
app_subq = (
|
||||
db.query(BizPilotApplication.id)
|
||||
.filter(
|
||||
BizPilotApplication.channel_id == channel_id,
|
||||
BizPilotApplication.del_flag == 0,
|
||||
)
|
||||
.subquery()
|
||||
)
|
||||
q = q.filter(BizPilotCheckup.pilot_application_id.in_(app_subq))
|
||||
|
||||
total = q.order_by(None).with_entities(func.count(BizPilotCheckup.id)).scalar() or 0
|
||||
page = max(1, page)
|
||||
page_size = min(max(1, page_size), 100)
|
||||
rows = (
|
||||
q.order_by(BizPilotCheckup.create_time.desc())
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
items = [_row_to_dict_checkup(r, db, tenant_no) for r in rows]
|
||||
return {
|
||||
"list": items,
|
||||
"pagination": {"page": page, "pageSize": page_size, "total": total},
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 新增 `list_pending_patients` 函数**
|
||||
|
||||
紧接上面函数之后添加:
|
||||
|
||||
```python
|
||||
def list_pending_patients(
|
||||
db: Session,
|
||||
tenant_no: str,
|
||||
page: int = 1,
|
||||
page_size: int = 10,
|
||||
application_no: Optional[str] = None,
|
||||
patient_name: Optional[str] = None,
|
||||
channel_id: Optional[str] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""查询 need_checkup=1 但尚未有 biz_pilot_checkup 记录的患者"""
|
||||
# 已有 checkup 的 patient_id 集合
|
||||
checked_patient_ids = (
|
||||
db.query(BizPilotCheckup.pilot_patient_id)
|
||||
.filter(
|
||||
BizPilotCheckup.tenant_no == tenant_no,
|
||||
BizPilotCheckup.del_flag == 0,
|
||||
BizPilotCheckup.pilot_patient_id.isnot(None),
|
||||
BizPilotCheckup.pilot_patient_id != "",
|
||||
)
|
||||
.subquery()
|
||||
)
|
||||
|
||||
q = db.query(BizPilotPatient).filter(
|
||||
BizPilotPatient.need_checkup == 1,
|
||||
BizPilotPatient.tenant_no == tenant_no,
|
||||
BizPilotPatient.del_flag == 0,
|
||||
~BizPilotPatient.id.in_(checked_patient_ids),
|
||||
)
|
||||
|
||||
if patient_name:
|
||||
q = q.filter(BizPilotPatient.patient_name.like(f"%{patient_name}%"))
|
||||
|
||||
if application_no or channel_id:
|
||||
app_q = db.query(BizPilotApplication.id).filter(
|
||||
BizPilotApplication.tenant_no == tenant_no,
|
||||
BizPilotApplication.del_flag == 0,
|
||||
)
|
||||
if application_no:
|
||||
app_q = app_q.filter(
|
||||
BizPilotApplication.application_no.like(f"%{application_no}%")
|
||||
)
|
||||
if channel_id:
|
||||
app_q = app_q.filter(BizPilotApplication.channel_id == channel_id)
|
||||
app_subq = app_q.subquery()
|
||||
q = q.filter(BizPilotPatient.pilot_application_id.in_(app_subq))
|
||||
|
||||
total = q.order_by(None).with_entities(func.count(BizPilotPatient.id)).scalar() or 0
|
||||
page = max(1, page)
|
||||
page_size = min(max(1, page_size), 100)
|
||||
rows = (
|
||||
q.order_by(BizPilotPatient.create_time.desc())
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
)
|
||||
|
||||
items = []
|
||||
for r in rows:
|
||||
d = {
|
||||
"id": r.id,
|
||||
"pilotApplicationId": r.pilot_application_id or "",
|
||||
"patientName": r.patient_name or "",
|
||||
"sex": r.sex or "",
|
||||
"age": r.age,
|
||||
"phoneNo": r.phone_no or "",
|
||||
}
|
||||
# 关联申请单信息
|
||||
app = (
|
||||
db.query(BizPilotApplication)
|
||||
.filter(
|
||||
BizPilotApplication.id == r.pilot_application_id,
|
||||
BizPilotApplication.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if app:
|
||||
d["applicationNo"] = app.application_no or ""
|
||||
d["channelName"] = app.channel_name or ""
|
||||
d["channelId"] = app.channel_id or ""
|
||||
else:
|
||||
d["applicationNo"] = ""
|
||||
d["channelName"] = ""
|
||||
d["channelId"] = ""
|
||||
items.append(d)
|
||||
|
||||
return {
|
||||
"list": items,
|
||||
"pagination": {"page": page, "pageSize": page_size, "total": total},
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 新增 `batch_create_checkups` 函数**
|
||||
|
||||
紧接上面函数之后添加:
|
||||
|
||||
```python
|
||||
def batch_create_checkups(
|
||||
db: Session,
|
||||
patient_ids: list,
|
||||
checkup_institution_id: str,
|
||||
reserve_time: Optional[str],
|
||||
reserve_items: list,
|
||||
tenant_no: str,
|
||||
user_id: str,
|
||||
) -> list:
|
||||
"""为多个患者批量创建体检记录 + 预约项目"""
|
||||
results = []
|
||||
now = datetime.now()
|
||||
|
||||
for patient_id in patient_ids:
|
||||
# 查找患者信息以获取 application_id
|
||||
patient = (
|
||||
db.query(BizPilotPatient)
|
||||
.filter(
|
||||
BizPilotPatient.id == patient_id,
|
||||
BizPilotPatient.tenant_no == tenant_no,
|
||||
BizPilotPatient.del_flag == 0,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if not patient:
|
||||
continue
|
||||
|
||||
# 创建 checkup 主记录
|
||||
checkup_row = BizPilotCheckup(
|
||||
id=uuid.uuid4().hex,
|
||||
pilot_application_id=patient.pilot_application_id,
|
||||
pilot_patient_id=patient_id,
|
||||
checkup_institution_id=checkup_institution_id or "",
|
||||
reserve_time=reserve_time or None,
|
||||
reserve_fee=sum(
|
||||
float(item.get("projectFee") or 0) for item in reserve_items
|
||||
) if reserve_items else None,
|
||||
actual_checkup_time=None,
|
||||
actual_checkup_fee=None,
|
||||
fee_settled=0,
|
||||
checkup_status="dtj",
|
||||
fee_status="wjs",
|
||||
checkup_remark="",
|
||||
report_attachments="",
|
||||
tenant_no=tenant_no,
|
||||
order_num=0,
|
||||
remark="",
|
||||
create_by=user_id,
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_by=user_id,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
db.add(checkup_row)
|
||||
db.flush() # 确保 checkup_row.id 可用
|
||||
|
||||
# 创建预约项目
|
||||
for idx, item in enumerate(reserve_items):
|
||||
ri = BizPilotCheckupReserveItem(
|
||||
id=uuid.uuid4().hex,
|
||||
pilot_checkup_id=checkup_row.id,
|
||||
project_name=item.get("projectName") or item.get("project_name") or "",
|
||||
project_fee=item.get("projectFee") if item.get("projectFee") is not None else (
|
||||
item.get("project_fee") if item.get("project_fee") is not None else None
|
||||
),
|
||||
tenant_no=tenant_no,
|
||||
order_num=idx + 1,
|
||||
remark="",
|
||||
create_by=user_id,
|
||||
create_dept_id="",
|
||||
create_time=now,
|
||||
update_by=user_id,
|
||||
update_time=now,
|
||||
del_flag=0,
|
||||
)
|
||||
db.add(ri)
|
||||
|
||||
results.append(_row_to_dict_checkup(checkup_row, db, tenant_no))
|
||||
|
||||
db.commit()
|
||||
return results
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 验证 CRUD 能正常加载**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
python -c "from app.crud import pilot_checkup; print([f for f in dir(pilot_checkup) if not f.startswith('_')])"
|
||||
```
|
||||
|
||||
预期输出包含 `list_checkups_paginated`、`list_pending_patients`、`batch_create_checkups`。
|
||||
|
||||
- [ ] **Step 7: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_checkup.py
|
||||
git commit -m "feat(checkup): add paginated list, pending patients, and batch create CRUD functions"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 API 层更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/pilot_checkup.py`
|
||||
|
||||
- [ ] **Step 1: 更新 `CheckupSaveBody` — 新增 `patient_id` 字段**
|
||||
|
||||
在 `CheckupSaveBody` 类中添加:
|
||||
|
||||
```python
|
||||
patient_id: Optional[str] = None
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 `api_save_checkup` — 传递 `patient_id`**
|
||||
|
||||
在 `api_save_checkup` 函数中,`data` 字典构建添加:
|
||||
|
||||
```python
|
||||
"pilotPatientId": body.patient_id,
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 新增 `BatchCheckupSaveBody` Schema**
|
||||
|
||||
在 Pydantic Schemas 区域(`CheckupItemsSaveBody` 之后)添加:
|
||||
|
||||
```python
|
||||
class BatchCheckupSaveBody(BaseModel):
|
||||
patientIds: List[str]
|
||||
checkupInstitutionId: Optional[str] = None
|
||||
reserveTime: Optional[str] = None
|
||||
reserveItems: Optional[List[CheckupItemBody]] = None
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 新增 `api_list_checkups` 端点**
|
||||
|
||||
在"1. 体检信息 CRUD"区域末尾(`api_settle_fee` 之后)添加:
|
||||
|
||||
```python
|
||||
@router.get("/pilot-checkup/list")
|
||||
async def api_list_checkups(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(10, ge=1, le=100, alias="pageSize"),
|
||||
checkupStatus: Optional[str] = Query(None, alias="checkupStatus"),
|
||||
feeStatus: Optional[str] = Query(None, alias="feeStatus"),
|
||||
checkupInstitutionId: Optional[str] = Query(None, alias="checkupInstitutionId"),
|
||||
applicationNo: Optional[str] = Query(None, alias="applicationNo"),
|
||||
patientName: Optional[str] = Query(None, alias="patientName"),
|
||||
channelId: Optional[str] = Query(None, alias="channelId"),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = pilot_checkup.list_checkups_paginated(
|
||||
db,
|
||||
tenant_no=tenant_no,
|
||||
page=page,
|
||||
page_size=pageSize,
|
||||
checkup_status=checkupStatus,
|
||||
fee_status=feeStatus,
|
||||
checkup_institution_id=checkupInstitutionId,
|
||||
application_no=applicationNo,
|
||||
patient_name=patientName,
|
||||
channel_id=channelId,
|
||||
)
|
||||
return success_response(result)
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 新增 `api_list_pending_patients` 端点**
|
||||
|
||||
```python
|
||||
@router.get("/pilot-checkup/pending-patients")
|
||||
async def api_list_pending_patients(
|
||||
page: int = Query(1, ge=1),
|
||||
pageSize: int = Query(10, ge=1, le=100, alias="pageSize"),
|
||||
applicationNo: Optional[str] = Query(None, alias="applicationNo"),
|
||||
patientName: Optional[str] = Query(None, alias="patientName"),
|
||||
channelId: Optional[str] = Query(None, alias="channelId"),
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
result = pilot_checkup.list_pending_patients(
|
||||
db,
|
||||
tenant_no=tenant_no,
|
||||
page=page,
|
||||
page_size=pageSize,
|
||||
application_no=applicationNo,
|
||||
patient_name=patientName,
|
||||
channel_id=channelId,
|
||||
)
|
||||
return success_response(result)
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 新增 `api_batch_save_checkup` 端点**
|
||||
|
||||
```python
|
||||
@router.post("/pilot-checkup/batch-save")
|
||||
async def api_batch_save_checkup(
|
||||
body: BatchCheckupSaveBody,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
try:
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
items_json = [item.dict() for item in body.reserveItems] if body.reserveItems else []
|
||||
result = pilot_checkup.batch_create_checkups(
|
||||
db,
|
||||
patient_ids=body.patientIds,
|
||||
checkup_institution_id=body.checkupInstitutionId or "",
|
||||
reserve_time=body.reserveTime or None,
|
||||
reserve_items=items_json,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user.get("user_id"),
|
||||
)
|
||||
return success_response(result, message=f"成功为 {len(result)} 名患者创建体检记录")
|
||||
except ValueError as e:
|
||||
return error_response(400, str(e))
|
||||
```
|
||||
|
||||
- [ ] **Step 7: 验证 API 能正常启动**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate
|
||||
python -c "from app.api.pilot_checkup import router; routes = [r.path for r in router.routes]; print(routes)"
|
||||
```
|
||||
|
||||
预期输出包含 `/web/admin/pilot-checkup/list`、`/web/admin/pilot-checkup/pending-patients`、`/web/admin/pilot-checkup/batch-save`。
|
||||
|
||||
- [ ] **Step 8: 提交**
|
||||
|
||||
```bash
|
||||
git add backend/app/api/pilot_checkup.py
|
||||
git commit -m "feat(checkup): add list, pending-patients, and batch-save API endpoints"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 API 函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`
|
||||
|
||||
- [ ] **Step 1: 在"中试服务 - 体检管理"区域末尾(`deletePilotCheckupActualItem` 之后)添加 3 个新函数**
|
||||
|
||||
```typescript
|
||||
// 体检记录分页列表
|
||||
export const fetchPilotCheckupList = (params: any) =>
|
||||
request.get({ url: '/web/admin/pilot-checkup/list', params })
|
||||
|
||||
// 待登记体检的患者列表
|
||||
export const fetchPilotCheckupPendingPatients = (params: any) =>
|
||||
request.get({ url: '/web/admin/pilot-checkup/pending-patients', params })
|
||||
|
||||
// 批量创建体检记录
|
||||
export const batchSavePilotCheckup = (data: any) =>
|
||||
request.post({ url: '/web/admin/pilot-checkup/batch-save', params: data })
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
```bash
|
||||
cd web-admin && npx tsc --noEmit src/api/admin.ts 2>&1 | head -5
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/admin.ts
|
||||
git commit -m "feat(checkup): add frontend API functions for checkup management page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端路由
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
|
||||
- [ ] **Step 1: 在 `PilotService` 的 `children` 数组末尾(`PilotApplication` 路由之后,即约 line 710 的 `}` 之前)添加新路由**
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000011',
|
||||
name: 'CheckupManagement',
|
||||
path: 'checkup-management',
|
||||
component: '/pilot-service/checkup-management/index',
|
||||
meta: {
|
||||
title: '体检管理',
|
||||
keepAlive: true,
|
||||
menuCode: 'pilot-service:checkup-management:list'
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/router/modules/sqxp.ts
|
||||
git commit -m "feat(checkup): add checkup management route"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 列表页 `index.vue`
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/checkup-management/index.vue`
|
||||
|
||||
**参考模板**: `pilot-service/channel-service-order/index.vue`(复杂列表)+ `checkup-institution/index.vue`(同模块风格)
|
||||
|
||||
- [ ] **Step 1: 创建目录**
|
||||
|
||||
```bash
|
||||
mkdir -p web-admin/src/views/pilot-service/checkup-management
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建 `index.vue`**
|
||||
|
||||
页面结构要求(遵循 AGENTS.md UI 规范):
|
||||
- `page-container` > `page-head` > `h1` 标题"体检管理"
|
||||
- `panel` > `panel-top` > `h2` "体检记录"
|
||||
- `filter-block` > `filter-grid`(2行4列筛选项)
|
||||
- `list-toolbar`:已选 N 项 + 「登记体检」按钮
|
||||
- `el-table` 带 `type="selection"` 列
|
||||
- `el-pagination`
|
||||
- 操作列 `fixed="right"` min-width ≥ 260
|
||||
|
||||
筛选项:
|
||||
- 体检状态(`el-select`:全部/待体检/已体检)
|
||||
- 费用状态(`el-select`:全部/未结算/已结算)
|
||||
- 体检机构(`el-select`,调用 `fetchCheckupInstitutionList` 加载选项)
|
||||
- 申请单号(`el-input`)
|
||||
- 患者姓名(`el-input`)
|
||||
|
||||
表格列(`min-width`,无 `width`):
|
||||
| 列 | prop | 说明 |
|
||||
|---|---|---|
|
||||
| ☐选择 | — | `type="selection"` |
|
||||
| 序号 | — | `type="index"` |
|
||||
| 申请单号 | applicationNo | |
|
||||
| 患者姓名 | patientName | |
|
||||
| 性别 | sex | 显示"男"/"女" |
|
||||
| 年龄 | age | |
|
||||
| 渠道名称 | channelName | |
|
||||
| 体检机构 | institutionName | 未登记显示"—" |
|
||||
| 预约时间 | reserveTime | |
|
||||
| 体检状态 | checkupStatus | `el-tag`:`checkupStatusTagType` |
|
||||
| 费用状态 | feeStatus | `el-tag`:待结算 info / 已结算 success |
|
||||
| 实际费用 | actualCheckupFee | `formatMoneyDisplay` |
|
||||
| 操作 | — | 查看 / 标记已体检 / 费用结算 |
|
||||
|
||||
操作按钮条件:
|
||||
- 查看:始终可用 → 打开 `CheckupDetailDialog`
|
||||
- 标记已体检:`checkupStatus === 'dtj'` 可用
|
||||
- 费用结算:`checkupStatus === 'ytj' && feeStatus === 'wjs'` 可用
|
||||
|
||||
工具栏「登记体检」按钮:`selectedRows.length > 0` 且所有选中行 `checkupStatus === 'dtj'` 时可用,点击打开 `CheckupRegisterDialog`。
|
||||
|
||||
API 调用:
|
||||
- 列表数据:`fetchPilotCheckupList`
|
||||
- 机构下拉:`fetchCheckupInstitutionList`
|
||||
- 标记已体检:`markPilotCheckupChecked`
|
||||
- 费用结算:`settlePilotCheckupFee`
|
||||
|
||||
复用工具:
|
||||
- `checkupStatusLabel` / `checkupStatusTagType` from `@/utils/status-tag-registry`
|
||||
- `formatMoneyDisplay` from `@/utils/format`
|
||||
|
||||
- [ ] **Step 3: 验证页面加载**
|
||||
|
||||
启动 dev server,访问 `/#/pilot-service/checkup-management`,确认页面正常渲染。
|
||||
|
||||
- [ ] **Step 4: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-management/index.vue
|
||||
git commit -m "feat(checkup): create checkup management list page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 登记体检弹窗 `CheckupRegisterDialog.vue`
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/checkup-management/CheckupRegisterDialog.vue`
|
||||
|
||||
**参考模式**: `CheckupPackagePanel.vue`(项目选择器模式)
|
||||
|
||||
- [ ] **Step 1: 创建弹窗组件**
|
||||
|
||||
组件结构:
|
||||
- `el-dialog` title="登记体检" width="1380px" `class="dialog-form-layout"` `destroy-on-close`
|
||||
- 内部分 3 个区域:患者选择区、体检信息区、项目选择区
|
||||
|
||||
**患者选择区**:
|
||||
- 搜索栏:申请单号 + 患者姓名 + 搜索按钮
|
||||
- `el-table` 带 `type="selection"`:展示 `fetchPilotCheckupPendingPatients` 数据
|
||||
- 列:申请单号、患者姓名、性别、年龄、渠道名称
|
||||
- 底部显示"已选 N 名患者"
|
||||
|
||||
**体检信息区**(`form-grid-2`):
|
||||
- 体检机构:`el-select` 调用 `fetchCheckupInstitutionList`,选择后加载该机构的项目和套餐
|
||||
- 预约时间:`el-date-picker` type="datetime"
|
||||
|
||||
**项目选择区**:
|
||||
- `el-tabs` 两个 Tab:「从套餐添加」和「添加单项」
|
||||
- Tab 1(套餐):`el-select` 选套餐 → 点击"加载套餐项目" → 自动填充到项目列表
|
||||
- Tab 2(单项):`el-button` "添加项目" → 打开项目选择器(`el-table` 带 selection 展示该机构所有项目)
|
||||
- 已选项目列表:`el-table` 显示项目名称 + 费用,可删除
|
||||
- 底部合计费用
|
||||
|
||||
**保存逻辑**:
|
||||
- 校验:至少选 1 名患者、必选体检机构
|
||||
- 调用 `batchSavePilotCheckup` 传入 `{ patientIds, checkupInstitutionId, reserveTime, reserveItems }`
|
||||
- 成功后 `emit('success')` 并关闭弹窗
|
||||
|
||||
API 调用:
|
||||
- `fetchPilotCheckupPendingPatients` — 搜索患者
|
||||
- `fetchCheckupInstitutionList` — 机构下拉
|
||||
- `fetchCheckupInstitutionProjects(institutionId)` — 机构项目列表
|
||||
- `fetchCheckupInstitutionPackages(institutionId)` — 机构套餐列表
|
||||
- `fetchCheckupInstitutionPackageDetail(packageId)` — 套餐详情(含项目)
|
||||
- `batchSavePilotCheckup` — 批量保存
|
||||
|
||||
- [ ] **Step 2: 在 `index.vue` 中引入并使用**
|
||||
|
||||
在 `index.vue` 中 import 并注册 `CheckupRegisterDialog`,添加 `v-model` 绑定和 `@success` 回调(回调刷新列表)。
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-management/
|
||||
git commit -m "feat(checkup): create batch checkup register dialog"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 详情弹窗 `CheckupDetailDialog.vue`
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/checkup-management/CheckupDetailDialog.vue`
|
||||
|
||||
**参考模式**: `ApplicationDetailDialog.vue` 体检 Tab 部分(约 line 2900-3500)
|
||||
|
||||
- [ ] **Step 1: 创建详情弹窗组件**
|
||||
|
||||
组件结构:
|
||||
- `el-dialog` title="体检详情 — {patientName}" width="1200px" `class="dialog-form-layout"` `destroy-on-close`
|
||||
|
||||
**基本信息区**(只读展示,`form-grid-2`):
|
||||
- 申请单号、患者姓名、性别、年龄、渠道名称
|
||||
- 体检机构、预约时间
|
||||
- 体检状态 `el-tag`、费用状态 `el-tag`
|
||||
|
||||
**预约项目区**(只读):
|
||||
- `el-table` 展示预约项目列表(项目名称 + 费用)
|
||||
- 底部合计
|
||||
|
||||
**实际项目区**(可编辑):
|
||||
- `el-button` "添加单项" → 内联输入行(项目名称 input + 费用 input + 确认按钮)
|
||||
- `el-table` 展示实际项目列表(项目名称 + 费用 + 删除操作)
|
||||
- 底部合计
|
||||
|
||||
**体检报告区**(卡片化上传,参考 `ProtocolFormDialog.vue`):
|
||||
- `el-upload` 触发器为虚线卡片(140×96px, dashed border `#a7f3d0`)
|
||||
- 已上传文件展示为卡片行,每个卡片含文件名 + 下载/删除按钮
|
||||
- 上传调用 `fetchUploadAttachment`,URL 以逗号分隔存储到 `reportAttachments`
|
||||
|
||||
**备注区**:
|
||||
- `el-input` type="textarea" v-model 绑定 `checkupRemark`
|
||||
|
||||
**底部操作按钮**(根据状态显示):
|
||||
- 标记已体检:`checkupStatus === 'dtj'` 时显示
|
||||
- 费用结算:`checkupStatus === 'ytj' && feeStatus === 'wjs'` 时显示
|
||||
- 保存:保存备注和实际项目修改
|
||||
|
||||
API 调用:
|
||||
- 打开时加载:`fetchPilotCheckupDetail({ application_id })` + `fetchPilotCheckupReserveItems` + `fetchPilotCheckupActualItems`
|
||||
- 保存实际项目:`savePilotCheckupActualItems`
|
||||
- 保存主信息:`savePilotCheckup`
|
||||
- 标记已体检:`markPilotCheckupChecked`
|
||||
- 费用结算:`settlePilotCheckupFee`
|
||||
- 上传附件:`fetchUploadAttachment`
|
||||
- 下载附件:`fetchAttachmentDownloadUrl`
|
||||
|
||||
- [ ] **Step 2: 在 `index.vue` 中引入并使用**
|
||||
|
||||
在 `index.vue` 中 import 并注册 `CheckupDetailDialog`,点击"查看"或行双击时打开。
|
||||
|
||||
- [ ] **Step 3: 提交**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/pilot-service/checkup-management/
|
||||
git commit -m "feat(checkup): create checkup detail dialog with report upload"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 端到端验证
|
||||
|
||||
- [ ] **Step 1: 启动后端**
|
||||
|
||||
```bash
|
||||
cd backend && source venv/bin/activate && ./start-local.sh
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 启动前端**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm dev
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 验证关键流程**
|
||||
|
||||
1. 访问 `/#/pilot-service/checkup-management`,列表页正常加载
|
||||
2. 点击「登记体检」按钮,弹窗正常弹出
|
||||
3. 搜索患者、选择体检机构、添加项目、保存 — 成功创建体检记录
|
||||
4. 列表中出现新记录,状态为"待体检"
|
||||
5. 点击"查看",详情弹窗正常显示基本信息 + 预约项目
|
||||
6. 上传体检报告附件 — 成功
|
||||
7. 添加实际项目 — 成功
|
||||
8. 点击"标记已体检" — 状态变为"已体检"
|
||||
9. 点击"费用结算" — 状态变为"已结算"
|
||||
|
||||
- [ ] **Step 4: 检查 LSP 诊断**
|
||||
|
||||
```bash
|
||||
# 后端
|
||||
cd backend && python -c "from app.api.pilot_checkup import router; print('OK')"
|
||||
# 前端 — 在 IDE 中检查 index.vue 无报错
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 最终提交**
|
||||
|
||||
```bash
|
||||
git add -A
|
||||
git commit -m "feat(checkup): complete checkup management page with register, detail, and report upload"
|
||||
```
|
||||
@@ -1,483 +0,0 @@
|
||||
# 输注计划管理页面实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 新建独立的输注计划管理页面,管理所有输注计划的状态流转(待输注→已用户确认→已完成/已取消),支持编辑、取消原因录入、完成时自动扣减渠道服务订单余额或产品份数。
|
||||
|
||||
**Architecture:** 新增 `infusion_status` 字段到 `biz_pilot_infusion_schedule` 表(与现有 `schedule_status` 生产状态独立),新增后端 CRUD/API 和前端完整页面(模式 P02 列表多状态),遵循 openspec UI 规范。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy + Pydantic v2 (后端) · Vue 3 + Element Plus + Tailwind CSS 4 (前端) · MySQL 5.7
|
||||
|
||||
**UI 模式选型:** **P02**(列表多状态,操作按钮随状态变化),参考页 `/#/demo/order`,业务参考 `pilot-service/checkup-management`。
|
||||
|
||||
---
|
||||
|
||||
## 文件结构
|
||||
|
||||
| 操作 | 文件路径 | 职责 |
|
||||
|------|----------|------|
|
||||
| 新建 | `docs/sql/20260526_infusion_schedule_add_fields.sql` | 数据库迁移 SQL |
|
||||
| 修改 | `backend/app/models/models.py` (BizPilotInfusionSchedule) | 添加 infusion_status、cancel_reason 字段 |
|
||||
| 新建 | `backend/app/crud/pilot_infusion_schedule_mgmt.py` | 输注计划管理 CRUD(列表 JOIN 查询、状态变更、扣减) |
|
||||
| 新建 | `backend/app/api/pilot_infusion_schedule_mgmt.py` | 输注计划管理 API 路由 |
|
||||
| 修改 | `backend/app/api/__init__.py` | 注册新路由 |
|
||||
| 修改 | `backend/app/api/pilot_application.py` | Bug Fix:创建时默认 infusion_status='dtz' |
|
||||
| 修改 | `web-admin/src/api/admin.ts` | 添加输注计划管理 API 函数 |
|
||||
| 修改 | `web-admin/src/utils/status-tag-registry.ts` | 添加 infusionStatusLabel/TagType |
|
||||
| 新建 | `web-admin/src/views/pilot-service/infusion-schedule-management/index.vue` | 主列表页 |
|
||||
| 新建 | `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleEditDialog.vue` | 编辑弹窗 |
|
||||
| 新建 | `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue` | 查看弹窗 |
|
||||
| 新建 | `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleCancelDialog.vue` | 取消弹窗(输入原因) |
|
||||
| 修改 | `web-admin/src/router/modules/sqxp.ts` | 添加路由 |
|
||||
| 修改 | `web-admin/src/App.vue` | panelTitleBarTextRules 添加标题 |
|
||||
| 修改 | `docs/web-admin-ui-pattern-index.md` | 补充页面→模式映射 |
|
||||
|
||||
---
|
||||
|
||||
## 状态码定义
|
||||
|
||||
### infusion_status(新增字段 — 输注状态)
|
||||
|
||||
| Code | 含义 | TagType | 说明 |
|
||||
|------|------|---------|------|
|
||||
| `dtz` | 待输注 | `info` | 默认值,创建时自动设置 |
|
||||
| `yrqr` | 已用户确认 | `warning` | 点击"用户已确认"按钮 |
|
||||
| `yqx` | 已取消 | `danger` | 点击"取消"按钮,需输入取消原因 |
|
||||
| `ywc` | 已完成 | `success` | 点击"完成"按钮,触发费用扣减 |
|
||||
|
||||
### product_status(扩展 — 细胞产品状态,跟随 infusion_status 变化)
|
||||
|
||||
| Code | 含义 | TagType |
|
||||
|------|------|---------|
|
||||
| `dtz` | 待输注 | `info` |
|
||||
| `yrqr` | 已用户确认 | `warning` |
|
||||
| `yqx` | 已取消 | `danger` |
|
||||
| `ywc` | 已完成 | `success` |
|
||||
|
||||
> **注意**:当前 `product_status` 使用中文文本"待输注",需改为 code `dtz`。迁移 SQL 中需 UPDATE 现有数据。
|
||||
|
||||
### 状态流转规则
|
||||
|
||||
```
|
||||
待输注(dtz) ──→ 已用户确认(yrqr) ──→ 已完成(ywc)
|
||||
│ │
|
||||
└──→ 已取消(yqx) │
|
||||
└──→ 已取消(yqx) ←────────────────────┘
|
||||
```
|
||||
|
||||
- `dtz` → `yrqr`:点击"用户已确认"
|
||||
- `dtz` → `yqx`:点击"取消"
|
||||
- `yrqr` → `ywc`:点击"完成",触发扣减
|
||||
- `yrqr` → `yqx`:点击"取消"
|
||||
- `ywc`/`yqx` 为终态,不可变更
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 数据库变更
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/20260526_infusion_schedule_add_fields.sql`
|
||||
|
||||
- [ ] **Step 1: 编写迁移 SQL**
|
||||
|
||||
```sql
|
||||
-- 20260526: 输注计划管理 — 添加输注状态字段
|
||||
-- 1. biz_pilot_infusion_schedule 新增 infusion_status 和 cancel_reason
|
||||
ALTER TABLE `biz_pilot_infusion_schedule`
|
||||
ADD COLUMN `infusion_status` varchar(16) NOT NULL DEFAULT 'dtz' COMMENT 'dtz待输注 yrqr已用户确认 yqx已取消 ywc已完成' AFTER `schedule_status`,
|
||||
ADD COLUMN `cancel_reason` varchar(512) DEFAULT NULL COMMENT '取消原因' AFTER `infusion_status`;
|
||||
|
||||
-- 2. biz_pilot_infusion_schedule_product 的 product_status 从中文文本改为 code
|
||||
-- 先更新现有数据
|
||||
UPDATE `biz_pilot_infusion_schedule_product` SET `product_status` = 'dtz' WHERE `product_status` = '待输注' OR `product_status` IS NULL;
|
||||
ALTER TABLE `biz_pilot_infusion_schedule_product`
|
||||
MODIFY COLUMN `product_status` varchar(32) DEFAULT 'dtz' COMMENT 'dtz待输注 yrqr已用户确认 yqx已取消 ywc已完成';
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库执行 SQL**
|
||||
|
||||
连接开发库执行上述 SQL,确认无报错。
|
||||
|
||||
- [ ] **Step 3: 更新 zkxw.sql 全量备份(手动确认后)**
|
||||
|
||||
记录变更到 `docs/sql/` 目录。
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 Model 更新
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (BizPilotInfusionSchedule 类,约 line 2892)
|
||||
|
||||
- [ ] **Step 1: 在 BizPilotInfusionSchedule 模型中添加新字段**
|
||||
|
||||
在 `schedule_status` 列定义之后添加:
|
||||
|
||||
```python
|
||||
# BizPilotInfusionSchedule 类中,schedule_status 字段之后添加:
|
||||
infusion_status = Column('infusion_status', String(16), nullable=False, default='dtz', comment='dtz待输注 yrqr已用户确认 yqx已取消 ywc已完成')
|
||||
cancel_reason = Column('cancel_reason', String(512), nullable=True, default=None, comment='取消原因')
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无 import 错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizPilotInfusionSchedule; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 CRUD
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/pilot_infusion_schedule_mgmt.py`
|
||||
|
||||
这个文件实现输注计划管理的核心业务逻辑。
|
||||
|
||||
- [ ] **Step 1: 创建 CRUD 文件,实现列表查询(多表 JOIN)**
|
||||
|
||||
关键:列表需要 JOIN 患者信息、渠道信息、申请单信息、方案信息。
|
||||
|
||||
```python
|
||||
"""输注计划管理 CRUD(独立管理页面用)"""
|
||||
from __future__ import annotations
|
||||
|
||||
import uuid
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from sqlalchemy import and_, func, or_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.models import (
|
||||
BizChannelServiceOrder,
|
||||
BizChannelServiceOrderProduct,
|
||||
BizChannelAccount,
|
||||
BizChannelAgreementProductPrice,
|
||||
BizChannelProductQuota,
|
||||
BizPilotApplication,
|
||||
BizPilotInfusionPlan,
|
||||
BizPilotInfusionSchedule,
|
||||
BizPilotInfusionScheduleProduct,
|
||||
BizPilotPatient,
|
||||
)
|
||||
from app.crud.pilot_service import (
|
||||
_get_or_create_channel_account,
|
||||
_reduce_channel_product_quota,
|
||||
)
|
||||
```
|
||||
|
||||
需要实现的核心函数:
|
||||
|
||||
1. **`list_infusion_schedules_mgmt`** — 多表 JOIN 分页查询
|
||||
- 查询 `biz_pilot_infusion_schedule` 为主表
|
||||
- LEFT JOIN `biz_pilot_infusion_plan` → `biz_pilot_application` → `biz_pilot_patient`
|
||||
- 筛选条件:keyword(申请单号/患者姓名/渠道名称)、infusion_status、infusion_time 范围(默认最近 30 天)
|
||||
- 返回字段包括:schedule 自身字段 + patientName/sex/age + channelName/applicationNo + plan 信息 + products 列表
|
||||
|
||||
2. **`update_infusion_status`** — 状态变更
|
||||
- 校验状态流转合法性
|
||||
- 更新 schedule 的 `infusion_status`
|
||||
- 同步更新所有关联 product 的 `product_status`
|
||||
- 如果变为 `yqx`,保存 `cancel_reason`
|
||||
- 如果变为 `ywc`,调用 `_deduct_fee_on_complete`
|
||||
|
||||
3. **`_deduct_fee_on_complete`** — 完成时费用扣减
|
||||
- 复用 `pilot_delivery.py` 中 `_deduct_fee_on_delivery` 的逻辑
|
||||
- schedule → plan → application → service_order
|
||||
- 预付款型(yfk):扣渠道账户余额 + 更新订单余额
|
||||
- 购买型(gmcp):扣产品份数 + 更新订单产品持仓
|
||||
- 余额/份数不足时抛出 ValueError
|
||||
|
||||
4. **`get_infusion_schedule_detail`** — 获取详情(含 products)
|
||||
5. **`update_infusion_schedule_mgmt`** — 编辑 schedule 和 products 信息
|
||||
|
||||
- [ ] **Step 2: 实现所有 CRUD 函数**
|
||||
|
||||
具体实现需参考:
|
||||
- `pilot_delivery.py` 的 `_deduct_fee_on_delivery` (line 174-327) — 扣减逻辑
|
||||
- `pilot_checkup.py` 的 `list_pilot_checkup` — 多表 JOIN 列表查询模式
|
||||
- `pilot_application.py` 的 `_row_to_dict_schedule` — schedule 序列化模式
|
||||
|
||||
- [ ] **Step 3: 验证 import**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "import app.crud.pilot_infusion_schedule_mgmt; print('OK')"`
|
||||
Expected: `OK`
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 API
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/api/pilot_infusion_schedule_mgmt.py`
|
||||
- Modify: `backend/app/api/__init__.py` — 注册新路由
|
||||
|
||||
- [ ] **Step 1: 创建 API 路由文件**
|
||||
|
||||
端点列表(前缀 `/web/admin/pilot-infusion-schedule-mgmt`):
|
||||
|
||||
```python
|
||||
# 1. 列表(分页 + 多表 JOIN)
|
||||
@router.get("/list")
|
||||
|
||||
# 2. 详情
|
||||
@router.get("/detail")
|
||||
|
||||
# 3. 更新状态(确认/取消/完成)
|
||||
@router.put("/update-status")
|
||||
# Body: { scheduleId, infusionStatus, cancelReason? }
|
||||
|
||||
# 4. 编辑(schedule 信息 + products)
|
||||
@router.put("/update")
|
||||
# Body: { id, cellType?, specText?, infusionTime?, infusionLocation?, infusionMethod?, products: [...] }
|
||||
```
|
||||
|
||||
Pydantic schemas 内联在 API 文件中(与现有模式一致),使用 `populate_by_name=True` + alias 驼峰命名。
|
||||
|
||||
- [ ] **Step 2: 注册路由到 __init__.py**
|
||||
|
||||
在 `backend/app/api/__init__.py` 中,pilot 相关路由组内添加:
|
||||
```python
|
||||
from app.api.pilot_infusion_schedule_mgmt import router as pilot_infusion_schedule_mgmt_router
|
||||
# ...
|
||||
api_router.include_router(pilot_infusion_schedule_mgmt_router, prefix="/web/admin", tags=["中试-输注计划管理"])
|
||||
```
|
||||
|
||||
同时检查 `app/main.py` 是否需要额外注册。
|
||||
|
||||
- [ ] **Step 3: 验证 API 注册**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; routes = [r.path for r in app.routes]; print(any('pilot-infusion-schedule-mgmt' in str(r) for r in routes))"`
|
||||
Expected: `True`
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 API 函数
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/admin.ts`
|
||||
|
||||
- [ ] **Step 1: 在 admin.ts 末尾添加输注计划管理 API 函数**
|
||||
|
||||
参考现有函数风格(如 `fetchPilotCheckupList`),添加:
|
||||
|
||||
```typescript
|
||||
// ═══════════════════════════════════════════
|
||||
// 输注计划管理
|
||||
// ═══════════════════════════════════════════
|
||||
|
||||
/** 输注计划管理 - 列表 */
|
||||
export function fetchInfusionScheduleMgmtList(params: any) {
|
||||
return request({ url: '/web/admin/pilot-infusion-schedule-mgmt/list', method: 'get', params })
|
||||
}
|
||||
|
||||
/** 输注计划管理 - 详情 */
|
||||
export function fetchInfusionScheduleMgmtDetail(params: any) {
|
||||
return request({ url: '/web/admin/pilot-infusion-schedule-mgmt/detail', method: 'get', params })
|
||||
}
|
||||
|
||||
/** 输注计划管理 - 更新状态 */
|
||||
export function updateInfusionScheduleStatus(data: any) {
|
||||
return request({ url: '/web/admin/pilot-infusion-schedule-mgmt/update-status', method: 'put', data })
|
||||
}
|
||||
|
||||
/** 输注计划管理 - 编辑 */
|
||||
export function updateInfusionScheduleMgmt(data: any) {
|
||||
return request({ url: '/web/admin/pilot-infusion-schedule-mgmt/update', method: 'put', data })
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端状态注册
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/status-tag-registry.ts`
|
||||
|
||||
- [ ] **Step 1: 添加输注状态标签函数**
|
||||
|
||||
在文件末尾(`scheduleStatusTagType` 之后)添加:
|
||||
|
||||
```typescript
|
||||
// ========== 中试服务 - 输注状态(infusion_status) ==========
|
||||
export function infusionStatusLabel(status: string): string {
|
||||
const map: Record<string, string> = {
|
||||
dtz: '待输注',
|
||||
yrqr: '已用户确认',
|
||||
yqx: '已取消',
|
||||
ywc: '已完成',
|
||||
}
|
||||
return map[status] || status || '-'
|
||||
}
|
||||
export function infusionStatusTagType(status: string): string {
|
||||
const map: Record<string, string> = {
|
||||
dtz: 'info',
|
||||
yrqr: 'warning',
|
||||
yqx: 'danger',
|
||||
ywc: 'success',
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 scheduleStatusLabel — 移除 yjf**
|
||||
|
||||
修改现有 `scheduleStatusLabel` 函数,移除 `yjf: '已交付'`:
|
||||
```typescript
|
||||
export function scheduleStatusLabel(status: string): string {
|
||||
const map: Record<string, string> = {
|
||||
dsc: '待生产',
|
||||
ysc: '已生产',
|
||||
yqx: '已取消',
|
||||
}
|
||||
return map[status] || status || '-'
|
||||
}
|
||||
export function scheduleStatusTagType(status: string): string {
|
||||
const map: Record<string, string> = {
|
||||
dsc: 'info',
|
||||
ysc: '',
|
||||
yqx: 'danger',
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端页面
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/pilot-service/infusion-schedule-management/index.vue`
|
||||
- Create: `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleEditDialog.vue`
|
||||
- Create: `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleViewDialog.vue`
|
||||
- Create: `web-admin/src/views/pilot-service/infusion-schedule-management/ScheduleCancelDialog.vue`
|
||||
|
||||
**UI 模式**: P02(列表多状态),参考 `checkup-management/index.vue`
|
||||
|
||||
- [ ] **Step 1: 创建目录**
|
||||
|
||||
```bash
|
||||
mkdir -p web-admin/src/views/pilot-service/infusion-schedule-management
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 创建主列表页 index.vue**
|
||||
|
||||
遵循 openspec UI 规范,页面结构:
|
||||
- `page-container` > `page-head` > `h1` 标题"输注计划管理"
|
||||
- `panel` > `panel-top` > `h2` 标题"输注计划"
|
||||
- `filter-block`:关键词、输注状态(下拉)、输注时间范围(`el-date-picker` type="daterange",默认最近 30 天)
|
||||
- `list-toolbar`:已选 N 项
|
||||
- `el-table` 列:
|
||||
- 序号、申请单号、患者姓名、性别、年龄、渠道名称、细胞类型、规格、输注时间、输注地点、输注方式
|
||||
- **生产状态**(`schedule_status`)— el-tag
|
||||
- **输注状态**(`infusion_status`)— el-tag
|
||||
- **操作列** `fixed="right" min-width="400"`:
|
||||
- 编辑(dtz/yrqr 可编辑)
|
||||
- 用户已确认(dtz→yrqr)
|
||||
- 完成(yrqr→ywc)
|
||||
- 取消(dtz/yrqr→yqx)
|
||||
- 查看
|
||||
|
||||
弹窗组件:
|
||||
- `ScheduleEditDialog.vue` — 编辑输注计划和细胞产品信息,`label-position="top"`,`dialog-form-layout`
|
||||
- `ScheduleViewDialog.vue` — 只读查看详情,展示关联信息和产品列表
|
||||
- `ScheduleCancelDialog.vue` — 取消原因输入(简单弹窗,textarea + 确认/取消)
|
||||
|
||||
- [ ] **Step 3: 创建 ScheduleEditDialog.vue**
|
||||
|
||||
- `el-dialog` width="800px" :close-on-click-modal="false"
|
||||
- 表单字段:细胞类型、规格、输注时间、输注地点、输注方式
|
||||
- 内嵌可编辑产品表格:项目名称、细胞类型、规格、协议单价、实际单价、份数
|
||||
- 使用 `.dialog-form-layout` + `.form-grid-2` 布局
|
||||
- `label-position="top"`
|
||||
|
||||
- [ ] **Step 4: 创建 ScheduleViewDialog.vue**
|
||||
|
||||
- 展示完整信息:申请单信息、患者信息、输注方案信息、输注计划信息、产品列表
|
||||
- 状态使用 el-tag
|
||||
- 参考 `SystemViewDialog` 模式
|
||||
|
||||
- [ ] **Step 5: 创建 ScheduleCancelDialog.vue**
|
||||
|
||||
- 简单弹窗 width="500px"
|
||||
- `el-input` type="textarea" placeholder="请输入取消原因" maxlength="500" show-word-limit
|
||||
- 确认/取消按钮
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端路由
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`
|
||||
- Modify: `web-admin/src/App.vue` (panelTitleBarTextRules)
|
||||
|
||||
- [ ] **Step 1: 添加路由**
|
||||
|
||||
在 `sqxp.ts` 的 PilotService children 中,`checkup-management` 路由之后添加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000012',
|
||||
name: 'InfusionScheduleManagement',
|
||||
path: 'infusion-schedule-management',
|
||||
component: '/pilot-service/infusion-schedule-management/index',
|
||||
meta: {
|
||||
title: '输注计划管理',
|
||||
keepAlive: true,
|
||||
menuCode: 'pilot-service:infusion-schedule-management:list'
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 更新 App.vue panelTitleBarTextRules**
|
||||
|
||||
在 `App.vue` 的 `panelTitleBarTextRules` 正则中追加 `输注计划` 标题文案。
|
||||
|
||||
---
|
||||
|
||||
## Task 9: Bug Fix — 新增时默认状态
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_application.py` — 查找创建 schedule 和 product 的位置
|
||||
- Modify: `backend/app/api/pilot_application.py` — 如需在 API 层默认设置
|
||||
|
||||
- [ ] **Step 1: 定位创建 infusion schedule 的代码**
|
||||
|
||||
在 `pilot_application.py` CRUD 中查找创建 `BizPilotInfusionSchedule` 和 `BizPilotInfusionScheduleProduct` 的位置,确认:
|
||||
1. 创建 schedule 时 `infusion_status` 默认为 `'dtz'`(Model 默认值已处理)
|
||||
2. 创建 product 时 `product_status` 默认为 `'dtz'`(需确认代码是否显式设置)
|
||||
|
||||
如果代码中显式设置了 `product_status='待输注'`,需改为 `'dtz'`。
|
||||
|
||||
- [ ] **Step 2: 验证创建流程**
|
||||
|
||||
通过 API 创建新的中试申请单,检查生成的 schedule 的 `infusion_status` 和 product 的 `product_status` 是否为 `'dtz'`。
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 更新文档
|
||||
|
||||
**Files:**
|
||||
- Modify: `docs/web-admin-ui-pattern-index.md`
|
||||
|
||||
- [ ] **Step 1: 补充页面→模式映射**
|
||||
|
||||
在文档 §四中添加:
|
||||
```
|
||||
| 输注计划管理 | pilot-service/infusion-schedule-management | P02 | /#/pilot-service/infusion-schedule-management |
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 验证清单
|
||||
|
||||
- [ ] 数据库:新字段已添加,现有数据已迁移
|
||||
- [ ] 后端:新 API 可通过 Swagger (/docs) 访问
|
||||
- [ ] 后端:扣减逻辑在余额/份数不足时正确报错
|
||||
- [ ] 前端:页面正常加载,列表展示多表 JOIN 数据
|
||||
- [ ] 前端:状态流转按钮根据 infusion_status 动态显示/隐藏
|
||||
- [ ] 前端:取消弹窗要求输入原因
|
||||
- [ ] 前端:完成操作触发扣减,错误时前端提示
|
||||
- [ ] Bug Fix:新创建的申请单中 schedule 和 product 默认状态为 dtz
|
||||
- [ ] openspec:页面标题竖条装饰正常显示
|
||||
- [ ] openspec:所有状态字段使用 el-tag 展示
|
||||
- [ ] openspec:操作列 fixed="right",按钮带 el-icon
|
||||
@@ -1,846 +0,0 @@
|
||||
# 出库生产工单 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在生产工单页面新增出库生产工单 tab,输注计划创建时自动创建出库工单,删除时自动作废,详情展示关联业务信息。
|
||||
|
||||
**Architecture:** 在现有生产工单 index.vue 中扩展第 4 个 tab(outbound),复用通用列表/详情 API。后端通过 `work_order_type="outbound"` 过滤,通过 `infusion_schedule_id` 反查关联链。自动创建/作废通过在 `pilot_application.py` 的 CRUD 函数中挂载钩子实现。
|
||||
|
||||
**Tech Stack:** Python 3.9 / FastAPI / SQLAlchemy / MySQL / Vue 3 / Element Plus / TypeScript
|
||||
|
||||
**Design Spec:** `docs/superpowers/specs/2026-05-26-outbound-production-work-order-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 新增 | `docs/sql/2026-05-26-outbound-work-order.sql` | ALTER TABLE DDL |
|
||||
| 修改 | `backend/app/models/models.py` (BizProductionWorkOrder 类) | 新增 biz_type 字段 |
|
||||
| 修改 | `backend/app/crud/production_work_order.py` | 状态映射、_wo_to_dict、create_outbound 函数签名、列表增强、详情增强 |
|
||||
| 修改 | `backend/app/crud/pilot_application.py` | create_schedule 自动创建钩子、soft_delete_schedule 作废钩子 |
|
||||
| 修改 | `web-admin/src/views/production/production-work-order/index.vue` | 新 tab、列配置、操作按钮、详情弹窗、状态映射 |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 数据库 DDL 脚本
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/2026-05-26-outbound-work-order.sql`
|
||||
|
||||
- [ ] **Step 1: 创建 SQL 迁移脚本**
|
||||
|
||||
```sql
|
||||
-- 出库生产工单:新增 biz_type 字段 + 更新 comment
|
||||
ALTER TABLE biz_production_work_order
|
||||
ADD COLUMN biz_type VARCHAR(20) NULL COMMENT '业务类型: pilot_service=中试服务, clinical_application=临床应用' AFTER infusion_schedule_id;
|
||||
|
||||
ALTER TABLE biz_production_work_order
|
||||
MODIFY COLUMN work_order_type VARCHAR(20) NOT NULL DEFAULT 'inbound' COMMENT '工单类型: inbound=入库, temporary=临时, outbound=出库';
|
||||
|
||||
ALTER TABLE biz_production_work_order
|
||||
MODIFY COLUMN work_order_status VARCHAR(16) NOT NULL DEFAULT 'dpz' COMMENT '工单状态 dpz待配置 jxz进行中 ywc已完成 yzf已作废';
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在数据库中执行此脚本**
|
||||
|
||||
Run: `source venv/bin/activate && python -c "from app.core.database import engine; from sqlalchemy import text; conn = engine.connect(); [conn.execute(text(s)) for s in open('docs/sql/2026-05-26-outbound-work-order.sql').read().split(';') if s.strip() and not s.strip().startswith('--')]; conn.commit(); print('OK')"`
|
||||
|
||||
或手动在 MySQL 客户端中执行。Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/2026-05-26-outbound-work-order.sql
|
||||
git commit -m "feat(production): add biz_type column and yzf status for outbound work orders"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 后端模型层 — BizProductionWorkOrder 新增 biz_type
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py` (BizProductionWorkOrder 类, 约 line 2430)
|
||||
|
||||
- [ ] **Step 1: 在 BizProductionWorkOrder 类中新增 biz_type 字段**
|
||||
|
||||
在 `infusion_schedule_id` 字段之后新增:
|
||||
|
||||
```python
|
||||
biz_type = Column(String(20), nullable=True, comment="业务类型: pilot_service=中试服务, clinical_application=临床应用")
|
||||
```
|
||||
|
||||
同时更新 `work_order_type` 字段的 comment:
|
||||
```python
|
||||
work_order_type = Column(String(20), nullable=False, default="inbound", comment="工单类型: inbound=入库, temporary=临时, outbound=出库")
|
||||
```
|
||||
|
||||
更新 `work_order_status` 字段的 comment:
|
||||
```python
|
||||
work_order_status = Column(String(16), nullable=False, default="dpz", comment="工单状态 dpz待配置 jxz进行中 ywc已完成 yzf已作废")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证模型无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.models.models import BizProductionWorkOrder; print('OK')"`
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/models/models.py
|
||||
git commit -m "feat(production): add biz_type field to BizProductionWorkOrder model"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: 后端 CRUD 层 — production_work_order.py
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/production_work_order.py`
|
||||
|
||||
- [ ] **Step 1: 扩展状态映射和来源标签**
|
||||
|
||||
文件顶部 `_WORK_ORDER_STATUS_LABELS` (约 line 32-36) 修改为:
|
||||
|
||||
```python
|
||||
_WORK_ORDER_STATUS_LABELS = {
|
||||
"dpz": "待配置",
|
||||
"jxz": "进行中",
|
||||
"ywc": "已完成",
|
||||
"yzf": "已作废",
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: _wo_to_dict 增加 bizType 字段**
|
||||
|
||||
在 `_wo_to_dict()` 函数 (约 line 87-111) 中,`"infusionScheduleId"` 之后新增:
|
||||
|
||||
```python
|
||||
"bizType": getattr(wo, "biz_type", None) or None,
|
||||
"bizTypeLabel": {"pilot_service": "中试服务", "clinical_application": "临床应用"}.get(getattr(wo, "biz_type", None) or "", ""),
|
||||
```
|
||||
|
||||
- [ ] **Step 3: create_outbound_production_work_order 增加 biz_type 参数**
|
||||
|
||||
函数签名 (约 line 638-646) 修改为:
|
||||
|
||||
```python
|
||||
def create_outbound_production_work_order(
|
||||
db: Session,
|
||||
*,
|
||||
schedule_id: str,
|
||||
tenant_no: str,
|
||||
user_id: Optional[str] = None,
|
||||
create_dept_id: str = "",
|
||||
remark: str = "",
|
||||
biz_type: str = "pilot_service",
|
||||
) -> BizProductionWorkOrder:
|
||||
```
|
||||
|
||||
在创建 `BizProductionWorkOrder` 对象时 (约 line 658-674) 新增字段:
|
||||
|
||||
```python
|
||||
wo = BizProductionWorkOrder(
|
||||
id=generate_uuid(),
|
||||
work_order_no=_generate_outbound_work_order_no(db, tenant_no),
|
||||
work_order_type="outbound",
|
||||
reception_id=None,
|
||||
protocol_sample_id=None,
|
||||
collection_protocol_id=None,
|
||||
protocol_no=None,
|
||||
sample_code=None,
|
||||
reception_source="outbound",
|
||||
infusion_schedule_id=schedule_id,
|
||||
biz_type=biz_type,
|
||||
work_order_status="dpz",
|
||||
tenant_no=tenant_no,
|
||||
remark=remark,
|
||||
create_by=user_id,
|
||||
create_dept_id=create_dept_id,
|
||||
)
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 列表增强 — outbound 工单附加业务数据**
|
||||
|
||||
在 `_enrich_wo_items()` 函数之后新增辅助函数:
|
||||
|
||||
```python
|
||||
_BIZ_TYPE_LABELS = {"pilot_service": "中试服务", "clinical_application": "临床应用"}
|
||||
|
||||
|
||||
def _enrich_outbound_items(db: Session, items: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
|
||||
"""为 outbound 类型工单附加申请单号、细胞类型、规格、输注时间等关联数据。"""
|
||||
from app.models.models import (
|
||||
BizPilotApplication,
|
||||
BizPilotInfusionPlan,
|
||||
BizPilotInfusionSchedule,
|
||||
)
|
||||
|
||||
outbound_ids = [
|
||||
it["infusionScheduleId"]
|
||||
for it in items
|
||||
if it.get("workOrderType") == "outbound" and it.get("infusionScheduleId")
|
||||
]
|
||||
if not outbound_ids:
|
||||
return items
|
||||
|
||||
schedules = (
|
||||
db.query(BizPilotInfusionSchedule)
|
||||
.filter(
|
||||
BizPilotInfusionSchedule.id.in_(outbound_ids),
|
||||
BizPilotInfusionSchedule.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
)
|
||||
sched_map = {s.id: s for s in schedules}
|
||||
|
||||
plan_ids = list({s.infusion_plan_id for s in schedules if s.infusion_plan_id})
|
||||
plan_map = {}
|
||||
if plan_ids:
|
||||
plans = db.query(BizPilotInfusionPlan).filter(BizPilotInfusionPlan.id.in_(plan_ids)).all()
|
||||
plan_map = {p.id: p for p in plans}
|
||||
|
||||
app_ids = list({p.pilot_application_id for p in plan_map.values() if p.pilot_application_id})
|
||||
app_map = {}
|
||||
if app_ids:
|
||||
apps = db.query(BizPilotApplication).filter(BizPilotApplication.id.in_(app_ids)).all()
|
||||
app_map = {a.id: a for a in apps}
|
||||
|
||||
for it in items:
|
||||
if it.get("workOrderType") != "outbound" or not it.get("infusionScheduleId"):
|
||||
continue
|
||||
sched = sched_map.get(it["infusionScheduleId"])
|
||||
if not sched:
|
||||
continue
|
||||
plan = plan_map.get(sched.infusion_plan_id) if sched.infusion_plan_id else None
|
||||
app = app_map.get(plan.pilot_application_id) if plan and plan.pilot_application_id else None
|
||||
|
||||
it["applicationNo"] = app.application_no if app else ""
|
||||
it["cellType"] = sched.cell_type or ""
|
||||
it["specText"] = sched.spec_text or ""
|
||||
it["infusionTime"] = _fmt_dt(sched.infusion_time) if sched.infusion_time else ""
|
||||
it["infusionLocation"] = sched.infusion_location or ""
|
||||
|
||||
return items
|
||||
```
|
||||
|
||||
然后在 `list_production_work_orders()` (约 line 343) 的 return 之前调用:
|
||||
|
||||
将:
|
||||
```python
|
||||
items = _enrich_wo_items(db, [_wo_to_dict(x) for x in rows])
|
||||
return {"items": items, "total": int(total)}
|
||||
```
|
||||
|
||||
改为:
|
||||
```python
|
||||
items = _enrich_wo_items(db, [_wo_to_dict(x) for x in rows])
|
||||
items = _enrich_outbound_items(db, items)
|
||||
return {"items": items, "total": int(total)}
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 详情增强 — outbound 工单详情返回关联链**
|
||||
|
||||
在 `_wo_to_response_dict()` 函数 (约 line 160-164) 中,对 outbound 类型附加关联信息:
|
||||
|
||||
将:
|
||||
```python
|
||||
def _wo_to_response_dict(db: Session, wo: BizProductionWorkOrder) -> Dict[str, Any]:
|
||||
"""工单响应(含接收记录关联的样本类型、接收人、接收时间及 reception 详情)。"""
|
||||
out = _enrich_wo_items(db, [_wo_to_dict(wo)])[0]
|
||||
_attach_reception_detail(db, wo, out, wo.tenant_no or "")
|
||||
return out
|
||||
```
|
||||
|
||||
改为:
|
||||
```python
|
||||
def _wo_to_response_dict(db: Session, wo: BizProductionWorkOrder) -> Dict[str, Any]:
|
||||
"""工单响应(含接收记录关联的样本类型、接收人、接收时间及 reception 详情)。"""
|
||||
out = _enrich_wo_items(db, [_wo_to_dict(wo)])[0]
|
||||
if wo.work_order_type == "outbound" and wo.infusion_schedule_id:
|
||||
_attach_outbound_detail(db, wo, out)
|
||||
else:
|
||||
_attach_reception_detail(db, wo, out, wo.tenant_no or "")
|
||||
return out
|
||||
```
|
||||
|
||||
新增 `_attach_outbound_detail` 函数:
|
||||
|
||||
```python
|
||||
def _attach_outbound_detail(
|
||||
db: Session, wo: BizProductionWorkOrder, out: Dict[str, Any]
|
||||
) -> None:
|
||||
"""outbound 工单详情附加申请单 + 输注计划信息。"""
|
||||
from app.models.models import (
|
||||
BizPilotApplication,
|
||||
BizPilotInfusionPlan,
|
||||
BizPilotInfusionSchedule,
|
||||
)
|
||||
|
||||
_APP_STATUS_LABELS = {"dks": "待开始", "jxz": "进行中", "ywc": "已完成", "yzf": "已作废"}
|
||||
|
||||
sched = (
|
||||
db.query(BizPilotInfusionSchedule)
|
||||
.filter(BizPilotInfusionSchedule.id == wo.infusion_schedule_id, BizPilotInfusionSchedule.del_flag == 0)
|
||||
.first()
|
||||
)
|
||||
plan = None
|
||||
app = None
|
||||
if sched and sched.infusion_plan_id:
|
||||
plan = db.query(BizPilotInfusionPlan).filter(BizPilotInfusionPlan.id == sched.infusion_plan_id).first()
|
||||
if plan and plan.pilot_application_id:
|
||||
app = db.query(BizPilotApplication).filter(BizPilotApplication.id == plan.pilot_application_id).first()
|
||||
|
||||
out["reception"] = {}
|
||||
out["pilotApplication"] = {
|
||||
"applicationNo": app.application_no if app else "",
|
||||
"applicationName": app.application_name if app else "",
|
||||
"applicationStatus": app.application_status if app else "",
|
||||
"applicationStatusLabel": _APP_STATUS_LABELS.get(app.application_status, "") if app else "",
|
||||
} if app else {}
|
||||
out["infusionSchedule"] = {
|
||||
"cellType": sched.cell_type if sched else "",
|
||||
"specText": sched.spec_text if sched else "",
|
||||
"infusionTime": _fmt_dt(sched.infusion_time) if sched and sched.infusion_time else "",
|
||||
"infusionLocation": sched.infusion_location if sched else "",
|
||||
"infusionMethod": sched.infusion_method if sched else "",
|
||||
"scheduleStatus": sched.schedule_status if sched else "",
|
||||
} if sched else {}
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud.production_work_order import list_production_work_orders, _wo_to_response_dict, create_outbound_production_work_order; print('OK')"`
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 7: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/production_work_order.py
|
||||
git commit -m "feat(production): extend CRUD for outbound work orders — biz_type, yzf status, list/detail enrichment"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 后端钩子 — 自动创建出库工单
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_application.py` (create_schedule 函数, 约 line 926)
|
||||
|
||||
- [ ] **Step 1: 在 create_schedule 中增加自动创建出库工单**
|
||||
|
||||
在 `create_schedule()` 函数 (约 line 966) 的 `if commit:` 之前插入:
|
||||
|
||||
```python
|
||||
# 自动创建出库生产工单
|
||||
from app.crud import production_work_order as pwo_svc
|
||||
pwo_svc.create_outbound_production_work_order(
|
||||
db,
|
||||
schedule_id=schedule_id,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=dept_id,
|
||||
biz_type="pilot_service",
|
||||
)
|
||||
```
|
||||
|
||||
注意位置:应在 `_create_schedule_products` 之后、`if commit:` 之前,确保 schedule_id 和 products 已写入但还未 commit(在同一事务内)。
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud.pilot_application import create_schedule; print('OK')"`
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_application.py
|
||||
git commit -m "feat(pilot): auto-create outbound production work order on schedule creation"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 后端钩子 — 自动作废出库工单
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_application.py` (soft_delete_schedule 函数, 约 line 1064)
|
||||
|
||||
- [ ] **Step 1: 在 soft_delete_schedule 中增加作废逻辑**
|
||||
|
||||
在 `soft_delete_schedule()` 函数中,`row.del_flag = 1` (约 line 1077) 之前插入:
|
||||
|
||||
```python
|
||||
# 关联的出库生产工单标记为已作废
|
||||
from app.models.models import BizProductionWorkOrder
|
||||
outbound_wo = (
|
||||
db.query(BizProductionWorkOrder)
|
||||
.filter(
|
||||
BizProductionWorkOrder.infusion_schedule_id == schedule_id,
|
||||
BizProductionWorkOrder.tenant_no == tenant_no,
|
||||
BizProductionWorkOrder.del_flag == 0,
|
||||
BizProductionWorkOrder.work_order_type == "outbound",
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if outbound_wo:
|
||||
outbound_wo.work_order_status = "yzf"
|
||||
outbound_wo.update_time = datetime.now()
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证无语法错误**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.crud.pilot_application import soft_delete_schedule; print('OK')"`
|
||||
|
||||
Expected: `OK`
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_application.py
|
||||
git commit -m "feat(pilot): auto-void outbound production work order on schedule deletion"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 前端 — 生产工单页面扩展 outbound tab
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/production/production-work-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 扩展 WorkOrderTypeTab 类型**
|
||||
|
||||
约 line 432,修改为:
|
||||
|
||||
```typescript
|
||||
type WorkOrderTypeTab = 'inbound' | 'temporary' | 'outbound' | 'all'
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 新增 outbound tab 面板**
|
||||
|
||||
约 line 15-19,在 `全部生产工单` 之前插入 outbound tab:
|
||||
|
||||
```html
|
||||
<el-tabs v-model="activeTypeTab" class="work-order-type-tabs" @tab-change="handleTypeTabChange">
|
||||
<el-tab-pane label="入库生产工单" name="inbound" />
|
||||
<el-tab-pane label="临时生产工单" name="temporary" />
|
||||
<el-tab-pane label="出库生产工单" name="outbound" />
|
||||
<el-tab-pane label="全部生产工单" name="all" />
|
||||
</el-tabs>
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 更新搜索框 placeholder**
|
||||
|
||||
约 line 27,修改 placeholder 为 computed:
|
||||
|
||||
将:
|
||||
```html
|
||||
:placeholder="activeTypeTab === 'temporary' ? '工单号' : '工单号/协议号/样本编码'"
|
||||
```
|
||||
|
||||
改为:
|
||||
```html
|
||||
:placeholder="searchPlaceholder"
|
||||
```
|
||||
|
||||
在 script setup 区域新增 computed:
|
||||
|
||||
```typescript
|
||||
const searchPlaceholder = computed(() => {
|
||||
if (activeTypeTab.value === 'temporary') return '工单号'
|
||||
if (activeTypeTab.value === 'outbound') return '工单号/申请单号'
|
||||
return '工单号/协议号/样本编码'
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 更新工具栏 — outbound 和 all tab 不显示新增按钮**
|
||||
|
||||
约 line 69,修改:
|
||||
|
||||
将:
|
||||
```html
|
||||
<div v-if="activeTypeTab !== 'all'" class="list-toolbar">
|
||||
```
|
||||
|
||||
改为:
|
||||
```html
|
||||
<div v-if="activeTypeTab !== 'all' && activeTypeTab !== 'outbound'" class="list-toolbar">
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 更新全部 tab 的工单类型 tag 映射**
|
||||
|
||||
约 line 94-100,修改类型 tag:
|
||||
|
||||
将:
|
||||
```html
|
||||
<el-table-column v-if="activeTypeTab === 'all'" prop="workOrderType" label="工单类型" min-width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.workOrderType === 'temporary' ? 'warning' : 'success'" size="small">
|
||||
{{ row.workOrderType === 'temporary' ? '临时' : '入库' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
改为:
|
||||
```html
|
||||
<el-table-column v-if="activeTypeTab === 'all'" prop="workOrderType" label="工单类型" min-width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="woTypeTag(row.workOrderType).type" size="small">
|
||||
{{ woTypeTag(row.workOrderType).label }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
在 script 中 `sourceTag` 函数之后新增:
|
||||
|
||||
```typescript
|
||||
const woTypeTag = (type: string) => {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
inbound: { label: '入库', type: 'success' },
|
||||
temporary: { label: '临时', type: 'warning' },
|
||||
outbound: { label: '出库', type: 'primary' },
|
||||
}
|
||||
return map[type] || { label: type, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 新增 outbound 专属列**
|
||||
|
||||
在 `全部工单类型` 列之后、`协议号` 列之前(约 line 100-101 之间),插入 outbound 专属列:
|
||||
|
||||
```html
|
||||
<!-- 出库工单专属列 -->
|
||||
<el-table-column v-if="activeTypeTab === 'outbound'" prop="bizTypeLabel" label="业务类型" min-width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.bizType === 'pilot_service' ? 'primary' : 'success'" size="small">
|
||||
{{ row.bizTypeLabel || '—' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="activeTypeTab === 'outbound'" prop="applicationNo" label="申请单号" min-width="150" align="center">
|
||||
<template #default="{ row }">{{ row.applicationNo || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="activeTypeTab === 'outbound'" prop="cellType" label="细胞类型" min-width="110" align="center">
|
||||
<template #default="{ row }">{{ row.cellType || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="activeTypeTab === 'outbound'" prop="specText" label="规格" min-width="110" align="center">
|
||||
<template #default="{ row }">{{ row.specText || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="activeTypeTab === 'outbound'" prop="infusionTime" label="输注时间" min-width="170" align="center">
|
||||
<template #default="{ row }">{{ row.infusionTime || '—' }}</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
- [ ] **Step 7: 更新 showReceptionCols 逻辑**
|
||||
|
||||
约 line 434,修改:
|
||||
|
||||
将:
|
||||
```typescript
|
||||
const showReceptionCols = computed(() => activeTypeTab.value !== 'temporary')
|
||||
```
|
||||
|
||||
改为:
|
||||
```typescript
|
||||
const showReceptionCols = computed(() => activeTypeTab.value !== 'temporary' && activeTypeTab.value !== 'outbound')
|
||||
```
|
||||
|
||||
- [ ] **Step 8: 全部 tab 隐藏操作列**
|
||||
|
||||
约 line 145-178 的操作列 `<el-table-column>` 添加 `v-if`:
|
||||
|
||||
将:
|
||||
```html
|
||||
<el-table-column
|
||||
label="操作"
|
||||
min-width="600"
|
||||
fixed="right"
|
||||
align="center"
|
||||
header-align="center"
|
||||
>
|
||||
```
|
||||
|
||||
改为:
|
||||
```html
|
||||
<el-table-column
|
||||
v-if="activeTypeTab !== 'all'"
|
||||
label="操作"
|
||||
min-width="600"
|
||||
fixed="right"
|
||||
align="center"
|
||||
header-align="center"
|
||||
>
|
||||
```
|
||||
|
||||
- [ ] **Step 9: 更新工单状态 Tag 映射**
|
||||
|
||||
约 line 510-517,修改 `woStatusTag`:
|
||||
|
||||
将:
|
||||
```typescript
|
||||
const woStatusTag = (status: string) => {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
dpz: { label: '待配置', type: 'info' },
|
||||
jxz: { label: '进行中', type: 'warning' },
|
||||
ywc: { label: '已完成', type: 'success' }
|
||||
}
|
||||
return map[status] || { label: status, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
改为:
|
||||
```typescript
|
||||
const woStatusTag = (status: string) => {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
dpz: { label: '待配置', type: 'info' },
|
||||
jxz: { label: '进行中', type: 'warning' },
|
||||
ywc: { label: '已完成', type: 'success' },
|
||||
yzf: { label: '已作废', type: 'danger' }
|
||||
}
|
||||
return map[status] || { label: status, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 10: 状态筛选下拉增加已作废选项**
|
||||
|
||||
约 line 38-41,增加选项:
|
||||
|
||||
将:
|
||||
```html
|
||||
<el-option label="待配置" value="dpz" />
|
||||
<el-option label="进行中" value="jxz" />
|
||||
<el-option label="已完成" value="ywc" />
|
||||
```
|
||||
|
||||
改为:
|
||||
```html
|
||||
<el-option label="待配置" value="dpz" />
|
||||
<el-option label="进行中" value="jxz" />
|
||||
<el-option label="已完成" value="ywc" />
|
||||
<el-option label="已作废" value="yzf" />
|
||||
```
|
||||
|
||||
- [ ] **Step 11: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/production-work-order/index.vue
|
||||
git commit -m "feat(production): add outbound work order tab with columns, filters, and status mapping"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 前端 — 详情弹窗增强
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/production/production-work-order/index.vue` (viewSections computed, 约 line 640)
|
||||
|
||||
- [ ] **Step 1: 更新 viewSections computed,增加 outbound 分支**
|
||||
|
||||
约 line 640-733,替换整个 `viewSections` computed。
|
||||
|
||||
核心逻辑:
|
||||
- `isOutbound = d.workOrderType === 'outbound'`
|
||||
- outbound 基本信息:工单号、工单类型(出库/primary)、业务类型、工单状态、备注、创建时间
|
||||
- outbound 不显示协议号/协议状态/样本编码/来源类型/样本类型
|
||||
- outbound 新增"中试申请信息"section:申请单号、申请名称、申请状态
|
||||
- outbound 新增"输注计划信息"section:细胞类型、规格、输注时间、输注地点、输注方式
|
||||
- outbound 不显示运输信息、样本接收 section
|
||||
|
||||
```typescript
|
||||
const viewSections = computed<ViewSection[]>(() => {
|
||||
if (!detail.value) return []
|
||||
const d = detail.value
|
||||
const isTemp = d.workOrderType === 'temporary'
|
||||
const isOutbound = d.workOrderType === 'outbound'
|
||||
const r = d.reception || {}
|
||||
|
||||
// ── 基本信息 fields ──
|
||||
const baseFields: ViewSection['fields'] = [
|
||||
{ label: '工单号', value: d.workOrderNo },
|
||||
{
|
||||
label: '工单类型',
|
||||
value: isTemp ? '临时' : isOutbound ? '出库' : '入库',
|
||||
tagType: isTemp ? 'warning' : isOutbound ? 'primary' : 'success'
|
||||
},
|
||||
]
|
||||
|
||||
// outbound 显示业务类型
|
||||
if (isOutbound) {
|
||||
baseFields.push({
|
||||
label: '业务类型',
|
||||
value: d.bizTypeLabel || (d.bizType === 'pilot_service' ? '中试服务' : d.bizType === 'clinical_application' ? '临床应用' : '—'),
|
||||
tagType: 'primary' as const
|
||||
})
|
||||
}
|
||||
|
||||
// inbound 显示协议/样本字段
|
||||
if (!isTemp && !isOutbound) {
|
||||
baseFields.push(
|
||||
{ label: '协议号', value: d.protocolNo },
|
||||
{
|
||||
label: '协议状态',
|
||||
value: protocolStatusLabelBySource(String(d.protocolStatus || ''), d.receptionSource || 'cell_storage'),
|
||||
tagType: protocolStatusTagTypeBySource(String(d.protocolStatus || ''), d.receptionSource || 'cell_storage')
|
||||
},
|
||||
{ label: '样本编码', value: d.sampleCode },
|
||||
{
|
||||
label: '来源类型',
|
||||
value:
|
||||
r.sourceTypeLabel ||
|
||||
d.receptionSourceLabel ||
|
||||
receptionSourceLabel(d.receptionSource || ''),
|
||||
tagType: 'primary' as const
|
||||
},
|
||||
{ label: '样本类型', value: r.sampleTypeName || d.sampleTypeName || '—' }
|
||||
)
|
||||
}
|
||||
|
||||
baseFields.push(
|
||||
{
|
||||
label: '工单状态',
|
||||
value: woStatusTag(d.workOrderStatus).label,
|
||||
tagType: woStatusTag(d.workOrderStatus).type as any
|
||||
},
|
||||
{ label: '备注', value: d.remark || '—', span: true },
|
||||
{ label: '创建时间', value: d.createTime || '—' }
|
||||
)
|
||||
|
||||
const sections: ViewSection[] = [
|
||||
{ title: '基本信息', fields: baseFields }
|
||||
]
|
||||
|
||||
// outbound: 申请单 + 输注计划
|
||||
if (isOutbound) {
|
||||
const pa = d.pilotApplication || {}
|
||||
const sched = d.infusionSchedule || {}
|
||||
const appStatusLabel = (s: string) => {
|
||||
const m: Record<string, string> = { dks: '待开始', jxz: '进行中', ywc: '已完成', yzf: '已作废' }
|
||||
return m[s] || s || '—'
|
||||
}
|
||||
const appStatusTagType = (s: string) => {
|
||||
const m: Record<string, string> = { dks: 'info', jxz: 'warning', ywc: 'success', yzf: 'danger' }
|
||||
return m[s] || 'info'
|
||||
}
|
||||
sections.push({
|
||||
title: '中试申请信息',
|
||||
fields: [
|
||||
{ label: '申请单号', value: pa.applicationNo || '—' },
|
||||
{ label: '申请名称', value: pa.applicationName || '—' },
|
||||
{
|
||||
label: '申请状态',
|
||||
value: appStatusLabel(pa.applicationStatus),
|
||||
tagType: appStatusTagType(pa.applicationStatus) as any
|
||||
},
|
||||
]
|
||||
})
|
||||
sections.push({
|
||||
title: '输注计划信息',
|
||||
fields: [
|
||||
{ label: '细胞类型', value: sched.cellType || '—' },
|
||||
{ label: '规格', value: sched.specText || '—' },
|
||||
{ label: '输注时间', value: sched.infusionTime || '—' },
|
||||
{ label: '输注地点', value: sched.infusionLocation || '—' },
|
||||
{ label: '输注方式', value: sched.infusionMethod || '—' },
|
||||
]
|
||||
})
|
||||
return sections
|
||||
}
|
||||
|
||||
// inbound: 运输 + 样本接收
|
||||
const transportFields: ViewSection['fields'] = [
|
||||
{ label: '运输方式', value: transportTypeLabel(String(r.transportType || '')) }
|
||||
]
|
||||
if (r.transportType === 'kdys') {
|
||||
transportFields.push(
|
||||
{ label: '快递公司', value: r.expressCompanyName || '—' },
|
||||
{ label: '快递单号', value: r.waybillNo || '—' }
|
||||
)
|
||||
} else if (r.transportType === 'ryxd') {
|
||||
transportFields.push(
|
||||
{ label: '携带人', value: r.carrierName || '—' },
|
||||
{ label: '携带人电话', value: r.carrierPhone || '—' }
|
||||
)
|
||||
}
|
||||
if (r.etaTime) transportFields.push({ label: '预计到达', value: r.etaTime })
|
||||
const transportSection = transportFields.length > 1 || r.transportType ? [{ title: '运输信息', fields: transportFields }] : []
|
||||
|
||||
return [
|
||||
{ title: '基本信息', fields: baseFields },
|
||||
...transportSection,
|
||||
...(!isTemp ? [{
|
||||
title: '样本接收',
|
||||
slot: 'reception-extra',
|
||||
fields: [
|
||||
{ label: '接收时间', value: r.receptionTime || d.receptionTime || '—' },
|
||||
{ label: '接收经手人', value: r.handlerName || d.handlerName || '—' },
|
||||
{ label: '接收温度(℃)', value: r.receiveTemperature ? `${r.receiveTemperature}℃` : '—' },
|
||||
{ label: '体积(ml)', value: formatMetric(r.volumeMl) },
|
||||
{ label: '净重(g)', value: formatMetric(r.netWeightG) },
|
||||
{
|
||||
label: '结论',
|
||||
value: r.acceptConclusionLabel || acceptConclusionLabel(String(r.acceptConclusion || '')),
|
||||
tagType: r.acceptConclusion === 'js' ? 'success' : r.acceptConclusion === 'jj' ? 'danger' : 'info'
|
||||
},
|
||||
{ label: '检查项', value: formatCheckResults(r.checkResults), span: true },
|
||||
{ label: '备注', value: r.remark || '—', span: true }
|
||||
]
|
||||
}] : [])
|
||||
]
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 验证前端无编译错误**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
|
||||
Expected: Build 成功(可能有无关的 type warning,但不应有 error)
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/production/production-work-order/index.vue
|
||||
git commit -m "feat(production): add outbound work order detail dialog with pilot application and infusion schedule sections"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 8: 端到端验证
|
||||
|
||||
**Files:** 无文件修改
|
||||
|
||||
- [ ] **Step 1: 启动后端,确认无报错**
|
||||
|
||||
Run: `cd backend && source venv/bin/activate && python -c "from app.main import app; print('App OK')"`
|
||||
|
||||
Expected: `App OK`
|
||||
|
||||
- [ ] **Step 2: 启动前端,确认无编译错误**
|
||||
|
||||
Run: `cd web-admin && pnpm build 2>&1 | tail -5`
|
||||
|
||||
Expected: Build 成功
|
||||
|
||||
- [ ] **Step 3: 功能验证清单(手动)**
|
||||
|
||||
1. 打开生产工单页面,确认 4 个 tab 都显示
|
||||
2. 点击「出库生产工单」tab,确认列表加载(无数据或已有数据)
|
||||
3. 确认出库 tab 不显示新增按钮
|
||||
4. 确认出库 tab 显示专属列(业务类型、申请单号、细胞类型、规格、输注时间)
|
||||
5. 点击「全部生产工单」tab,确认操作列已隐藏
|
||||
6. 创建一条输注计划,切换到出库 tab 确认自动生成了工单
|
||||
7. 删除该输注计划,确认出库工单状态变为「已作废」
|
||||
8. 点击出库工单的查看详情,确认显示申请单信息和输注计划信息
|
||||
9. 确认编辑任务、派发任务、完成工单按钮可正常使用
|
||||
|
||||
- [ ] **Step 4: Final Commit (如有遗漏修复)**
|
||||
|
||||
```bash
|
||||
git add -A
|
||||
git commit -m "fix(production): final adjustments for outbound work order feature"
|
||||
```
|
||||
@@ -1,881 +0,0 @@
|
||||
# 出库质检工单功能实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在现有质检工单页面新增"出库质检工单"Tab,展示由中试服务申请单/输注计划触发的出库质检工单,支持查看(含完整申请单+输注计划信息)、编辑备注、配置检测。
|
||||
|
||||
**Architecture:** 前端在 `qc-work-order/index.vue` 中新增第 4 个 Tab `outbound`,复用列表骨架、配置检测、编辑备注逻辑,新建独立查看对话框组件 `OutboundQcViewDialog.vue`。后端新增聚合查询 API,扩展现有列表 API 返回字段,并在输注计划取消时自动作废关联质检工单。
|
||||
|
||||
**Tech Stack:** Vue 3 + Element Plus (前端) / FastAPI + SQLAlchemy + Pydantic v2 (后端) / MySQL 5.7
|
||||
|
||||
**设计文档:** `docs/superpowers/specs/2026-05-26-outbound-qc-work-order-design.md`
|
||||
|
||||
---
|
||||
|
||||
## Task 1: 数据库 — 新增 biz_type 字段
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/2026-05-26-qc-work-order-add-biz-type.sql`
|
||||
- Modify: `backend/app/models/models.py:1239` (在 `infusion_schedule_id` 后新增字段)
|
||||
|
||||
- [ ] **Step 1: 创建 SQL 迁移文件**
|
||||
|
||||
```sql
|
||||
-- 出库质检工单:新增 biz_type 字段
|
||||
ALTER TABLE biz_qc_work_order
|
||||
ADD COLUMN biz_type VARCHAR(20) NULL COMMENT '业务类型: pilot_service=中试服务, clinical_application=临床应用' AFTER infusion_schedule_id;
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 SQLAlchemy 模型中新增 biz_type 字段**
|
||||
|
||||
在 `backend/app/models/models.py` 的 `BizQcWorkOrder` 类中,在 `infusion_schedule_id` 字段之后添加:
|
||||
|
||||
```python
|
||||
biz_type = Column(String(20), nullable=True, comment="业务类型: pilot_service=中试服务, clinical_application=临床应用")
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 在数据库执行 SQL**
|
||||
|
||||
在 MySQL 客户端中执行迁移 SQL。
|
||||
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
```bash
|
||||
git add docs/sql/2026-05-26-qc-work-order-add-biz-type.sql backend/app/models/models.py
|
||||
git commit -m "feat(qc): add biz_type column to qc_work_order table for outbound business type"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 2: 后端 — 扩展列表 API 和 _row_to_dict
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/qc_work_order.py` (扩展列表查询和 `_row_to_dict`)
|
||||
- Modify: `backend/app/schemas/qc_work_order.py` (无改动,schema 跟随 _row_to_dict)
|
||||
|
||||
**参考文件(只读):**
|
||||
- `backend/app/crud/qc_work_order.py` — 搜索 `_row_to_dict` 函数和 `list_work_orders` 函数
|
||||
- `backend/app/models/models.py` — 搜索 `BizPilotInfusionSchedule`、`BizPilotInfusionPlan`、`BizPilotApplication` 模型
|
||||
|
||||
- [ ] **Step 1: 修改 `list_work_orders()` 函数,支持 outbound 类型的 JOIN 查询和 bizType 筛选参数**
|
||||
|
||||
在 `backend/app/crud/qc_work_order.py` 中:
|
||||
|
||||
1. 找到 `list_work_orders()` 函数(查询质检工单列表)
|
||||
2. 新增可选参数 `biz_type: Optional[str] = None`
|
||||
3. 当 `work_order_type == 'outbound'` 时,LEFT JOIN 以下链路获取关联数据:
|
||||
- `biz_qc_work_order.infusion_schedule_id` → `biz_pilot_infusion_schedule`
|
||||
- `biz_pilot_infusion_schedule.infusion_plan_id` → `biz_pilot_infusion_plan`
|
||||
- `biz_pilot_infusion_plan.pilot_application_id` → `biz_pilot_application`
|
||||
4. 添加 WHERE 条件 `biz_type` 筛选(当参数非空时)
|
||||
|
||||
- [ ] **Step 2: 扩展 `_row_to_dict()` 函数,为 outbound 类型返回额外字段**
|
||||
|
||||
在 `_row_to_dict()` 函数中,当工单的 `work_order_type == 'outbound'` 时,额外返回:
|
||||
|
||||
```python
|
||||
# outbound 工单额外字段
|
||||
'bizType': row.biz_type, # 业务类型
|
||||
'bizTypeLabel': '中试服务' if row.biz_type == 'pilot_service' else ('临床应用' if row.biz_type == 'clinical_application' else ''),
|
||||
'applicationNo': application_no if outbound else None, # 申请单号
|
||||
'applicationName': application_name if outbound else None, # 申请单名称
|
||||
'channelName': channel_name if outbound else None, # 渠道名称
|
||||
'infusionTime': infusion_time if outbound else None, # 输注时间
|
||||
```
|
||||
|
||||
这些字段从 JOIN 查询结果中获取。
|
||||
|
||||
- [ ] **Step 3: 修改列表 API 路由,接收 bizType 查询参数**
|
||||
|
||||
在 `backend/app/api/qc.py` 的工单列表端点中,从 `request.args` 或 Pydantic 查询模型中接收 `bizType` 参数,传递给 `list_work_orders()`。
|
||||
|
||||
- [ ] **Step 4: 修改 `create_outbound_qc_work_order()` 写入 biz_type**
|
||||
|
||||
在 `create_outbound_qc_work_order()` 函数中,创建工单时设置 `biz_type = 'pilot_service'`(当前场景均为中试服务)。
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/qc_work_order.py backend/app/api/qc.py
|
||||
git commit -m "feat(qc): extend outbound work order list API with application/infusion fields and bizType filter"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 3: 后端 — 新增出库质检查看聚合 API
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/api/qc.py` (新增路由)
|
||||
- Modify: `backend/app/crud/qc_work_order.py` (新增查询函数)
|
||||
- Modify: `backend/app/schemas/qc_work_order.py` (新增返回 Schema)
|
||||
|
||||
**参考文件(只读):**
|
||||
- `backend/app/crud/qc_work_order.py` — 搜索 `get_work_order_detail` 了解现有详情查询模式
|
||||
- `backend/app/crud/pilot_application.py` — 搜索申请单/方案/计划的查询模式
|
||||
- `backend/app/models/models.py` — 搜索 `BizPilotPatient`、`BizPilotInfusionScheduleProduct` 模型
|
||||
|
||||
- [ ] **Step 1: 在 `schemas/qc_work_order.py` 中新增出库详情返回 Schema**
|
||||
|
||||
```python
|
||||
class OutboundQcDetailApplication(BaseModel):
|
||||
"""出库质检查看 - 申请单信息"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
application_no: Optional[str] = Field(None, alias="applicationNo")
|
||||
application_name: Optional[str] = Field(None, alias="applicationName")
|
||||
application_status: Optional[str] = Field(None, alias="applicationStatus")
|
||||
channel_name: Optional[str] = Field(None, alias="channelName")
|
||||
|
||||
|
||||
class OutboundQcDetailPatient(BaseModel):
|
||||
"""出库质检查看 - 患者信息"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
patient_name: Optional[str] = Field(None, alias="patientName")
|
||||
sex: Optional[str] = Field(None)
|
||||
age: Optional[str] = Field(None)
|
||||
phone_no: Optional[str] = Field(None, alias="phoneNo")
|
||||
id_card_no: Optional[str] = Field(None, alias="idCardNo")
|
||||
emergency_contact: Optional[str] = Field(None, alias="emergencyContact")
|
||||
emergency_phone: Optional[str] = Field(None, alias="emergencyPhone")
|
||||
clinical_diagnosis: Optional[str] = Field(None, alias="clinicalDiagnosis")
|
||||
diagnosis_attachments: Optional[str] = Field(None, alias="diagnosisAttachments")
|
||||
|
||||
|
||||
class OutboundQcDetailInfusionPlan(BaseModel):
|
||||
"""出库质检查看 - 输注方案信息"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
cell_type: Optional[str] = Field(None, alias="cellType")
|
||||
spec_text: Optional[str] = Field(None, alias="specText")
|
||||
total_course_count: Optional[int] = Field(None, alias="totalCourseCount")
|
||||
course_interval: Optional[str] = Field(None, alias="courseInterval")
|
||||
infusion_route: Optional[str] = Field(None, alias="infusionRoute")
|
||||
infusion_start_date: Optional[str] = Field(None, alias="infusionStartDate")
|
||||
|
||||
|
||||
class OutboundQcDetailInfusionSchedule(BaseModel):
|
||||
"""出库质检查看 - 输注计划信息"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
infusion_time: Optional[str] = Field(None, alias="infusionTime")
|
||||
infusion_location: Optional[str] = Field(None, alias="infusionLocation")
|
||||
infusion_method: Optional[str] = Field(None, alias="infusionMethod")
|
||||
schedule_status: Optional[str] = Field(None, alias="scheduleStatus")
|
||||
infusion_status: Optional[str] = Field(None, alias="infusionStatus")
|
||||
qc_status: Optional[str] = Field(None, alias="qcStatus")
|
||||
cancel_reason: Optional[str] = Field(None, alias="cancelReason")
|
||||
|
||||
|
||||
class OutboundQcDetailProduct(BaseModel):
|
||||
"""出库质检查看 - 产品明细"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
project_code: Optional[str] = Field(None, alias="projectCode")
|
||||
project_name: Optional[str] = Field(None, alias="projectName")
|
||||
cell_type_name: Optional[str] = Field(None, alias="cellTypeName")
|
||||
spec_text: Optional[str] = Field(None, alias="specText")
|
||||
agreement_price: Optional[float] = Field(None, alias="agreementPrice")
|
||||
actual_price: Optional[float] = Field(None, alias="actualPrice")
|
||||
quantity: Optional[int] = Field(None)
|
||||
product_status: Optional[str] = Field(None, alias="productStatus")
|
||||
|
||||
|
||||
class OutboundQcDetailResponse(BaseModel):
|
||||
"""出库质检聚合详情"""
|
||||
model_config = ConfigDict(populate_by_name=True)
|
||||
work_order: Optional[dict] = Field(None, alias="workOrder")
|
||||
application: Optional[OutboundQcDetailApplication] = Field(None, alias="application")
|
||||
patient: Optional[OutboundQcDetailPatient] = Field(None, alias="patient")
|
||||
infusion_plan: Optional[OutboundQcDetailInfusionPlan] = Field(None, alias="infusionPlan")
|
||||
infusion_schedule: Optional[OutboundQcDetailInfusionSchedule] = Field(None, alias="infusionSchedule")
|
||||
products: Optional[list[OutboundQcDetailProduct]] = Field(None, alias="products")
|
||||
tasks: Optional[list[dict]] = Field(None, alias="tasks")
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 在 `crud/qc_work_order.py` 中新增 `get_outbound_qc_detail()` 函数**
|
||||
|
||||
```python
|
||||
def get_outbound_qc_detail(db: Session, work_order_id: str, tenant_no: str) -> dict:
|
||||
"""获取出库质检工单聚合详情(含申请单、患者、方案、计划、产品、任务)"""
|
||||
# 1. 获取工单基本信息(复用现有 get_work_order_detail 或直接查询)
|
||||
# 2. 通过 infusion_schedule_id JOIN 链路获取:
|
||||
# - biz_pilot_infusion_schedule
|
||||
# - biz_pilot_infusion_plan → biz_pilot_application → biz_pilot_patient
|
||||
# - biz_pilot_infusion_schedule_product
|
||||
# 3. 获取关联的质检任务(复用现有任务查询逻辑)
|
||||
# 4. 组装返回 dict
|
||||
```
|
||||
|
||||
实现时参考现有 `get_work_order_detail()` 的模式,通过 SQLAlchemy session 查询并组装字典返回。
|
||||
|
||||
- [ ] **Step 3: 在 `api/qc.py` 中新增路由**
|
||||
|
||||
```python
|
||||
@router.get("/qc-work-orders/{work_order_id}/outbound-detail")
|
||||
def api_get_outbound_qc_detail(work_order_id: str, db: Session = Depends(get_db), current_user=Depends(require_auth)):
|
||||
"""获取出库质检工单聚合详情"""
|
||||
tenant_no = current_user["tenant_no"]
|
||||
result = get_outbound_qc_detail(db, work_order_id, tenant_no)
|
||||
return success(result)
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 验证 API 可用**
|
||||
|
||||
启动后端服务,访问 `/docs` 确认新端点出现在 Swagger 文档中。
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/schemas/qc_work_order.py backend/app/crud/qc_work_order.py backend/app/api/qc.py
|
||||
git commit -m "feat(qc): add outbound QC work order aggregated detail API endpoint"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 4: 后端 — 输注计划取消时自动作废关联质检工单
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/crud/pilot_infusion_schedule_mgmt.py`
|
||||
|
||||
**参考文件(只读):**
|
||||
- `backend/app/crud/pilot_infusion_schedule_mgmt.py` — 搜索状态更新逻辑、`update_status`、取消相关代码
|
||||
- `backend/app/models/models.py` — 搜索 `BizQcWorkOrder` 模型
|
||||
|
||||
- [ ] **Step 1: 找到输注计划取消/删除的状态更新入口**
|
||||
|
||||
在 `pilot_infusion_schedule_mgmt.py` 中搜索输注计划状态变更为 `yqx` 的逻辑入口(通常在 `update_status` 或 `cancel_schedule` 函数中)。
|
||||
|
||||
- [ ] **Step 2: 在取消逻辑中新增自动作废关联质检工单的代码**
|
||||
|
||||
在状态变更为 `yqx` 的逻辑之后,新增:
|
||||
|
||||
```python
|
||||
from app.models.models import BizQcWorkOrder
|
||||
|
||||
# 当输注计划被取消时,自动作废关联的未完成出库质检工单
|
||||
pending_qc_orders = db.query(BizQcWorkOrder).filter(
|
||||
BizQcWorkOrder.infusion_schedule_id == schedule_id,
|
||||
BizQcWorkOrder.work_order_status.notin_(['ywc', 'yzf']),
|
||||
BizQcWorkOrder.del_flag == 0
|
||||
).all()
|
||||
for order in pending_qc_orders:
|
||||
order.work_order_status = 'yzf'
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add backend/app/crud/pilot_infusion_schedule_mgmt.py
|
||||
git commit -m "feat(infusion): auto-void outbound QC work orders when infusion schedule is cancelled"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 5: 前端 — 新增 API 函数和类型
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/qc-work-order.ts` (新增类型和 API 函数)
|
||||
|
||||
- [ ] **Step 1: 在 `QcWorkOrder` 类型中新增 outbound 相关字段**
|
||||
|
||||
在 `QcWorkOrder` 类型定义中新增:
|
||||
|
||||
```typescript
|
||||
bizType?: string
|
||||
bizTypeLabel?: string
|
||||
applicationNo?: string
|
||||
applicationName?: string
|
||||
channelName?: string
|
||||
infusionTime?: string
|
||||
```
|
||||
|
||||
同时,`fetchQcWorkOrderList` 的参数类型新增 `bizType?: string`:
|
||||
|
||||
```typescript
|
||||
export function fetchQcWorkOrderList(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
keyword?: string
|
||||
workOrderStatus?: string
|
||||
workOrderType?: string
|
||||
bizType?: string
|
||||
createTimeStart?: string
|
||||
createTimeEnd?: string
|
||||
}) {
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 新增出库质检查看聚合 API 类型定义和调用函数**
|
||||
|
||||
```typescript
|
||||
export type OutboundQcDetailApplication = {
|
||||
applicationNo?: string
|
||||
applicationName?: string
|
||||
applicationStatus?: string
|
||||
channelName?: string
|
||||
}
|
||||
|
||||
export type OutboundQcDetailPatient = {
|
||||
patientName?: string
|
||||
sex?: string
|
||||
age?: string
|
||||
phoneNo?: string
|
||||
idCardNo?: string
|
||||
emergencyContact?: string
|
||||
emergencyPhone?: string
|
||||
clinicalDiagnosis?: string
|
||||
diagnosisAttachments?: string
|
||||
}
|
||||
|
||||
export type OutboundQcDetailInfusionPlan = {
|
||||
cellType?: string
|
||||
specText?: string
|
||||
totalCourseCount?: number
|
||||
courseInterval?: string
|
||||
infusionRoute?: string
|
||||
infusionStartDate?: string
|
||||
}
|
||||
|
||||
export type OutboundQcDetailInfusionSchedule = {
|
||||
infusionTime?: string
|
||||
infusionLocation?: string
|
||||
infusionMethod?: string
|
||||
scheduleStatus?: string
|
||||
infusionStatus?: string
|
||||
qcStatus?: string
|
||||
cancelReason?: string
|
||||
}
|
||||
|
||||
export type OutboundQcDetailProduct = {
|
||||
projectCode?: string
|
||||
projectName?: string
|
||||
cellTypeName?: string
|
||||
specText?: string
|
||||
agreementPrice?: number
|
||||
actualPrice?: number
|
||||
quantity?: number
|
||||
productStatus?: string
|
||||
}
|
||||
|
||||
export type OutboundQcDetail = {
|
||||
workOrder: QcWorkOrderDetail
|
||||
application?: OutboundQcDetailApplication
|
||||
patient?: OutboundQcDetailPatient
|
||||
infusionPlan?: OutboundQcDetailInfusionPlan
|
||||
infusionSchedule?: OutboundQcDetailInfusionSchedule
|
||||
products?: OutboundQcDetailProduct[]
|
||||
tasks?: QcWorkOrderDetail['tasks']
|
||||
}
|
||||
|
||||
export function fetchOutboundQcDetail(id: string) {
|
||||
return request.get<OutboundQcDetail>({
|
||||
url: `/web/admin/qc-work-orders/${id}/outbound-detail`
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/api/qc-work-order.ts
|
||||
git commit -m "feat(qc): add outbound QC detail API types and fetch function"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 6: 前端 — 新增出库质检 Tab 和列表
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-work-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 扩展 Tab 类型定义和 el-tabs**
|
||||
|
||||
在 `<script setup>` 中修改 `WorkOrderTypeTab` 类型:
|
||||
|
||||
```typescript
|
||||
type WorkOrderTypeTab = 'inbound' | 'temporary' | 'outbound' | 'all'
|
||||
```
|
||||
|
||||
在模板的 `<el-tabs>` 中,在"临时质检工单"和"全部质检工单"之间新增:
|
||||
|
||||
```html
|
||||
<el-tab-pane label="出库质检工单" name="outbound" />
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 新增出库列的 computed 控制**
|
||||
|
||||
在 `<script setup>` 中新增:
|
||||
|
||||
```typescript
|
||||
const showOutboundCols = computed(() => activeTypeTab.value === 'outbound')
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 修改筛选区域 — 出库 Tab 显示业务类型筛选**
|
||||
|
||||
在筛选区域的 `<div class="filter-grid">` 中,关键词输入框的 placeholder 需要根据 Tab 调整:
|
||||
|
||||
```html
|
||||
<el-input
|
||||
v-model="searchForm.keyword"
|
||||
:placeholder="
|
||||
activeTypeTab === 'temporary'
|
||||
? '工单号'
|
||||
: activeTypeTab === 'outbound'
|
||||
? '工单号/申请单号/申请单名称'
|
||||
: '工单号/协议号/样本编码'
|
||||
"
|
||||
clearable
|
||||
/>
|
||||
```
|
||||
|
||||
在工单状态 `el-select` 之后,新增业务类型筛选(仅 outbound Tab 显示):
|
||||
|
||||
```html
|
||||
<el-form-item v-if="activeTypeTab === 'outbound'" label="业务类型">
|
||||
<el-select
|
||||
v-model="searchForm.bizType"
|
||||
placeholder="全部"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option label="中试服务" value="pilot_service" />
|
||||
<el-option label="临床应用" value="clinical_application" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
同时在 `searchForm` reactive 中新增 `bizType: ''`。
|
||||
|
||||
- [ ] **Step 4: 修改工具栏 — 出库 Tab 不显示新增按钮**
|
||||
|
||||
在 `<div v-if="activeTypeTab !== 'all'" class="list-toolbar">` 中,新增 outbound 的排除:
|
||||
|
||||
```html
|
||||
<div v-if="activeTypeTab !== 'all' && activeTypeTab !== 'outbound'" class="list-toolbar">
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 新增出库质检专属表格列**
|
||||
|
||||
在表格中,在"工单号"列之后、"业务类型"列之前(或复用业务类型列位置),新增出库专属列。在 `<el-table-column prop="workOrderNo"...>` 后面添加:
|
||||
|
||||
```html
|
||||
<!-- 出库质检专属列 -->
|
||||
<el-table-column
|
||||
v-if="showOutboundCols"
|
||||
prop="bizTypeLabel"
|
||||
label="业务类型"
|
||||
min-width="100"
|
||||
align="center"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<el-tag
|
||||
:type="row.bizType === 'pilot_service' ? 'primary' : 'warning'"
|
||||
size="small"
|
||||
>
|
||||
{{ row.bizTypeLabel || (row.bizType === 'pilot_service' ? '中试服务' : '临床应用') }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="showOutboundCols"
|
||||
prop="applicationNo"
|
||||
label="申请单号"
|
||||
min-width="160"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="showOutboundCols"
|
||||
prop="applicationName"
|
||||
label="申请单名称"
|
||||
min-width="200"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="showOutboundCols"
|
||||
prop="channelName"
|
||||
label="渠道名称"
|
||||
min-width="140"
|
||||
align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="showOutboundCols"
|
||||
prop="infusionTime"
|
||||
label="输注时间"
|
||||
min-width="160"
|
||||
align="center"
|
||||
/>
|
||||
```
|
||||
|
||||
- [ ] **Step 6: 修改状态列支持 yzf(已作废)**
|
||||
|
||||
在状态列的 `el-tag` 中,`tagType` 计算需新增 yzf 分支:
|
||||
|
||||
```html
|
||||
<el-tag
|
||||
:type="
|
||||
row.workOrderStatus === 'ywc'
|
||||
? 'success'
|
||||
: row.workOrderStatus === 'ypz'
|
||||
? 'warning'
|
||||
: row.workOrderStatus === 'yzf'
|
||||
? 'danger'
|
||||
: 'info'
|
||||
"
|
||||
size="small"
|
||||
>
|
||||
```
|
||||
|
||||
在 `workOrderStatusLabel` 映射函数中确认已支持 `yzf` → `已作废`(需检查 `utils/qc-labels.ts` 或 `utils/status-tag-registry.ts`,如缺失则新增)。
|
||||
|
||||
- [ ] **Step 7: 修改操作列 — 出库 Tab 按钮逻辑**
|
||||
|
||||
在操作列的 `<template #default="{ row }">` 中:
|
||||
|
||||
**查看按钮** — 所有 Tab 都显示(保持不变)
|
||||
|
||||
**编辑按钮** — 出库 Tab 显示"编辑备注"按钮(与入库的编辑备注行为一致):
|
||||
|
||||
```html
|
||||
<!-- 出库质检编辑备注 -->
|
||||
<el-button
|
||||
v-if="activeTypeTab === 'outbound' && row.workOrderStatus !== 'ywc' && row.workOrderStatus !== 'yzf'"
|
||||
class="btn-op-item"
|
||||
@click="handleEditRemark(row)"
|
||||
>
|
||||
<el-icon><EditPen /></el-icon>编辑
|
||||
</el-button>
|
||||
```
|
||||
|
||||
**配置检测按钮** — 保持现有逻辑(`dpz`/`ypz` 时显示),对 outbound 同样适用
|
||||
|
||||
**删除按钮** — outbound Tab 不显示。将删除按钮的条件修改为:
|
||||
|
||||
```html
|
||||
<el-button
|
||||
v-if="activeTypeTab !== 'outbound' && activeTypeTab !== 'all' && row.workOrderStatus !== 'ywc'"
|
||||
class="btn-op-item"
|
||||
@click="handleDelete(row)"
|
||||
>删除</el-button>
|
||||
```
|
||||
|
||||
- [ ] **Step 8: 修改 `loadData()` 传递 bizType 参数**
|
||||
|
||||
在 `loadData()` 函数中,调用 `fetchQcWorkOrderList` 时新增 `bizType` 参数:
|
||||
|
||||
```typescript
|
||||
const res = await fetchQcWorkOrderList({
|
||||
page: pagination.page,
|
||||
pageSize: pagination.pageSize,
|
||||
keyword: searchForm.keyword || undefined,
|
||||
workOrderStatus: searchForm.workOrderStatus || undefined,
|
||||
workOrderType: activeTypeTab.value === 'all' ? undefined : activeTypeTab.value,
|
||||
bizType: searchForm.bizType || undefined,
|
||||
createTimeStart: createTimeRange.value?.[0] || undefined,
|
||||
createTimeEnd: createTimeRange.value?.[1] || undefined
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 9: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/quality-inspection/qc-work-order/index.vue
|
||||
git commit -m "feat(qc): add outbound QC work order tab with list, filters and action buttons"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 7: 前端 — 新建 OutboundQcViewDialog.vue 查看对话框
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/quality-inspection/qc-work-order/OutboundQcViewDialog.vue`
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-work-order/index.vue` (引入并使用新组件)
|
||||
|
||||
**参考文件(只读,必须先读取理解模式):**
|
||||
- `web-admin/src/components/business/system-view-dialog/index.vue` — `SystemViewDialog` 组件接口
|
||||
- `web-admin/src/views/quality-inspection/qc-work-order/index.vue:425-460` — 现有查看对话框的使用方式
|
||||
- `web-admin/src/views/quality-inspection/qc-work-order/index.vue:964-1020` — `buildTaskTypeSections()` 函数
|
||||
- `web-admin/src/components/business/protocol-attachment/ProtocolAttachmentReadonly.vue` — 附件预览组件
|
||||
- `web-admin/src/utils/status-tag-registry.ts` — 状态标签映射函数
|
||||
|
||||
- [ ] **Step 1: 创建 `OutboundQcViewDialog.vue` 基础骨架**
|
||||
|
||||
```vue
|
||||
<!-- 出库质检工单查看对话框 -->
|
||||
<template>
|
||||
<SystemViewDialog
|
||||
v-model:visible="dialogVisible"
|
||||
title="出库质检工单详情"
|
||||
width="1200px"
|
||||
:grid-columns="4"
|
||||
compact
|
||||
:loading="loading"
|
||||
:icon="Document"
|
||||
:meta="detail?.workOrder?.workOrderNo || ''"
|
||||
:sections="sections"
|
||||
>
|
||||
<!-- 诊断附件 slot -->
|
||||
<template #diagnosis-attachments>
|
||||
<ProtocolAttachmentReadonly
|
||||
:files="diagnosisAttachmentFiles"
|
||||
@preview="handlePreview"
|
||||
@download="handleDownload"
|
||||
/>
|
||||
</template>
|
||||
<!-- 任务附件 slots -->
|
||||
<template v-for="task in tasksWithAttachments" #[taskAttachmentSlotName(task.id)]>
|
||||
<div :key="task.id" class="outbound-qc-task-attachments">
|
||||
<ProtocolAttachmentReadonly
|
||||
:files="task.attachmentFiles || []"
|
||||
@preview="handleTaskPreview"
|
||||
@download="handleTaskDownload"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</SystemViewDialog>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, watch } from 'vue'
|
||||
import { Document } from '@element-plus/icons-vue'
|
||||
import { fetchOutboundQcDetail, type OutboundQcDetail } from '@/api/qc-work-order'
|
||||
import { fetchQcTaskResults, type QcTaskResultItem } from '@/api/qc-task-result'
|
||||
import {
|
||||
workOrderStatusLabel,
|
||||
taskStatusLabel,
|
||||
qcTaskConclusionLabel
|
||||
} from '@/utils/qc-labels'
|
||||
import {
|
||||
scheduleStatusLabel,
|
||||
scheduleStatusTagType,
|
||||
infusionStatusLabel,
|
||||
infusionStatusTagType,
|
||||
qcStatusLabel,
|
||||
qcStatusTagType,
|
||||
applicationStatusLabel,
|
||||
applicationStatusTagType,
|
||||
bizTypeLabel,
|
||||
bizTypeTagType
|
||||
} from '@/utils/status-tag-registry'
|
||||
import SystemViewDialog from '@/components/business/system-view-dialog/index.vue'
|
||||
import type { ViewField, ViewSection } from '@/components/business/system-view-dialog/index.vue'
|
||||
import ProtocolAttachmentReadonly from '@/views/cell-storage/protocol/ProtocolAttachmentReadonly.vue'
|
||||
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
||||
import { formatMoneyDisplay } from '@/utils/money-format'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
workOrderId: string
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:visible', v: boolean): void
|
||||
}>()
|
||||
|
||||
const dialogVisible = computed({
|
||||
get: () => props.visible,
|
||||
set: (v) => emit('update:visible', v)
|
||||
})
|
||||
|
||||
const loading = ref(false)
|
||||
const detail = ref<OutboundQcDetail | null>(null)
|
||||
type TaskWithResults = { id: string; taskNo: string; taskType: string; itemCode?: string; itemName?: string; taskStatus: string; conclusion?: string; conclusionLabel?: string; remark?: string; completedTime?: string; attachmentFiles?: Array<{ id?: string; fileUrl?: string; fileName?: string }>; results?: QcTaskResultItem[]; companyName?: string; feeAmount?: number }
|
||||
const tasksWithResults = ref<TaskWithResults[]>([])
|
||||
|
||||
// ... 后续步骤中补充 sections 计算逻辑和附件处理
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 实现 sections computed 属性**
|
||||
|
||||
在 `<script setup>` 中实现完整的 `sections` computed,包含 7 个 Section 组:
|
||||
|
||||
1. **工单基本信息** — 工单号、工单类型(出库)、业务类型(el-tag)、状态(el-tag)、检测方式、配置时间、配置人、备注、创建时间
|
||||
2. **中试服务申请单信息** — 申请单号、名称、状态(el-tag)、渠道名称
|
||||
3. **患者信息** — 姓名、性别、年龄、电话、证件号、紧急联系人、紧急电话、临床诊断(span)、诊断附件(slot)
|
||||
4. **输注方案信息** — 细胞类型、规格、总疗程数、疗程间隔、输注途径、输注开始日期
|
||||
5. **本次输注计划信息** — 输注时间、地点、方式、生产状态(el-tag)、输注状态(el-tag)、质检状态(el-tag)、取消原因(仅已取消)
|
||||
6. **产品明细** — 内嵌表格展示 `products` 数组(项目编码、名称、细胞类型、规格、协议单价、实际单价、份数、产品状态)
|
||||
7. **检测结果** — 动态 Section,复用 `buildTaskTypeSections` 的逻辑生成实验室和第三方项目的详情
|
||||
|
||||
> 注意:状态标签映射函数需确认 `status-tag-registry.ts` 中是否存在。如 `scheduleStatusLabel`、`infusionStatusLabel`、`qcStatusLabel`、`applicationStatusLabel`、`bizTypeLabel` 等不存在,需在该文件中新增。
|
||||
|
||||
- [ ] **Step 3: 实现 handleView 数据加载**
|
||||
|
||||
```typescript
|
||||
watch(() => props.visible, async (v) => {
|
||||
if (!v || !props.workOrderId) return
|
||||
loading.value = true
|
||||
tasksWithResults.value = []
|
||||
try {
|
||||
const d = await fetchOutboundQcDetail(props.workOrderId)
|
||||
detail.value = d
|
||||
// 加载任务结果
|
||||
const rawTasks = (d.workOrder?.tasks || []) as TaskWithResults[]
|
||||
const enriched = await Promise.all(
|
||||
rawTasks.map(async (task) => {
|
||||
if (task.taskType !== 'sysz' || task.taskStatus !== 'ywc') {
|
||||
return { ...task, results: [] as QcTaskResultItem[] }
|
||||
}
|
||||
try {
|
||||
const results = await fetchQcTaskResults(task.id)
|
||||
return { ...task, results: results || [] }
|
||||
} catch {
|
||||
return { ...task, results: [] as QcTaskResultItem[] }
|
||||
}
|
||||
})
|
||||
)
|
||||
tasksWithResults.value = enriched
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 补充附件处理逻辑**
|
||||
|
||||
实现 `diagnosisAttachmentFiles` computed(解析 `patient.diagnosisAttachments` 为文件数组)、`handlePreview`、`handleDownload`、`handleTaskPreview`、`handleTaskDownload`、`taskAttachmentSlotName` 等函数。参照现有 `index.vue` 中同名函数的模式。
|
||||
|
||||
- [ ] **Step 5: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/quality-inspection/qc-work-order/OutboundQcViewDialog.vue
|
||||
git commit -m "feat(qc): create OutboundQcViewDialog component with full detail sections"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 8: 前端 — 在 index.vue 中集成 OutboundQcViewDialog
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/quality-inspection/qc-work-order/index.vue`
|
||||
|
||||
- [ ] **Step 1: 导入 OutboundQcViewDialog 组件**
|
||||
|
||||
在 `<script setup>` 的 import 区域添加:
|
||||
|
||||
```typescript
|
||||
import OutboundQcViewDialog from './OutboundQcViewDialog.vue'
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 新增出库查看对话框的状态变量**
|
||||
|
||||
```typescript
|
||||
const outboundViewVisible = ref(false)
|
||||
const outboundViewId = ref('')
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 新增出库查看处理函数**
|
||||
|
||||
```typescript
|
||||
function handleOutboundView(row: QcWorkOrder) {
|
||||
outboundViewId.value = row.id
|
||||
outboundViewVisible.value = true
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: 修改 handleView 函数区分出库类型**
|
||||
|
||||
修改现有的 `handleView` 函数,当 `activeTypeTab === 'outbound'` 时调用 `handleOutboundView`:
|
||||
|
||||
```typescript
|
||||
async function handleView(row: QcWorkOrder) {
|
||||
if (activeTypeTab.value === 'outbound') {
|
||||
handleOutboundView(row)
|
||||
return
|
||||
}
|
||||
// ... 原有逻辑不变
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 5: 在模板中放置 OutboundQcViewDialog**
|
||||
|
||||
在 `</section>` 结束标签之前(与 `WorkOrderRemarkDialog` 同级)添加:
|
||||
|
||||
```html
|
||||
<OutboundQcViewDialog
|
||||
v-model:visible="outboundViewVisible"
|
||||
:work-order-id="outboundViewId"
|
||||
/>
|
||||
```
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/views/quality-inspection/qc-work-order/index.vue
|
||||
git commit -m "feat(qc): integrate OutboundQcViewDialog into QC work order page"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 9: 前端 — 补充状态标签映射
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/utils/status-tag-registry.ts` (如需新增标签函数)
|
||||
|
||||
- [ ] **Step 1: 检查 status-tag-registry.ts 中是否已有以下映射函数**
|
||||
|
||||
需要确认的函数:
|
||||
- `scheduleStatusLabel` / `scheduleStatusTagType` — 输注计划生产状态 (dsc/ysc/yjf/yqx)
|
||||
- `infusionStatusLabel` / `infusionStatusTagType` — 输注状态 (dtz/yrqr/yqx/ywc)
|
||||
- `qcStatusLabel` / `qcStatusTagType` — 质检状态 (dzc/yzj/yqx)
|
||||
- `applicationStatusLabel` / `applicationStatusTagType` — 申请单状态 (dks/jxz/ywc/yzf)
|
||||
- `bizTypeLabel` / `bizTypeTagType` — 业务类型 (pilot_service/clinical_application)
|
||||
- `productStatusLabel` / `productStatusTagType` — 产品状态 (dtz/yrqr/yqx/ywc)
|
||||
|
||||
如果已存在,跳过此 Task。如果不存在,新增对应的映射函数。
|
||||
|
||||
- [ ] **Step 2: 新增缺失的标签映射函数**
|
||||
|
||||
遵循文件中已有的映射函数模式(label 函数返回中文名,tagType 函数返回 `TagType`),为每个缺失的状态类型新增。
|
||||
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
```bash
|
||||
git add web-admin/src/utils/status-tag-registry.ts
|
||||
git commit -m "feat(qc): add missing status label/tag mappings for outbound QC view dialog"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Task 10: 验证与修复
|
||||
|
||||
- [ ] **Step 1: 运行前端 lint 检查**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm lint
|
||||
```
|
||||
|
||||
修复所有 lint 错误。
|
||||
|
||||
- [ ] **Step 2: 运行前端 Prettier 格式化**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm lint:prettier
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 运行前端类型检查**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm build:typecheck
|
||||
```
|
||||
|
||||
确保无类型错误。
|
||||
|
||||
- [ ] **Step 4: 前端构建验证**
|
||||
|
||||
```bash
|
||||
cd web-admin && pnpm build
|
||||
```
|
||||
|
||||
确保构建成功。
|
||||
|
||||
- [ ] **Step 5: 后端 LSP 诊断**
|
||||
|
||||
对修改过的后端文件运行 `lsp_diagnostics` 确认无错误。
|
||||
|
||||
- [ ] **Step 6: 端到端手动验证**
|
||||
|
||||
1. 访问质检工单页面,确认 4 个 Tab 正常切换
|
||||
2. 在出库质检 Tab 确认列表加载、筛选、分页正常
|
||||
3. 确认查看对话框显示完整的申请单+输注计划+患者+产品信息
|
||||
4. 确认编辑备注功能正常
|
||||
5. 确认配置检测功能正常
|
||||
6. 确认删除按钮不显示、新增按钮不显示
|
||||
7. 在输注计划页面取消一个计划,返回出库质检 Tab 确认关联工单状态变为"已作废"
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,519 @@
|
||||
# 山峡化工生产一体化门户 — 工程清理 + Tag 集中化实施计划
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
## 背景与目标
|
||||
|
||||
将 zkxw 工程清理为山峡化工生产一体化门户(shanxia2.0)的基础框架:
|
||||
1. **删除所有 zkxw 业务代码**(前端 + 后端),仅保留系统管理、工作流管理、请假申请模块
|
||||
2. **Tag 颜色集中化**:在 `sys_dict_data` 表新增 `tag_type` 字段,前端全局 Dict Store 统一管理所有状态标签显示,彻底删除 `status-tag-registry.ts`
|
||||
3. **数据库清理**:删除所有业务表模型,仅保留系统表 + 工作流表 + 请假表 + 附件表
|
||||
|
||||
## 保留清单
|
||||
|
||||
### 后端保留
|
||||
- **API**:`public.py`(鉴权), `menu.py`(菜单), `admin.py`(系统管理), `workflow.py`(工作流), `leave.py`(请假)
|
||||
- **Services**:`workflow_engine.py`, `workflow_callback.py`, `web_auth_roles.py`
|
||||
- **模型**(models.py 中):Sys*, Wf*, BizLeaveRequest, BizAttachment, SysEthnic, SysApiRequestLog, SysApiRequestLogHis
|
||||
- **CRUD**:dict_type, dict_data, dept, menu, post, role, tenant, user, workflow, leave, attachment, base, api_request_log, biz_no_generator, site
|
||||
- **Schemas**:auth, common, leave, menu, user, workflow, attachment
|
||||
|
||||
### 前端保留
|
||||
- **Views 目录**:`auth/`, `dashboard/`, `exception/`, `index/`, `outside/`, `system/`(子目录: dept, dict, leave, menu, post, role, tenant, user, workflow)
|
||||
- **API 模块**:`auth.ts`, `admin.ts`, `system.ts`, `workflow.ts`
|
||||
- **Store**:`user.ts`, `menu.ts`, `setting.ts`, `table.ts`, `worktab.ts`
|
||||
- **Router**:`index.ts`, `sqxp.ts`(精简为仅保留路由), `exception.ts`
|
||||
|
||||
### 删除清单
|
||||
- **后端 API**(17 个文件):basic_info, collection_protocol, operations, ethnic, sample_reception, qc, research_donation, production, pilot_service, insurance_company, material, storage_release_review, sample_sms_notification, storage_entry_sms_notification, pilot_application, pilot_checkup, pilot_delivery, pilot_infusion_confirm, pilot_infusion_schedule_mgmt, outbound_release_review, clinical_payment
|
||||
- **后端模型**(独立文件 3 个 + models.py 中 ~100 个 Biz* 类):clinical_payment.py, material.py, qc_material.py, qc_param.py, research_donation.py + models.py 中所有 Biz* 类(除 BizLeaveRequest, BizAttachment)
|
||||
- **后端 CRUD**(~50 个业务文件):所有非保留清单的 crud 文件
|
||||
- **后端 Schemas**(~30 个业务文件):所有非保留清单的 schema 文件
|
||||
- **前端 Views**(7 个目录):basic-info, cell-storage, operations, pilot-service, production, quality-inspection, research-donation
|
||||
- **前端 API**(~26 个业务文件):所有非保留清单的 api 文件
|
||||
- **前端 Router**:`sqxp.ts` 中所有业务路由(13 个一级菜单精简为 3 个:工作流管理、系统管理、Dashboard)
|
||||
- **`status-tag-registry.ts`**:整体删除,所有 tag 走字典
|
||||
|
||||
---
|
||||
|
||||
## 实施任务
|
||||
|
||||
### Phase 1: 数据库层变更
|
||||
|
||||
#### Task 1.1: sys_dict_data 表新增 tag_type 字段
|
||||
- [ ] 编写 SQL migration 脚本 `docs/sql/20260530_add_tag_type_to_dict_data.sql`
|
||||
```sql
|
||||
ALTER TABLE `sys_dict_data`
|
||||
ADD COLUMN `tag_type` varchar(20) NOT NULL DEFAULT ''
|
||||
COMMENT '标签类型:success/warning/danger/info/primary/空'
|
||||
AFTER `dict_value`;
|
||||
```
|
||||
- [ ] 在 shanxia2.0 数据库上执行该 SQL
|
||||
|
||||
#### Task 1.2: 字典种子数据初始化
|
||||
- [ ] 编写 SQL 脚本 `docs/sql/20260530_seed_dict_data_for_framework.sql`
|
||||
|
||||
需要创建以下 dict_type 及其 dict_data 条目(每条都含 tag_type):
|
||||
|
||||
| dict_type | dict_name | 数据项 (dict_value → dict_label / tag_type) |
|
||||
|-----------|-----------|----------------------------------------------|
|
||||
| `sys_status` | 通用状态 | 1 → 正常 / success, 0 → 停用 / danger |
|
||||
| `sys_sex` | 性别 | 0 → 男 / primary, 1 → 女 / success |
|
||||
| `sys_data_scope` | 数据权限范围 | 1 → 全部数据 / '', 2 → 本部门数据 / info, 3 → 本部门及以下 / info, 4 → 仅本人 / warning, 5 → 自定义 / primary |
|
||||
| `sys_visible` | 显示状态 | 1 → 显示 / success, 0 → 隐藏 / info |
|
||||
| `menu_type` | 菜单类型 | M → 目录 / '', C → 菜单 / success, F → 按钮 / warning |
|
||||
| `leave_status` | 请假状态 | draft → 草稿 / info, pending → 审批中 / warning, approved → 已通过 / success, rejected → 已驳回 / danger, cancelled → 已取消 / info |
|
||||
| `wf_process_status` | 流程实例状态 | running → 进行中 / warning, completed → 已完成 / success, rejected → 已驳回 / danger, cancelled → 已取消 / info, pending → 待处理 / warning, approved → 已通过 / success, withdrawn → 已撤回 / info |
|
||||
| `wf_node_type` | 流程节点类型 | start → 开始 / info, end → 结束 / info, approver → 审批人 / warning, condition → 条件分支 / primary |
|
||||
| `wf_approve_type` | 审批方式 | any → 或签 / primary, all → 会签 / success |
|
||||
| `user_role` | 用户角色 | admin → 管理员 / primary, super_admin → 超级管理员 / danger |
|
||||
|
||||
**每个 dict_type 先在 `sys_dict_type` 中创建,再插入对应的 `sys_dict_data` 条目,每条都带 tag_type 值。**
|
||||
|
||||
- [ ] 在 shanxia2.0 数据库上执行种子数据 SQL
|
||||
|
||||
#### Task 1.3: 清理数据库业务表(生成脚本,不自动执行)
|
||||
- [ ] 编写 SQL 脚本 `docs/sql/20260530_drop_business_tables.sql`
|
||||
- 列出所有需要 DROP 的业务表(所有非 sys_、wf_、biz_leave_request、biz_attachment 的表)
|
||||
- 脚本中每个 DROP 前加注释说明原用途
|
||||
- [ ] 交给用户确认后手动执行
|
||||
|
||||
---
|
||||
|
||||
### Phase 2: 后端清理
|
||||
|
||||
#### Task 2.1: 清理后端 API 路由文件
|
||||
- [ ] 删除以下 API 文件(17 个):
|
||||
```
|
||||
backend/app/api/basic_info.py
|
||||
backend/app/api/collection_protocol.py
|
||||
backend/app/api/operations.py
|
||||
backend/app/api/ethnic.py
|
||||
backend/app/api/sample_reception.py
|
||||
backend/app/api/qc.py
|
||||
backend/app/api/research_donation.py
|
||||
backend/app/api/production.py
|
||||
backend/app/api/pilot_service.py
|
||||
backend/app/api/insurance_company.py
|
||||
backend/app/api/material.py
|
||||
backend/app/api/storage_release_review.py
|
||||
backend/app/api/sample_sms_notification.py
|
||||
backend/app/api/storage_entry_sms_notification.py
|
||||
backend/app/api/pilot_application.py
|
||||
backend/app/api/pilot_checkup.py
|
||||
backend/app/api/pilot_delivery.py
|
||||
backend/app/api/pilot_infusion_confirm.py
|
||||
backend/app/api/pilot_infusion_schedule_mgmt.py
|
||||
backend/app/api/outbound_release_review.py
|
||||
backend/app/api/clinical_payment.py
|
||||
```
|
||||
|
||||
#### Task 2.2: 清理后端模型文件
|
||||
- [ ] 删除独立模型文件(4 个):
|
||||
```
|
||||
backend/app/models/clinical_payment.py
|
||||
backend/app/models/material.py
|
||||
backend/app/models/qc_material.py
|
||||
backend/app/models/qc_param.py
|
||||
backend/app/models/research_donation.py
|
||||
```
|
||||
- [ ] 精简 `backend/app/models/models.py`:
|
||||
- **保留**的类:SysUser, SysRole, SysUserRole, SysRoleMenu, SysRoleDataScopeDetail, SysMenu, SysDept, SysTenant, SysSite, SysPost, SysUserPost, SysDictType, SysEthnic, SysDictData, SysApiRequestLog, SysApiRequestLogHis, BizLeaveRequest, BizAttachment, WfProcessDef, WfProcessVersion, WfNode, WfTransition, WfProcessInstance, WfTask
|
||||
- **删除**的类:所有 Biz* 类(除 BizLeaveRequest, BizAttachment),即从 BizItemUnit 开始到文件末尾的所有业务类
|
||||
- 在 SysDictData 类中新增字段:`tag_type = Column(String(20), nullable=False, default="", comment="标签类型")`,位置在 `dict_value` 之后
|
||||
|
||||
#### Task 2.3: 清理后端 CRUD 文件
|
||||
- [ ] 删除以下业务 CRUD 文件(约 50 个,仅保留列出的保留清单):
|
||||
```
|
||||
# 保留:base.py, api_request_log.py, biz_no_generator.py, dept.py, dict_data.py,
|
||||
# dict_type.py, leave.py, menu.py, post.py, role.py, tenant.py, user.py,
|
||||
# workflow.py, attachment.py, site.py, ethnic.py
|
||||
# 删除:其余全部(cell_product.py, collection_protocol.py, customer.py ... 等约 50 个文件)
|
||||
```
|
||||
|
||||
完整删除列表:
|
||||
```
|
||||
backend/app/crud/cell_product.py
|
||||
backend/app/crud/cell_sample_type.py
|
||||
backend/app/crud/clean_room.py
|
||||
backend/app/crud/clinical_payment.py
|
||||
backend/app/crud/collection_protocol.py
|
||||
backend/app/crud/collection_protocol_no.py
|
||||
backend/app/crud/collection_region.py
|
||||
backend/app/crud/consumable.py
|
||||
backend/app/crud/consumable_pack.py
|
||||
backend/app/crud/consumable_stock_log.py
|
||||
backend/app/crud/customer.py
|
||||
backend/app/crud/exhibition_appointment.py
|
||||
backend/app/crud/express_company.py
|
||||
backend/app/crud/item_unit.py
|
||||
backend/app/crud/material.py
|
||||
backend/app/crud/material_stock_log.py
|
||||
backend/app/crud/outbound_handover.py
|
||||
backend/app/crud/outbound_handover_inventory.py
|
||||
backend/app/crud/outbound_release_material.py
|
||||
backend/app/crud/outbound_release_review.py
|
||||
backend/app/crud/output_type.py
|
||||
backend/app/crud/pilot_application.py
|
||||
backend/app/crud/pilot_checkup.py
|
||||
backend/app/crud/pilot_delivery.py
|
||||
backend/app/crud/pilot_infusion_confirm.py
|
||||
backend/app/crud/pilot_infusion_schedule_mgmt.py
|
||||
backend/app/crud/pilot_outbound_status_sync.py
|
||||
backend/app/crud/pilot_service.py
|
||||
backend/app/crud/process.py
|
||||
backend/app/crud/process_category.py
|
||||
backend/app/crud/process_route.py
|
||||
backend/app/crud/production_task.py
|
||||
backend/app/crud/production_work_order.py
|
||||
backend/app/crud/protocol_donation_convert.py
|
||||
backend/app/crud/qc_item_param.py
|
||||
backend/app/crud/qc_lab_test_item.py
|
||||
backend/app/crud/qc_material.py
|
||||
backend/app/crud/qc_material_usage.py
|
||||
backend/app/crud/qc_task.py
|
||||
backend/app/crud/qc_task_result.py
|
||||
backend/app/crud/qc_third_party_company.py
|
||||
backend/app/crud/qc_third_party_item.py
|
||||
backend/app/crud/qc_work_order.py
|
||||
backend/app/crud/reagent.py
|
||||
backend/app/crud/reagent_stock_log.py
|
||||
backend/app/crud/research_donation.py
|
||||
backend/app/crud/sample_code.py
|
||||
backend/app/crud/sample_reception.py
|
||||
backend/app/crud/sample_reception_check_item.py
|
||||
backend/app/crud/sample_reception_check_result.py
|
||||
backend/app/crud/sample_sms_notification.py
|
||||
backend/app/crud/sop_document.py
|
||||
backend/app/crud/storage_entry_sms_notification.py
|
||||
backend/app/crud/storage_facility.py
|
||||
backend/app/crud/storage_occupancy.py
|
||||
backend/app/crud/storage_release_review.py
|
||||
```
|
||||
|
||||
#### Task 2.4: 清理后端 Schemas 文件
|
||||
- [ ] 删除以下业务 Schema 文件(约 30 个,仅保留列出的保留清单):
|
||||
```
|
||||
# 保留:auth.py, common.py, leave.py, menu.py, user.py, workflow.py, attachment.py
|
||||
# 删除:其余全部
|
||||
```
|
||||
|
||||
完整删除列表:
|
||||
```
|
||||
backend/app/schemas/category.py
|
||||
backend/app/schemas/category_parameter.py
|
||||
backend/app/schemas/cell_product.py
|
||||
backend/app/schemas/delivery.py
|
||||
backend/app/schemas/inquiry.py
|
||||
backend/app/schemas/order.py
|
||||
backend/app/schemas/order_adjust.py
|
||||
backend/app/schemas/outbound_handover.py
|
||||
backend/app/schemas/outbound_release_material.py
|
||||
backend/app/schemas/outbound_release_review.py
|
||||
backend/app/schemas/price_list.py
|
||||
backend/app/schemas/process_route.py
|
||||
backend/app/schemas/product.py
|
||||
backend/app/schemas/product_banner.py
|
||||
backend/app/schemas/product_detail_media.py
|
||||
backend/app/schemas/product_parameter.py
|
||||
backend/app/schemas/product_parameter_value.py
|
||||
backend/app/schemas/product_review.py
|
||||
backend/app/schemas/product_review_media.py
|
||||
backend/app/schemas/production_task.py
|
||||
backend/app/schemas/production_work_order.py
|
||||
backend/app/schemas/qc_task.py
|
||||
backend/app/schemas/qc_work_order.py
|
||||
backend/app/schemas/quotation.py
|
||||
backend/app/schemas/region.py
|
||||
backend/app/schemas/storage_occupancy.py
|
||||
backend/app/schemas/storage_release_review.py
|
||||
backend/app/schemas/unit.py
|
||||
```
|
||||
|
||||
#### Task 2.5: 更新后端路由注册
|
||||
- [ ] 重写 `backend/app/api/__init__.py`:仅保留 public_router, menu_router, admin_router, workflow_router, leave_router 的 import 和注册
|
||||
- [ ] 重写 `backend/app/main.py` 的 import 行:仅 import 保留的 5 个 router,同时删除对已删除 API 文件的任何引用
|
||||
- [ ] 更新 `backend/app/main.py` 中的 title/description:将 "zkxw" 替换为 "shanxia2.0" / "山峡化工生产一体化门户"
|
||||
|
||||
#### Task 2.6: 后端 dict 模块改造(Tag 集中化核心)
|
||||
- [ ] 修改 `backend/app/models/models.py` 中 SysDictData:新增 `tag_type` Column(在 Task 2.2 中已完成)
|
||||
- [ ] 修改 `backend/app/crud/dict_data.py`:
|
||||
- `_row_to_dict()` 返回值新增 `"tagType": d.tag_type or ""`
|
||||
- `create_dict_data()` 新增 tag_type 参数
|
||||
- `update_dict_data()` 新增 tag_type 参数更新
|
||||
- `list_dict_data_options()` 返回值新增 `"tagType": r.tag_type or ""`
|
||||
- [ ] 修改 `backend/app/api/admin.py` 中字典相关 endpoint:
|
||||
- `create_dict_data` body 新增 tag_type 字段
|
||||
- `update_dict_data` payload 新增 tag_type
|
||||
- `dict_data_options` 返回值含 tagType
|
||||
- [ ] 新增 API endpoint `GET /web/admin/dict-data/all`:
|
||||
- 返回当前租户下所有有效(del_flag=0)的字典数据,按 dict_type 分组
|
||||
- 返回格式:`{ "data": { "sys_status": [{ label, value, tagType }, ...], "leave_status": [...] } }`
|
||||
- 添加到 `admin.py` 中
|
||||
|
||||
#### Task 2.7: 清理 admin.py 中的业务端点
|
||||
- [ ] 从 `backend/app/api/admin.py` 中删除所有业务相关的端点:
|
||||
- 客户相关 (customer)
|
||||
- 快递公司 (express)
|
||||
- 计量单位 (item-unit)
|
||||
- 采样区域 (collection-region)
|
||||
- 细胞样本类型 (cell-sample-type)
|
||||
- 采样医院 (collection-hospital)
|
||||
- 其他所有非系统管理的端点
|
||||
- [ ] 保留的端点:用户、角色、部门、租户、菜单、字典类型、字典数据、岗位、站点、附件上传、组织管理
|
||||
|
||||
#### Task 2.8: 验证后端可启动
|
||||
- [ ] 激活 venv 后运行 `python -c "from app.main import app; print('OK')"`
|
||||
- [ ] 如有 import 错误,逐一修复(清理残留引用)
|
||||
- [ ] 启动服务 `./start-local.sh`,确认无报错
|
||||
|
||||
---
|
||||
|
||||
### Phase 3: 前端清理
|
||||
|
||||
#### Task 3.1: 删除业务 Views 目录
|
||||
- [ ] 删除以下 7 个前端 Views 目录:
|
||||
```
|
||||
web-admin/src/views/basic-info/
|
||||
web-admin/src/views/cell-storage/
|
||||
web-admin/src/views/operations/
|
||||
web-admin/src/views/pilot-service/
|
||||
web-admin/src/views/production/
|
||||
web-admin/src/views/quality-inspection/
|
||||
web-admin/src/views/research-donation/
|
||||
```
|
||||
|
||||
#### Task 3.2: 删除 system/ 下的模板/业务页面
|
||||
- [ ] 删除以下目录(属于模板参考页或业务页面):
|
||||
```
|
||||
web-admin/src/views/system/category/
|
||||
web-admin/src/views/system/product/
|
||||
web-admin/src/views/system/order/
|
||||
web-admin/src/views/system/express/
|
||||
```
|
||||
|
||||
#### Task 3.3: 删除业务 API 模块
|
||||
- [ ] 删除以下前端 API 文件(约 26 个):
|
||||
```
|
||||
web-admin/src/api/business.ts
|
||||
web-admin/src/api/cell-product.ts
|
||||
web-admin/src/api/collection-protocol.ts
|
||||
web-admin/src/api/ethnic.ts
|
||||
web-admin/src/api/infusion-schedule-handover.ts
|
||||
web-admin/src/api/material.ts
|
||||
web-admin/src/api/outbound-release-review.ts
|
||||
web-admin/src/api/production-task.ts
|
||||
web-admin/src/api/production-work-order.ts
|
||||
web-admin/src/api/production.ts
|
||||
web-admin/src/api/qc-item-param.ts
|
||||
web-admin/src/api/qc-lab-test-item.ts
|
||||
web-admin/src/api/qc-material-usage.ts
|
||||
web-admin/src/api/qc-material.ts
|
||||
web-admin/src/api/qc-task-result.ts
|
||||
web-admin/src/api/qc-task.ts
|
||||
web-admin/src/api/qc-third-party-company.ts
|
||||
web-admin/src/api/qc-third-party-item.ts
|
||||
web-admin/src/api/qc-work-order.ts
|
||||
web-admin/src/api/research-donation.ts
|
||||
web-admin/src/api/sample-reception-check-item.ts
|
||||
web-admin/src/api/sample-reception.ts
|
||||
web-admin/src/api/sample-sms-notification.ts
|
||||
web-admin/src/api/storage-entry-sms-notification.ts
|
||||
web-admin/src/api/storage-release-review.ts
|
||||
web-admin/src/api/chinaRegion.ts
|
||||
```
|
||||
|
||||
#### Task 3.4: 精简前端路由
|
||||
- [ ] 重写 `web-admin/src/router/modules/sqxp.ts`:
|
||||
- 仅保留 3 个一级菜单路由:
|
||||
1. Dashboard(控制台)
|
||||
2. 工作流管理(子菜单:流程配置、待办中心、已办中心、我的申请、请假申请)
|
||||
3. 系统管理(子菜单:租户管理、字典管理、菜单管理、组织管理、角色管理、用户管理、职位管理)
|
||||
- 删除所有业务路由(细胞存储、科研捐赠、中试服务、临床应用、质检管理、生产管理、运营支撑、市场/质检/生产基础信息等)
|
||||
- 更新注释为山峡化工相关
|
||||
|
||||
#### Task 3.5: 删除 status-tag-registry.ts
|
||||
- [ ] 删除 `web-admin/src/utils/status-tag-registry.ts`
|
||||
|
||||
#### Task 3.6: 清理 admin.ts 中的业务 API 函数
|
||||
- [ ] 从 `web-admin/src/api/admin.ts` 中删除所有业务相关的函数(客户、快递、计量单位等)
|
||||
- [ ] 保留的函数:用户、角色、部门、租户、菜单、字典类型、字典数据、岗位、站点、组织管理、附件上传
|
||||
|
||||
---
|
||||
|
||||
### Phase 4: 前端 Tag 集中化
|
||||
|
||||
#### Task 4.1: 新增前端类型定义
|
||||
- [ ] 修改 `web-admin/src/types/api.d.ts`:
|
||||
- 在 `Dict.DictDataItem` 中新增 `tagType: string`
|
||||
- 在 `Dict.DictDataOption` 中新增 `tagType: string`
|
||||
- 新增类型:
|
||||
```typescript
|
||||
Dict {
|
||||
// ...existing...
|
||||
interface DictDataOption {
|
||||
label: string
|
||||
value: string
|
||||
tagType: string // 新增
|
||||
}
|
||||
interface DictDataGroup {
|
||||
[dictType: string]: DictDataItem[]
|
||||
}
|
||||
interface DictAllResponse {
|
||||
[dictType: string]: { label: string; value: string; tagType: string }[]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Task 4.2: 新增前端 Dict Store
|
||||
- [ ] 新建 `web-admin/src/store/modules/dict.ts`:
|
||||
```typescript
|
||||
// 核心功能:
|
||||
// 1. state: dictMap (Map<dictType, DictDataItem[]>)
|
||||
// 2. action: loadAllDict() — 调用 /web/admin/dict-data/all 一次性加载
|
||||
// 3. getter: getLabel(dictType, value) → string
|
||||
// 4. getter: getTagType(dictType, value) → string
|
||||
// 5. getter: getOptions(dictType) → { label, value, tagType }[]
|
||||
```
|
||||
- [ ] 在应用入口 `web-admin/src/main.ts` 或登录后的路由守卫中调用 `loadAllDict()`
|
||||
|
||||
#### Task 4.3: 新增前端 composable
|
||||
- [ ] 新建 `web-admin/src/composables/useDictTag.ts`:
|
||||
```typescript
|
||||
// useDictTag(dictType: string)
|
||||
// 返回:{ getLabel(value), getTagType(value), options }
|
||||
// 内部从 dict store 获取数据
|
||||
```
|
||||
|
||||
#### Task 4.4: 前端 admin.ts 新增全量加载 API
|
||||
- [ ] 在 `web-admin/src/api/admin.ts` 中新增:
|
||||
```typescript
|
||||
export function fetchAllDictData() {
|
||||
return request.get<Api.Dict.DictAllResponse>({
|
||||
url: '/web/admin/dict-data/all'
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
#### Task 4.5: 字典管理页面支持 tag_type 编辑
|
||||
- [ ] 修改 `web-admin/src/views/system/dict/index.vue`:
|
||||
- 在字典数据的新增/编辑表单中增加 `tag_type` 选择字段
|
||||
- 选项:空(默认)、success(成功/绿)、warning(警告/橙)、danger(危险/红)、info(信息/灰)、primary(主要/蓝)
|
||||
- 在字典数据列表中增加 tag_type 显示列(渲染为对应颜色的 el-tag 预览)
|
||||
|
||||
---
|
||||
|
||||
### Phase 5: 保留页面 Tag 迁移
|
||||
|
||||
#### Task 5.1: 迁移 system/dept/index.vue
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'danger'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
- [ ] 将硬编码的中文标签改为 `dictStore.getLabel('sys_status', row.status)`
|
||||
|
||||
#### Task 5.2: 迁移 system/user/index.vue
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'info'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
|
||||
#### Task 5.3: 迁移 system/role/index.vue
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'info'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
|
||||
#### Task 5.4: 迁移 system/post/index.vue
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'info'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
|
||||
#### Task 5.5: 迁移 system/site/index.vue
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'info'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
|
||||
#### Task 5.6: 迁移 system/menu/index.vue
|
||||
- [ ] 删除 `menuTypeTagMap` 硬编码对象
|
||||
- [ ] 将菜单类型的 tag 改为 `dictStore.getTagType('menu_type', row.menuType)`
|
||||
- [ ] 将菜单类型的 label 改为 `dictStore.getLabel('menu_type', row.menuType)`
|
||||
- [ ] 将 `row.visible === '1' ? 'success' : 'info'` 改为 `dictStore.getTagType('sys_visible', row.visible)`
|
||||
- [ ] 将 `row.status === '1' ? 'success' : 'danger'` 改为 `dictStore.getTagType('sys_status', row.status)`
|
||||
|
||||
#### Task 5.7: 迁移 system/user/detail.vue
|
||||
- [ ] 将 `getRoleTagType` 改为 `dictStore.getTagType('user_role', userData.role)`
|
||||
- [ ] 将 `getRoleText` 改为 `dictStore.getLabel('user_role', userData.role)`
|
||||
- [ ] 将 `userData.isActive ? 'success' : 'danger'` 改为 `dictStore.getTagType('sys_status', userData.isActive ? '1' : '0')`
|
||||
|
||||
#### Task 5.8: 迁移 system/leave/index.vue
|
||||
- [ ] 删除 `import { leaveStatusLabel, leaveStatusTagType } from '@/utils/status-tag-registry'`
|
||||
- [ ] 将 `statusTagType(row.status)` 改为 `dictStore.getTagType('leave_status', row.status)`
|
||||
- [ ] 将 `statusLabel(row.status)` 改为 `dictStore.getLabel('leave_status', row.status)`
|
||||
|
||||
#### Task 5.9: 迁移 system/workflow/components/ProcessStatusTag.vue
|
||||
- [ ] 删除硬编码 `statusMap` 对象
|
||||
- [ ] 改为从 dict store 获取:
|
||||
```typescript
|
||||
const tagType = computed(() => dictStore.getTagType('wf_process_status', props.status))
|
||||
const label = computed(() => dictStore.getLabel('wf_process_status', props.status))
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Phase 6: 清理残留引用与验证
|
||||
|
||||
#### Task 6.1: 清理所有 status-tag-registry 的 import
|
||||
- [ ] 全局搜索 `status-tag-registry` 引用,确保已全部替换为 dict store
|
||||
- [ ] 确认文件已删除后无残留 import
|
||||
|
||||
#### Task 6.2: 清理所有已删除 API 模块的 import
|
||||
- [ ] 全局搜索已删除的 API 文件 import(如 `from '@/api/business'`, `from '@/api/cell-product'` 等)
|
||||
- [ ] 清除所有残留引用
|
||||
|
||||
#### Task 6.3: 后端启动验证
|
||||
- [ ] `cd backend && source venv/bin/activate && python -c "from app.main import app; print('OK')"`
|
||||
- [ ] 修复任何 import 错误
|
||||
|
||||
#### Task 6.4: 前端构建验证
|
||||
- [ ] `cd web-admin && pnpm build`
|
||||
- [ ] 修复任何编译错误(TypeScript、模板引用等)
|
||||
|
||||
#### Task 6.5: 全局文本替换
|
||||
- [ ] 搜索代码中残留的 "zkxw"、"中科兴皖"、"陇耘鲜达"、"叁强鲜配" 等旧项目名称
|
||||
- [ ] 替换为 "shanxia2.0"、"山峡化工" 等新名称(注意:数据库字段 default 值中的 'zkxw' 暂时保留,等后续数据迁移时再处理)
|
||||
|
||||
#### Task 6.6: 更新 README 和项目描述
|
||||
- [ ] 更新 `backend/README.md` 项目名称和描述
|
||||
- [ ] 更新 `backend/app/main.py` 中的 title/description
|
||||
- [ ] 更新 `.env.example` 中的 APP_NAME
|
||||
|
||||
---
|
||||
|
||||
## 执行顺序与并行策略
|
||||
|
||||
```
|
||||
Phase 1 (DB) ──────────────────────────────── 串行,先执行
|
||||
↓
|
||||
Phase 2 (Backend) ── Task 2.1~2.4 可并行 ── Task 2.5~2.7 串行 ── Task 2.8 验证
|
||||
↓
|
||||
Phase 3 (Frontend cleanup) ── Task 3.1~3.3 可并行 ── Task 3.4~3.6 串行
|
||||
↓ (可与 Phase 3 并行)
|
||||
Phase 4 (Tag infrastructure) ── Task 4.1~4.4 串行
|
||||
↓
|
||||
Phase 5 (Tag migration) ── Task 5.1~5.9 可并行
|
||||
↓
|
||||
Phase 6 (验证 & 收尾) ── 串行
|
||||
```
|
||||
|
||||
## 预估工作量
|
||||
|
||||
| Phase | 任务数 | 预估时间 |
|
||||
|-------|--------|----------|
|
||||
| Phase 1 (DB) | 3 | 0.5h |
|
||||
| Phase 2 (Backend) | 8 | 2h |
|
||||
| Phase 3 (Frontend cleanup) | 6 | 1.5h |
|
||||
| Phase 4 (Tag infrastructure) | 5 | 2h |
|
||||
| Phase 5 (Tag migration) | 9 | 1.5h |
|
||||
| Phase 6 (验证) | 6 | 1h |
|
||||
| **总计** | **37** | **~8.5h** |
|
||||
|
||||
使用 subagent 并行执行可压缩到 ~4-5h。
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **不自动执行 DROP TABLE** — 数据库业务表的删除需要用户手动确认执行
|
||||
2. **保留 biz_attachment 表和模型** — 附件是通用基础设施
|
||||
3. **保留 SysEthnic** — 民族码表可能在后续业务中使用
|
||||
4. **保留 SysSite** — 站点管理属于系统管理模块
|
||||
5. **后端 CRUD 的 `__init__.py`** — 删除文件后需同步清理该文件中的 import
|
||||
6. **后端 Schemas 的 `__init__.py`** — 同上
|
||||
7. **前端 chinaRegion.ts** 删除 — 地区数据属于旧业务
|
||||
8. **字典 CRUD 的 `_row_to_dict`** 是字段一致性检查的 single source of truth,新增 tag_type 后需要同步更新对应 schema
|
||||
@@ -1,195 +0,0 @@
|
||||
# 样本入库信息 — 短信通知功能设计
|
||||
|
||||
> 状态:待评审
|
||||
> 日期:2025-05-23
|
||||
> 需求来源:客户提出"样本入库也需要给客户发短信"
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
客户已完成**样本接收信息**页面(`/cell-storage/sample-reception-info`),用于管理样本接收后的短信通知(提取短信内容 → 复制到剪贴板 → 用户线下发送)。现需增加**样本入库信息**页面,在样本完成入库(或拒绝入库)后提供同样的短信通知管理能力。
|
||||
|
||||
**核心模式**:克隆样本接收信息的完整链路(前端页面 + 后端 API + 独立通知表),调整为入库场景。
|
||||
|
||||
**关键约束**:短信不通过系统自动发送,由用户线下手动发送。系统只负责生成短信内容供复制。
|
||||
|
||||
## 2. 决策记录
|
||||
|
||||
| 决策项 | 选择 | 理由 |
|
||||
|---|---|---|
|
||||
| 数据范围 | 已入库(`yrk`) + 拒绝入库(`review_conclusion='btg'`) | 展示最终结果的记录 |
|
||||
| 短信模板 | 系统预设,后续可调 | 先上线后迭代 |
|
||||
| 页面位置 | 细胞存储模块下,与样本接收信息同级 | 用户操作习惯一致 |
|
||||
| 查看弹窗 | 复用 `ProtocolViewDialog` | 与样本接收信息一致,查看协议完整信息 |
|
||||
| 后端存储 | 新建独立表 | 代码独立,不影响现有功能 |
|
||||
|
||||
## 3. 数据范围
|
||||
|
||||
数据源为 `biz_storage_release_review` 表,筛选条件:
|
||||
|
||||
- `storage_status = 'yrk'`(已入库),**或**
|
||||
- `review_conclusion = 'btg'`(审核不通过/拒绝入库)
|
||||
|
||||
不展示 `storage_status = 'drk'`(待入库)且审核未出结论的记录。
|
||||
|
||||
**重要**:仅展示 `reception_source = 'cell_storage'`(细胞存储)的记录,不包含科研捐赠来源的数据。此过滤条件同时应用于「样本接收信息」和「样本入库信息」两个页面。
|
||||
|
||||
## 4. 后端设计
|
||||
|
||||
### 4.1 数据库
|
||||
|
||||
**新建表 `biz_storage_entry_sms_notification`**:
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_storage_entry_sms_notification (
|
||||
id VARCHAR(64) NOT NULL COMMENT 'UUID主键',
|
||||
storage_review_id VARCHAR(64) NOT NULL COMMENT '关联 biz_storage_release_review.id',
|
||||
protocol_id VARCHAR(64) DEFAULT NULL COMMENT '冗余协议单ID',
|
||||
sms_content VARCHAR(500) DEFAULT NULL COMMENT '生成的短信内容',
|
||||
sms_notified TINYINT(1) NOT NULL DEFAULT 0 COMMENT '0=未通知 1=已通知',
|
||||
notified_by VARCHAR(64) DEFAULT NULL COMMENT '通知操作人ID',
|
||||
notified_by_name VARCHAR(64) DEFAULT NULL COMMENT '通知操作人姓名',
|
||||
notified_time DATETIME DEFAULT NULL COMMENT '通知操作时间',
|
||||
tenant_no VARCHAR(64) DEFAULT NULL COMMENT '租户编号',
|
||||
order_num INT DEFAULT 0 COMMENT '排序',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL,
|
||||
create_dept_id VARCHAR(64) DEFAULT NULL,
|
||||
create_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
||||
update_by VARCHAR(64) DEFAULT NULL,
|
||||
update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
del_flag CHAR(1) DEFAULT '0' COMMENT '0=正常 1=删除',
|
||||
PRIMARY KEY (id),
|
||||
KEY idx_storage_review_id (storage_review_id),
|
||||
KEY idx_tenant_no (tenant_no)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='样本入库短信通知';
|
||||
```
|
||||
|
||||
### 4.2 ORM 模型
|
||||
|
||||
在 `backend/app/models/models.py` 追加 `BizStorageEntrySmsNotification`,字段与表结构对应。
|
||||
|
||||
### 4.3 CRUD 层
|
||||
|
||||
新建 `backend/app/crud/storage_entry_sms_notification.py`,克隆 `sample_sms_notification.py` 并调整:
|
||||
|
||||
- **联查**:`BizStorageReleaseReview` LEFT JOIN `BizStorageEntrySmsNotification`(通过 `storage_review_id` + `tenant_no`) LEFT JOIN `BizCollectionProtocol` LEFT JOIN `BizProtocolPartyCustomer` LEFT JOIN `BizProtocolSample`
|
||||
- **过滤**:`del_flag=0`,`reception_source='cell_storage'`,`(storage_status='yrk' OR review_conclusion='btg')`,租户隔离,数据权限(`apply_data_scope`)
|
||||
- **懒创建**:列表查询时自动为缺失的 review 记录创建通知记录(`sms_notified=0`)
|
||||
- **`_row_to_dict()`**:蛇形→驼峰,返回前端所需字段
|
||||
|
||||
### 4.4 短信模板
|
||||
|
||||
```
|
||||
已入库:尊敬的{母亲}女士,您的样本(编码:{code})已于{date}完成入库处理。如有疑问请联系客服。
|
||||
拒绝入库:尊敬的{母亲}女士,您的样本(编码:{code})入库审核未通过。如有疑问请联系客服。
|
||||
```
|
||||
|
||||
变量来源:
|
||||
- `{母亲}`:`BizProtocolPartyCustomer.mother_name`
|
||||
- `{code}`:`BizStorageReleaseReview.sample_code`
|
||||
- `{date}`:入库时间 `storage_time`(拒绝入库用审核时间 `review_time`)
|
||||
|
||||
### 4.5 API 端点
|
||||
|
||||
新建 `backend/app/api/storage_entry_sms_notification.py`,前缀 `/api/web/admin`:
|
||||
|
||||
| 方法 | 路径 | 功能 | 权限码 |
|
||||
|---|---|---|---|
|
||||
| GET | `/storage-entry-sms-notifications/list` | 分页列表 | `cell-storage:storage-entry-info:list` |
|
||||
| PUT | `/storage-entry-sms-notifications/{id}/toggle-status` | 切换通知状态 | 同上 |
|
||||
| POST | `/storage-entry-sms-notifications/{id}/generate-sms` | 生成短信内容 | 同上 |
|
||||
|
||||
路由注册:`backend/app/api/__init__.py` + `backend/app/main.py`。
|
||||
|
||||
## 5. 前端设计
|
||||
|
||||
### 5.1 路由
|
||||
|
||||
在 `web-admin/src/router/modules/sqxp.ts` 的 `CellStorage` 子项下添加:
|
||||
|
||||
```
|
||||
path: 'storage-entry-info'
|
||||
name: 'CellStorageStorageEntryInfo'
|
||||
component: '/cell-storage/storage-entry-info/index'
|
||||
meta: { title: '样本入库信息', keepAlive: true, menuCode: 'cell-storage:storage-entry-info:list' }
|
||||
```
|
||||
|
||||
### 5.2 API 模块
|
||||
|
||||
新建 `web-admin/src/api/storage-entry-sms-notification.ts`,3 个函数:
|
||||
|
||||
- `fetchStorageEntrySmsList(params)` → GET `/storage-entry-sms-notifications/list`
|
||||
- `fetchToggleStorageEntrySmsNotified(id, data)` → PUT `/storage-entry-sms-notifications/{id}/toggle-status`
|
||||
- `fetchGenerateStorageEntrySms(id)` → POST `/storage-entry-sms-notifications/{id}/generate-sms`
|
||||
|
||||
### 5.3 页面组件
|
||||
|
||||
新建 `web-admin/src/views/cell-storage/storage-entry-info/index.vue`,克隆 `sample-reception-info/index.vue` 并调整:
|
||||
|
||||
**筛选区**:
|
||||
| 字段 | 控件 | 绑定 |
|
||||
|---|---|---|
|
||||
| 关键词 | `el-input` | `keyword`(协议号/姓名/样本编码) |
|
||||
| 入库状态 | `el-select` | `storageStatus`(已入库 `yrk` / 拒绝入库 `btg`) |
|
||||
| 通知状态 | `el-select` | `smsNotified`(已通知 `1` / 未通知 `0`) |
|
||||
|
||||
**表格列**(全部 `min-width`,`align="center"`):
|
||||
| 列 | prop | 宽度 | 说明 |
|
||||
|---|---|---|---|
|
||||
| 序号 | type=index | 68 | 自动序号 |
|
||||
| 协议号 | protocolNo | 140 | |
|
||||
| 母亲姓名 | motherName | 100 | |
|
||||
| 新生儿姓名 | newbornName | 110 | `show-overflow-tooltip` |
|
||||
| 样本编码 | sampleCode | 130 | |
|
||||
| 样本类型 | sampleTypeName | 110 | |
|
||||
| 入库时间 | storageTime | 170 | 已入库显示入库时间,拒绝入库显示审核时间 |
|
||||
| 入库状态 | storageStatusLabel | 100 | `el-tag`:已入库=`success`,拒绝入库=`danger` |
|
||||
| 通知状态 | smsNotified | 100 | `el-tag`:已通知=`success`,未通知=`info` |
|
||||
| 操作 | — | 260 | `fixed="right"` |
|
||||
|
||||
**操作按钮**:
|
||||
1. **查看** `<el-icon><View /></el-icon>` — 打开 `ProtocolViewDialog`(含 `show-audit-history`、`show-storage-cert`)
|
||||
2. **提取短信** `<el-icon><ChatDotRound /></el-icon>` — 调用 `fetchGenerateStorageEntrySms`,复制到剪贴板
|
||||
3. **标记已/未通知** `<el-icon><Bell /></el-icon>` — 调用 `fetchToggleStorageEntrySmsNotified`
|
||||
|
||||
**交互**:双击行 → `handleView`,分页 `[10, 20, 50]`
|
||||
|
||||
### 5.4 其他修改
|
||||
|
||||
- `App.vue`:在 `panelTitleBarTextRules` 注册「样本入库列表」标题文案
|
||||
- 菜单配置:后台管理中添加「样本入库信息」菜单项,权限码 `cell-storage:storage-entry-info:list`
|
||||
|
||||
## 6. 边界情况
|
||||
|
||||
| 场景 | 处理方式 |
|
||||
|---|---|
|
||||
| 拒绝入库记录无 `storageTime` | 短信模板用 `review_time` 替代,表格列也显示审核时间 |
|
||||
| 协议单为空 | 查看按钮提示"缺少关联协议单",不打开弹窗 |
|
||||
|
||||
## 7. 文件清单
|
||||
|
||||
### 新建(5 个)
|
||||
|
||||
| 文件 | 说明 |
|
||||
|---|---|
|
||||
| `docs/sql/biz_storage_entry_sms_notification.sql` | 建表 DDL |
|
||||
| `backend/app/crud/storage_entry_sms_notification.py` | CRUD 层(联查+懒创建+短信生成) |
|
||||
| `backend/app/api/storage_entry_sms_notification.py` | API 路由(3 个端点) |
|
||||
| `web-admin/src/api/storage-entry-sms-notification.ts` | 前端 API 封装 |
|
||||
| `web-admin/src/views/cell-storage/storage-entry-info/index.vue` | 前端页面 |
|
||||
|
||||
### 修改(4 个)
|
||||
|
||||
| 文件 | 修改内容 |
|
||||
|---|---|
|
||||
| `backend/app/models/models.py` | 追加 `BizStorageEntrySmsNotification` 模型 |
|
||||
| `backend/app/api/__init__.py` | 注册新路由 |
|
||||
| `backend/app/main.py` | 挂载新路由 |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | 添加路由条目(CellStorage 子项) |
|
||||
|
||||
## 8. 不做的事
|
||||
|
||||
- 不实现自动发送短信(线下发送)
|
||||
- 不修改现有 `sample-reception-info` 任何逻辑
|
||||
- 不引入新的 npm/pip 依赖
|
||||
- 不改动入库放行审核页面逻辑
|
||||
@@ -1,435 +0,0 @@
|
||||
# 中试服务申请单 — 详情页改弹窗 + UI合规修复
|
||||
|
||||
> 日期: 2025-05-25
|
||||
> 状态: 设计待审
|
||||
> 影响: web-admin 前端 only
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
当前【中试服务申请单】模块有两个界面:
|
||||
- **列表页** `pilot-application/index.vue`(644行)— 菜单可见路由
|
||||
- **详情页** `pilot-application/ApplicationDetail.vue`(2635行)— `hidden: true` 路由,通过 `router.push` 跳转
|
||||
|
||||
**问题**:
|
||||
1. 详情页作为独立路由页面,用户需通过浏览器后退返回列表,体验割裂
|
||||
2. 列表页操作列按钮缺少 `el-icon`,不符合 openspec 按钮须携带图标规范
|
||||
|
||||
**目标**:
|
||||
1. 将详情页从独立路由改为弹窗形式,**同时参考两个参考页面**:
|
||||
- **查看弹窗风格**:照抄 `ProtocolViewDialog.vue`(采集协议单查看弹窗,1600px 宽,KPI 摘要条 + data-grid 只读数据展示)
|
||||
- **编辑/新增弹窗风格**:照抄 `ProtocolFormDialog.vue`(采集协议单新增/编辑弹窗,1380px 宽,section-card + form-grid 表单布局)
|
||||
2. 一并修复列表页所有操作按钮的 `el-icon` 缺失
|
||||
|
||||
---
|
||||
|
||||
## 2. 变更范围
|
||||
|
||||
| 文件 | 操作 | 说明 |
|
||||
|------|------|------|
|
||||
| `src/views/pilot-service/pilot-application/ApplicationDetailDialog.vue` | **新建** | 详情弹窗主体(照抄 ProtocolViewDialog 的 KPI + data-grid 只读展示风格) |
|
||||
| `src/views/pilot-service/pilot-application/index.vue` | **修改** | 引入弹窗组件,替换路由跳转逻辑,修复按钮图标 |
|
||||
| `src/views/pilot-service/pilot-application/ApplicationDetail.vue` | **删除** | 被 ApplicationDetailDialog.vue 完全替代 |
|
||||
| `src/router/modules/sqxp.ts` | **修改** | 删除 PilotApplicationDetail 路由定义(第650-656行) |
|
||||
|
||||
**不变更**:
|
||||
- API 层(`src/api/admin.ts`)— 无需修改
|
||||
- 状态标签工具(`src/utils/status-tag-registry.ts`)— 无需修改
|
||||
- 后端代码 — 无需修改
|
||||
|
||||
---
|
||||
|
||||
## 3. 设计方案:详情页改弹窗(照抄 ProtocolViewDialog + ProtocolFormDialog 风格)
|
||||
|
||||
> **核心原则**:详情弹窗 = **查看模式照抄 ProtocolViewDialog** + **编辑区域照抄 ProtocolFormDialog**。
|
||||
>
|
||||
> - **查看展示**(申请单只读信息、各Tab中的只读数据)→ 照抄 `ProtocolViewDialog.vue`(1600px宽,KPI 摘要条 + `.data-grid` + `.section-card`)
|
||||
> - **表单编辑**(患者信息可编辑表单、嵌套弹窗中的表单)→ 照抄 `ProtocolFormDialog.vue`(`.form-grid` + `.section-card`)
|
||||
> - **公共元素**(弹窗壳层、Sticky Tab 导航、状态操作按钮)→ 两者共用
|
||||
|
||||
### 3.1 照抄清单:两个参考弹窗的关键风格要素
|
||||
|
||||
#### A. 来自 ProtocolViewDialog(查看弹窗,只读展示风格)
|
||||
|
||||
| # | 风格要素 | ProtocolViewDialog 中的实现 | 申请单详情弹窗中的对应 |
|
||||
|---|----------|---------------------------|----------------------|
|
||||
| A1 | **弹窗宽度** | `width="1600px"` + `class="dialog-form-layout protocol-view-dialog"` | 照抄 1600px(查看类弹窗用更宽尺寸,与 ProtocolViewDialog 一致) |
|
||||
| A2 | **KPI 摘要条** | `.kpi-strip` 4列网格 + `.kpi-card`(渐变绿背景 #ecfdf5、图标徽章、label+value) | 用于展示:申请单号、状态、渠道名称、创建时间 等关键指标 |
|
||||
| A3 | **只读数据网格** | `.data-grid .data-grid--4` + `.data-item`(`.data-label` + `.data-value`) | 用于"申请单信息"只读区域(替代原 `el-descriptions`) |
|
||||
| A4 | **绿色背景分区** | `.section-card--green`(#f0fdf4 背景) | 可用于患者信息区(区分只读和可编辑) |
|
||||
| A5 | **白色背景分区** | `.section-card--white`(默认白底) | 用于申请单信息、输注方案等标准分区 |
|
||||
|
||||
#### B. 来自 ProtocolFormDialog(编辑弹窗,表单风格)
|
||||
|
||||
| # | 风格要素 | ProtocolFormDialog 中的实现 | 申请单详情弹窗中的对应 |
|
||||
|---|----------|---------------------------|----------------------|
|
||||
| B1 | **表单网格** | `.form-grid`(默认3列)、`.form-grid--col2`、`.form-grid--col4`、`.form-col-span-2` | 用于患者信息可编辑表单 |
|
||||
| B2 | **表单标签位置** | `label-position="top"` + `scroll-to-error` | 照抄 |
|
||||
| B3 | **附件上传卡片** | `.upload-card`(140×96px 虚线框 + Plus 图标)+ `.attachment-item` 卡片列表 | 用于诊断附件上传区域 |
|
||||
| B4 | **弹窗背景色** | `.protocol-dialog-body { background: #f5f7fa; overflow: visible }` | 照抄 |
|
||||
|
||||
#### C. 公共元素(两个弹窗共用)
|
||||
|
||||
| # | 风格要素 | 实现 |
|
||||
|---|----------|------|
|
||||
| C1 | **DialogFormBody 包裹** | `<DialogFormBody :loading="loading" body-class="application-dialog-body min-h-[200px]">` |
|
||||
| C2 | **Sticky Tab 导航** | `.detail-tabs` + `.detail-tab`,绿色背景 pill 样式,`position: sticky; top: 0` |
|
||||
| C3 | **分区卡片** | `.section-card`(白底圆角12px、阴影、hover 效果)+ `.section-title`(绿色竖线 `::before`) |
|
||||
| C4 | **Footer 按钮** | 嵌套弹窗:`btn-ghost`(取消)+ `btn-main type="primary"`(确定),都带 `<el-icon>` |
|
||||
|
||||
### 3.2 弹窗组件接口
|
||||
|
||||
参照 `ProtocolFormDialog.vue` 的标准模式:
|
||||
|
||||
```typescript
|
||||
// ApplicationDetailDialog.vue
|
||||
const props = defineProps<{
|
||||
modelValue: boolean // v-model 控制显隐
|
||||
applicationId: string // 申请单 ID(替代 route.query.id)
|
||||
listRow?: any // 可选:列表行数据(用于预填标题/状态)
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'update:modelValue', val: boolean): void
|
||||
(e: 'status-changed'): void // 状态操作后通知父组件刷新列表
|
||||
}>()
|
||||
```
|
||||
|
||||
### 3.3 弹窗壳层配置(照抄 ProtocolViewDialog 查看弹窗尺寸)
|
||||
|
||||
```vue
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
@update:model-value="emit('update:modelValue', $event)"
|
||||
:title="dialogTitle"
|
||||
width="1600px"
|
||||
class="dialog-form-layout application-detail-dialog"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div
|
||||
class="application-detail-body"
|
||||
:class="{ 'is-loading': detailLoading }"
|
||||
v-loading="detailLoading"
|
||||
element-loading-text="加载中…"
|
||||
>
|
||||
<!-- 照抄 ProtocolViewDialog 的 detail-tabs sticky 导航 -->
|
||||
<div class="detail-tabs">
|
||||
<div
|
||||
v-for="tab in detailTabs"
|
||||
:key="tab.key"
|
||||
class="detail-tab"
|
||||
:class="{ active: activeTab === tab.key }"
|
||||
@click="scrollToTab(tab.key)"
|
||||
>
|
||||
{{ tab.label }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="applicationDetail">
|
||||
<!-- KPI 摘要条(照抄 ProtocolViewDialog) -->
|
||||
<div class="kpi-strip">...</div>
|
||||
|
||||
<!-- 6个Tab内容区域 -->
|
||||
...
|
||||
</template>
|
||||
</div>
|
||||
</el-dialog>
|
||||
```
|
||||
|
||||
- `width="1600px"` — 与 ProtocolViewDialog 查看弹窗一致(查看类弹窗用更宽尺寸)
|
||||
- `application-detail-dialog` — 弹窗级样式
|
||||
- `application-detail-body` — 与 `protocol-view-body` 一致的灰底滚动容器
|
||||
- 直接用 `div + v-loading` 替代 `DialogFormBody`(与 ProtocolViewDialog 保持一致)
|
||||
|
||||
### 3.4 顶部区域改造
|
||||
|
||||
**移除**:原详情页的 `<header class="page-head">` 返回按钮和标题栏(弹窗自带关闭按钮)
|
||||
|
||||
**保留**:状态操作按钮(开始/完成/作废),移入弹窗 `#header` 自定义 slot 右侧
|
||||
|
||||
```vue
|
||||
<!-- 照抄 ProtocolFormDialog 的 header 布局风格 -->
|
||||
<template #header>
|
||||
<div class="detail-dialog-header">
|
||||
<div class="detail-dialog-header-left">
|
||||
<h3>申请单详情</h3>
|
||||
<span v-if="applicationDetail.applicationNo" class="detail-code">
|
||||
{{ applicationDetail.applicationNo }}
|
||||
</span>
|
||||
<el-tag
|
||||
v-if="applicationDetail.applicationStatus"
|
||||
:type="applicationStatusTagType(applicationDetail.applicationStatus)"
|
||||
size="large"
|
||||
>
|
||||
{{ applicationStatusLabel(applicationDetail.applicationStatus) }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<div class="detail-dialog-header-right">
|
||||
<el-button v-if="..." class="btn-main" type="primary" @click="handleStart">
|
||||
<el-icon><VideoPlay /></el-icon>开始
|
||||
</el-button>
|
||||
<el-button v-if="..." class="btn-main" type="primary" @click="handleComplete">
|
||||
<el-icon><CircleCheck /></el-icon>完成
|
||||
</el-button>
|
||||
<el-button v-if="..." class="btn-op-item op-warn" type="danger" @click="handleVoid">
|
||||
<el-icon><CircleClose /></el-icon>作废
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
```
|
||||
|
||||
### 3.5 正文结构:照抄两个参考弹窗的混合模式
|
||||
|
||||
**ProtocolViewDialog 的正文层次**(查看模式,只读数据展示):
|
||||
```
|
||||
div.protocol-view-body (灰底 #f5f7fa, v-loading)
|
||||
└─ .detail-tabs (sticky 绿色 pill 导航)
|
||||
└─ .kpi-strip (4列 KPI 摘要条:协议号 / 状态 / 母亲姓名 / 登记日期)
|
||||
└─ #view-section-basic (.section-card > .data-grid--4 > .data-item)
|
||||
└─ #view-section-party (.section-card--green > .data-grid--4)
|
||||
└─ #view-section-collection (.section-card > .data-grid--4)
|
||||
└─ #view-section-sample (.section-card > 样本卡片)
|
||||
└─ #view-section-payment (.section-card > 缴费卡片)
|
||||
```
|
||||
|
||||
**申请单详情弹窗照抄后的正文层次**:
|
||||
```
|
||||
div.application-detail-body (灰底, v-loading)
|
||||
└─ .detail-tabs (sticky 绿色 pill 导航)
|
||||
基本信息 | 输注方案 | 体检信息 | 交付信息 | 放行审核 | 应用确认
|
||||
|
||||
└─ .kpi-strip (4列 KPI 摘要条,照抄 ProtocolViewDialog)
|
||||
申请单号 | 状态 | 渠道名称 | 创建时间
|
||||
|
||||
└─ #tab-basic (.section-card)
|
||||
├─ 申请单信息(.data-grid--4 只读,照抄 ProtocolViewDialog)
|
||||
└─ 患者信息(.form-grid--col2 表单,照抄 ProtocolFormDialog)
|
||||
|
||||
└─ #tab-infusion (.section-card)
|
||||
└─ 方案表格 + 展开计划列表
|
||||
|
||||
└─ #tab-checkup (.section-card)
|
||||
└─ 体检详情 + 预约/实际项目
|
||||
|
||||
└─ #tab-delivery (.section-card)
|
||||
└─ 交付列表
|
||||
|
||||
└─ #tab-release (.section-card)
|
||||
└─ 审核列表
|
||||
|
||||
└─ #tab-confirm (.section-card)
|
||||
└─ 确认列表
|
||||
|
||||
└─ 8个嵌套弹窗 (el-dialog z-index 自动递增,不受影响)
|
||||
```
|
||||
|
||||
**具体照抄细节**:
|
||||
|
||||
1. **KPI 摘要条**(照抄 ProtocolViewDialog `.kpi-strip`)
|
||||
- `.kpi-strip`: `display: grid; grid-template-columns: repeat(4, 1fr); margin-bottom: 24px; padding: 6px; background: linear-gradient(135deg, #ecfdf5 0%, #f8fafc 52%, #ecfdf5 100%); border: 1px solid #a7f3d0; border-radius: 12px`
|
||||
- `.kpi-card`: `display: flex; align-items: flex-start; gap: 12px; padding: 14px 18px`
|
||||
- `.kpi-card__icon`: 40×40px 圆角图标徽章(白底 + 绿色边框 + 绿色图标)
|
||||
- `.kpi-label`: 11px 灰色标签
|
||||
- `.kpi-value`: 15px 黑色值(强调值 `.kpi-value--emphasis`: 16px + 绿色 + 加粗)
|
||||
- 展示内容:申请单号、状态(el-tag)、渠道名称、创建时间
|
||||
|
||||
2. **只读数据展示**(照抄 ProtocolViewDialog `.data-grid`)
|
||||
- `.data-grid--4`: `display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 14px 20px`
|
||||
- `.data-item` > `.data-label`(12px 灰色)+ `.data-value`(14px 黑色)
|
||||
- **替代原详情页的 `el-descriptions` 组件**,用 `.data-grid` 做只读展示
|
||||
|
||||
3. **Tab 导航用 `.detail-tabs` + `.detail-tab`**(自定义样式),不用 `el-tabs` 组件
|
||||
- 与 ProtocolViewDialog / ProtocolFormDialog 完全一致的 sticky 绿色 pill 导航
|
||||
|
||||
4. **每个 Tab 内容用 `.section-card` 包裹**
|
||||
- 白色区域 `.section-card--white`(默认)、绿色区域 `.section-card--green`
|
||||
|
||||
5. **分区标题用 `.section-title`**
|
||||
- `.section-title::before`: 绿色竖线 `3px × 18px; background: #10b981`
|
||||
|
||||
6. **表单区域**(照抄 ProtocolFormDialog `.form-grid`)
|
||||
- 患者信息编辑表单:`.form-grid--col2` + `label-position="top"`
|
||||
- `.form-col-span-2`: 跨整行(临床诊断、诊断附件)
|
||||
|
||||
7. **附件上传**(照抄 ProtocolFormDialog `.upload-card` 卡片化布局)
|
||||
- 上传触发器:140×96px 虚线框 + Plus 图标 + "上传附件" 文字
|
||||
|
||||
### 3.6 数据加载方式变更
|
||||
|
||||
**原方式**:`onMounted` + `route.query.id`
|
||||
|
||||
**新方式**:`watch(applicationId)` + 立即加载
|
||||
|
||||
```typescript
|
||||
watch(() => props.applicationId, (newId) => {
|
||||
if (newId && props.modelValue) {
|
||||
loadApplicationDetail(newId)
|
||||
}
|
||||
}, { immediate: true })
|
||||
```
|
||||
|
||||
弹窗关闭时(`destroy-on-close`)自动清理状态。
|
||||
|
||||
### 3.7 列表页 index.vue 改造
|
||||
|
||||
**替换导航逻辑**:
|
||||
|
||||
```typescript
|
||||
// 移除
|
||||
const router = useRouter()
|
||||
const handleView = (row) => router.push({ name: 'PilotApplicationDetail', query: { id: row.id } })
|
||||
|
||||
// 新增
|
||||
const detailDialogVisible = ref(false)
|
||||
const detailApplicationId = ref('')
|
||||
|
||||
const handleView = (row: any) => {
|
||||
detailApplicationId.value = row.id
|
||||
detailDialogVisible.value = true
|
||||
}
|
||||
|
||||
const handleEdit = (row: any) => {
|
||||
detailApplicationId.value = row.id
|
||||
detailDialogVisible.value = true
|
||||
}
|
||||
|
||||
// 创建成功后不再跳转路由,改为打开详情弹窗
|
||||
const handleSubmit = async () => {
|
||||
// ...提交逻辑...
|
||||
const newId = data?.id || data?.pilotApplicationId || data
|
||||
if (newId) {
|
||||
detailApplicationId.value = newId
|
||||
detailDialogVisible.value = true
|
||||
}
|
||||
loadData()
|
||||
}
|
||||
|
||||
// 状态变更后刷新列表
|
||||
const onDetailStatusChanged = () => {
|
||||
loadData()
|
||||
}
|
||||
```
|
||||
|
||||
**模板引入弹窗组件**:
|
||||
|
||||
```vue
|
||||
<ApplicationDetailDialog
|
||||
v-model="detailDialogVisible"
|
||||
:application-id="detailApplicationId"
|
||||
@status-changed="onDetailStatusChanged"
|
||||
/>
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 设计方案:列表页 UI 合规修复
|
||||
|
||||
### 4.1 操作列按钮补充 el-icon
|
||||
|
||||
当前操作列按钮缺少图标,需按 openspec 规范补充:
|
||||
|
||||
| 按钮 | 图标组件 | 适用状态 |
|
||||
|------|----------|----------|
|
||||
| 查看 | `View` | 始终显示 |
|
||||
| 编辑 | `Edit` | 仅 `dks`(待开始) |
|
||||
| 删除 | `Delete` | 仅 `dks`(popconfirm 内) |
|
||||
| 开始 | `VideoPlay` | 仅 `dks` |
|
||||
| 完成 | `CircleCheck` | 仅 `jxz`(进行中) |
|
||||
| 作废 | `CircleClose` | 仅 `dks` / `jxz` |
|
||||
|
||||
**新增 import**:
|
||||
|
||||
```typescript
|
||||
import {
|
||||
Plus, Search, RefreshLeft, Close, Check,
|
||||
View, Edit, Delete, VideoPlay, CircleCheck, CircleClose
|
||||
} from '@element-plus/icons-vue'
|
||||
```
|
||||
|
||||
### 4.2 详情弹窗内按钮图标
|
||||
|
||||
详情弹窗顶部状态操作按钮(开始/完成/作废)也需补充 el-icon:
|
||||
- 开始 → `VideoPlay`
|
||||
- 完成 → `CircleCheck`
|
||||
- 作废 → `CircleClose`
|
||||
|
||||
弹窗内各 Tab 的操作按钮(新增输注方案、编辑、删除等)也需补充 el-icon。
|
||||
|
||||
### 4.3 其他合规项
|
||||
|
||||
| 检查项 | 当前状态 | 操作 |
|
||||
|--------|----------|------|
|
||||
| 状态字段用 el-tag | ✅ 已合规 | 无需修改 |
|
||||
| 操作列 fixed="right" | ✅ 已合规 | 无需修改 |
|
||||
| min-width 而非 width | ✅ 已合规 | 无需修改 |
|
||||
| 筛选区搜索/重置有图标 | ✅ 已合规 | 无需修改 |
|
||||
| 弹窗 footer 有图标 | ✅ 已合规 | 无需修改 |
|
||||
| 排序字段默认不展示 | ✅ 无排序字段 | 无需修改 |
|
||||
|
||||
---
|
||||
|
||||
## 5. 路由清理
|
||||
|
||||
删除 `src/router/modules/sqxp.ts` 中的 PilotApplicationDetail 路由定义:
|
||||
|
||||
```typescript
|
||||
// 删除以下路由(第650-656行)
|
||||
{
|
||||
id: '80000000000000000000000000000011',
|
||||
name: 'PilotApplicationDetail',
|
||||
path: 'pilot-application/detail',
|
||||
component: '/pilot-service/pilot-application/ApplicationDetail',
|
||||
meta: { title: '申请单详情', hidden: true }
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. 不在范围内
|
||||
|
||||
- 后端 API 变更
|
||||
- 数据库变更
|
||||
- 新增业务功能
|
||||
- 其他页面的 UI 合规修复
|
||||
- 状态标签注册表变更
|
||||
|
||||
---
|
||||
|
||||
## 7. 风险与缓解
|
||||
|
||||
| 风险 | 缓解措施 |
|
||||
|------|----------|
|
||||
| 2635行组件改造量大 | 保留原有逻辑,仅改 props 接口和容器层,不重构内部 |
|
||||
| 嵌套弹窗 z-index 层级 | el-dialog 自动管理 z-index 递增,不受影响;验证点:打开详情弹窗后逐个测试嵌套弹窗 |
|
||||
| `destroy-on-close` 导致状态丢失 | 符合预期:每次打开弹窗重新加载数据,与原来路由跳转行为一致 |
|
||||
| 列表页操作列按钮变多导致换行 | 操作列已设置 `min-width="280"`,验证各状态下的按钮宽度是否足够 |
|
||||
|
||||
---
|
||||
|
||||
## 8. 照抄样式速查表(从两个参考弹窗复制)
|
||||
|
||||
### 来自 ProtocolViewDialog.vue(查看弹窗 — 只读展示风格)
|
||||
|
||||
| CSS 类/块 | ProtocolViewDialog 行号 | 用途 |
|
||||
|-----------|------------------------|------|
|
||||
| `.protocol-view-body` | ~L15-19 | 弹窗 body 灰底 + v-loading 容器 |
|
||||
| `.kpi-strip` / `.kpi-card` / `.kpi-label` / `.kpi-value` | L2073-2143 | KPI 摘要条(4列绿渐变背景 + 图标徽章) |
|
||||
| `.data-grid` / `--2` / `--3` / `--4` | L2197-2212 | 只读数据网格 |
|
||||
| `.data-item` / `.data-label` / `.data-value` | L2214-2238 | 只读数据项(label + value) |
|
||||
| `.section-card` / `--white` / `--green` | L2146-2168 | 分区卡片 |
|
||||
| `.section-title` + `::before` + `h3` | L2170-2194 | 分区标题(绿色竖线) |
|
||||
| `.detail-tabs` / `.detail-tab` | 同 ProtocolFormDialog | Sticky 绿色 pill Tab 导航 |
|
||||
|
||||
### 来自 ProtocolFormDialog.vue(编辑弹窗 — 表单风格)
|
||||
|
||||
| CSS 类/块 | ProtocolFormDialog 行号 | 用途 |
|
||||
|-----------|------------------------|------|
|
||||
| `.protocol-dialog-body` | L2867-2870 | 弹窗 body 灰底背景 |
|
||||
| `.form-tab-pane` | L2917-2924 | Tab 内容区容器 |
|
||||
| `.form-grid` / `--col2` / `--col4` / `.form-col-span-2` | L2995-3023 | 表单网格布局 |
|
||||
| `.upload-card` / `.attachment-item` | ~L3100+ | 附件上传卡片 |
|
||||
| `@media (max-width: 900px)` | L3520-3543 | 响应式断点 |
|
||||
@@ -1,159 +0,0 @@
|
||||
# 细胞存储管理(2.2.6~2.2.10)— 实现设计(方案 C)
|
||||
|
||||
**依据**:`docs/中科兴皖需求V0.3.md` 菜单 2.2.6~2.2.10;数据模型 `docs/sql/zkxw.sql`(`biz_collection_protocol` 及其子表)。
|
||||
|
||||
**范围**:Web 管理端 `web-admin` + FastAPI `backend`;租户隔离与既有 `/web/admin` 响应风格保持一致。
|
||||
|
||||
---
|
||||
|
||||
## 1. 目标与非目标
|
||||
|
||||
### 1.1 目标
|
||||
|
||||
- 新增一级菜单 **细胞存储管理**,下挂 5 个页面,路由与目录命名已定稿。
|
||||
- **最小闭环**:协议单列表/概要详情;审核(仅写审核表);财务收款确认与退费确认(限定状态流转);分期缴费预警(固定规则)。
|
||||
- **审核(2.2.7)**:采用用户确认的 **方案 A**——审核仅写入 `biz_protocol_audit`,**不修改** `biz_collection_protocol.protocol_status`。
|
||||
- **审核记录策略**:采用 **A1**——同一协议单**允许多条**审核记录,保留历史。
|
||||
- **收款确认(2.2.8)**:仅处理 `pay_status = jfqrz` → `yjf`。
|
||||
- **退费确认(2.2.9)**:仅处理 `pay_status = tfqrz` → `ytf`;**不包含**退费发起(不把状态推到 `tfqrz`)。
|
||||
- **分期预警(2.2.10)**:预警窗口 **未来 15 天**;列表仅包含 `pay_status = dfj` 的分期明细(**不包含 `jfqrz`**);逾期定义为应缴日早于当天。
|
||||
|
||||
### 1.2 非目标(本阶段不做)
|
||||
|
||||
- 不实现科研捐赠、临床应用等非本菜单范围模块。
|
||||
- 不把 2.2.6 下所有子表(采集信息、样本、运输、当事人等)一次性做全量录入与维护 UI;**第一版协议单详情以主表 + 缴费相关信息为主**,子表可后续迭代。
|
||||
- 不引入工作流引擎驱动上述 5 个菜单(除非后续产品明确要求);审核与财务确认以**表字段 + 接口**为准。
|
||||
- 退费发起、待缴费→提交财务确认等业务动作若未在本阶段定义接口,**不实现**。
|
||||
|
||||
---
|
||||
|
||||
## 2. 前端:菜单与路由
|
||||
|
||||
### 2.1 一级菜单
|
||||
|
||||
- **标题**:细胞存储管理
|
||||
- **路径前缀**:`/cell-storage`
|
||||
- **组件容器**:与现有模块一致,使用布局父级 ` /index/index`。
|
||||
|
||||
### 2.2 子菜单与文件路径
|
||||
|
||||
| 需求编号 | 菜单名称 | path | 组件路径 |
|
||||
|----------|--------------------|--------------------------|----------|
|
||||
| 2.2.6 | 采集协议单 | `protocol` | `views/cell-storage/protocol/index.vue` |
|
||||
| 2.2.7 | 采集协议单审核 | `protocol-audit` | `views/cell-storage/protocol-audit/index.vue` |
|
||||
| 2.2.8 | 收款确认(财务) | `payment-confirm` | `views/cell-storage/payment-confirm/index.vue` |
|
||||
| 2.2.9 | 退费确认(财务) | `refund-confirm` | `views/cell-storage/refund-confirm/index.vue` |
|
||||
| 2.2.10 | 分期缴费用户预警 | `installment-warning` | `views/cell-storage/installment-warning/index.vue` |
|
||||
|
||||
### 2.3 与后端菜单对齐
|
||||
|
||||
- 同步更新 `web-admin/src/router/modules/sqxp.ts` 与 `backend/app/api/menu.py` 中的静态菜单树,保证 **前端路由与后端菜单接口一致**(与仓库现有约定相同)。
|
||||
|
||||
### 2.4 UI 约定
|
||||
|
||||
- 列表页对齐模板:`web-admin/src/views/system/unit/index.vue`(筛选、工具栏、表格、分页)。
|
||||
- 弹窗表单:`label-position="top"`,`.dialog-form-layout`,无 backdrop blur;色板遵循 `docs/web-admin-ui-spec-fresh-mint.md`。
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据与后端建模范围(方案 C)
|
||||
|
||||
### 3.1 本阶段必须落地的表(SQLAlchemy Model + CRUD)
|
||||
|
||||
| 表名 | 用途 |
|
||||
|------|------|
|
||||
| `biz_collection_protocol` | 协议单主表:列表、概要详情 |
|
||||
| `biz_protocol_audit` | 审核记录:列表、提交审核 |
|
||||
| `biz_protocol_payment` | 缴费主表:展示缴费模式、合同金额、分期参数(与协议单 1:1) |
|
||||
| `biz_protocol_payment_detail` | 缴费明细:财务确认列表、状态变更、分期预警 |
|
||||
|
||||
可选后续迭代再补:`biz_protocol_collection_info`、`biz_protocol_sample`、`biz_protocol_party_customer` 等。
|
||||
|
||||
### 3.2 租户与软删除
|
||||
|
||||
- 所有查询默认 `tenant_no = 当前用户租户`、`del_flag = 0`。
|
||||
- 写入时设置 `tenant_no`、`create_by` / `update_by` 等公共字段(与现有 CRUD 一致)。
|
||||
|
||||
### 3.3 列表默认排序
|
||||
|
||||
- 无自定义排序时:`create_time DESC`(与工程规范一致);预警列表可按 `installment_due_date ASC` 等业务需求单独约定。
|
||||
|
||||
---
|
||||
|
||||
## 4. API 设计(前缀 `/api`,路由挂载与现有 `basic_info`、`admin` 一致)
|
||||
|
||||
以下路径均在 **`/web/admin`** 下(与现有基础信息管理相同前缀),具体以路由注册为准。
|
||||
|
||||
### 4.1 采集协议单(2.2.6)
|
||||
|
||||
- `GET .../collection-protocols`
|
||||
- Query:`page`, `pageSize`, `keyword`(协议号等), `protocolStatus`(可选)
|
||||
- `GET .../collection-protocols/{id}`
|
||||
- 返回:协议单主表字段 + 缴费主表概要(若存在)+ 缴费明细分页或摘要(实现时可先返回主表 + payment 一行)
|
||||
|
||||
创建/编辑协议单若产品未在本次冻结字段,可:**第一版仅只读列表 + 详情**,或最小字段新增——以 OpenSpec tasks 为准。
|
||||
|
||||
### 4.2 采集协议单审核(2.2.7)
|
||||
|
||||
- `GET .../collection-protocol-audits`
|
||||
- 列表:关联协议单展示协议号、审核状态、审核时间等;支持按 `auditStatus`、`keyword` 筛选
|
||||
- `POST .../collection-protocols/{id}/audit`
|
||||
- Body:`auditStatus`(`shtg` | `shth`), `auditRemark`(可选)
|
||||
- 行为:插入一条 `biz_protocol_audit`(**A1:允许多条**);**不更新** `biz_collection_protocol.protocol_status`
|
||||
- `auditor_user_id` / `create_by` 使用当前登录用户
|
||||
|
||||
### 4.3 收款确认(2.2.8)
|
||||
|
||||
- `GET .../protocol-payment-details/receipt-confirm`
|
||||
- 仅 `pay_status = jfqrz`
|
||||
- `POST .../protocol-payment-details/{detailId}/receipt-confirm`
|
||||
- 校验当前行必须为 `jfqrz`
|
||||
- 更新为 `yjf`,写入 `finance_confirm_attachments`(若前端上传)、备注等
|
||||
- **幂等**:已为 `yjf` 则返回业务错误提示
|
||||
|
||||
### 4.4 退费确认(2.2.9)
|
||||
|
||||
- `GET .../protocol-payment-details/refund-confirm`
|
||||
- 仅 `pay_status = tfqrz`
|
||||
- `POST .../protocol-payment-details/{detailId}/refund-confirm`
|
||||
- 校验当前行必须为 `tfqrz`
|
||||
- 更新为 `ytf`
|
||||
- **幂等**:已为 `ytf` 则返回业务错误提示
|
||||
|
||||
### 4.5 分期缴费预警(2.2.10)
|
||||
|
||||
- `GET .../protocol-payment-details/installment-warning`
|
||||
- 条件:`installment_no IS NOT NULL`、`pay_status = dfj`
|
||||
- 计算字段(可由后端计算返回):
|
||||
- `warningType = warn`:`today <= due <= today+15天`
|
||||
- `warningType = overdue`:`due < today`
|
||||
- Query:`warningType`(`warn` | `overdue` | `all`)、`page`、`pageSize`
|
||||
- 排序建议:`installment_due_date ASC`
|
||||
|
||||
日期计算使用服务器本地日期(YYYYMMDD 字符串与当天对比)。
|
||||
|
||||
---
|
||||
|
||||
## 5. 权限(建议)
|
||||
|
||||
- 五个菜单默认 **`admin` / `super_admin`** 可见(与 Demo 体系一致);若需细分「财务」角色,在 OpenSpec 任务中增加 `perms` 与角色菜单种子 SQL,不阻塞第一版。
|
||||
|
||||
---
|
||||
|
||||
## 6. 风险与后续迭代
|
||||
|
||||
- **协议单详情不完整**:第一版可能无法满足采集专员全量录入,需在后续变更中按子表拆分页面或 Tab。
|
||||
- **退费链路不完整**:仅确认 `tfqrz→ytf`,需业务侧在其他模块或后续任务中补齐「发起退费」。
|
||||
- **附件字段**:`finance_confirm_attachments` 等与 MinIO 上传组件对齐现有项目用法。
|
||||
|
||||
---
|
||||
|
||||
## 7. OpenSpec 后续步骤
|
||||
|
||||
1. 使用 `openspec new change` 创建变更(例如 `cell-storage-protocol-modules`)。
|
||||
2. 按 `openspec-propose` 生成 `proposal.md`、`design.md`、`tasks.md` 及 capabilities 下各 `spec.md`,与本设计对齐。
|
||||
3. `openspec-apply-change` 按 tasks 实现后端 Model、CRUD、路由注册、`sqxp.ts` + `menu.py`、五个 Vue 页面及 `web-admin/src/api` 封装。
|
||||
|
||||
---
|
||||
|
||||
**文档状态**:已定稿上述边界(含 A、A1、财务状态、预警 C+1、菜单与路径)。审阅通过后进入 implementation plan(writing-plans)与 OpenSpec 变更落地。
|
||||
@@ -55,7 +55,7 @@ router/modules/sqxp.ts ← 新增3个路由
|
||||
|
||||
## 2. 数据库模型
|
||||
|
||||
已有 6 张表 DDL 见全库导出 `docs/sql/zkxw.sql`(搜索 `wf_process_def` 等表名);基线表结构以当前导出为准。
|
||||
已有 6 张表 DDL 见全库导出 `docs/sql/`(搜索 `wf_process_def` 等表名);基线表结构以当前导出为准。
|
||||
|
||||
| 表名 | 用途 | 关键字段 |
|
||||
|------|------|----------|
|
||||
@@ -74,7 +74,7 @@ router/modules/sqxp.ts ← 新增3个路由
|
||||
|
||||
### 2.1 Schema 变更(需新增字段)
|
||||
|
||||
`wf_process_instance` 需新增 `callback_url` 字段(VARCHAR 512, 可空),用于业务回调地址。DDL 变更将在实施阶段维护到 `docs/sql/`(全量基线为 `docs/sql/zkxw.sql`,或附加增量脚本)。
|
||||
`wf_process_instance` 需新增 `callback_url` 字段(VARCHAR 512, 可空),用于业务回调地址。DDL 变更将在实施阶段维护到 `docs/sql/`(全量基线为 `docs/sql/`,或附加增量脚本)。
|
||||
|
||||
### 2.2 双存储语义
|
||||
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
# 运营支撑模块设计规格
|
||||
|
||||
## 概述
|
||||
实现需求文档 2.4 节中运营支撑下的三个子模块:洁净室管理、库位管理、展馆预约。
|
||||
新增一级菜单【运营支撑】,下设三个二级菜单。
|
||||
|
||||
## SQL 表(已存在,无需新建)
|
||||
1. `biz_clean_room` - 洁净室信息(编号、名称、等级A/B/C/D、状态正常/异常、面积)
|
||||
2. `biz_clean_room_access_log` - 洁净室人员进出(人员、部门、进入时间、目的、离开时间、体温)
|
||||
3. `biz_storage_facility` - 细胞存储设施树节点(树形结构:parent_id, node_name, node_type, is_leaf)
|
||||
4. `biz_storage_facility_slot` - 存储位置格子(叶子节点下的小方格)
|
||||
5. `biz_exhibition_appointment` - 展馆预约(预约编号、来访单位、联系人、到访日期、人数、接待人员)
|
||||
|
||||
## 模块设计
|
||||
|
||||
### 模块 1: 洁净室管理
|
||||
- **类型**: 标准列表 + 子表模式
|
||||
- **后端**: Model + CRUD (`clean_room.py`) + API 路由
|
||||
- **前端**: 参照 `system/unit/index.vue`,增加"人员进出"按钮弹窗查看进出记录
|
||||
- **路由**: `/operations/clean-room`
|
||||
- **API**: `/web/admin/clean-rooms` + `/web/admin/clean-room-access-logs`
|
||||
|
||||
### 模块 2: 库位管理
|
||||
- **类型**: 树形结构模式
|
||||
- **后端**: Model + CRUD (`storage_facility.py`) + API 路由(树查询 + 节点 CRUD + 格子 CRUD)
|
||||
- **前端**: 参照 `system/category/index.vue`,左侧树形结构,右侧节点详情+格子列表
|
||||
- **路由**: `/operations/storage-facility`
|
||||
- **API**: `/web/admin/storage-facilities` + `/web/admin/storage-facility-slots`
|
||||
- **工具**: 使用 `tree-path.ts` 构建完整路径
|
||||
|
||||
### 模块 3: 展馆预约
|
||||
- **类型**: 标准列表模式
|
||||
- **后端**: Model + CRUD (`exhibition_appointment.py`) + API 路由
|
||||
- **前端**: 参照 `system/unit/index.vue` 标准列表
|
||||
- **路由**: `/operations/exhibition-appointment`
|
||||
- **API**: `/web/admin/exhibition-appointments`
|
||||
|
||||
## 技术规范
|
||||
- 后端模式:flat 函数式 CRUD(参照 `app/crud/item_unit.py`),不用 service 层
|
||||
- 前端模式:API 函数加入 `admin.ts`,路由加入 `sqxp.ts`
|
||||
- 所有查询带 `tenant_no` 过滤,删除为软删除
|
||||
- Fresh Mint 配色 (`--primary #10b981`)
|
||||
- 树形模块使用 `tree-path.ts` 工具
|
||||
|
||||
## 实施顺序
|
||||
1. 后端:Models → CRUD → API 路由 → 注册
|
||||
2. 前端:API 函数 → 路由 → 页面组件
|
||||
3. 测试:API 验证 + 页面功能验证
|
||||
@@ -30,16 +30,14 @@ SQL 模型已定义完整的权限体系(sys_menu, sys_role, sys_role_menu, sy
|
||||
|
||||
**原则**:
|
||||
- 系统管理接口(租户、角色、菜单 CRUD)保持 `require_admin_or_super_admin`,仅 super_admin 可操作
|
||||
- 业务接口(客户、订单、采集协议等)使用 `require_menu_code`
|
||||
- 业务接口使用 `require_menu_code`
|
||||
- 列表接口用 `xxx:list`,创建用 `xxx:add`,更新用 `xxx:edit`,删除用 `xxx:delete`
|
||||
- `require_menu_code` 内部已先调用 `require_admin_or_super_admin`,所以路由只需一个 Depends
|
||||
|
||||
**影响文件**:
|
||||
- `backend/app/api/basic_info.py` — 客户、细胞样本类型、采集地区、采集协议号、样本编码等
|
||||
- `backend/app/api/operations.py` — 渠道、订单、质检等运营接口
|
||||
- `backend/app/api/collection_protocol.py` — 采集协议
|
||||
- `backend/app/api/sample_reception.py` — 样本接收
|
||||
- `backend/app/api/admin.py` — 仅业务部分(用户管理加 `system:user:list` 等)
|
||||
**影响文件**(注:业务 API 文件已在工程清理中移除,仅 admin.py / workflow.py / leave.py 保留):
|
||||
- `backend/app/api/admin.py` — 系统管理部分(用户管理加 `system:user:list` 等)
|
||||
- `backend/app/api/workflow.py` — 工作流接口
|
||||
- `backend/app/api/leave.py` — 请假申请
|
||||
|
||||
**perms 值来源**:直接使用 `sys_menu` 表中已定义的 `perms` 字段值。
|
||||
|
||||
|
||||
@@ -1,359 +0,0 @@
|
||||
# 中试服务管理 — 6 模块实现设计规格
|
||||
|
||||
> 日期: 2026-05-17
|
||||
> 状态: DRAFT
|
||||
> 需求来源: `docs/中科兴皖需求V0.3.md` §2.3
|
||||
|
||||
---
|
||||
|
||||
## 1. 概述
|
||||
|
||||
一次性实现中试服务管理下 6 个基础数据管理模块,涵盖后端 API、前端页面、路由和菜单配置。数据库表已全部建好(`docs/sql/zkxw.sql`),无数据。
|
||||
|
||||
### 模块清单
|
||||
|
||||
| # | 模块 | 表 | 前端模板 | 复杂度 |
|
||||
|---|------|-----|----------|--------|
|
||||
| 2.3.1 | 细胞产品类型管理 | `biz_cell_product_type` | `unit/index.vue` | 简单 CRUD |
|
||||
| 2.3.2 | 细胞产品规格管理 | `biz_cell_product_spec` | `unit/index.vue` | 简单 CRUD |
|
||||
| 2.3.3 | 细胞产品价格体系管理 | `biz_cell_product_price` | `unit/index.vue` | 中等 — 含下拉关联 |
|
||||
| 2.3.4 | 细胞产品项目价格管理 | `biz_cell_product_project_system` + `biz_cell_product_project_system_item` | `category/index.vue` | 较复杂 — 主子表 |
|
||||
| 2.3.5 | 渠道信息管理 | `biz_channel` + 4 张子表 | `product/index.vue` | 复杂 — 多 tab + 子表 |
|
||||
| 2.3.6 | 体检机构及项目价格 | `biz_checkup_institution` + 2 张子表 | `category/index.vue` | 较复杂 — 主子表 |
|
||||
|
||||
### 实现顺序
|
||||
|
||||
```
|
||||
2.3.1 → 2.3.2 → 2.3.3 → 2.3.4 → 2.3.6 → 2.3.5
|
||||
```
|
||||
|
||||
理由:2.3.3 依赖 2.3.1/2.3.2 的下拉数据;2.3.4 依赖 2.3.3;2.3.5 渠道协议价格引用 2.3.1/2.3.2/2.3.3。
|
||||
|
||||
---
|
||||
|
||||
## 2. 架构决策
|
||||
|
||||
| 决策 | 选择 | 理由 |
|
||||
|------|------|------|
|
||||
| 后端路由文件 | `backend/app/api/pilot_service.py` 单文件 | 6 模块关联紧密,跟随 `basic_info.py` 模式 |
|
||||
| 后端 CRUD 文件 | `backend/app/crud/pilot_service.py` 单文件 | 与路由文件对应 |
|
||||
| 后端 Model | 在 `backend/app/models/models.py` 中追加 | 遵循现有单文件模式 |
|
||||
| 前端 API | 在 `web-admin/src/api/admin.ts` 中追加 | 遵循现有模式 |
|
||||
| 前端页面目录 | `web-admin/src/views/pilot-service/{module}/index.vue` | 独立一级路由 |
|
||||
| 前端路由 | `web-admin/src/router/modules/sqxp.ts` 中追加 | 现有中试服务路由位置 |
|
||||
| 菜单 SQL | `docs/sql/sys_menu_pilot_service.sql` | 独立增量 SQL |
|
||||
| 渠道协议价格来源 | 同时支持价格体系(2.3.3)和项目价格体系(2.3.4) | 用户确认,方便渠道自由组合 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 后端设计
|
||||
|
||||
### 3.1 Model(`backend/app/models/models.py`)
|
||||
|
||||
在文件末尾追加 13 个 SQLAlchemy Model 类。所有 Model 遵循现有模式:
|
||||
|
||||
```
|
||||
id → 业务字段 → tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag
|
||||
```
|
||||
|
||||
新增 Model 清单:
|
||||
|
||||
1. `BizCellProductType` — `biz_cell_product_type`
|
||||
2. `BizCellProductSpec` — `biz_cell_product_spec`
|
||||
3. `BizCellProductPrice` — `biz_cell_product_price`
|
||||
4. `BizCellProductProjectSystem` — `biz_cell_product_project_system`
|
||||
5. `BizCellProductProjectSystemItem` — `biz_cell_product_project_system_item`
|
||||
6. `BizChannel` — `biz_channel`
|
||||
7. `BizChannelAgreement` — `biz_channel_agreement`
|
||||
8. `BizChannelAgreementProductPrice` — `biz_channel_agreement_product_price`
|
||||
9. `BizChannelInvoice` — `biz_channel_invoice`
|
||||
10. `BizChannelMailAddress` — `biz_channel_mail_address`
|
||||
11. `BizCheckupInstitution` — `biz_checkup_institution`
|
||||
12. `BizCheckupInstitutionInvoice` — `biz_checkup_institution_invoice`
|
||||
13. `BizCheckupInstitutionProject` — `biz_checkup_institution_project`
|
||||
|
||||
### 3.2 CRUD(`backend/app/crud/pilot_service.py`)
|
||||
|
||||
单文件,按模块分段组织,每段包含:
|
||||
|
||||
- `_row_to_dict_xxx()` — 转换为 camelCase 字典
|
||||
- `list_xxx()` — 分页列表 + keyword 搜索 + tenant_no 过滤
|
||||
- `get_xxx()` — 单条查询
|
||||
- `xxx_code_exists()` — 唯一性校验(编码字段)
|
||||
- `create_xxx()` — 新增
|
||||
- `update_xxx()` — 更新
|
||||
- `soft_delete_xxx()` — 软删除
|
||||
|
||||
子表额外函数:
|
||||
- `list_xxx_items(parent_id)` — 按 parent_id 查子表列表
|
||||
- `create_xxx_item()` / `update_xxx_item()` / `soft_delete_xxx_item()` — 子表 CRUD
|
||||
|
||||
### 3.3 Route(`backend/app/api/pilot_service.py`)
|
||||
|
||||
单文件,`APIRouter(prefix="/web/admin", tags=["中试服务管理"])`。
|
||||
|
||||
每个实体提供 4 个标准端点:
|
||||
|
||||
| 方法 | 路径 | 说明 | 权限 |
|
||||
|------|------|------|------|
|
||||
| GET | `/cell-product-types` | 分页列表 | `require_menu_code` |
|
||||
| POST | `/cell-product-types` | 新增 | `require_admin_or_super_admin` |
|
||||
| PUT | `/cell-product-types/{id}` | 更新 | `require_admin_or_super_admin` |
|
||||
| DELETE | `/cell-product-types/{id}` | 删除 | `require_admin_or_super_admin` |
|
||||
|
||||
子表额外端点(如项目价格体系明细、渠道子表等):
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/cell-product-project-systems/{id}/items` | 获取子表明细 |
|
||||
| POST | `/cell-product-project-systems/{id}/items` | 新增子表行 |
|
||||
| PUT | `/project-system-items/{id}` | 更新子表行 |
|
||||
| DELETE | `/project-system-items/{id}` | 删除子表行 |
|
||||
|
||||
Pydantic Body Model 定义在路由文件内部,使用 `alias` 支持 camelCase。
|
||||
|
||||
渠道信息管理(2.3.5)因其复杂度,需要以下额外端点:
|
||||
- 渠道基础信息 CRUD(含渠道协议附件上传)
|
||||
- 渠道开票信息 CRUD(子表)
|
||||
- 渠道邮寄地址 CRUD(子表)
|
||||
- 渠道协议 CRUD(子表,含状态变更:生效/作废)
|
||||
- 渠道协议-产品价格 CRUD(协议的子表)
|
||||
- 协议状态变更端点:`PUT /channel-agreements/{id}/activate` 和 `PUT /channel-agreements/{id}/void`
|
||||
|
||||
### 3.4 路由注册
|
||||
|
||||
1. `backend/app/api/__init__.py` — 添加 `from app.api.pilot_service import router as pilot_service_router` + `__all__`
|
||||
2. `backend/app/main.py` — `from app.api import ..., pilot_service_router` + `app.include_router(pilot_service_router, prefix=settings.API_V1_PREFIX)`
|
||||
|
||||
---
|
||||
|
||||
## 4. 前端设计
|
||||
|
||||
### 4.1 API 函数(`web-admin/src/api/admin.ts`)
|
||||
|
||||
追加以下 API 函数(每个实体 4 个:list / create / update / delete):
|
||||
|
||||
```
|
||||
// 2.3.1 细胞产品类型
|
||||
fetchCellProductTypeList / fetchCreateCellProductType / fetchUpdateCellProductType / fetchDeleteCellProductType
|
||||
|
||||
// 2.3.2 细胞产品规格
|
||||
fetchCellProductSpecList / fetchCreateCellProductSpec / fetchUpdateCellProductSpec / fetchDeleteCellProductSpec
|
||||
|
||||
// 2.3.3 细胞产品价格体系
|
||||
fetchCellProductPriceList / fetchCreateCellProductPrice / fetchUpdateCellProductPrice / fetchDeleteCellProductPrice
|
||||
|
||||
// 2.3.4 细胞产品项目价格体系
|
||||
fetchProjectSystemList / fetchCreateProjectSystem / fetchUpdateProjectSystem / fetchDeleteProjectSystem
|
||||
fetchProjectSystemItems / fetchCreateProjectSystemItem / fetchUpdateProjectSystemItem / fetchDeleteProjectSystemItem
|
||||
|
||||
// 2.3.5 渠道信息
|
||||
fetchChannelList / fetchCreateChannel / fetchUpdateChannel / fetchDeleteChannel
|
||||
fetchChannelInvoices / fetchCreateChannelInvoice / fetchUpdateChannelInvoice / fetchDeleteChannelInvoice
|
||||
fetchChannelMailAddresses / fetchCreateChannelMailAddress / fetchUpdateChannelMailAddress / fetchDeleteChannelMailAddress
|
||||
fetchChannelAgreements / fetchCreateChannelAgreement / fetchUpdateChannelAgreement / fetchDeleteChannelAgreement
|
||||
fetchChannelAgreementPrices / fetchCreateChannelAgreementPrice / fetchUpdateChannelAgreementPrice / fetchDeleteChannelAgreementPrice
|
||||
fetchActivateChannelAgreement / fetchVoidChannelAgreement
|
||||
|
||||
// 2.3.6 体检机构
|
||||
fetchCheckupInstitutionList / fetchCreateCheckupInstitution / fetchUpdateCheckupInstitution / fetchDeleteCheckupInstitution
|
||||
fetchCheckupInstitutionInvoices / fetchCreateCheckupInstitutionInvoice / ...
|
||||
fetchCheckupInstitutionProjects / fetchCreateCheckupInstitutionProject / ...
|
||||
```
|
||||
|
||||
### 4.2 页面文件
|
||||
|
||||
```
|
||||
web-admin/src/views/pilot-service/
|
||||
├── cell-product-type/index.vue # 2.3.1 — 复制 unit/index.vue
|
||||
├── cell-product-spec/index.vue # 2.3.2 — 复制 unit/index.vue
|
||||
├── cell-product-price/index.vue # 2.3.3 — 复制 unit/index.vue,表单含下拉关联
|
||||
├── project-price-system/index.vue # 2.3.4 — 复制 category/index.vue,主子表
|
||||
├── channel/index.vue # 2.3.5 — 复制 product/index.vue,多 tab + 子表
|
||||
└── checkup-institution/index.vue # 2.3.6 — 复制 category/index.vue,主子表
|
||||
```
|
||||
|
||||
### 4.3 页面详细设计
|
||||
|
||||
#### 2.3.1 细胞产品类型管理(简单 CRUD)
|
||||
|
||||
- **列表列**: 序号、类型编码(`product_type_code`)、类型名称(`product_type_name`)、排序号、备注、创建时间、操作
|
||||
- **新增/编辑弹窗**: 2 列表单,字段:类型编码(必填)、类型名称(必填)、排序号、备注
|
||||
- **查看弹窗**: `SystemViewDialog`,展示基本信息
|
||||
- **搜索**: keyword 搜索编码/名称
|
||||
|
||||
#### 2.3.2 细胞产品规格管理(简单 CRUD)
|
||||
|
||||
- **列表列**: 序号、规格编码(`spec_code`)、规格名称(`spec_name`)、排序号、备注、创建时间、操作
|
||||
- **新增/编辑弹窗**: 2 列表单,字段:规格编码(必填)、规格名称(必填)、排序号、备注
|
||||
- **查看弹窗**: `SystemViewDialog`
|
||||
- **搜索**: keyword 搜索编码/名称
|
||||
|
||||
#### 2.3.3 细胞产品价格体系管理(含下拉关联)
|
||||
|
||||
- **列表列**: 序号、项目名称(`project_name`)、项目编码(`project_code`)、细胞类型名称(`cell_type_name`)、规格(`spec_text`)、单价(`unit_price`)、排序号、备注、创建时间、操作
|
||||
- **新增/编辑弹窗**: 2 列表单,字段:
|
||||
- 项目名称(必填)、项目编码(必填)
|
||||
- 细胞产品类型(下拉,从 2.3.1 获取,选择后填充 `cell_type_code` + `cell_type_name`)
|
||||
- 规格(下拉,从 2.3.2 获取,选择后填充 `spec_id` + `spec_text`)
|
||||
- 单价(元,数字输入)、排序号、备注
|
||||
- **搜索**: keyword + 细胞类型下拉筛选
|
||||
|
||||
#### 2.3.4 细胞产品项目价格管理(主子表)
|
||||
|
||||
- **列表列**: 序号、体系名称(`system_name`)、体系编码(`system_code`)、状态(tag)、排序号、备注、创建时间、操作
|
||||
- **新增/编辑弹窗**:
|
||||
- 顶部:体系名称(必填)、体系编码(必填)、状态(下拉:正常/停用)、排序号、备注
|
||||
- 下方:明细表格(可编辑表格)
|
||||
- 操作列:添加行(从价格体系 2.3.3 选择)、删除行
|
||||
- 列:项目名称、项目编码、细胞类型名称、规格、单价(可修改)
|
||||
- 选择后自动填充:`source_price_id`, `project_name`, `project_code`, `cell_type_code`, `cell_type_name`, `spec_text`, `spec_id`, `cell_product_type_id`
|
||||
- `unit_price` 默认带入选中的价格,但可修改
|
||||
- **查看弹窗**: 展示主表信息 + 明细列表
|
||||
|
||||
#### 2.3.5 渠道信息管理(多 Tab + 子表)
|
||||
|
||||
- **列表列**: 序号、渠道名称(`channel_name`)、统一社会信用代码(`credit_code`)、渠道类型(tag)、联系人、联系电话、排序号、创建时间、操作
|
||||
- **新增/编辑弹窗**: 使用 Tab 分区
|
||||
- **Tab 1 基础信息**: 渠道名称(必填)、统一社会信用代码、渠道类型(下拉:yy/hzjg/zs/zfjg/qt)、联系人姓名、联系电话、联系邮箱、渠道协议附件(上传)、排序号、备注
|
||||
- **Tab 2 开票信息**: 子表列表 + 新增/编辑/删除
|
||||
- 字段:单位名称(必填)、税号、单位地址、电话、开户银行、银行账号
|
||||
- **Tab 3 邮寄地址**: 子表列表 + 新增/编辑/删除
|
||||
- 字段:邮寄地址(必填)、邮寄联系人、邮寄联系电话
|
||||
- **Tab 4 协议信息**: 子表列表 + 新增/编辑/删除
|
||||
- 每个协议可展开查看/编辑协议价格明细
|
||||
- 协议字段:协议类型(必填,下拉 kyxy/zsxy/lcxy)、业务类型(随协议类型自动填充)、结算方式(下拉)、授信额度、生效日期、到期日期、协议状态(tag)
|
||||
- 操作按钮:生效、作废(仅状态变更)
|
||||
- **协议价格明细子表**:
|
||||
- 可从价格体系(2.3.3)或项目价格体系(2.3.4)中选择添加
|
||||
- 选择后自动填充:项目名称、项目编码、细胞类型编码、细胞类型名称、规格
|
||||
- 原价(自动带入,可修改)、协议价(必填)
|
||||
|
||||
#### 2.3.6 体检机构及项目价格(主子表)
|
||||
|
||||
- **列表列**: 序号、机构名称(`institution_name`)、机构地址、联系人、联系电话、状态(tag)、排序号、创建时间、操作
|
||||
- **新增/编辑弹窗**: 使用 Tab 分区
|
||||
- **Tab 1 基础信息**: 机构名称(必填)、机构地址、联系人、联系电话、状态(正常/停用)、排序号、备注
|
||||
- **Tab 2 开票信息**: 子表列表 + 新增/编辑/删除
|
||||
- 字段:单位名称(必填)、税号、单位地址、电话、开户银行、银行账号
|
||||
- **Tab 3 项目及价格**: 子表列表 + 新增/编辑/删除
|
||||
- 字段:项目名称(必填)、项目费用(元)
|
||||
|
||||
### 4.4 路由配置
|
||||
|
||||
在 `web-admin/src/router/modules/sqxp.ts` 中添加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000001',
|
||||
name: 'PilotService',
|
||||
path: '/pilot-service',
|
||||
component: '/index/index',
|
||||
meta: {
|
||||
title: '中试服务管理',
|
||||
icon: 'ri:flask-line',
|
||||
keepAlive: false,
|
||||
roles: ['admin']
|
||||
},
|
||||
children: [
|
||||
{
|
||||
id: '80000000000000000000000000000002',
|
||||
name: 'CellProductType',
|
||||
path: 'cell-product-type',
|
||||
component: '/pilot-service/cell-product-type/index',
|
||||
meta: { title: '细胞产品类型管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000003',
|
||||
name: 'CellProductSpec',
|
||||
path: 'cell-product-spec',
|
||||
component: '/pilot-service/cell-product-spec/index',
|
||||
meta: { title: '细胞产品规格管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000004',
|
||||
name: 'CellProductPrice',
|
||||
path: 'cell-product-price',
|
||||
component: '/pilot-service/cell-product-price/index',
|
||||
meta: { title: '细胞产品价格体系管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000005',
|
||||
name: 'ProjectPriceSystem',
|
||||
path: 'project-price-system',
|
||||
component: '/pilot-service/project-price-system/index',
|
||||
meta: { title: '细胞产品项目价格管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000006',
|
||||
name: 'Channel',
|
||||
path: 'channel',
|
||||
component: '/pilot-service/channel/index',
|
||||
meta: { title: '渠道信息管理', keepAlive: true }
|
||||
},
|
||||
{
|
||||
id: '80000000000000000000000000000007',
|
||||
name: 'CheckupInstitution',
|
||||
path: 'checkup-institution',
|
||||
component: '/pilot-service/checkup-institution/index',
|
||||
meta: { title: '体检机构及项目价格', keepAlive: true }
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. 菜单 SQL
|
||||
|
||||
新增文件 `docs/sql/sys_menu_pilot_service.sql`,包含:
|
||||
- 一级菜单目录:中试服务管理(parent_id 指向 Web 端根菜单,即 `id=2`)
|
||||
- 6 个二级菜单项
|
||||
- 与路由 id 保持一致
|
||||
|
||||
---
|
||||
|
||||
## 6. UI 规范遵循
|
||||
|
||||
所有页面严格遵循 `docs/web-admin-ui-spec-fresh-mint.md` 和 AGENTS.md 中的 UI 约定:
|
||||
|
||||
- **颜色**: 主色 `#10b981`(Fresh Mint),不使用小程序颜色
|
||||
- **表单**: `label-position="top"`,使用 `.dialog-form-layout` + `.form-grid-2`
|
||||
- **弹窗**: `backdrop-filter: none`,`max-height: calc(100vh - 100px)` 只 body 滚动
|
||||
- **标题**: `panel-top` → `h2.title-bar-heading` 带竖线
|
||||
- **按钮**: 每行只有一个 `type="primary"`,工具栏"已选 N 项"在前
|
||||
- **排序字段**: 列表和弹窗中默认不展示 `order_num` 排序字段(按 AGENTS.md 约定)
|
||||
- **操作列**: `fixed="right"`,`min-width ≥ 260px`
|
||||
|
||||
---
|
||||
|
||||
## 7. 交付物清单
|
||||
|
||||
| # | 文件 | 操作 |
|
||||
|---|------|------|
|
||||
| 1 | `backend/app/models/models.py` | 追加 13 个 Model |
|
||||
| 2 | `backend/app/crud/pilot_service.py` | 新建 |
|
||||
| 3 | `backend/app/api/pilot_service.py` | 新建 |
|
||||
| 4 | `backend/app/api/__init__.py` | 追加 import + __all__ |
|
||||
| 5 | `backend/app/main.py` | 追加 include_router |
|
||||
| 6 | `web-admin/src/api/admin.ts` | 追加 API 函数 |
|
||||
| 7 | `web-admin/src/views/pilot-service/cell-product-type/index.vue` | 新建 |
|
||||
| 8 | `web-admin/src/views/pilot-service/cell-product-spec/index.vue` | 新建 |
|
||||
| 9 | `web-admin/src/views/pilot-service/cell-product-price/index.vue` | 新建 |
|
||||
| 10 | `web-admin/src/views/pilot-service/project-price-system/index.vue` | 新建 |
|
||||
| 11 | `web-admin/src/views/pilot-service/channel/index.vue` | 新建 |
|
||||
| 12 | `web-admin/src/views/pilot-service/checkup-institution/index.vue` | 新建 |
|
||||
| 13 | `web-admin/src/router/modules/sqxp.ts` | 追加路由 |
|
||||
| 14 | `docs/sql/sys_menu_pilot_service.sql` | 新建 |
|
||||
|
||||
---
|
||||
|
||||
## 8. 不在范围内
|
||||
|
||||
以下内容不在本次实现中(后续模块需要):
|
||||
|
||||
- 2.3.7 渠道服务购买订单管理
|
||||
- 2.3.8 渠道服务购买订单管理(财务确认)
|
||||
- 2.3.9 中试服务单管理
|
||||
- 工作流集成
|
||||
- 数据权限(`apply_data_scope`)— 本次使用 `require_admin_or_super_admin`,后续按需添加
|
||||
@@ -1,224 +0,0 @@
|
||||
# 生产管理模块设计规格
|
||||
|
||||
## 概述
|
||||
实现需求文档 2.5 节中生产管理下的 7 个子模块(工艺路线配置暂不实现)。
|
||||
新增一级菜单【生产管理】,下设 7 个二级菜单。按依赖关系分 2 批实现。
|
||||
|
||||
## 范围
|
||||
| 批次 | 模块 | 需求章节 | 依赖 |
|
||||
|------|------|----------|------|
|
||||
| 第1批 | 耗材管理 | 2.5.1 | 无 |
|
||||
| 第1批 | 试剂管理 | 2.5.3 | 物品单位管理(已有) |
|
||||
| 第1批 | SOP文档 | 2.5.4 | 无(附件上传) |
|
||||
| 第1批 | 工艺工序分类 | 2.5.5 | 无 |
|
||||
| 第1批 | 工艺产出物类型 | 2.3.6 | 无 |
|
||||
| 第2批 | 耗材包管理 | 2.5.2 | 耗材管理 |
|
||||
| 第2批 | 工艺库管理 | 2.3.7 | 试剂、耗材、SOP、工序分类、产出物类型 |
|
||||
|
||||
**不在范围内**: 工艺路线配置[2.3.8] — 留待下次迭代。
|
||||
|
||||
## SQL 表(需新建 11 张)
|
||||
|
||||
### 第1批:单表模块(5 张)
|
||||
|
||||
#### 1. biz_consumable — 耗材
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| consumable_code | VARCHAR(64) NOT NULL | 耗材编码 |
|
||||
| consumable_name | VARCHAR(100) NOT NULL | 耗材名称 |
|
||||
| spec_model | VARCHAR(200) DEFAULT NULL | 规格型号 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| description | VARCHAR(500) DEFAULT NULL | 描述 |
|
||||
| + 公共字段 | | tenant_no ~ del_flag |
|
||||
|
||||
#### 2. biz_reagent — 试剂
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| reagent_code | VARCHAR(64) NOT NULL | 试剂编码 |
|
||||
| reagent_name | VARCHAR(100) NOT NULL | 试剂名称 |
|
||||
| spec | VARCHAR(200) DEFAULT NULL | 规格 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| unit | VARCHAR(64) DEFAULT NULL | 单位(下拉自物品单位管理) |
|
||||
| description | VARCHAR(500) DEFAULT NULL | 描述 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 3. biz_sop_document — SOP文档
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| sop_code | VARCHAR(64) NOT NULL | SOP编号 |
|
||||
| sop_name | VARCHAR(200) NOT NULL | SOP文档名称 |
|
||||
| version_no | VARCHAR(50) DEFAULT NULL | 版本号 |
|
||||
| sop_attachments | VARCHAR(2000) DEFAULT NULL | SOP文档附件(逗号分隔URL) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 4. biz_process_category — 工艺工序分类
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| category_code | VARCHAR(64) NOT NULL | 分类编码 |
|
||||
| category_name | VARCHAR(100) NOT NULL | 分类名称 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 5. biz_output_type — 工艺产出物类型
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| type_code | VARCHAR(64) NOT NULL | 类型编码 |
|
||||
| type_name | VARCHAR(100) NOT NULL | 类型名称 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
### 第2批:主表+子表模块(6 张)
|
||||
|
||||
#### 6. biz_consumable_pack — 耗材包主表
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| pack_code | VARCHAR(64) NOT NULL | 编号 |
|
||||
| pack_name | VARCHAR(100) NOT NULL | 名称 |
|
||||
| usage_scene | VARCHAR(200) DEFAULT NULL | 使用场景 |
|
||||
| pack_type | VARCHAR(20) DEFAULT NULL | 类型(bzhcb-标准耗材包、zdyhcb-自定义耗材包) |
|
||||
| status | CHAR(1) DEFAULT '1' | 状态(1-启用、0-停用) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 7. biz_consumable_pack_item — 耗材包耗材明细
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| pack_id | VARCHAR(64) NOT NULL | 耗材包id |
|
||||
| consumable_code | VARCHAR(64) DEFAULT NULL | 耗材编码 |
|
||||
| consumable_name | VARCHAR(100) DEFAULT NULL | 耗材名称 |
|
||||
| spec_model | VARCHAR(200) DEFAULT NULL | 耗材规格型号 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| remark | VARCHAR(512) DEFAULT NULL | 备注 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 8. biz_process — 工艺库主表
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| process_code | VARCHAR(64) NOT NULL | 工序代码 |
|
||||
| category_id | VARCHAR(64) DEFAULT NULL | 工序分类id(下拉自工艺工序分类) |
|
||||
| process_name | VARCHAR(100) NOT NULL | 工序名称 |
|
||||
| description | VARCHAR(500) DEFAULT NULL | 描述 |
|
||||
| equipment_name | VARCHAR(200) DEFAULT NULL | 预计使用设备名称 |
|
||||
| estimated_duration | VARCHAR(100) DEFAULT NULL | 预估耗时 |
|
||||
| sop_ids | VARCHAR(1000) DEFAULT NULL | 关联SOP文档id(逗号分隔) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 9. biz_process_reagent — 工艺-试剂关联
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| process_id | VARCHAR(64) NOT NULL | 工艺id |
|
||||
| reagent_code | VARCHAR(64) DEFAULT NULL | 试剂编码 |
|
||||
| reagent_name | VARCHAR(100) DEFAULT NULL | 试剂名称 |
|
||||
| spec | VARCHAR(200) DEFAULT NULL | 规格 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| unit | VARCHAR(64) DEFAULT NULL | 单位 |
|
||||
| is_key_material | CHAR(1) DEFAULT '0' | 是否关键物料(0-否、1-是) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 10. biz_process_consumable — 工艺-耗材关联
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| process_id | VARCHAR(64) NOT NULL | 工艺id |
|
||||
| consumable_code | VARCHAR(64) DEFAULT NULL | 耗材编码 |
|
||||
| consumable_name | VARCHAR(100) DEFAULT NULL | 耗材名称 |
|
||||
| spec_model | VARCHAR(200) DEFAULT NULL | 耗材规格型号 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| is_required | CHAR(1) DEFAULT '1' | 是否必需(1-必须、0-可选) |
|
||||
| remark | VARCHAR(512) DEFAULT NULL | 备注 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
#### 11. biz_process_output — 工艺-产出关联
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| process_id | VARCHAR(64) NOT NULL | 工艺id |
|
||||
| output_type_id | VARCHAR(64) DEFAULT NULL | 产出类型(下拉自工艺产出物类型) |
|
||||
| output_name | VARCHAR(200) DEFAULT NULL | 产出物名称 |
|
||||
| output_barcode | VARCHAR(200) DEFAULT NULL | 产出物条码(生产时才有数据) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
## 模块设计
|
||||
|
||||
### 模块 1-5: 耗材/试剂/SOP/工序分类/产出物类型(简单 CRUD)
|
||||
- **类型**: 标准列表模式
|
||||
- **后端**: Model + CRUD + API 路由(完全参照 `item_unit.py` 模式)
|
||||
- **前端**: 参照 `system/unit/index.vue` 标准列表
|
||||
- **特殊**: 试剂管理的"单位"字段下拉数据从物品单位管理获取;SOP文档需要附件上传
|
||||
|
||||
### 模块 6: 耗材包管理(主表+明细)
|
||||
- **类型**: 标准列表 + 弹窗内明细表格
|
||||
- **后端**: 主表 CRUD + 明细子表 CRUD(级联创建/更新/删除)
|
||||
- **前端**: 列表参照 `unit/index.vue`;新增/编辑弹窗中嵌入耗材明细表格,支持:
|
||||
- 从耗材库逐条添加(下拉选择耗材后自动带入编码/名称/规格/用量)
|
||||
- 行内编辑标准用量
|
||||
- 行内删除
|
||||
- **API**: `/web/admin/consumable-packs` + `/web/admin/consumable-packs/{id}` (含明细一起提交)
|
||||
|
||||
### 模块 7: 工艺库管理(主表+3个关联子表)
|
||||
- **类型**: 标准列表 + Tab式编辑弹窗
|
||||
- **后端**: 主表 CRUD + 3 个子表 CRUD(级联操作)
|
||||
- **前端**: 列表页标准列表;新增/编辑弹窗分 4 个 Tab:
|
||||
- Tab1「基本信息」: 工序代码、工序分类(下拉)、工序名称、描述、设备名称、预估耗时、关联SOP(多选下拉)
|
||||
- Tab2「试剂关联」: 表格形式,下拉选试剂后自动带入编码/名称/规格/用量/单位,可改标准用量,标记是否关键物料
|
||||
- Tab3「耗材关联」: 表格形式,支持从耗材包批量导入或从耗材库逐条添加;可改标准用量,标记是否必需
|
||||
- Tab4「产出物」: 表格形式,下拉选产出类型 + 填产出物名称
|
||||
- **API**: `/web/admin/processes` + `/web/admin/processes/{id}` (含所有子表一起提交)
|
||||
|
||||
## 路由与菜单
|
||||
|
||||
### 前端路由
|
||||
在 `sqxp.ts` 新增顶级路由组:
|
||||
```
|
||||
/production
|
||||
/production/consumable 耗材管理
|
||||
/production/reagent 试剂管理
|
||||
/production/sop SOP文档
|
||||
/production/process-category 工艺工序分类
|
||||
/production/output-type 工艺产出物类型
|
||||
/production/consumable-pack 耗材包管理
|
||||
/production/process 工艺库管理
|
||||
```
|
||||
|
||||
### 后端 API
|
||||
统一路由前缀 `/web/admin`,新增以下端点:
|
||||
```
|
||||
GET/POST /consumables 耗材列表/创建
|
||||
GET/PUT/DELETE /consumables/{id} 耗材详情/更新/删除
|
||||
GET/POST /reagents 试剂列表/创建
|
||||
GET/PUT/DELETE /reagents/{id} 试剂详情/更新/删除
|
||||
GET/POST /sop-documents SOP列表/创建
|
||||
GET/PUT/DELETE /sop-documents/{id} SOP详情/更新/删除
|
||||
GET/POST /process-categories 工序分类列表/创建
|
||||
GET/PUT/DELETE /process-categories/{id} 工序分类详情/更新/删除
|
||||
GET/POST /output-types 产出物类型列表/创建
|
||||
GET/PUT/DELETE /output-types/{id} 产出物类型详情/更新/删除
|
||||
GET/POST /consumable-packs 耗材包列表/创建
|
||||
GET/PUT/DELETE /consumable-packs/{id} 耗材包详情/更新/删除
|
||||
GET/POST /processes 工艺库列表/创建
|
||||
GET/PUT/DELETE /processes/{id} 工艺库详情/更新/删除
|
||||
```
|
||||
|
||||
### 菜单 SQL
|
||||
在 `sys_menu` 中新增生产管理顶级菜单(parent_id 指向 Web 端菜单根节点)及 7 个子菜单项。
|
||||
|
||||
## 技术规范
|
||||
- 后端模式:flat 函数式 CRUD(参照 `app/crud/item_unit.py`),不用 service 层
|
||||
- 前端模式:API 函数加入 `production.ts`,路由加入 `sqxp.ts`
|
||||
- 所有查询带 `tenant_no` 过滤,删除为软删除
|
||||
- Fresh Mint 配色 (`--primary #10b981`)
|
||||
- 附件使用 MinIO,多附件逗号分隔 URL
|
||||
- 编码字段需做唯一性校验(同 tenant_no + del_flag=0 下)
|
||||
|
||||
## 实施顺序
|
||||
1. **第1批**(5 个简单模块,可并行):
|
||||
- SQL DDL → Model → CRUD → API → 注册 → 前端 API → 路由 → 页面
|
||||
2. **第2批**(2 个复杂模块,串行):
|
||||
- 耗材包管理 → 工艺库管理
|
||||
3. **菜单 SQL**:与第1批一起执行
|
||||
@@ -1,354 +0,0 @@
|
||||
# 质量检测 — 第三方/实验室主数据、质检工单与质检任务
|
||||
|
||||
**日期**:2026-05-17
|
||||
**依据**:用户确认的业务规则;`docs/中科兴皖需求V0.3.md` 签收后触发样本检测流程;既有 `biz_sample_reception`、样本接收 Web 页。
|
||||
**范围**:`web-admin` + `backend`(FastAPI);租户隔离、软删除、公共字段与工程规范一致。
|
||||
|
||||
---
|
||||
|
||||
## 1. 已确认业务规则
|
||||
|
||||
| 项 | 规则 |
|
||||
|----|------|
|
||||
| 样本类型 | **不考虑**;主数据维护全部检测项目,由人员自选 |
|
||||
| 样本接收 UI | **保持现状**,不在接收弹窗勾选检测项目 |
|
||||
| 触发时机 | 接收结论为 **接收(`js`)** 时,自动生成 **1 条质检工单**(与 `biz_sample_reception` 1:1);**拒收(`bj`)** 不建单 |
|
||||
| 项目配置 | 在 **质检工单** 界面配置:检测方式(实验室自检 / 第三方检测,可多选)及具体项目 |
|
||||
| 任务生成 | **实验室 + 第三方** 所选项目 **各生成 1 条质检任务**;处理逻辑按任务类型区分 |
|
||||
| 任务差异 | 实验室自检:本实验室处理(一期仅状态/骨架);第三方:需 **上传第三方检测材料** |
|
||||
| 样本类型映射 | **不做** |
|
||||
|
||||
---
|
||||
|
||||
## 2. 目标与非目标
|
||||
|
||||
### 2.1 目标(一期)
|
||||
|
||||
- 在「质量检测」下新增 **5 个菜单**(见 §4)。
|
||||
- 主数据 CRUD:第三方检测公司、第三方检测项目及费用(归属公司)、实验室自检项目。
|
||||
- 接收成功 → 自动创建 **待配置** 质检工单。
|
||||
- 质检工单:列表、查看、**配置检测**(勾选方式与项目)→ 确认后批量生成任务,工单变为 **已配置**。
|
||||
- 质检任务:列表、查看;实验室任务最小状态流转;第三方任务支持附件上传并完结。
|
||||
- 后端在 `create_sample_reception` 提交事务内(或同事务)创建工单,保证幂等(同一 `reception_id` 仅一条工单)。
|
||||
|
||||
### 2.2 非目标(一期不做)
|
||||
|
||||
- 检测任务完整实验过程录入、仪器对接、审批流。
|
||||
- 检测结论回写协议样本状态(`sample_status` / 作废 / 入库)— 留二期。
|
||||
- 按样本类型自动匹配项目。
|
||||
- 在接收弹窗配置检测项目。
|
||||
- 工作流引擎驱动质检。
|
||||
|
||||
---
|
||||
|
||||
## 3. 方案对比(已选方案 A)
|
||||
|
||||
| 方案 | 说明 | 结论 |
|
||||
|------|------|------|
|
||||
| **A. 工单头 + 明细行 + 任务表** | 工单存头信息;配置时写入工单明细(快照);确认后按明细生成 `biz_qc_task` | **采用** — 便于待配置态展示、费用汇总、审计快照 |
|
||||
| B. 仅工单 + 任务 | 配置直接写任务,无中间明细 | 待配置编辑与历史追溯弱 |
|
||||
| C. JSON 存配置 | 配置存 JSON 字段 | 不利于列表筛选与报表 |
|
||||
|
||||
---
|
||||
|
||||
## 4. 菜单与路由
|
||||
|
||||
一级菜单 **质量检测**(`/quality-inspection`,已有)下新增:
|
||||
|
||||
| 序号 | 菜单名称 | path | 组件 | 权限前缀(建议) |
|
||||
|------|----------|------|------|------------------|
|
||||
| 1 | 第三方检测公司 | `third-party-company` | `views/quality-inspection/third-party-company/index.vue` | `biz:qcThirdPartyCompany` |
|
||||
| 2 | 第三方检测项目 | `third-party-item` | `views/quality-inspection/third-party-item/index.vue` | `biz:qcThirdPartyItem` |
|
||||
| 3 | 实验室自检项目 | `lab-test-item` | `views/quality-inspection/lab-test-item/index.vue` | `biz:qcLabTestItem` |
|
||||
| 4 | 质检工单 | `qc-work-order` | `views/quality-inspection/qc-work-order/index.vue` | `biz:qcWorkOrder` |
|
||||
| 5 | 质检任务 | `qc-task` | `views/quality-inspection/qc-task/index.vue` | `biz:qcTask` |
|
||||
|
||||
保留现有:**样本接收**、**接收检查项配置**。
|
||||
|
||||
同步:`web-admin/src/router/modules/sqxp.ts`、`backend/app/api/menu.py`、`docs/sql/sys_menu_quality_inspection.sql`(或增量 SQL)。
|
||||
|
||||
UI:列表对齐 `system/unit/index.vue`;弹窗 `label-position="top"`、`.dialog-form-layout`;色板 Fresh Mint。
|
||||
|
||||
---
|
||||
|
||||
## 5. 数据模型
|
||||
|
||||
命名空间表前缀:`biz_qc_*`。均含标准公共字段(`id` UUID、`tenant_no`、`order_num`、`remark`、`create_by`、`create_dept_id`、`create_time`、`update_by`、`update_time`、`del_flag`)。
|
||||
|
||||
### 5.1 `biz_qc_third_party_company` — 第三方检测公司
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| company_code | VARCHAR(64) | 公司编码,租户内唯一 |
|
||||
| company_name | VARCHAR(200) | 公司名称 |
|
||||
| contact_name | VARCHAR(100) | 联系人 |
|
||||
| contact_phone | VARCHAR(32) | 联系电话 |
|
||||
| address | VARCHAR(500) | 地址 |
|
||||
| status | CHAR(1) | `1` 启用 / `0` 停用 |
|
||||
|
||||
### 5.2 `biz_qc_third_party_item` — 第三方检测项目及费用
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| company_id | VARCHAR(64) | FK → 第三方公司 |
|
||||
| item_code | VARCHAR(64) | 项目编码(租户内可与 company 联合唯一) |
|
||||
| item_name | VARCHAR(200) | 项目名称 |
|
||||
| fee_amount | DECIMAL(18,2) | 费用(元) |
|
||||
| status | CHAR(1) | `1` 启用 / `0` 停用 |
|
||||
|
||||
列表页支持按 **公司** 筛选;新增/编辑必须选择所属公司。
|
||||
|
||||
### 5.3 `biz_qc_lab_test_item` — 实验室自检项目
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| item_code | VARCHAR(64) | 项目编码,租户内唯一 |
|
||||
| item_name | VARCHAR(200) | 项目名称 |
|
||||
| description | VARCHAR(500) | 描述/方法说明(可选) |
|
||||
| status | CHAR(1) | `1` 启用 / `0` 停用 |
|
||||
|
||||
### 5.4 `biz_qc_work_order` — 质检工单
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| work_order_no | VARCHAR(32) | 工单号(规则:`ZJ` + yyyyMMdd + 4 位序,租户内按日序) |
|
||||
| reception_id | VARCHAR(64) | 接收记录 ID,**唯一**(未删除) |
|
||||
| protocol_sample_id | VARCHAR(64) | 协议样本 ID |
|
||||
| collection_protocol_id | VARCHAR(64) | 协议单 ID |
|
||||
| protocol_no | VARCHAR(64) | 协议号快照(列表展示) |
|
||||
| sample_code | VARCHAR(32) | 样本编码快照 |
|
||||
| work_order_status | VARCHAR(16) | 见 §6.1 |
|
||||
| has_lab | CHAR(1) | `1`/`0` 是否含实验室自检 |
|
||||
| has_third_party | CHAR(1) | `1`/`0` 是否含第三方检测 |
|
||||
| configured_time | DATETIME | 配置确认时间 |
|
||||
| configured_by | VARCHAR(64) | 配置人用户 ID |
|
||||
| third_party_fee_total | DECIMAL(18,2) | 第三方项目费用合计(配置时汇总) |
|
||||
|
||||
### 5.5 `biz_qc_work_order_lab_item` — 工单-实验室项目明细(配置快照)
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| work_order_id | VARCHAR(64) | 工单 ID |
|
||||
| lab_test_item_id | VARCHAR(64) | 主数据 ID |
|
||||
| item_code / item_name | VARCHAR | 快照 |
|
||||
|
||||
### 5.6 `biz_qc_work_order_third_item` — 工单-第三方项目明细(配置快照)
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| work_order_id | VARCHAR(64) | 工单 ID |
|
||||
| third_party_item_id | VARCHAR(64) | 主数据 ID |
|
||||
| company_id | VARCHAR(64) | 公司 ID |
|
||||
| company_name | VARCHAR(200) | 公司名快照 |
|
||||
| item_code / item_name | VARCHAR | 快照 |
|
||||
| fee_amount | DECIMAL(18,2) | 费用快照 |
|
||||
|
||||
### 5.7 `biz_qc_task` — 质检任务
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| work_order_id | VARCHAR(64) | 工单 ID |
|
||||
| task_no | VARCHAR(32) | 任务号(`RW` + 日序,或工单号 + `-` + 序号) |
|
||||
| task_type | VARCHAR(16) | `sysz` 实验室自检 / `dsfjc` 第三方检测 |
|
||||
| source_line_id | VARCHAR(64) | 对应工单明细行 ID(lab 或 third 明细表) |
|
||||
| item_code / item_name | VARCHAR | 快照 |
|
||||
| company_id / company_name | VARCHAR | 第三方任务填公司快照;实验室为空 |
|
||||
| fee_amount | DECIMAL(18,2) | 第三方费用快照 |
|
||||
| task_status | VARCHAR(16) | 见 §6.2 |
|
||||
| third_party_attachments | VARCHAR(4000) | 第三方检测材料 URL,逗号分隔(MinIO) |
|
||||
| completed_time | DATETIME | 完成时间 |
|
||||
| completed_by | VARCHAR(64) | 完成人 |
|
||||
|
||||
---
|
||||
|
||||
## 6. 状态与字典
|
||||
|
||||
### 6.1 工单状态 `work_order_status`
|
||||
|
||||
| 值 | 标签 | 说明 |
|
||||
|----|------|------|
|
||||
| `dpz` | 待配置 | 接收后自动创建 |
|
||||
| `ypz` | 已配置 | 已确认检测方式与项目,任务已生成 |
|
||||
| `ywc` | 已完成 | 全部任务已完成(可由任务聚合更新,一期可实现自动推进) |
|
||||
|
||||
### 6.2 任务状态 `task_status`
|
||||
|
||||
| 值 | 标签 | 说明 |
|
||||
|----|------|------|
|
||||
| `dzx` | 待执行 | 刚生成 |
|
||||
| `jxz` | 进行中 | 实验室:开始处理;第三方:已上传部分材料可选 |
|
||||
| `ywc` | 已完成 | 实验室:手动完成;第三方:上传材料后确认完成 |
|
||||
|
||||
### 6.3 字典类型(可选 `sys_dict`)
|
||||
|
||||
- `qc_task_type`:`sysz` / `dsfjc`
|
||||
- `qc_work_order_status`:`dpz` / `ypz` / `ywc`
|
||||
- `qc_task_status`:`dzx` / `jxz` / `ywc`
|
||||
|
||||
一期也可前端常量 + 标签函数(与样本接收结论一致)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 核心流程
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant SR as 样本接收
|
||||
participant WO as 质检工单
|
||||
participant TK as 质检任务
|
||||
|
||||
SR->>WO: 结论=接收(js) 提交
|
||||
Note over WO: 创建工单 status=dpz
|
||||
WO->>WO: 质检专员打开「配置检测」
|
||||
Note over WO: 勾选 has_lab / has_third_party<br/>多选启用项目
|
||||
WO->>WO: POST 确认配置
|
||||
WO->>WO: 写入明细快照 status=ypz
|
||||
loop 每个实验室项目
|
||||
WO->>TK: 创建 task_type=sysz
|
||||
end
|
||||
loop 每个第三方项目
|
||||
WO->>TK: 创建 task_type=dsfjc
|
||||
end
|
||||
TK->>TK: 实验室:状态流转(一期骨架)
|
||||
TK->>TK: 第三方:上传材料 → 完成
|
||||
TK->>WO: 全部 ywc 时工单→ywc
|
||||
```
|
||||
|
||||
### 7.1 自动建单(后端)
|
||||
|
||||
在 `create_sample_reception` 中,当 `accept_conclusion == 'js'` 且提交成功后:
|
||||
|
||||
1. 若该 `reception_id` 尚无未删除工单,则插入 `biz_qc_work_order`(`dpz`)。
|
||||
2. 填充 `reception_id`、`protocol_sample_id`、`collection_protocol_id`;从协议单/样本补 `protocol_no`、`sample_code`。
|
||||
3. 生成 `work_order_no`。
|
||||
4. **同一事务** commit。
|
||||
|
||||
幂等:已存在工单则跳过(防重复接收场景应在前置校验拦截,此处防御性检查)。
|
||||
|
||||
### 7.2 配置检测(工单)
|
||||
|
||||
- 仅 `work_order_status = dpz` 可配置。
|
||||
- 请求体示例:
|
||||
- `hasLab`: boolean
|
||||
- `hasThirdParty`: boolean
|
||||
- `labItemIds`: string[](`hasLab` 时至少 1 项)
|
||||
- `thirdPartyItemIds`: string[](`hasThirdParty` 时至少 1 项)
|
||||
- 校验:所选 ID 均为本租户 **启用** 主数据;第三方项目带公司信息写入快照。
|
||||
- 行为:
|
||||
1. 删除该工单下已有明细(`dpz` 态理论上无任务,若有则拒绝)。
|
||||
2. 批量插入 lab/third 明细行。
|
||||
3. 按明细 **每条生成 1 个任务**(`dzx`)。
|
||||
4. 更新工单:`ypz`、`has_lab`、`has_third_party`、`third_party_fee_total`、`configured_*`。
|
||||
- **已配置后一期不允许修改项目**(避免任务与明细不一致);追加以二期为准。
|
||||
|
||||
### 7.3 任务处理(一期)
|
||||
|
||||
| 类型 | 操作 |
|
||||
|------|------|
|
||||
| `sysz` | 列表查看;支持「开始」「完成」状态变更(无结果表单) |
|
||||
| `dsfjc` | 上传第三方检测材料(附件卡片,MinIO);「完成」前至少 1 个附件 |
|
||||
|
||||
工单完成:该工单下所有任务 `ywc` → 工单 `ywc`(可在任务完成 API 内聚合更新)。
|
||||
|
||||
---
|
||||
|
||||
## 8. API 设计(前缀 `/api/web/admin`)
|
||||
|
||||
### 8.1 第三方检测公司
|
||||
|
||||
- `GET /qc-third-party-companies` — 分页列表,`keyword`、`status`
|
||||
- `GET /qc-third-party-companies/options` — 下拉(启用)
|
||||
- `POST /qc-third-party-companies`
|
||||
- `PUT /qc-third-party-companies/{id}`
|
||||
- `DELETE /qc-third-party-companies/{id}` — 软删;若存在未删第三方项目则拒绝
|
||||
|
||||
### 8.2 第三方检测项目
|
||||
|
||||
- `GET /qc-third-party-items` — `companyId`、`keyword`、`status`
|
||||
- `GET /qc-third-party-items/options` — `companyId` 可选
|
||||
- `POST` / `PUT` / `DELETE` — 标准 CRUD
|
||||
|
||||
### 8.3 实验室自检项目
|
||||
|
||||
- `GET /qc-lab-test-items` — 分页
|
||||
- `GET /qc-lab-test-items/options` — 启用项,供工单配置多选
|
||||
- `POST` / `PUT` / `DELETE`
|
||||
|
||||
### 8.4 质检工单
|
||||
|
||||
- `GET /qc-work-orders` — `keyword`(工单号/协议号/样本编码)、`workOrderStatus`
|
||||
- `GET /qc-work-orders/{id}` — 含接收摘要、明细、任务列表
|
||||
- `POST /qc-work-orders/{id}/configure` — §7.2 配置确认
|
||||
|
||||
(不提供手工新建:仅接收触发。)
|
||||
|
||||
### 8.5 质检任务
|
||||
|
||||
- `GET /qc-tasks` — `keyword`、`taskType`、`taskStatus`、`workOrderId`
|
||||
- `GET /qc-tasks/{id}`
|
||||
- `POST /qc-tasks/{id}/start` — `sysz`:`dzx`→`jxz`
|
||||
- `POST /qc-tasks/{id}/complete` — `sysz`:`jxz`→`ywc`;`dsfjc`:校验附件后 `ywc`
|
||||
- `PUT /qc-tasks/{id}/attachments` — `dsfjc` 更新 `third_party_attachments`
|
||||
|
||||
路由注册:`app/api/qc_*.py` 或合并 `quality_inspection.py`;`__init__.py` + `main.py`。
|
||||
|
||||
权限:`require_menu_code` + `apply_data_scope`(与 `sample_reception` 一致)。
|
||||
|
||||
---
|
||||
|
||||
## 9. 前端要点
|
||||
|
||||
### 9.1 第三方检测公司 / 项目 / 实验室项目
|
||||
|
||||
- 标准列表 CRUD;项目列表带公司筛选,表单公司用 `el-select`(options 接口)。
|
||||
- 停用主数据后,工单配置下拉不出现,**不影响**已生成工单快照与任务。
|
||||
|
||||
### 9.2 质检工单
|
||||
|
||||
- 列表列:工单号、协议号、样本编码、接收时间、工单状态、检测方式(实验室/第三方标签)、配置时间。
|
||||
- 操作:**查看**、**配置检测**(仅 `dpz`)。
|
||||
- 配置弹窗:
|
||||
- 区块1:检测方式 `el-checkbox-group`(实验室自检、第三方检测)
|
||||
- 区块2:实验室项目 `el-checkbox-group` 或表格多选(仅启用项)
|
||||
- 区块3:第三方项目 — 可按公司分组展示全部启用项目 + 费用列,多选
|
||||
- 确认前校验:勾选方式与所选项目一致;至少选 1 个项目
|
||||
- 查看弹窗:只读展示接收信息、已选明细、关联任务列表。
|
||||
|
||||
### 9.3 质检任务
|
||||
|
||||
- 列表:`taskType` 筛选;类型列区分标签。
|
||||
- 操作:
|
||||
- 实验室:开始 / 完成
|
||||
- 第三方:上传材料(附件卡片)、完成
|
||||
- 查看:展示工单关联、项目快照、附件只读。
|
||||
|
||||
---
|
||||
|
||||
## 10. 实施分期建议
|
||||
|
||||
| 阶段 | 交付 |
|
||||
|------|------|
|
||||
| **P1** | SQL + Models + 主数据 3 模块 API/页面 |
|
||||
| **P2** | 接收触发改单 + 工单列表/配置/查看 + 配置生成任务 |
|
||||
| **P3** | 任务列表 + 分类型操作 + 工单完成聚合 |
|
||||
| **P4(二期)** | 检测结果、样本状态联动、配置后追加项目、统计报表 |
|
||||
|
||||
实施计划文件:`docs/superpowers/plans/2026-05-17-quality-inspection-modules.md`(待 `writing-plans` 生成)。
|
||||
|
||||
---
|
||||
|
||||
## 11. 测试要点
|
||||
|
||||
- 接收 `js` → 生成 `dpz` 工单;`bj` → 无工单。
|
||||
- 同一接收重复提交应被接收层拦截,不重复工单。
|
||||
- 配置仅选实验室 → 仅 `sysz` 任务;仅第三方 → 仅 `dsfjc` 任务;两者都选 → 两类任务总数 = 所选项目数。
|
||||
- 第三方任务无附件不可完成;全部任务完成后工单 `ywc`。
|
||||
- 租户隔离、软删除、停用主数据不参与新配置。
|
||||
|
||||
---
|
||||
|
||||
## 12. 变更记录
|
||||
|
||||
| 日期 | 说明 |
|
||||
|------|------|
|
||||
| 2026-05-17 | 初稿:用户确认人工选配、接收触发、工单配置、双类型任务 |
|
||||
@@ -1,231 +0,0 @@
|
||||
# 科研捐赠管理模块设计文档
|
||||
|
||||
> 日期:2026-05-17
|
||||
> 方案:C — 独立业务 + 共享基础数据
|
||||
> 状态:已确认
|
||||
|
||||
## 背景与需求
|
||||
|
||||
客户现有「细胞存储管理」业务,现需新增「科研捐赠」业务。两者关系:
|
||||
|
||||
- **独立新建**:科研捐赠可以直接创建
|
||||
- **双向转化**:细胞存储协议可「转科研」→ 科研捐赠;科研捐赠可「转存储」→ 细胞存储协议
|
||||
- **核心区别**:
|
||||
1. 科研捐赠不收费(无缴费相关流程)
|
||||
2. 科研捐赠必须上传知情同意书附件
|
||||
- **相同部分**:当事人信息、采集信息、样本信息、审核流程、状态生命周期
|
||||
|
||||
## 方案选型
|
||||
|
||||
| 方案 | 描述 | 结论 |
|
||||
|------|------|------|
|
||||
| A. 完全复制+裁剪 | Clone 细胞存储全部代码,删缴费/储存证书 | 代码重复严重 |
|
||||
| B. 共享表+类型区分 | 同一套表,用 business_type 区分 | 耦合高,维护难 |
|
||||
| **C. 独立业务+共享基础数据** | 独立表和 CRUD,复用基础数据和前端组件 | **已选择** |
|
||||
|
||||
选择理由:符合项目现有模式(每业务独立路由/CRUD),风险最低,独立演进。
|
||||
|
||||
---
|
||||
|
||||
## Section 1:数据库设计
|
||||
|
||||
### 新建表(6 张)
|
||||
|
||||
#### `biz_research_donation` — 主表
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | VARCHAR(64) UUID | 主键 |
|
||||
| `donation_no` | VARCHAR(64) | 捐赠协议编号 |
|
||||
| `status` | VARCHAR(20) | 状态:dsx/sxz/ygq/yzf/zckc |
|
||||
| `donation_date` | DATE | 捐赠日期 |
|
||||
| `source_type` | VARCHAR(20) | 来源类型:`direct`(独立新建)/ `from_storage`(从存储转来) |
|
||||
| `source_protocol_id` | VARCHAR(64) | 来源协议 ID(from_storage 时填源细胞存储协议 ID) |
|
||||
| `consent_form_urls` | TEXT | 知情同意书附件 URL(逗号分隔,必填) |
|
||||
| `attachment_urls` | TEXT | 其他附件 URL(逗号分隔,可选) |
|
||||
| `remark` | VARCHAR(500) | 备注 |
|
||||
| `tenant_no` | VARCHAR(64) | 租户编号 |
|
||||
| `order_num` | INT | 排序号 |
|
||||
| `create_by` | VARCHAR(64) | 创建人 |
|
||||
| `create_dept_id` | VARCHAR(64) | 创建部门 |
|
||||
| `create_time` | DATETIME | 创建时间 |
|
||||
| `update_by` | VARCHAR(64) | 更新人 |
|
||||
| `update_time` | DATETIME | 更新时间 |
|
||||
| `del_flag` | CHAR(1) DEFAULT '0' | 删除标记 |
|
||||
|
||||
#### `biz_research_donation_audit` — 审核记录
|
||||
|
||||
结构与 `biz_protocol_audit` 一致:审核状态(shtg/shth)+ 备注 + 审核人 + 审核时间。
|
||||
|
||||
#### `biz_research_donation_party` — 当事人信息
|
||||
|
||||
结构与 `biz_protocol_party_customer` 一致:母亲/父亲/新生儿信息。
|
||||
|
||||
#### `biz_research_donation_collection` — 采集信息
|
||||
|
||||
结构与 `biz_protocol_collection_info` 一致:区域/医院/采集人/时间。
|
||||
|
||||
#### `biz_research_donation_sample` — 样本信息
|
||||
|
||||
参照 `biz_protocol_sample`,**去掉**金额/费用相关字段,保留:样本类型、编码、数量、储存年限。
|
||||
|
||||
#### `biz_research_donation_sample_transport` — 样本运输信息
|
||||
|
||||
结构与 `biz_protocol_sample_transport` 一致。
|
||||
|
||||
### 不新建的表
|
||||
|
||||
| 细胞存储表 | 原因 |
|
||||
|---|---|
|
||||
| `biz_protocol_payment` | 科研捐赠不收费 |
|
||||
| `biz_protocol_payment_detail` | 科研捐赠不收费 |
|
||||
| `biz_protocol_storage_cert` | 科研捐赠无储存证书 |
|
||||
|
||||
### 复用的基础数据表(不新建)
|
||||
|
||||
- `biz_customer` — 客户主数据
|
||||
- `biz_cell_sample_type` — 样本类型
|
||||
- `biz_collection_region` / `biz_collection_hospital` — 采集区域/医院
|
||||
- `biz_sample_code` — 样本编码池
|
||||
- `biz_attachment` — 通用附件
|
||||
|
||||
### 状态生命周期
|
||||
|
||||
```
|
||||
科研捐赠:dsx(待生效) → sxz(生效中) → ygq(已过期) / yzf(已作废) / zckc(转细胞存储)
|
||||
细胞存储:dsx(待生效) → sxz(生效中) → ygq(已过期) / yzf(已作废) / zky(转科研)
|
||||
```
|
||||
|
||||
### 双向转化机制
|
||||
|
||||
- **细胞存储 → 科研捐赠**:细胞存储协议状态变为 `zky`,新建科研捐赠记录(`source_type=from_storage`, `source_protocol_id=源协议ID`)
|
||||
- **科研捐赠 → 细胞存储**:科研捐赠状态变为 `zckc`,新建细胞存储协议记录(缴费信息留空待补填),科研捐赠记录保留关联
|
||||
|
||||
---
|
||||
|
||||
## Section 2:后端架构
|
||||
|
||||
### 文件结构
|
||||
|
||||
```
|
||||
backend/app/
|
||||
├── api/
|
||||
│ ├── research_donation.py # 新建:科研捐赠 API 路由
|
||||
│ └── __init__.py # 注册新路由
|
||||
├── crud/
|
||||
│ └── research_donation.py # 新建:科研捐赠 CRUD/业务逻辑
|
||||
├── models/
|
||||
│ └── models.py # 新增 6 个 Model 类
|
||||
├── schemas/
|
||||
│ └── research_donation.py # 新建:Pydantic schemas
|
||||
└── main.py # 注册新路由
|
||||
```
|
||||
|
||||
### API 路由
|
||||
|
||||
前缀:`/web/admin/research-donations`,tag `"科研捐赠管理"`
|
||||
|
||||
| 端点 | 方法 | 说明 |
|
||||
|---|---|---|
|
||||
| `/` | GET | 列表查询(分页、关键字、状态筛选) |
|
||||
| `/` | POST | 新建科研捐赠 |
|
||||
| `/{id}` | GET | 详情(含所有子资源) |
|
||||
| `/{id}` | PUT | 更新 |
|
||||
| `/{id}` | DELETE | 删除(软删除) |
|
||||
| `/batch-delete` | POST | 批量删除 |
|
||||
| `/audit/list` | GET | 审核列表 |
|
||||
| `/audit/submit` | POST | 提交审核(单个/批量) |
|
||||
| `/status-change` | POST | 状态变更(生效/过期/作废/转存储) |
|
||||
| `/convert-from-storage` | POST | 从细胞存储协议转化 |
|
||||
| `/convert-to-storage` | POST | 转为细胞存储 |
|
||||
|
||||
### CRUD 层
|
||||
|
||||
参照 `collection_protocol.py` 模式,简化(无缴费逻辑):
|
||||
|
||||
- 子资源整体 upsert
|
||||
- 审核逻辑(shtg/shth + remark)
|
||||
- 状态机校验
|
||||
- 转化逻辑(双向数据复制 + 关联)
|
||||
- 租户隔离 + 数据权限过滤
|
||||
|
||||
### Schemas
|
||||
|
||||
- `ResearchDonationCreate` / `ResearchDonationUpdate`
|
||||
- `ResearchDonationResponse` / `ResearchDonationListResponse`
|
||||
- `ResearchDonationAuditSubmit`
|
||||
- `ResearchDonationStatusChange`
|
||||
- `ConvertFromStorageRequest` / `ConvertToStorageRequest`
|
||||
|
||||
### 代码复用策略
|
||||
|
||||
- **复用**:基础数据查询函数、附件处理工具、字段命名转换工具
|
||||
- **不复用**:CRUD 代码(独立文件,避免耦合)
|
||||
|
||||
---
|
||||
|
||||
## Section 3:前端结构
|
||||
|
||||
### 路由注册(`sqxp.ts`)
|
||||
|
||||
```
|
||||
科研捐赠管理 (id: 6000...)
|
||||
├── /research-donation/list → 捐赠协议单管理
|
||||
├── /research-donation/audit → 捐赠协议审核
|
||||
```
|
||||
|
||||
### 页面与组件
|
||||
|
||||
```
|
||||
web-admin/src/
|
||||
├── views/research-donation/
|
||||
│ ├── list/
|
||||
│ │ ├── index.vue # 列表页
|
||||
│ │ ├── DonationFormDialog.vue # 新增/编辑弹窗(5 Tab)
|
||||
│ │ ├── DonationViewDialog.vue # 查看详情弹窗
|
||||
│ │ ├── DonationAuditDialog.vue # 审核弹窗
|
||||
│ │ └── DonationStatusChangeDialog.vue # 状态变更弹窗(含转存储)
|
||||
│ └── audit/
|
||||
│ └── index.vue # 审核管理页
|
||||
├── api/
|
||||
│ └── research-donation.ts # API 模块
|
||||
└── components/ # 从细胞存储提取的公共组件
|
||||
├── party-info/ # 当事人信息(Form + View)
|
||||
├── collection-info/ # 采集信息(Form + View)
|
||||
└── sample-info/ # 样本信息(Form + View,捐赠版去金额)
|
||||
```
|
||||
|
||||
### 捐赠表单弹窗(5 个 Tab)
|
||||
|
||||
| Tab | 说明 | 来源 |
|
||||
|---|---|---|
|
||||
| 基本信息 | 协议编号、状态、日期、来源类型、备注 | 新写 |
|
||||
| 当事人信息 | 母亲/父亲/新生儿 | 提取公共组件 `PartyInfoForm` |
|
||||
| 采集信息 | 区域/医院/采集人/时间 | 提取公共组件 `CollectionInfoForm` |
|
||||
| 样本信息 | 样本类型/编码/数量/储存年限(无金额) | 提取公共组件 `SampleInfoForm` |
|
||||
| 附件 | 知情同意书(必传)+ 其他附件 | 新写 |
|
||||
|
||||
### 知情同意书上传
|
||||
|
||||
在「附件」Tab 中分两个区域:
|
||||
1. **知情同意书**(必传)— 红色 `*` 标注,提交时校验至少 1 份
|
||||
2. **其他附件** — 可选
|
||||
|
||||
### 细胞存储端最小改动
|
||||
|
||||
- `ProtocolStatusChangeDialog.vue` 增加 `zky`(转科研)操作
|
||||
- 列表页状态筛选增加「转科研」选项
|
||||
- 不改表结构,不改现有 CRUD 逻辑
|
||||
|
||||
---
|
||||
|
||||
## 实施顺序建议
|
||||
|
||||
1. SQL 建表脚本 → `docs/sql/`
|
||||
2. 后端 Model + Schema
|
||||
3. 后端 CRUD(子资源 upsert、审核、状态机)
|
||||
4. 后端 API 路由 + 注册
|
||||
5. 提取前端公共组件(当事人/采集/样本)
|
||||
6. 前端页面(列表 → 表单弹窗 → 查看弹窗 → 审核弹窗 → 状态变更)
|
||||
7. 双向转化功能(转科研 + 转存储)
|
||||
8. 联调测试
|
||||
@@ -1,240 +0,0 @@
|
||||
# 体检机构项目套餐设计文档
|
||||
|
||||
> 日期:2026-05-18
|
||||
> 状态:已确认
|
||||
> 父模块:中试服务管理 §2.3.6 体检机构及项目价格
|
||||
> 需求来源:`docs/中科兴皖需求V0.3.md` §2.3.6(增强)、探索结论 2026-05-18
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
运营在维护各体检机构的**原子项目**后,常需将多项组合成固定搭配(如「基础套餐」「全面套餐」),供后续业务人员一键选用,减少逐条勾选与漏项。
|
||||
|
||||
**目标**
|
||||
|
||||
- 在机构维度维护「套餐」:勾选多个本机构项目,可调整套餐内各行费用。
|
||||
- **套餐总价 = 所含项目费用之和**(不单独维护打包价,口径简单、易解释)。
|
||||
- 业务落单(中试申请单体检预约等)时**展开为明细行**写入现有 `biz_pilot_checkup_reserve_item`,不引入新的结算实体。
|
||||
|
||||
**非目标(首期不做)**
|
||||
|
||||
- 跨机构共用套餐模板库
|
||||
- 套餐固定优惠价(与明细之和不一致)
|
||||
- 仅保存套餐头、不展开明细的预约模型
|
||||
|
||||
---
|
||||
|
||||
## 2. 已确认业务规则
|
||||
|
||||
| 规则 | 说明 |
|
||||
|------|------|
|
||||
| 套餐总价 | **始终**为明细 `project_fee` 之和;**不存**套餐头「一口价」字段 |
|
||||
| 明细价格 | 从机构项目带入默认费用后,**可在套餐内单独修改**;修改仅影响该套餐行,**不回写**机构项目主数据 |
|
||||
| 套餐归属 | 仅属于一个 `checkup_institution_id`,不跨机构 |
|
||||
| 项目引用 | 明细行关联 `checkup_institution_project_id`;保存时校验项目属于同一机构且未删除 |
|
||||
| 停用项目 | 套餐保存/启用时:若含 `status=0` 的项目,**禁止保存或禁止启用**(二选一实现,推荐禁止保存含停用项) |
|
||||
| 历史业务单 | 下游预约/实际明细为快照(名称+费用),套餐后续调价**不影响**已生成单据 |
|
||||
| 名称快照 | 明细行冗余 `project_name`(与 2.3.4 项目价格体系明细一致),避免主数据改名后历史套餐展示歧义 |
|
||||
| **套餐编码** | **必填**;同一机构下未删除(`del_flag=0`)的套餐编码**唯一**(应用层校验) |
|
||||
| **删除机构项目** | **允许软删除**,不因被套餐引用而拦截;**不级联**删除或修改套餐明细行 |
|
||||
| 删除后展示 | 套餐明细仍按行内 `project_name` / `project_fee` 快照展示;源项目已删时 UI 标注「源项目已删除」,**不影响历史查看与合计** |
|
||||
|
||||
### 2.1 机构项目软删除与套餐的关系
|
||||
|
||||
```
|
||||
运营删除机构项目(del_flag=1)
|
||||
│
|
||||
├─► 套餐明细行:保留,不自动移除
|
||||
│ 展示:project_name(快照)+ 可选标签「源项目已删除」
|
||||
│ 合计:仍计入该行 project_fee(套餐定义不变)
|
||||
│
|
||||
├─► 编辑套餐:不可再「添加」已删除/停用的源项目;已有行可删除或改价
|
||||
│
|
||||
└─► Phase 2 从套餐带入预约:仅展开源项目仍有效(del_flag=0 且 status=1)的行;
|
||||
已删除源项目行跳过(快照仅用于套餐档案展示)
|
||||
```
|
||||
|
||||
与中试单预约/实际明细一致:业务单落库为快照,**机构项目删除不影响已生成业务单展示**。
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据模型
|
||||
|
||||
### 3.1 ER 关系
|
||||
|
||||
```
|
||||
biz_checkup_institution
|
||||
│
|
||||
├──1:N── biz_checkup_institution_project (原子项目,已有)
|
||||
│
|
||||
└──1:N── biz_checkup_institution_package (套餐头,新增)
|
||||
│
|
||||
└──1:N── biz_checkup_institution_package_item (套餐明细,新增)
|
||||
│
|
||||
└──N:1── biz_checkup_institution_project
|
||||
```
|
||||
|
||||
### 3.2 表:`biz_checkup_institution_package`(套餐头)
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | VARCHAR(64) | 主键 UUID |
|
||||
| `checkup_institution_id` | VARCHAR(64) | 所属体检机构 |
|
||||
| `package_name` | VARCHAR(200) | 套餐名称(必填) |
|
||||
| `package_code` | VARCHAR(64) | 套餐编码(**必填**,机构内 `del_flag=0` 唯一) |
|
||||
| `status` | CHAR(1) | `1` 正常 / `0` 停用 |
|
||||
| `tenant_no` … `del_flag` | — | 公共字段(见 database-conventions) |
|
||||
|
||||
**不建字段**:`package_fee` / `total_fee`(总价由明细汇总计算)。
|
||||
|
||||
### 3.3 表:`biz_checkup_institution_package_item`(套餐明细)
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | VARCHAR(64) | 主键 |
|
||||
| `package_id` | VARCHAR(64) | 套餐头 ID |
|
||||
| `checkup_institution_project_id` | VARCHAR(64) | 来源机构项目 ID |
|
||||
| `project_name` | VARCHAR(200) | 项目名称快照(从项目带入,可展示用) |
|
||||
| `project_fee` | DECIMAL(18,2) | **套餐内**项目费用(元),可编辑 |
|
||||
| `tenant_no` … `del_flag` | — | 公共字段 |
|
||||
|
||||
**约束**
|
||||
|
||||
- 同一 `package_id` 下 `checkup_institution_project_id` 不重复。
|
||||
- `project_fee` ≥ 0;允许为 NULL 时按 0 参与合计(建议表单必填 ≥0)。
|
||||
|
||||
### 3.4 API 派生字段
|
||||
|
||||
列表/详情响应增加只读字段(不落库):
|
||||
|
||||
```json
|
||||
{
|
||||
"totalFee": 1280.00,
|
||||
"itemCount": 5
|
||||
}
|
||||
```
|
||||
|
||||
`totalFee = SUM(package_item.project_fee)`,后端计算返回。
|
||||
|
||||
---
|
||||
|
||||
## 4. 后端设计
|
||||
|
||||
沿用 `pilot_service.py` + `pilot_service.py` CRUD 分段模式。
|
||||
|
||||
### 4.1 端点
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/checkup-institutions/{institution_id}/packages` | 机构下套餐列表(含 `totalFee`、`itemCount`) |
|
||||
| POST | `/checkup-institutions/{institution_id}/packages` | 新增套餐(Body 含 `items[]`) |
|
||||
| GET | `/checkup-institution-packages/{package_id}` | 套餐详情 + 明细 |
|
||||
| PUT | `/checkup-institution-packages/{package_id}` | 更新套餐头 + 全量替换明细(与 2.3.4 主子表保存方式一致) |
|
||||
| DELETE | `/checkup-institution-packages/{package_id}` | 软删除套餐及明细 |
|
||||
|
||||
权限、租户隔离、数据权限与现有中试服务接口一致。
|
||||
|
||||
### 4.2 保存逻辑(要点)
|
||||
|
||||
1. 校验 `package_code`、`package_name` 非空;`package_code` 在同机构未删除套餐中唯一。
|
||||
2. 校验 `items` 非空(至少 1 项)。
|
||||
3. **新增/全量替换明细**时:每项 `checkup_institution_project_id` 须属于当前机构、`del_flag=0`、`status=1`。
|
||||
4. **更新且明细含历史行**(源项目已软删):允许保留该行(`project_name` / `project_fee` 以 Body 或库内快照为准),不允许新增指向已删项目的行。
|
||||
5. 写入明细时:`project_name` 默认取机构项目当前名称;`project_fee` 取 Body 传入值。
|
||||
6. 不写入、不校验套餐头总价字段。
|
||||
|
||||
### 4.3 机构项目删除(`soft_delete_checkup_institution_project`)
|
||||
|
||||
- **不检查**套餐引用,直接软删除机构项目。
|
||||
- **不修改** `biz_checkup_institution_package_item` 任意字段。
|
||||
- 列表/详情 join 源项目时附带 `sourceProjectDeleted: true`(源 `del_flag=1` 或不存在时),供前端展示标签。
|
||||
|
||||
### 4.4 Model
|
||||
|
||||
在 `backend/app/models/models.py` 追加:
|
||||
|
||||
- `BizCheckupInstitutionPackage`
|
||||
- `BizCheckupInstitutionPackageItem`
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端设计(web-admin)
|
||||
|
||||
### 5.1 入口
|
||||
|
||||
在 **体检机构及项目价格** 页(`checkup-institution/index.vue`)的「项目价格配置」弹窗内增加 Tab 或并列入口:
|
||||
|
||||
- **Tab 1:项目列表**(现有)
|
||||
- **Tab 2:套餐管理**(新增)
|
||||
|
||||
也可采用「套餐配置」独立按钮 + 弹窗,与「项目价格配置」同级;以不挤占单弹窗高度为准。
|
||||
|
||||
### 5.2 套餐列表
|
||||
|
||||
列:序号、套餐名称、套餐编码、项目数、**合计费用(元)**、状态、备注、操作(编辑/删除)。
|
||||
|
||||
合计费用列展示 API 返回的 `totalFee`(只读)。
|
||||
|
||||
### 5.3 套餐新增/编辑弹窗
|
||||
|
||||
**头部**:套餐名称(必填)、**套餐编码(必填)**、状态(正常/停用)、备注。
|
||||
|
||||
**明细区**(可编辑表格,对齐 `project-price-system` 明细交互):
|
||||
|
||||
| 操作 | 说明 |
|
||||
|------|------|
|
||||
| 添加项目 | 从当前机构「正常」状态项目中多选/逐条添加 |
|
||||
| 删除行 | 移除明细 |
|
||||
| 项目名称 | 只读展示(快照);源项目已删时后缀 muted 文案「源项目已删除」 |
|
||||
| 项目费用(元) | **可编辑** `el-input-number`,默认 = 机构项目当前 `projectFee` |
|
||||
| 合计 | 弹窗底部展示「套餐合计:¥ xxx.xx」= 各行费用实时求和 |
|
||||
|
||||
保存时提交 `items: [{ checkupInstitutionProjectId, projectName, projectFee }, ...]`,不传 `totalFee`。
|
||||
|
||||
### 5.4 UI 规范
|
||||
|
||||
- 遵循 Fresh Mint 与 `dialog-form-layout`、`form-grid-2`、列表工具栏等既有约定。
|
||||
- 树/路径无涉;明细勾选来自 flat 项目列表。
|
||||
|
||||
---
|
||||
|
||||
## 6. 与下游业务对接(Phase 2)
|
||||
|
||||
中试申请单体检模块(`biz_pilot_checkup` + `reserve_item`)实现时:
|
||||
|
||||
1. 选择机构后,提供 **「从套餐添加」**:选套餐 → 将有效 `package_item` 展开为预约明细行(`project_name` + `project_fee`)。
|
||||
2. **有效行**:源机构项目 `del_flag=0` 且 `status=1`;源已删/停用的套餐行**跳过**,不写入预约明细(套餐档案仍完整展示)。
|
||||
3. 展开后各行仍可在预约单内微调(与 V0.3 明细模型一致)。
|
||||
4. 可选:明细行增加 `source_package_id` 字段便于统计(**非首期必需**)。
|
||||
|
||||
---
|
||||
|
||||
## 7. 实现分期
|
||||
|
||||
| 阶段 | 范围 |
|
||||
|------|------|
|
||||
| **Phase 1** | 表结构 + 后端 CRUD + web-admin 套餐维护(本文 §3–5) |
|
||||
| **Phase 2** | 中试申请单体检预约「从套餐添加」展开明细 |
|
||||
|
||||
---
|
||||
|
||||
## 8. SQL 增量
|
||||
|
||||
见 `docs/sql/checkup_institution_package.sql`(`CREATE TABLE` 两张 + 索引)。
|
||||
|
||||
---
|
||||
|
||||
## 9. 与 V0.3 / 原设计的关系
|
||||
|
||||
- V0.3 §2.3.6 仅定义机构级原子项目;本设计为**已确认增强**,不改变下游明细表结构。
|
||||
- 模式对齐 §2.3.4「细胞产品项目价格体系」主子表,降低实现与认知成本。
|
||||
|
||||
---
|
||||
|
||||
## 10. 产品确认记录(2026-05-18 补充)
|
||||
|
||||
| 议题 | 结论 |
|
||||
|------|------|
|
||||
| 套餐编码 | **必填**;机构内未删除套餐编码唯一 |
|
||||
| 删除被套餐引用的机构项目 | **允许软删除**;套餐明细**不自动移除**;靠快照保证历史展示;业务带入时跳过无效源项目 |
|
||||
@@ -1,322 +0,0 @@
|
||||
# 工艺路线管理模块设计规格
|
||||
|
||||
## 概述
|
||||
|
||||
实现需求文档 2.3.8 节「工艺路线配置」。在生产管理菜单下的「工艺库管理」之后新增「工艺路线管理」菜单。
|
||||
|
||||
核心功能:维护工艺路线基础信息(路线编码、名称、产品类型、版本号),支持同编码多版本管理(轻量版:is_current 标记当前版本),并通过拖拽式三栏弹窗配置路线中的工艺步骤和子表数据。
|
||||
|
||||
## 设计决策
|
||||
|
||||
| 决策项 | 选择 | 理由 |
|
||||
|--------|------|------|
|
||||
| 版本号 | 同编码多版本 + is_current 标记当前版本 | 轻量版:同 route_code 可有多条记录,仅一个可标记为当前版本。无发布/草稿状态机 |
|
||||
| 子表范围 | 完整复刻4张子表(试剂/耗材/产出物/数据采集) | 从工艺库拖入时克隆默认数据,用户可覆盖编辑 |
|
||||
| 排列模式 | 线性排列(A→B→C→D) | 卡片从上到下,无需分支逻辑 |
|
||||
| 可编辑范围 | 全部字段可编辑(基础信息+4张子表) | 右侧面板展示完整工艺信息供修改 |
|
||||
| 保存方式 | 实时保存,拖入即创建后端记录 | 每步操作即时持久化,弹窗关闭无需额外保存 |
|
||||
| UI方案 | 方案A:单弹窗 + vue-draggable-plus | 项目中已有3处成熟用法,跨栏拖拽通过HTML5 Drag API组合实现 |
|
||||
| 步骤删除 | 支持删除,软删除步骤+级联软删除子表 | 中栏卡片上有删除按钮,确认后删除 |
|
||||
|
||||
## 依赖
|
||||
|
||||
| 依赖模块 | 用途 | 状态 |
|
||||
|----------|------|------|
|
||||
| 细胞产品类型管理(biz_cell_product_type) | 产品类型下拉 | 已实现 |
|
||||
| 工艺工序分类(biz_process_category) | 工艺分组展示 | 已实现 |
|
||||
| 工艺库(biz_process + 4张子表) | 拖入时的数据源和克隆来源 | 已实现 |
|
||||
| SOP文档(biz_sop_document) | 步骤关联SOP | 已实现 |
|
||||
| vue-draggable-plus@0.6.0 | 卡片排序拖拽 | 已安装 |
|
||||
| sortablejs@1.15.7 | vue-draggable-plus 底层引擎 | 已安装 |
|
||||
|
||||
## SQL 表(6 张新建)
|
||||
|
||||
所有表遵循项目公共字段规范:`id` VARCHAR(64) UUID → 业务字段 → `tenant_no` → `order_num` → `remark` → `create_by` → `create_dept_id` → `create_time` → `update_by` → `update_time` → `del_flag`。
|
||||
|
||||
### 1. biz_process_route — 工艺路线主表
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| route_code | VARCHAR(64) NOT NULL | 路线编码 |
|
||||
| route_name | VARCHAR(100) NOT NULL | 路线名称 |
|
||||
| product_type_id | VARCHAR(64) DEFAULT NULL | 细胞产品类型ID(引用 biz_cell_product_type) |
|
||||
| version | VARCHAR(50) DEFAULT NULL | 版本号(用户手填文本,如 V1.0、V2.0) |
|
||||
| is_current | CHAR(1) DEFAULT '0' | 是否当前版本(0-否 1-是)。同 route_code 下仅一条记录 is_current=1 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
索引:`idx_route_tenant(tenant_no, del_flag)`
|
||||
|
||||
### 2. biz_process_route_step — 路线工序步骤
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| route_id | VARCHAR(64) NOT NULL | 所属路线ID |
|
||||
| process_id | VARCHAR(64) DEFAULT NULL | 来源工艺库工艺ID(工艺被删时可null) |
|
||||
| step_order | INT DEFAULT NULL | 步骤顺序(拖拽排序时自动计算) |
|
||||
| process_code | VARCHAR(64) DEFAULT NULL | 工序代码(从工艺库克隆,可编辑) |
|
||||
| category_id | VARCHAR(64) DEFAULT NULL | 工序分类ID(可编辑) |
|
||||
| process_name | VARCHAR(100) DEFAULT NULL | 工序名称(可编辑) |
|
||||
| description | VARCHAR(500) DEFAULT NULL | 描述(可编辑) |
|
||||
| equipment_name | VARCHAR(200) DEFAULT NULL | 预计使用设备(可编辑) |
|
||||
| estimated_duration | VARCHAR(100) DEFAULT NULL | 预估耗时(可编辑) |
|
||||
| sop_ids | VARCHAR(1000) DEFAULT NULL | 关联SOP文档ID(可编辑,逗号分隔) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
索引:`idx_prs_route(route_id, del_flag)`、`idx_prs_tenant(tenant_no, del_flag)`
|
||||
|
||||
### 3. biz_process_route_step_reagent — 步骤试剂
|
||||
|
||||
字段完全镜像 `biz_process_reagent`,但外键改为 `step_id`(关联 biz_process_route_step.id):
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| step_id | VARCHAR(64) NOT NULL | 所属步骤ID |
|
||||
| reagent_code | VARCHAR(64) DEFAULT NULL | 试剂编码 |
|
||||
| reagent_name | VARCHAR(100) DEFAULT NULL | 试剂名称 |
|
||||
| spec | VARCHAR(200) DEFAULT NULL | 规格 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| unit | VARCHAR(64) DEFAULT NULL | 单位 |
|
||||
| is_key_material | CHAR(1) DEFAULT '0' | 是否关键物料(0-否 1-是) |
|
||||
| + 公共字段 | | |
|
||||
|
||||
索引:`idx_prsr_step(step_id, del_flag)`
|
||||
|
||||
### 4. biz_process_route_step_consumable — 步骤耗材
|
||||
|
||||
字段完全镜像 `biz_process_consumable`,外键改为 `step_id`:
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| step_id | VARCHAR(64) NOT NULL | 所属步骤ID |
|
||||
| consumable_code | VARCHAR(64) DEFAULT NULL | 耗材编码 |
|
||||
| consumable_name | VARCHAR(100) DEFAULT NULL | 耗材名称 |
|
||||
| spec_model | VARCHAR(200) DEFAULT NULL | 规格型号 |
|
||||
| standard_usage | VARCHAR(100) DEFAULT NULL | 标准用量 |
|
||||
| unit | VARCHAR(64) DEFAULT NULL | 单位 |
|
||||
| is_required | CHAR(1) DEFAULT '1' | 是否必需(1-必须 0-可选) |
|
||||
| remark | VARCHAR(512) DEFAULT NULL | 备注 |
|
||||
| + 公共字段(不含 remark) | | |
|
||||
|
||||
索引:`idx_prsc_step(step_id, del_flag)`
|
||||
|
||||
### 5. biz_process_route_step_output — 步骤产出物
|
||||
|
||||
字段完全镜像 `biz_process_output`,外键改为 `step_id`:
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| step_id | VARCHAR(64) NOT NULL | 所属步骤ID |
|
||||
| output_type_id | VARCHAR(64) DEFAULT NULL | 产出类型ID |
|
||||
| output_name | VARCHAR(200) DEFAULT NULL | 产出物名称 |
|
||||
| output_barcode | VARCHAR(200) DEFAULT NULL | 产出物条码 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
索引:`idx_prso_step(step_id, del_flag)`
|
||||
|
||||
### 6. biz_process_route_step_data_collection — 步骤数据采集
|
||||
|
||||
字段完全镜像 `biz_process_data_collection`,外键改为 `step_id`:
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | VARCHAR(64) PK | UUID |
|
||||
| step_id | VARCHAR(64) NOT NULL | 所属步骤ID |
|
||||
| collection_name | VARCHAR(100) DEFAULT NULL | 采集信息名称 |
|
||||
| unit | VARCHAR(64) DEFAULT NULL | 单位 |
|
||||
| + 公共字段 | | |
|
||||
|
||||
索引:`idx_prsdc_step(step_id, del_flag)`
|
||||
|
||||
### 菜单数据
|
||||
|
||||
在「工艺库管理」(order_num=6)之后、「SOP文档」(order_num=7)之前插入,SOP 文档 order_num 改为 8:
|
||||
|
||||
```sql
|
||||
INSERT INTO sys_menu (id, menu_name, parent_id, menu_type, path, component, perms, is_frame, visible, status, tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag)
|
||||
VALUES ('90000000000000000000000000000010', '工艺路线管理', '90000000000000000000000000000001', 'C', 'process-route', '/production/process-route/index', 'production:process-route:list', 1, '1', '1', 'zkxw', 7, NULL, NULL, '', '2026-05-19 00:00:00', NULL, '2026-05-19 00:00:00', 0);
|
||||
|
||||
-- SOP文档 order_num 从 7 改为 8
|
||||
UPDATE sys_menu SET order_num = 8 WHERE id = '90000000000000000000000000000004';
|
||||
```
|
||||
|
||||
## 后端 API
|
||||
|
||||
路由前缀:`/api/admin/production/route/`
|
||||
|
||||
### 路线主表 CRUD
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/list` | 路线分页列表。支持筛选:route_name(模糊)、route_code(精确)、product_type_id。排序:order_num ASC, create_time DESC。带 tenant_no 隔离。 |
|
||||
| POST | `/create` | 创建路线主表。必填:route_code, route_name。自动填充 tenant_no。默认 is_current=0。 |
|
||||
| PUT | `/update` | 更新路线主表信息(编码、名称、产品类型、版本号、备注)。 |
|
||||
| PUT | `/set-current` | 设置指定路线为当前版本。逻辑:先将同 route_code + tenant_no 下所有记录 is_current 置 0,再将目标记录 is_current 置 1。 |
|
||||
| DELETE | `/delete/{id}` | 软删除路线(del_flag=1)+ 级联软删除所有步骤及步骤子表。 |
|
||||
| GET | `/detail/{id}` | 获取路线详情:主表 + 步骤列表(按 step_order ASC)+ 每个步骤的4张子表数据。 |
|
||||
|
||||
### 步骤操作(实时保存)
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| POST | `/step/add` | 从工艺库拖入创建步骤。入参:route_id, process_id, step_order。后端读取 biz_process 基础信息克隆到 step 表,读取4张子表数据批量克隆到 route_step_* 子表。返回完整 step 对象(含子表)。 |
|
||||
| PUT | `/step/update` | 更新步骤基础信息(右侧面板字段修改时触发)。 |
|
||||
| PUT | `/step/reorder` | 批量重排步骤顺序。入参:route_id, step_ids[](新顺序数组)。遍历更新 step_order。 |
|
||||
| DELETE | `/step/delete/{id}` | 软删除步骤(del_flag=1)+ 级联软删除该步骤的4张子表数据。 |
|
||||
| PUT | `/step/reagent/update` | 更新步骤试剂子表。入参:step_id, items[](完整替换)。 |
|
||||
| PUT | `/step/consumable/update` | 更新步骤耗材子表。入参:step_id, items[](完整替换)。 |
|
||||
| PUT | `/step/output/update` | 更新步骤产出子表。入参:step_id, items[](完整替换)。 |
|
||||
| PUT | `/step/data-collection/update` | 更新步骤数据采集子表。入参:step_id, items[](完整替换)。 |
|
||||
|
||||
### 关键后端逻辑
|
||||
|
||||
**拖入克隆(step/add)**:
|
||||
1. 校验 route_id 存在且属于当前租户
|
||||
2. 从 `biz_process` 读取工艺基础信息
|
||||
3. 插入 `biz_process_route_step`(克隆字段:process_code, category_id, process_name, description, equipment_name, estimated_duration, sop_ids)
|
||||
4. 从 `biz_process_reagent` 等4张子表批量读取并插入对应 `biz_process_route_step_*`
|
||||
5. 返回完整 step 对象
|
||||
|
||||
**级联软删除**:
|
||||
- 删除路线 → 遍历所有步骤设 del_flag=1 → 遍历每步子表设 del_flag=1
|
||||
- 删除步骤 → 遍历该步骤子表设 del_flag=1
|
||||
|
||||
**子表更新(完整替换策略)**:
|
||||
- 接收 items[] 后,将现有记录 del_flag=1,然后批量插入新记录
|
||||
- 避免逐条 diff,简化逻辑
|
||||
|
||||
## 前端设计
|
||||
|
||||
### 文件清单
|
||||
|
||||
| 文件 | 操作 | 说明 |
|
||||
|------|------|------|
|
||||
| `web-admin/src/views/production/process-route/index.vue` | 新建 | 路线列表页 + 路线图配置弹窗 |
|
||||
| `web-admin/src/api/production.ts` | 追加 | route 相关 API 函数 |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | 追加 | process-route 路由条目 |
|
||||
|
||||
### 列表页
|
||||
|
||||
遵循标准列表模板(参考 `src/views/system/unit/index.vue`):
|
||||
|
||||
- **搜索栏**:路线名称(模糊)、路线编码(精确)、产品类型(下拉,数据来自细胞产品类型管理列表 API)
|
||||
- **工具栏**:新增按钮(单一 primary)
|
||||
- **表格列**:路线名称、路线编码、产品类型名称、版本号、当前版本(is_current=1 时显示绿色 `el-tag` 标签)、备注、创建时间
|
||||
- **操作列**(fixed="right", min-width ≥ 260px):路线图配置、编辑、设为当前版本(仅 is_current=0 时显示)、删除
|
||||
- **新增/编辑弹窗**:标准表单(label-position="top"),字段:路线编码、路线名称、产品类型(下拉)、版本号(文本)、备注
|
||||
|
||||
### 路线图配置弹窗
|
||||
|
||||
**弹窗属性**:`width="90vw"`,`destroy-on-close`,标题显示路线名称和版本号
|
||||
|
||||
**三栏布局**(flex):
|
||||
|
||||
```
|
||||
┌──────────────────────────────────────────────────────────────┐
|
||||
│ 路线图配置 - {路线名称} v{版本号} [关闭] │
|
||||
├────────────┬──────────────────────┬──────────────────────────┤
|
||||
│ 工艺库 │ 工艺流程布局 │ 工艺详情 │
|
||||
│ (240px) │ (flex:1) │ (360px) │
|
||||
│ │ │ │
|
||||
│ [分类折叠] │ ┌────────────┐ │ 工序名称: [___] │
|
||||
│ > 细胞培养 │ │ 步骤1: xxx │ ←拖 │ 工序分类: [下拉] │
|
||||
│ [卡片] │ └────────────┘ │ 描述: [___] │
|
||||
│ [卡片] │ ┌────────────┐ │ 设备: [___] │
|
||||
│ > 病毒转染 │ │ 步骤2: xxx │ │ 预估耗时: [___] │
|
||||
│ [卡片] │ └────────────┘ │ SOP: [选择] │
|
||||
│ > ... │ │ ────────────── │
|
||||
│ │ [+ 拖入工艺卡片] │ [试剂][耗材][产出][采集] │
|
||||
│ │ │ (子表tab切换编辑) │
|
||||
└────────────┴──────────────────────┴──────────────────────────┘
|
||||
```
|
||||
|
||||
**左栏 — 工艺库面板(240px 固定宽度)**:
|
||||
- 使用 `el-collapse` 按工序分类(biz_process_category)分组展示
|
||||
- 每组内展示工艺小卡片:工序名称 + 编码
|
||||
- 卡片使用 HTML5 `draggable="true"` + `@dragstart` 传递 `process_id`
|
||||
- 无分类的工艺归入"未分类"组
|
||||
- 仅展示当前租户未删除的工艺
|
||||
|
||||
**中栏 — 流程布局区(flex:1 自适应)**:
|
||||
- 使用 `vue-draggable-plus`(VueDraggable 组件)包裹步骤卡片列表
|
||||
- 每张步骤卡片显示:步骤序号(圆角标签)+ 工艺名称 + 操作按钮(删除图标)
|
||||
- 支持内部排序拖拽(handle 拖拽手柄,使用 `<el-icon><Rank /></el-icon>`)
|
||||
- 空白区域通过 `@dragover.prevent` + `@drop` 接收从左栏拖入的工艺卡片
|
||||
- 拖入时调用 `POST /step/add`,即时创建后端记录
|
||||
- 排序变化时调用 `PUT /step/reorder`
|
||||
- 点击卡片 → 选中态(高亮边框)→ 触发右栏加载详情
|
||||
- 卡片上的删除按钮 → 确认弹窗 → `DELETE /step/delete/{id}` → 从列表移除
|
||||
|
||||
**右栏 — 工艺详情编辑面板(360px 固定宽度)**:
|
||||
- **顶部**:工艺基础信息表单
|
||||
- 工序名称(el-input)
|
||||
- 工序分类(el-select,下拉数据来自工艺工序分类)
|
||||
- 描述(el-input textarea)
|
||||
- 设备名称(el-input)
|
||||
- 预估耗时(el-input)
|
||||
- SOP文档(el-select multiple,数据来自 SOP 文档列表)
|
||||
- 字段修改时 `@change` 触发 `PUT /step/update` 实时保存
|
||||
- **底部**:4 个 el-tab-pane 切换子表编辑
|
||||
- **试剂 tab**:表格列(试剂编码、名称、规格、标准用量、单位、是否关键物料),底部"添加"按钮新增行,每行有删除按钮。修改后实时保存 `PUT /step/reagent/update`
|
||||
- **耗材 tab**:表格列(耗材编码、名称、规格型号、标准用量、单位、是否必需、备注),同上交互
|
||||
- **产出 tab**:表格列(产出类型[下拉选择产出物类型]、名称、条码),同上交互
|
||||
- **数据采集 tab**:表格列(采集名称、单位),同上交互
|
||||
- 未选中任何步骤时显示空状态提示:"请从左侧工艺库拖入工艺,或点击已添加的步骤查看详情"
|
||||
|
||||
### 数据流
|
||||
|
||||
```
|
||||
拖入流程:
|
||||
左栏卡片 dragstart(process_id)
|
||||
→ 中栏 drop 事件
|
||||
→ POST /step/add {route_id, process_id, step_order: list.length + 1}
|
||||
→ 后端克隆工艺+子表 → 返回完整 step
|
||||
→ 前端追加到步骤列表
|
||||
|
||||
排序流程:
|
||||
中栏内 vue-draggable-plus 拖拽排序
|
||||
→ @end 回调
|
||||
→ PUT /step/reorder {route_id, step_ids: [...]}
|
||||
|
||||
编辑流程:
|
||||
右栏字段 @change
|
||||
→ PUT /step/update {step_id, ...fields}
|
||||
|
||||
右栏子表增删改
|
||||
→ PUT /step/{sub-table}/update {step_id, items: [...]}
|
||||
|
||||
删除步骤:
|
||||
卡片删除按钮 → ElMessageBox.confirm
|
||||
→ DELETE /step/delete/{step_id}
|
||||
→ 前端从列表移除
|
||||
|
||||
点击步骤:
|
||||
中栏卡片 click
|
||||
→ 设置 selectedStepId
|
||||
→ 右栏加载该步骤详情(从列表数据中取,无需额外 API)
|
||||
```
|
||||
|
||||
## 实现文件清单
|
||||
|
||||
| 层 | 文件 | 操作 |
|
||||
|----|------|------|
|
||||
| SQL | `docs/sql/production_process_route.sql` | 新建:6张表DDL + 菜单INSERT + SOP order_num UPDATE |
|
||||
| Model | `backend/app/models/models.py` | 追加 6 个 SQLAlchemy Model 类 |
|
||||
| Model | `backend/app/models/__init__.py` | 追加 6 个 export |
|
||||
| CRUD | `backend/app/crud/process_route.py` | 新建:路线CRUD + 步骤CRUD + 子表CRUD + 克隆逻辑 |
|
||||
| API | `backend/app/api/production.py` | 追加 route 子路由(挂载到 production router 下) |
|
||||
| Schema | `backend/app/schemas/process_route.py` | 新建:Pydantic v2 schemas |
|
||||
| 前端 API | `web-admin/src/api/production.ts` | 追加 route 相关函数(~15个 API 函数) |
|
||||
| 前端页面 | `web-admin/src/views/production/process-route/index.vue` | 新建:列表页 + 三栏拖拽配置弹窗 |
|
||||
| 路由 | `web-admin/src/router/modules/sqxp.ts` | 追加 process-route 路由条目 |
|
||||
|
||||
## 风险与注意事项
|
||||
|
||||
1. **跨容器拖拽**:左栏(HTML5 Drag)→ 中栏(vue-draggable-plus)的跨容器拖入是核心难点。需在 drop 事件中正确获取 process_id 并调用 API。参考项目中 FlowDesigner.vue 的 HTML5 drag 实现。
|
||||
2. **大弹窗性能**:90vw 弹窗内三栏 + 多个子表可能数据量大。步骤列表应限制每页展示(暂无分页需求,路线步骤通常 < 50)。
|
||||
3. **工艺库删除影响**:步骤的 process_id 引用工艺库,但工艺被删除后步骤保留(process_id 可 null)。右栏编辑时不依赖 process_id 回查,所有数据已克隆到步骤中。
|
||||
4. **子表更新策略**:使用完整替换(del旧 + insert新),避免复杂 diff。注意 UUID 生成和 tenant_no 继承。
|
||||
@@ -1,524 +0,0 @@
|
||||
# 入库生产工单 + 生产任务 + 细胞产品库 设计文档
|
||||
|
||||
> 日期: 2026-05-19
|
||||
> 状态: 已确认
|
||||
> 关联模块: 样本接收、工艺路线管理、库位管理
|
||||
|
||||
---
|
||||
|
||||
## 1. 业务背景
|
||||
|
||||
当前系统中,样本接收(accept_conclusion="js")后会自动触发一个入库质检工单。现在需要在此基础上,同时触发生成一个**入库生产工单**。生产工单可以创建多个**生产任务单**,生产任务单用于记录完整的工艺过程执行数据。
|
||||
|
||||
### 业务流程
|
||||
|
||||
```
|
||||
样本接收(accept_conclusion="js")
|
||||
├→ 自动创建 入库质检工单 (已有)
|
||||
└→ 自动创建 入库生产工单 (新增, 状态=dpz待配置)
|
||||
└→ 用户在工单中手动创建 生产任务单(1:N)
|
||||
├→ 选择一个工艺路线 → 克隆全部步骤(含试剂/耗材/产出/采集项)
|
||||
├→ 可新增/删除工艺步骤
|
||||
├→ 可录入输入(样本或细胞产品)
|
||||
├→ 执行过程中填写实际用量、采集值
|
||||
└→ 录入输出(细胞产品 → 存入细胞产品库 → 关联储物格)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 2. 需求共识
|
||||
|
||||
1. **触发机制**: 样本接收后自动创建入库生产工单(状态为"待配置"),与质检工单在同一个事务中
|
||||
2. **工单→任务关系**: 1对多,用户在工单中自由创建多个生产任务单
|
||||
3. **生产任务单三部分**(全部用子表):
|
||||
- **输入子表**: 可选关联样本或细胞产品
|
||||
- **工艺过程**: 必选一个工艺路线,克隆其所有步骤(含试剂、耗材、产出物、数据采集项),可修改
|
||||
- **输出子表**: 记录产出的细胞产品,关联储物格位置
|
||||
4. **细胞产品库**: 新建 `biz_cell_product` 表(产品编码、类型、规格、储物格、状态等)
|
||||
5. **菜单位置**: 在【生产管理】下新增"入库生产工单"、"生产任务"、"细胞产品库"三个二级菜单
|
||||
6. **数据采集填写**: 克隆数据采集项后,用户在生产执行过程中填写采集值
|
||||
7. **工艺过程可编辑**: 选了工艺路线后可以新增/删除工艺步骤;执行中仍可继续增删
|
||||
8. **实际用量录入**: 用户可录入耗材实际使用量、试剂实际使用量、数据采集值等
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据库设计
|
||||
|
||||
### 3.1 新增表概览(10 张)
|
||||
|
||||
| # | 表名 | 说明 |
|
||||
|---|------|------|
|
||||
| 1 | `biz_cell_product` | 细胞产品库 |
|
||||
| 2 | `biz_production_work_order` | 入库生产工单 |
|
||||
| 3 | `biz_production_task` | 生产任务 |
|
||||
| 4 | `biz_production_task_input` | 任务输入子表 |
|
||||
| 5 | `biz_production_task_step` | 任务工艺步骤(克隆自路线) |
|
||||
| 6 | `biz_production_task_step_reagent` | 步骤试剂 + 实际用量 |
|
||||
| 7 | `biz_production_task_step_consumable` | 步骤耗材 + 实际用量 |
|
||||
| 8 | `biz_production_task_step_output` | 步骤产出物 + 实际条码 |
|
||||
| 9 | `biz_production_task_step_data_collection` | 步骤数据采集项 + 填写值 |
|
||||
| 10 | `biz_production_task_output` | 任务输出子表(细胞产品+储物格) |
|
||||
|
||||
### 3.2 表关系图
|
||||
|
||||
```
|
||||
biz_sample_reception ──→ biz_production_work_order ──→ biz_production_task
|
||||
│ │
|
||||
└──→ biz_qc_work_order (已有) ├── biz_production_task_input
|
||||
├── biz_production_task_step (克隆自)
|
||||
│ └── biz_process_route_step
|
||||
│ ├── ..._reagent
|
||||
│ ├── ..._consumable
|
||||
│ ├── ..._output
|
||||
│ └── ..._data_collection
|
||||
├── biz_production_task_output
|
||||
└── biz_cell_product ← 细胞产品库
|
||||
└── biz_storage_facility_slot (库位)
|
||||
```
|
||||
|
||||
### 3.3 详细字段设计
|
||||
|
||||
#### 3.3.1 `biz_cell_product` — 细胞产品库
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_cell_product` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`product_code` varchar(64) NOT NULL COMMENT '产品编码',
|
||||
`product_name` varchar(200) NOT NULL COMMENT '产品名称',
|
||||
`product_type_id` varchar(64) DEFAULT NULL COMMENT '细胞产品类型ID',
|
||||
`spec_id` varchar(64) DEFAULT NULL COMMENT '规格ID',
|
||||
`batch_no` varchar(64) DEFAULT NULL COMMENT '批次号',
|
||||
`storage_slot_id` varchar(64) DEFAULT NULL COMMENT '储物格ID',
|
||||
`product_status` varchar(16) NOT NULL DEFAULT 'zk' COMMENT '状态(zk在库/yc已出库/ysy已使用)',
|
||||
`source_type` varchar(20) DEFAULT 'production' COMMENT '来源类型(production生产/manual手动录入)',
|
||||
`production_task_id` varchar(64) DEFAULT NULL COMMENT '来源生产任务ID',
|
||||
`quantity` decimal(18,4) DEFAULT NULL COMMENT '数量',
|
||||
`unit` varchar(64) DEFAULT NULL COMMENT '单位',
|
||||
`expiry_date` datetime DEFAULT NULL COMMENT '有效期',
|
||||
`product_images` varchar(4000) DEFAULT NULL COMMENT '产品图片URL(逗号分隔)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_cp_tenant_status` (`tenant_no`,`product_status`,`del_flag`),
|
||||
KEY `idx_cp_type` (`product_type_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='细胞产品库';
|
||||
```
|
||||
|
||||
#### 3.3.2 `biz_production_work_order` — 入库生产工单
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_work_order` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`work_order_no` varchar(32) NOT NULL COMMENT '工单号(前缀SC)',
|
||||
`reception_id` varchar(64) NOT NULL COMMENT '样本接收记录ID',
|
||||
`protocol_sample_id` varchar(64) NOT NULL COMMENT '协议样本ID',
|
||||
`collection_protocol_id` varchar(64) NOT NULL COMMENT '协议单ID',
|
||||
`protocol_no` varchar(64) DEFAULT NULL COMMENT '协议号快照',
|
||||
`sample_code` varchar(32) DEFAULT NULL COMMENT '样本编码快照',
|
||||
`reception_source` varchar(20) NOT NULL DEFAULT 'cell_storage' COMMENT '来源(cell_storage/research_donation)',
|
||||
`work_order_status` varchar(16) NOT NULL DEFAULT 'dpz' COMMENT '状态(dpz待配置/ywc已完成)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_pwo_reception` (`reception_id`,`del_flag`),
|
||||
KEY `idx_pwo_tenant_status` (`tenant_no`,`work_order_status`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='入库生产工单';
|
||||
```
|
||||
|
||||
#### 3.3.3 `biz_production_task` — 生产任务
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`task_no` varchar(32) NOT NULL COMMENT '任务号(前缀RW)',
|
||||
`work_order_id` varchar(64) NOT NULL COMMENT '所属工单ID',
|
||||
`task_name` varchar(200) DEFAULT NULL COMMENT '任务名称',
|
||||
`description` varchar(500) DEFAULT NULL COMMENT '描述',
|
||||
`route_id` varchar(64) DEFAULT NULL COMMENT '所选工艺路线ID(仅记录来源)',
|
||||
`task_status` varchar(16) NOT NULL DEFAULT 'dpz' COMMENT '状态(dpz待配置/jxz进行中/ywc已完成)',
|
||||
`started_time` datetime DEFAULT NULL COMMENT '开始时间',
|
||||
`completed_time` datetime DEFAULT NULL COMMENT '完成时间',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`attachments` varchar(4000) DEFAULT NULL COMMENT '附件/图片URL(逗号分隔)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_pt_wo` (`work_order_id`,`del_flag`),
|
||||
KEY `idx_pt_tenant_status` (`tenant_no`,`task_status`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务';
|
||||
```
|
||||
|
||||
#### 3.3.4 `biz_production_task_input` — 任务输入子表
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_input` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`task_id` varchar(64) NOT NULL COMMENT '任务ID',
|
||||
`input_type` varchar(20) NOT NULL COMMENT '类型(sample样本/cell_product细胞产品)',
|
||||
`input_id` varchar(64) DEFAULT NULL COMMENT '关联ID(样本ID或细胞产品ID)',
|
||||
`input_code` varchar(64) DEFAULT NULL COMMENT '编码快照',
|
||||
`input_name` varchar(200) DEFAULT NULL COMMENT '名称快照',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_pti_task` (`task_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务输入';
|
||||
```
|
||||
|
||||
#### 3.3.5 `biz_production_task_step` — 任务工艺步骤
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_step` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`task_id` varchar(64) NOT NULL COMMENT '任务ID',
|
||||
`step_order` int(11) DEFAULT NULL COMMENT '步骤顺序',
|
||||
`process_code` varchar(64) DEFAULT NULL COMMENT '工序代码',
|
||||
`category_id` varchar(64) DEFAULT NULL COMMENT '工序分类ID',
|
||||
`process_name` varchar(100) DEFAULT NULL COMMENT '工序名称',
|
||||
`description` varchar(500) DEFAULT NULL COMMENT '描述',
|
||||
`equipment_name` varchar(200) DEFAULT NULL COMMENT '设备名称',
|
||||
`estimated_duration` varchar(100) DEFAULT NULL COMMENT '预估耗时',
|
||||
`actual_duration` varchar(100) DEFAULT NULL COMMENT '实际耗时',
|
||||
`sop_ids` varchar(1000) DEFAULT NULL COMMENT 'SOP文档ID(逗号分隔)',
|
||||
`step_status` varchar(16) NOT NULL DEFAULT 'dzx' COMMENT '状态(dzx待执行/jxz进行中/ywc已完成)',
|
||||
`started_time` datetime DEFAULT NULL COMMENT '开始时间',
|
||||
`completed_time` datetime DEFAULT NULL COMMENT '完成时间',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_pts_task` (`task_id`,`del_flag`),
|
||||
KEY `idx_pts_tenant` (`tenant_no`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务工艺步骤';
|
||||
```
|
||||
|
||||
#### 3.3.6 `biz_production_task_step_reagent` — 步骤试剂
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_step_reagent` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`step_id` varchar(64) NOT NULL COMMENT '步骤ID',
|
||||
`reagent_code` varchar(64) DEFAULT NULL COMMENT '试剂编码',
|
||||
`reagent_name` varchar(100) DEFAULT NULL COMMENT '试剂名称',
|
||||
`spec` varchar(200) DEFAULT NULL COMMENT '规格',
|
||||
`standard_usage` varchar(100) DEFAULT NULL COMMENT '标准用量',
|
||||
`actual_usage` varchar(100) DEFAULT NULL COMMENT '实际用量',
|
||||
`unit` varchar(64) DEFAULT NULL COMMENT '单位',
|
||||
`is_key_material` char(1) DEFAULT '0' COMMENT '是否关键物料(0否 1是)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ptsr_step` (`step_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务步骤试剂';
|
||||
```
|
||||
|
||||
#### 3.3.7 `biz_production_task_step_consumable` — 步骤耗材
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_step_consumable` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`step_id` varchar(64) NOT NULL COMMENT '步骤ID',
|
||||
`consumable_code` varchar(64) DEFAULT NULL COMMENT '耗材编码',
|
||||
`consumable_name` varchar(100) DEFAULT NULL COMMENT '耗材名称',
|
||||
`spec_model` varchar(200) DEFAULT NULL COMMENT '规格型号',
|
||||
`standard_usage` varchar(100) DEFAULT NULL COMMENT '标准用量',
|
||||
`actual_usage` varchar(100) DEFAULT NULL COMMENT '实际用量',
|
||||
`unit` varchar(64) DEFAULT NULL COMMENT '单位',
|
||||
`is_required` char(1) DEFAULT '1' COMMENT '是否必需(1必须 0可选)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ptsc_step` (`step_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务步骤耗材';
|
||||
```
|
||||
|
||||
#### 3.3.8 `biz_production_task_step_output` — 步骤产出物
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_step_output` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`step_id` varchar(64) NOT NULL COMMENT '步骤ID',
|
||||
`output_type_id` varchar(64) DEFAULT NULL COMMENT '产出类型ID',
|
||||
`output_name` varchar(200) DEFAULT NULL COMMENT '产出物名称',
|
||||
`output_barcode` varchar(200) DEFAULT NULL COMMENT '实际条码',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ptso_step` (`step_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务步骤产出物';
|
||||
```
|
||||
|
||||
#### 3.3.9 `biz_production_task_step_data_collection` — 步骤数据采集
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_step_data_collection` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`step_id` varchar(64) NOT NULL COMMENT '步骤ID',
|
||||
`collection_name` varchar(100) DEFAULT NULL COMMENT '采集项名称',
|
||||
`unit` varchar(64) DEFAULT NULL COMMENT '单位',
|
||||
`collection_value` varchar(500) DEFAULT NULL COMMENT '填写值',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ptsdc_step` (`step_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务步骤数据采集';
|
||||
```
|
||||
|
||||
#### 3.3.10 `biz_production_task_output` — 任务输出
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_production_task_output` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`task_id` varchar(64) NOT NULL COMMENT '任务ID',
|
||||
`cell_product_id` varchar(64) DEFAULT NULL COMMENT '关联细胞产品ID',
|
||||
`storage_slot_id` varchar(64) DEFAULT NULL COMMENT '储物格ID',
|
||||
`output_name` varchar(200) DEFAULT NULL COMMENT '产出物名称',
|
||||
`output_barcode` varchar(200) DEFAULT NULL COMMENT '产出物条码',
|
||||
`quantity` decimal(18,4) DEFAULT NULL COMMENT '数量',
|
||||
`unit` varchar(64) DEFAULT NULL COMMENT '单位',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`attachments` varchar(4000) DEFAULT NULL COMMENT '图片URL(逗号分隔)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_pto_task` (`task_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产任务输出';
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 后端架构
|
||||
|
||||
### 4.1 触发点
|
||||
|
||||
**文件**: `backend/app/crud/sample_reception.py` 第 757-766 行
|
||||
|
||||
在现有的 `if conclusion == "js"` 判断中,紧跟质检工单创建之后,添加生产工单创建调用。
|
||||
|
||||
```python
|
||||
if conclusion == "js":
|
||||
# 现有:质检工单
|
||||
from app.crud import qc_work_order as qc_wo_svc
|
||||
qc_wo_svc.create_work_order_from_reception(...)
|
||||
|
||||
# 新增:生产工单
|
||||
from app.crud import production_work_order as prod_wo_svc
|
||||
prod_wo_svc.create_production_work_order_from_reception(
|
||||
db, reception=obj, tenant_no=tenant_no,
|
||||
user_id=user_id, create_dept_id=create_dept_id or "",
|
||||
)
|
||||
```
|
||||
|
||||
### 4.2 新增文件清单
|
||||
|
||||
| 层 | 文件 | 说明 |
|
||||
|---|------|------|
|
||||
| Models | `models.py` 新增 10 个 SQLAlchemy 模型 | 对应 10 张新表 |
|
||||
| CRUD | `crud/production_work_order.py` | 工单 CRUD + `create_production_work_order_from_reception()` |
|
||||
| CRUD | `crud/production_task.py` | 任务 CRUD + 克隆工艺路线 + 步骤增删改 |
|
||||
| CRUD | `crud/cell_product.py` | 细胞产品库 CRUD |
|
||||
| API | `api/production.py` 扩展 | 新增工单/任务/产品库路由 |
|
||||
| Schemas | `schemas/production_work_order.py` | 工单 Pydantic 模型 |
|
||||
| Schemas | `schemas/production_task.py` | 任务 Pydantic 模型 |
|
||||
| Schemas | `schemas/cell_product.py` | 产品 Pydantic 模型 |
|
||||
|
||||
### 4.3 核心业务逻辑
|
||||
|
||||
#### 工单号生成
|
||||
- 前缀 "SC" + 日期 YYYYMMDD + 4 位序号(如 `SC202605190001`)
|
||||
- 与质检工单 ZJ 前缀对应
|
||||
- 同一租户同一天内序号递增
|
||||
|
||||
#### 任务号生成
|
||||
- 前缀 "RW" + 日期 YYYYMMDD + 4 位序号(如 `RW202605190001`)
|
||||
|
||||
#### 克隆工艺路线到任务步骤
|
||||
1. 读取 `biz_process_route_step` 及其 4 个子表(reagent/consumable/output/data_collection)
|
||||
2. 将每个步骤克隆到 `biz_production_task_step`(task_id 替换 route_id)
|
||||
3. 将步骤的试剂/耗材/产出物/数据采集项克隆到对应的 task_step 子表
|
||||
4. 数据采集项的 `collection_value` 初始为空,等待用户执行时填写
|
||||
5. 试剂和耗材的 `actual_usage` 初始为空
|
||||
|
||||
#### 执行中增删工艺
|
||||
- **新增步骤**: 直接在 `biz_production_task_step` 中插入新记录,重新排序 step_order
|
||||
- **删除步骤**: 软删除(del_flag=1)步骤及其子表,重新排序
|
||||
- **编辑步骤**: 直接更新步骤及其子表(整体替换模式)
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端架构
|
||||
|
||||
### 5.1 新增菜单(在【生产管理】下)
|
||||
|
||||
| 菜单名称 | 路由路径 | 组件 |
|
||||
|---------|---------|------|
|
||||
| 入库生产工单 | /production/work-order | views/production/production-work-order/index.vue |
|
||||
| 生产任务 | /production/task | views/production/production-task/index.vue |
|
||||
| 细胞产品库 | /production/cell-product | views/production/cell-product/index.vue |
|
||||
|
||||
### 5.2 新增前端文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `views/production/production-work-order/index.vue` | 入库生产工单列表+详情 |
|
||||
| `views/production/production-task/index.vue` | 生产任务列表+执行界面 |
|
||||
| `views/production/cell-product/index.vue` | 细胞产品库管理 |
|
||||
| `api/production-work-order.ts` | 工单 API |
|
||||
| `api/production-task.ts` | 任务 API |
|
||||
| `api/cell-product.ts` | 产品 API |
|
||||
|
||||
### 5.3 界面设计要点
|
||||
|
||||
- **入库生产工单**: 标准 list 页面,展示工单号、协议号、样本编码、状态、创建时间。支持查看详情(含关联的生产任务列表)
|
||||
- **生产任务**: list 页面展示任务号、所属工单、状态、工艺路线、开始/完成时间。进入详情可执行工艺步骤、录入数据
|
||||
- **细胞产品库**: 标准 list 页面,支持新增手动录入或从生产任务产出自动生成
|
||||
|
||||
---
|
||||
|
||||
## 6. API 路由设计
|
||||
|
||||
### 6.1 入库生产工单 API
|
||||
|
||||
| Method | Path | 说明 |
|
||||
|--------|------|------|
|
||||
| GET | /web/admin/production-work-orders | 工单列表(分页) |
|
||||
| GET | /web/admin/production-work-orders/{id} | 工单详情 |
|
||||
| PUT | /web/admin/production-work-orders/{id}/complete | 完成工单 |
|
||||
|
||||
### 6.2 生产任务 API
|
||||
|
||||
| Method | Path | 说明 |
|
||||
|--------|------|------|
|
||||
| POST | /web/admin/production-tasks | 创建任务(选工艺路线,克隆步骤) |
|
||||
| GET | /web/admin/production-tasks | 任务列表(分页,支持按工单ID筛选) |
|
||||
| GET | /web/admin/production-tasks/{id} | 任务详情(含步骤+子表) |
|
||||
| PUT | /web/admin/production-tasks/{id} | 更新任务基本信息 |
|
||||
| PUT | /web/admin/production-tasks/{id}/status | 更新任务状态 |
|
||||
| POST | /web/admin/production-tasks/{id}/steps | 新增步骤 |
|
||||
| PUT | /web/admin/production-tasks/{id}/steps/{step_id} | 更新步骤 |
|
||||
| DELETE | /web/admin/production-tasks/{id}/steps/{step_id} | 删除步骤 |
|
||||
| PUT | /web/admin/production-tasks/{id}/steps/{step_id}/reagents | 替换步骤试剂 |
|
||||
| PUT | /web/admin/production-tasks/{id}/steps/{step_id}/consumables | 替换步骤耗材 |
|
||||
| PUT | /web/admin/production-tasks/{id}/steps/{step_id}/data-collection | 替换步骤数据采集 |
|
||||
| POST | /web/admin/production-tasks/{id}/inputs | 设置任务输入 |
|
||||
| POST | /web/admin/production-tasks/{id}/outputs | 设置任务输出 |
|
||||
|
||||
### 6.3 细胞产品库 API
|
||||
|
||||
| Method | Path | 说明 |
|
||||
|--------|------|------|
|
||||
| GET | /web/admin/cell-products | 产品列表(分页) |
|
||||
| GET | /web/admin/cell-products/{id} | 产品详情 |
|
||||
| POST | /web/admin/cell-products | 新增产品 |
|
||||
| PUT | /web/admin/cell-products/{id} | 更新产品 |
|
||||
| DELETE | /web/admin/cell-products/{id} | 删除产品(软删除) |
|
||||
|
||||
---
|
||||
|
||||
## 7. 状态流转
|
||||
|
||||
### 7.1 入库生产工单
|
||||
|
||||
```
|
||||
dpz(待配置) ──→ ywc(已完成)
|
||||
```
|
||||
- 创建时默认 dpz
|
||||
- 所有关联任务完成后,可手动标记为 ywc
|
||||
|
||||
### 7.2 生产任务
|
||||
|
||||
```
|
||||
dpz(待配置) ──→ jxz(进行中) ──→ ywc(已完成)
|
||||
```
|
||||
- 创建时默认 dpz(已克隆工艺步骤)
|
||||
- 用户开始执行时手动标记为 jxz
|
||||
- 所有步骤完成后标记为 ywc
|
||||
|
||||
### 7.3 生产任务步骤
|
||||
|
||||
```
|
||||
dzx(待执行) ──→ jxz(进行中) ──→ ywc(已完成)
|
||||
```
|
||||
- 克隆时默认 dzx
|
||||
- 用户开始该步骤时标记为 jxz,记录 started_time
|
||||
- 步骤完成时标记为 ywc,记录 completed_time
|
||||
|
||||
---
|
||||
|
||||
## 8. 约束与注意事项
|
||||
|
||||
1. **租户隔离**: 所有查询必须带 tenant_no 过滤
|
||||
2. **软删除**: 所有删除操作设置 del_flag=1,不物理删除
|
||||
3. **工单号唯一**: SC 前缀 + 日期 + 序号,同一租户同一天唯一
|
||||
4. **任务号唯一**: RW 前缀 + 日期 + 序号,同一租户同一天唯一
|
||||
5. **克隆独立性**: 任务步骤克隆后与原工艺路线完全独立,后续修改互不影响
|
||||
6. **细胞产品编码唯一**: 产品编码在租户内唯一
|
||||
7. **储物格关联**: 细胞产品的 storage_slot_id 关联 biz_storage_facility_slot
|
||||
8. **触发原子性**: 生产工单与质检工单在同一事务中创建,确保要么同时成功要么同时失败
|
||||
@@ -1,339 +0,0 @@
|
||||
# 细胞存储 ⇄ 科研捐赠 转移改造方案
|
||||
|
||||
> 日期:2026-05-19
|
||||
> 状态:已实施(2026-05-19)
|
||||
> 关联模块:采集协议单管理、捐赠协议单管理
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与问题
|
||||
|
||||
### 1.1 业务场景
|
||||
|
||||
- **协议转科研**:细胞存储采集协议(`sxz`)→ 新建科研捐赠单,源协议状态 `zky`。
|
||||
- **转细胞存储**:科研捐赠单(`sxz`)→ 新建采集协议单,源捐赠状态 `zckc`。
|
||||
|
||||
产品约定:
|
||||
|
||||
1. 转移时 **协议号与样本编码与源单一致**(同一业务在不同模块各一张单)。
|
||||
2. 转移后用户 **可能单独调整** 采集协议号或捐赠协议号(两边不必长期同号)。
|
||||
3. 二次编辑保存时不应误报「协议号已存在」「样本编码已被占用」。
|
||||
|
||||
### 1.2 现状问题
|
||||
|
||||
| 问题 | 原因 |
|
||||
|------|------|
|
||||
| 转移后协议号为 `KY…` / `XC…` 临时串 | `convert_from_storage` / `convert_to_storage` 临时生成编号 |
|
||||
| 二次保存报样本编码已占用 | 全局唯一校验未识别「转移配对单」 |
|
||||
| 同号需求与跨表唯一校验冲突 | `protocol_no` 与 `donation_no` 互斥,未对配对单豁免 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 改造目标
|
||||
|
||||
| # | 目标 |
|
||||
|---|------|
|
||||
| G1 | 转移瞬间:新单 `protocol_no` / `donation_no` = 源单展示号;样本 `sample_code` / `sample_code_id` 原样拷贝 |
|
||||
| G2 | 建立 **转移关联** 持久化记录(中间表),供保存/改号校验查询 |
|
||||
| G3 | 样本编码、协议号唯一性:对 **配对单据 ID** 豁免,不依赖编号字符串是否相同 |
|
||||
| G4 | 转移后允许用户 **独立修改** 本单协议号/捐赠号,**不自动同步** 对端 |
|
||||
| G5 | 非配对单据仍严格执行全局唯一,不影响手工新建/审核等流程 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 方案概述
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph transfer [转移事务]
|
||||
A[源单状态变更 zky/zckc]
|
||||
B[新建目标单 同号同码]
|
||||
C[写入关联表 biz_protocol_donation_convert]
|
||||
end
|
||||
subgraph save [编辑保存]
|
||||
D[根据当前单 ID 查配对 protocol_id / donation_id]
|
||||
E[协议号校验 排除配对单]
|
||||
F[样本编码校验 排除配对单样本行]
|
||||
end
|
||||
transfer --> save
|
||||
```
|
||||
|
||||
**核心原则**:配对关系由 **关联表 + 双方主键 ID** 锁定;`biz_no` 仅记录转移完成时的初始编号(审计),**不参与** 豁免判断。
|
||||
|
||||
---
|
||||
|
||||
## 4. 数据库设计
|
||||
|
||||
### 4.1 新建表 `biz_protocol_donation_convert`
|
||||
|
||||
脚本路径:`docs/sql/biz_protocol_donation_convert.sql`
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `id` | VARCHAR(64) | 主键 UUID |
|
||||
| `convert_type` | VARCHAR(32) | `storage_to_research` / `research_to_storage` |
|
||||
| `protocol_id` | VARCHAR(64) | `biz_collection_protocol.id` |
|
||||
| `research_donation_id` | VARCHAR(64) | `biz_research_donation.id` |
|
||||
| `biz_no` | VARCHAR(64) | **转移完成时** 的共用编号快照(不随改号自动更新) |
|
||||
| `tenant_no` | VARCHAR(64) | 租户 |
|
||||
| 公共字段 | — | `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag` |
|
||||
|
||||
**索引与约束(建议)**
|
||||
|
||||
- `UNIQUE (protocol_id)`:同一采集协议仅允许一条有效转移关联(应用层保证 `del_flag=0` 唯一)。
|
||||
- `UNIQUE (research_donation_id)`:同一科研捐赠仅允许一条有效转移关联。
|
||||
- `KEY (tenant_no, biz_no, del_flag)`:按初始编号排查。
|
||||
|
||||
**不新建** 主表字段为一期必选项;科研侧已有 `source_type`、`source_protocol_id` 可继续用于列表筛选与展示。
|
||||
|
||||
### 4.2 与现有表关系
|
||||
|
||||
```
|
||||
biz_collection_protocol (1) ──< biz_protocol_donation_convert >── (1) biz_research_donation
|
||||
│ │
|
||||
├── biz_protocol_sample ├── biz_research_donation_sample
|
||||
```
|
||||
|
||||
一对一:一次转移产生一对主单 + 一条关联记录。
|
||||
|
||||
---
|
||||
|
||||
## 5. 转移业务规则
|
||||
|
||||
### 5.1 协议转科研(`convert_from_storage`)
|
||||
|
||||
**前置**
|
||||
|
||||
- 源协议存在、`tenant_no` 匹配、`del_flag=0`。
|
||||
- 源协议状态 = `sxz`(生效中)。
|
||||
- 该 `protocol_id` 尚未存在有效关联记录。
|
||||
|
||||
**事务内操作**
|
||||
|
||||
| 步骤 | 操作 |
|
||||
|------|------|
|
||||
| 1 | 新建 `biz_research_donation`:`donation_no = proto.protocol_no`,`donation_status=dsx`,`source_type=from_storage`,`source_protocol_id=protocol_id` |
|
||||
| 2 | 复制 party / collection / samples(+transport),样本编码与源一致 |
|
||||
| 3 | 源协议 `protocol_status=zky`,写 `to_research_time` / `to_research_desc` |
|
||||
| 4 | 插入关联表:`convert_type=storage_to_research`,`biz_no=proto.protocol_no` |
|
||||
|
||||
**删除**:`KY` + 时间戳 + UUID 临时号逻辑。
|
||||
|
||||
### 5.2 转细胞存储(`convert_to_storage`)
|
||||
|
||||
**前置**
|
||||
|
||||
- 源捐赠存在、`sxz`、无有效关联。
|
||||
|
||||
**事务内操作**
|
||||
|
||||
| 步骤 | 操作 |
|
||||
|------|------|
|
||||
| 1 | 新建 `biz_collection_protocol`:`protocol_no = donation.donation_no`,`protocol_status=dsx`;`protocol_no_id` 可按 `biz_no` 反查号池(可选) |
|
||||
| 2 | 复制子表,样本同码;价格字段置空 |
|
||||
| 3 | 源捐赠 `donation_status=zckc`,写 `to_storage_time` / `to_storage_desc` |
|
||||
| 4 | 插入关联表:`convert_type=research_to_storage`,`biz_no=donation.donation_no` |
|
||||
|
||||
**删除**:`XC` + 时间戳临时号逻辑。
|
||||
|
||||
### 5.3 转移后改号(用户可能调整)
|
||||
|
||||
| 规则 | 说明 |
|
||||
|------|------|
|
||||
| 允许改号 | 采集协议可改 `protocol_no`;科研捐赠可改 `donation_no`(需确认前端是否已暴露字段,后端须支持校验) |
|
||||
| 不同步对端 | 改 A 单号 **不自动修改** B 单号(方案 A) |
|
||||
| 关联表 `biz_no` | **保留转移快照**,不随改号更新 |
|
||||
| 可选 UI 提示 | 改号成功后提示「配对单据当前编号为 xxx」(二期) |
|
||||
|
||||
---
|
||||
|
||||
## 6. 校验规则改造
|
||||
|
||||
### 6.1 公共能力(新建)
|
||||
|
||||
位置建议:`backend/app/crud/protocol_donation_convert.py`(或合入 `research_donation.py`)
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
| `create_convert_link(db, ...)` | 转移事务内写入关联 |
|
||||
| `get_convert_partner(db, tenant_no, *, protocol_id=None, donation_id=None)` | 返回 `{ protocol_id, research_donation_id, biz_no, convert_type }` 或 `None` |
|
||||
| `get_partner_sample_codes(db, tenant_no, protocol_id, donation_id)` | 配对单上所有 `del_flag=0` 的 `sample_code` 集合 |
|
||||
|
||||
### 6.2 样本编码唯一性
|
||||
|
||||
改造:`collection_protocol.validate_sample_codes_not_used`
|
||||
|
||||
```text
|
||||
占用集合 = 全租户 采集样本表 ∪ 科研捐赠样本表(del_flag=0)
|
||||
占用集合 -= 配对 protocol_id 下样本编码
|
||||
占用集合 -= 配对 research_donation_id 下样本编码
|
||||
若 待保存编码 ∩ 占用集合 非空 → 报错
|
||||
```
|
||||
|
||||
**调用点**
|
||||
|
||||
- `collection_protocol.save_samples`:传入当前 `collection_protocol_id`,查 partner 后排除。
|
||||
- `research_donation._create_samples`:传入当前 `research_donation_id`,查 partner 后排除。
|
||||
|
||||
> 本单 upsert 会先软删旧样本行,排除逻辑必须基于 **配对单 ID**,与双方编号是否一致无关。
|
||||
|
||||
### 6.3 协议号 / 捐赠号跨表唯一性
|
||||
|
||||
改造:`create_collection_protocol`、`update_collection_protocol`、`create_donation`、`update_donation`(若支持改 `donation_no`)。
|
||||
|
||||
**判断「编号是否冲突」时:**
|
||||
|
||||
```text
|
||||
冲突对象 = 其他采集协议.protocol_no(排除当前 protocol_id)
|
||||
∪ 其他科研捐赠.donation_no(排除当前 donation_id)
|
||||
|
||||
若存在 convert 配对:
|
||||
- 更新采集协议时:再排除 配对 research_donation_id 对应行的 donation_no
|
||||
- 更新科研捐赠时:再排除 配对 protocol_id 对应行的 protocol_no
|
||||
|
||||
仅当 新编号 落在「冲突对象」中时报错
|
||||
```
|
||||
|
||||
**说明**:配对单占用 **整行单据** 豁免,不要求新号与对端当前号相同。例如协议改为 A001、捐赠仍为 A002,只要无第三方占用,均应通过。
|
||||
|
||||
### 6.4 非转移场景
|
||||
|
||||
- 手工新建、无关联记录:保持现有严格唯一。
|
||||
- 批量转移失败策略:维持现有「逐条调用、部分成功」行为。
|
||||
|
||||
---
|
||||
|
||||
## 7. 后端改动清单
|
||||
|
||||
| 序号 | 文件 | 改动要点 |
|
||||
|------|------|----------|
|
||||
| 1 | `docs/sql/biz_protocol_donation_convert.sql` | 建表 |
|
||||
| 2 | `backend/app/models/research_donation.py` | `BizProtocolDonationConvert` |
|
||||
| 3 | `backend/app/models/__init__.py` | 导出 Model |
|
||||
| 4 | `backend/app/crud/protocol_donation_convert.py` | 关联 CRUD + 查询(新建) |
|
||||
| 5 | `backend/app/crud/research_donation.py` | `convert_*` 同号同码 + 写关联;`_create_samples` 传排除参数;`update_donation` 支持 `donation_no` 改号校验 |
|
||||
| 6 | `backend/app/crud/collection_protocol.py` | `validate_sample_codes_not_used`、`save_samples`、create/update 协议号校验 |
|
||||
| 7 | `backend/app/api/research_donation.py` | 无路由变更(可选详情返回 `convertPartner`) |
|
||||
|
||||
**API**:不新增对外接口;现有:
|
||||
|
||||
- `POST /web/admin/research-donations/convert-from-storage`
|
||||
- `POST /web/admin/research-donations/{id}/convert-to-storage`
|
||||
|
||||
---
|
||||
|
||||
## 8. 前端改动清单
|
||||
|
||||
### 8.1 一期(随然后端联调)
|
||||
|
||||
| 项 | 改动 |
|
||||
|----|------|
|
||||
| 转移确认文案 | 说明「将创建新单,**初始**协议号与样本编码与源单一致」 |
|
||||
| 编辑表单 | 转移生成的新单:**协议号/捐赠号保持可编辑**(勿做只读) |
|
||||
| 保存逻辑 | 无改动,依赖后端豁免 |
|
||||
|
||||
### 8.2 二期(体验增强)
|
||||
|
||||
| 项 | 改动 |
|
||||
|----|------|
|
||||
| 查看弹窗 | 展示「转移关联」:对端单据类型、编号、跳转 |
|
||||
| 改号提示 | 保存后若与对端编号不一致,轻提示对端当前号 |
|
||||
|
||||
---
|
||||
|
||||
## 9. 历史数据
|
||||
|
||||
| 类型 | 处理 |
|
||||
|------|------|
|
||||
| 已用 `KY…`/`XC…` 生成的转移单 | 脚本按 `source_protocol_id`、`to_research_desc`、`remark` 尝试配对并补关联表;编号是否改为源单同号需 **业务确认后** 再批量更新 |
|
||||
| 无法配对 | 保持现状,仅新转移走新逻辑 |
|
||||
|
||||
脚本建议:`backend/scripts/backfill_protocol_donation_convert.py`(可选)。
|
||||
|
||||
---
|
||||
|
||||
## 10. 实施步骤
|
||||
|
||||
| 阶段 | 内容 | 产出 |
|
||||
|------|------|------|
|
||||
| P1 | SQL + Model + 关联 CRUD | 表可建、可查询配对 |
|
||||
| P2 | 改造 `convert_from_storage` / `convert_to_storage` | 转移同号同码 + 写关联 |
|
||||
| P3 | 样本编码校验 + `save_samples` / `_create_samples` | 二次编辑样本保存通过 |
|
||||
| P4 | 协议号/捐赠号 create & update 豁免 | 改号不误报、可独立改号 |
|
||||
| P5 | 联调 + 回归 + 确认文案 | 测试清单通过 |
|
||||
| P6 | 历史数据脚本(可选) | 补关联记录 |
|
||||
|
||||
---
|
||||
|
||||
## 11. 测试用例
|
||||
|
||||
### 11.1 转移
|
||||
|
||||
| # | 步骤 | 预期 |
|
||||
|---|------|------|
|
||||
| T1 | `sxz` 协议转科研 | 捐赠号=协议号;样本码一致;关联表 1 条;源单 `zky` |
|
||||
| T2 | `sxz` 捐赠转存储 | 协议号=捐赠号;样本码一致;关联表 1 条;源单 `zckc` |
|
||||
| T3 | 非 `sxz` 转移 | 400 业务错误 |
|
||||
| T4 | 已转移协议再次转科研 | 失败 |
|
||||
|
||||
### 11.2 二次保存(样本)
|
||||
|
||||
| # | 步骤 | 预期 |
|
||||
|---|------|------|
|
||||
| T5 | 转移后不改编码,直接保存 | 成功 |
|
||||
| T6 | 修改非编码字段后保存 | 成功 |
|
||||
|
||||
### 11.3 改号
|
||||
|
||||
| # | 步骤 | 预期 |
|
||||
|---|------|------|
|
||||
| T7 | 只改采集协议号 | 成功;捐赠号可不变 |
|
||||
| T8 | 只改捐赠号 | 成功 |
|
||||
| T9 | 改为第三方已占用号 | 失败 |
|
||||
| T10 | 改为配对单当前持有的号 | 成功(豁免) |
|
||||
|
||||
### 11.4 回归
|
||||
|
||||
| # | 步骤 | 预期 |
|
||||
|---|------|------|
|
||||
| T11 | 无关联手工新建协议+样本 | 重复编码仍失败 |
|
||||
| T12 | 审核、状态变更、删除 | 行为不变 |
|
||||
|
||||
---
|
||||
|
||||
## 12. 风险与待定项
|
||||
|
||||
| 项 | 说明 | 建议 |
|
||||
|----|------|------|
|
||||
| 号池下发状态 | 转移同号后 `biz_collection_protocol_no` 是否标记已下发 | 二期与基础数据模块对齐 |
|
||||
| `protocol_no_id` | 转存储时是否回填号池 ID | 可选:按 `biz_no` 查池 |
|
||||
| 链式转移 | 同一业务多次互转 | 当前按 **一对一** 设计;若需支持需单独立项 |
|
||||
| 软删一方 | 另一方编辑是否仍豁免 | 建议:**仍豁免**(关联保留,占用仅计 `del_flag=0`) |
|
||||
|
||||
---
|
||||
|
||||
## 13. 已确认产品决策
|
||||
|
||||
| 决策 | 结论 |
|
||||
|------|------|
|
||||
| 转移初始编号 | 与源单相同 |
|
||||
| 转移初始样本编码 | 与源单相同 |
|
||||
| 转移后改号 | 允许,两边可不一致 |
|
||||
| 改号是否同步对端 | **否** |
|
||||
| 关联表 `biz_no` | 转移快照,不随改号更新 |
|
||||
| 豁免依据 | 关联表 **单据 ID**,非编号字符串 |
|
||||
|
||||
---
|
||||
|
||||
## 14. 参考代码位置(改造前)
|
||||
|
||||
| 逻辑 | 文件 |
|
||||
|------|------|
|
||||
| 转移(临时号) | `backend/app/crud/research_donation.py` → `convert_from_storage` / `convert_to_storage` |
|
||||
| 样本编码校验 | `backend/app/crud/collection_protocol.py` → `validate_sample_codes_not_used` |
|
||||
| 协议号互斥 | `create_collection_protocol` / `update_collection_protocol` / `create_donation` |
|
||||
| 前端转移调用 | `web-admin/src/api/research-donation.ts` |
|
||||
|
||||
---
|
||||
|
||||
*文档结束*
|
||||
@@ -1,206 +0,0 @@
|
||||
# 状态标签注册表设计
|
||||
|
||||
> 日期:2026-05-19
|
||||
> 状态:已批准
|
||||
> 范围:web-admin 前端工程所有枚举字段标签集中化管理
|
||||
|
||||
## 1. 背景与问题
|
||||
|
||||
当前 web-admin 中所有状态/结论/类型字段的标签映射散落在 **21 个 Vue 文件** 中,存在以下问题:
|
||||
|
||||
1. **颜色不一致**:同一状态值在表格中用 `el-tag type="primary"`(蓝色),查看弹窗中用自定义 `badge--purple`(紫色)
|
||||
2. **大量重复**:`protocolStatusLabel` 在 6 个文件中重复定义,`newbornSexLabel` 在 6 个文件中重复定义
|
||||
3. **tagType 缺失**:仅 1/15 的集中化函数有 tagType 变体,其余需在使用处手写
|
||||
4. **Badge CSS 残留**:3 个复杂查看弹窗(ProtocolViewDialog、DonationViewDialog、ChannelViewDialog)仍使用自定义 `.badge--*` CSS,与 `el-tag` 并存
|
||||
|
||||
## 2. 目标
|
||||
|
||||
- 新建一个 `src/utils/status-tag-registry.ts`,集中定义所有枚举字段的 **label + tagType**
|
||||
- 所有页面和弹窗统一从此文件导入,确保同一状态值在任何地方颜色一致
|
||||
- 消灭所有自定义 badge CSS 系统,统一为 `el-tag`
|
||||
- 与现有调用签名完全兼容,零迁移成本
|
||||
|
||||
## 3. 方案选择
|
||||
|
||||
| 方案 | 描述 | 优点 | 缺点 |
|
||||
|------|------|------|------|
|
||||
| **A. 单体注册表(选定)** | 一个 `status-tag-registry.ts` 集中管理所有枚举 | Ctrl+Click 一处看到所有映射,改颜色绝不遗漏 | 文件约 300 行 |
|
||||
| B. 按域分文件 | 拆成 `qc-status.ts`、`protocol-status.ts` 等 | 每个文件职责单一 | 需记住去哪个文件找,import 路径多 |
|
||||
| C. 运行时注册 | `registerStatusGroup` + `getStatusLabel` 查找 | 可扩展 | 过度设计,丧失类型安全 |
|
||||
|
||||
选定方案 A。
|
||||
|
||||
## 4. 数据结构
|
||||
|
||||
```typescript
|
||||
// src/utils/status-tag-registry.ts
|
||||
|
||||
/** el-tag 的 type 属性值 */
|
||||
export type TagType = 'success' | 'warning' | 'danger' | 'info' | '' | 'primary'
|
||||
|
||||
/** 单条枚举映射 */
|
||||
export interface StatusItem {
|
||||
label: string
|
||||
tagType: TagType
|
||||
}
|
||||
|
||||
/** 注册表类型 */
|
||||
export type StatusRegistry = Record<string, StatusItem>
|
||||
```
|
||||
|
||||
不使用类、不使用运行时注册、不使用 Map。纯静态 `Record`,类型安全、tree-shakeable。
|
||||
|
||||
## 5. 便捷函数工厂
|
||||
|
||||
```typescript
|
||||
/** 从注册表提取 label */
|
||||
export function createLabelGetter(registry: StatusRegistry) {
|
||||
return (code: string): string => registry[code]?.label ?? code ?? '—'
|
||||
}
|
||||
|
||||
/** 从注册表提取 tagType */
|
||||
export function createTagTypeGetter(registry: StatusRegistry) {
|
||||
return (code: string): TagType => registry[code]?.tagType ?? 'info'
|
||||
}
|
||||
```
|
||||
|
||||
导出示例:
|
||||
|
||||
```typescript
|
||||
export const protocolStatus: StatusRegistry = {
|
||||
dsx: { label: '待生效', tagType: 'info' },
|
||||
sxz: { label: '生效中', tagType: 'success' },
|
||||
ygq: { label: '已过期', tagType: 'warning' },
|
||||
yzf: { label: '已作废', tagType: 'danger' },
|
||||
zky: { label: '转科研', tagType: 'primary' },
|
||||
}
|
||||
|
||||
export const protocolStatusLabel = createLabelGetter(protocolStatus)
|
||||
export const protocolStatusTagType = createTagTypeGetter(protocolStatus)
|
||||
```
|
||||
|
||||
现有代码调用 `protocolStatusLabel('dsx')` 完全不变,零迁移成本。
|
||||
|
||||
## 6. 完整注册表分组
|
||||
|
||||
### 6.1 协议/捐赠/样本域
|
||||
|
||||
| 注册表名 | 枚举值 | 原散落文件数 |
|
||||
|----------|--------|-------------|
|
||||
| `protocolStatus` | dsx/sxz/ygq/yzf/zky | 6 |
|
||||
| `donationStatus` | dsx/sxz/ygq/yzf/zckc | 3 |
|
||||
| `sampleStatus` | ycj/jcz/yrk/yzf | 3 |
|
||||
| `payStatus` | dfj/jfqrz/yjf/tfqrz/ytf | 3 |
|
||||
| `auditStatus` | shtg/shth | 2 |
|
||||
| `acceptConclusion` | js/bj(jjj) | 2 |
|
||||
| `transportType` | kdys/ryxd | 5+ |
|
||||
| `sourceType` | direct/from_storage | 1 |
|
||||
| `newbornSex` | 1/0 | 6 |
|
||||
| `deliveryMode` | sc/pgc | 6 |
|
||||
|
||||
### 6.2 质检域
|
||||
|
||||
| 注册表名 | 枚举值 | 原散落文件数 |
|
||||
|----------|--------|-------------|
|
||||
| `qcBizType` | inbound/outbound | 1 |
|
||||
| `taskStatus` | dzx/jxz/ywc | 1 |
|
||||
| `taskType` | sysz/dsfjc | 1 |
|
||||
| `qcConclusion` | tg/btg | 1 |
|
||||
| `workOrderStatus` | dpz/ypz/ywc | 1 |
|
||||
| `receptionSource` | cell_storage/research_donation | 1 |
|
||||
|
||||
### 6.3 渠道域
|
||||
|
||||
| 注册表名 | 枚举值 | 原散落文件数 |
|
||||
|----------|--------|-------------|
|
||||
| `channelType` | yy/hzjg/zs/zfjg/qt | 2 |
|
||||
| `agreementType` | kyxy/zsxy/lcxy | 2 |
|
||||
| `agreementStatus` | dsx/sxz/yzf | 2 |
|
||||
| `settlementType` | yj/jj/nj/dcjs | 2 |
|
||||
|
||||
### 6.4 支付/通用域
|
||||
|
||||
| 注册表名 | 枚举值 | 原散落文件数 |
|
||||
|----------|--------|-------------|
|
||||
| `payMode` | dj/fq | 2 |
|
||||
| `transferType` | wxzz/zzbzz/yhkzz/xj | 5+ |
|
||||
| `enableStatus` | 1/0(通用启用/停用) | 12+ |
|
||||
|
||||
### 6.5 系统域
|
||||
|
||||
| 注册表名 | 枚举值 | 原散落文件数 |
|
||||
|----------|--------|-------------|
|
||||
| `leaveStatus` | draft/pending/approved/rejected/cancelled | 1 |
|
||||
| `workflowStatus` | running/completed/rejected/cancelled/pending/approved/withdrawn | 1 |
|
||||
| `menuType` | M/C/F | 1 |
|
||||
| `userRole` | admin/supplier/client/deliver | 1 |
|
||||
| `dataScope` | 1-5 | 1 |
|
||||
| `cleanRoomGrade` | A/B/C/D | 1 |
|
||||
| `sampleCodeType` | zxbm/qdbm | 1 |
|
||||
| `packType` | bzhcb/zdyhcb | 1 |
|
||||
| `paramType` | text/select/multi_select | 2 |
|
||||
| `orderStatus` | pending_payment/pending_confirm/completed/cancelled/... | 1 |
|
||||
| `deliveryStatus` | pending_dispatch/pending_delivery/delivering/delivered/... | 1 |
|
||||
|
||||
## 7. 与现有文件的关系
|
||||
|
||||
| 现有文件 | 处理方式 |
|
||||
|---------|---------|
|
||||
| `utils/qc-labels.ts` | 所有函数迁移到 registry,原文件改为从 registry re-export(过渡期兼容) |
|
||||
| `utils/protocol-payment-labels.ts` | 标签函数迁移到 registry;`formatPaymentAmount`、`isPaymentDueWithinWarnWindow`、`formatPaymentDueDate` 等纯格式化函数保留原文件 |
|
||||
| 21 个 Vue 文件中的本地函数 | 删除本地函数,改为从 registry 导入 |
|
||||
|
||||
## 8. 消灭自定义 Badge 系统
|
||||
|
||||
以下 3 个文件的自定义 `.badge` CSS 和 `status-dot` 全部替换为 `<el-tag>`:
|
||||
|
||||
| 文件 | 消灭内容 |
|
||||
|-----|---------|
|
||||
| `cell-storage/protocol/ProtocolViewDialog.vue` | `.badge` / `badge--*` → `<el-tag>` |
|
||||
| `research-donation/list/DonationViewDialog.vue` | `.badge` / `badge--*` / `status-dot` → `<el-tag>` |
|
||||
| `pilot-service/channel/ChannelViewDialog.vue` | `.badge` / `badge--*` → `<el-tag>` |
|
||||
| `components/business/sample-qc-info-cards/index.vue` | 内联 badge class → `<el-tag>` |
|
||||
|
||||
替换后删除 `<style scoped>` 中的 `.badge` 相关 CSS 定义。
|
||||
|
||||
## 9. Tag Type 语义色规范
|
||||
|
||||
| TagType | 颜色 | 适用语义 | 示例 |
|
||||
|---------|------|---------|------|
|
||||
| `success` | 绿色 | 正常、启用、已完成、生效中、通过、已缴费 | 正常/启用/已完成/接收/通过/已入库 |
|
||||
| `warning` | 橙色 | 进行中、待确认、已过期、预警 | 进行中/已排配/已过期/待确认/检测中 |
|
||||
| `danger` | 红色 | 异常、已作废、拒绝、不通过、已退费 | 异常/已作废/拒绝/不通过/已退费 |
|
||||
| `info` | 灰色 | 待执行、待生效、停用、默认 | 待执行/待生效/停用/无结论/其他 |
|
||||
| `primary` | 蓝色 | 特殊分类、来源类型、转出 | 转科研/医院/框架协议/已采集 |
|
||||
| `''` | 默认色 | 无特殊语义 | 目录类型 |
|
||||
|
||||
## 10. 迁移策略
|
||||
|
||||
分 3 波执行,每波可独立验证:
|
||||
|
||||
### 波次 1:核心(质检 + 协议状态 + Badge 消灭)
|
||||
- 创建 `status-tag-registry.ts`
|
||||
- 迁移质检域 6 组 + 协议/支付域 4 组
|
||||
- 消灭 ProtocolViewDialog、DonationViewDialog 的 badge 系统
|
||||
- 迁移 `qc-labels.ts` 的 re-export
|
||||
- 涉及约 12 个文件
|
||||
|
||||
### 波次 2:捐赠 + 渠道
|
||||
- 迁移捐赠域 5 组 + 渠道域 4 组
|
||||
- 消灭 ChannelViewDialog 的 badge 系统
|
||||
- 涉及约 8 个文件
|
||||
|
||||
### 波次 3:系统 + 通用 + 订单
|
||||
- 迁移通用启用/停用、系统域、订单域等
|
||||
- 消灭 sample-qc-info-cards 的 badge 系统
|
||||
- 迁移 `protocol-payment-labels.ts` 标签部分为 re-export
|
||||
- 涉及约 15 个文件
|
||||
|
||||
## 11. 验收标准
|
||||
|
||||
1. `status-tag-registry.ts` 覆盖所有 30+ 组枚举映射
|
||||
2. 项目中不存在自定义 `.badge--*` CSS 类
|
||||
3. 项目中不存在本地定义的 `xxxStatusLabel` / `xxxTagType` 函数(除 re-export 文件外)
|
||||
4. 所有状态/结论/类型字段在表格和查看弹窗中颜色完全一致
|
||||
5. LSP 诊断零错误
|
||||
6. 现有页面功能无回归
|
||||
@@ -1,244 +0,0 @@
|
||||
# 统一样本接收 — 支持科研捐赠来源
|
||||
|
||||
> 日期:2026-05-19
|
||||
> 状态:待审核
|
||||
> 关联:AGENTS.md(database-conventions、api-conventions、ui-conventions)
|
||||
|
||||
## 背景与目标
|
||||
|
||||
当前【样本接收】模块仅支持来自**细胞存储(采集协议单)**的样本。业务需要**科研捐赠(捐赠协议单)**的样本也走统一的样本接收流程,接收后自动生成质检工单。
|
||||
|
||||
**核心诉求**:
|
||||
1. 样本接收页面统一展示两种来源的待接收/已接收样本,用类型标签区分
|
||||
2. 完整展示运输信息(运输方式、快递公司、快递单号、预计到达时间、携带人等),方便接收人员核对
|
||||
3. 科研捐赠样本接收后,同样触发质检工单创建
|
||||
|
||||
## 方案:现有表加字段 + 双路径查询
|
||||
|
||||
### 1. 数据库变更
|
||||
|
||||
在 `biz_sample_reception` 表新增 3 个字段:
|
||||
|
||||
```sql
|
||||
-- docs/sql/sample_reception_add_donation_source.sql
|
||||
|
||||
ALTER TABLE biz_sample_reception
|
||||
ADD COLUMN reception_source VARCHAR(20) NOT NULL DEFAULT 'cell_storage'
|
||||
COMMENT '来源类型 cell_storage细胞存储 research_donation科研捐赠'
|
||||
AFTER receive_attachments,
|
||||
ADD COLUMN donation_sample_id VARCHAR(64) NULL
|
||||
COMMENT '捐赠样本ID(biz_research_donation_sample.id, 仅科研捐赠来源)'
|
||||
AFTER reception_source,
|
||||
ADD COLUMN research_donation_id VARCHAR(64) NULL
|
||||
COMMENT '科研捐赠单ID(biz_research_donation.id, 仅科研捐赠来源)'
|
||||
AFTER donation_sample_id;
|
||||
```
|
||||
|
||||
**约束规则**:
|
||||
- `reception_source = 'cell_storage'`:`protocol_sample_id` + `collection_protocol_id` 必填,`donation_sample_id` = NULL
|
||||
- `reception_source = 'research_donation'`:`donation_sample_id` + `research_donation_id` 必填,`protocol_sample_id` = NULL
|
||||
- 现有数据 `reception_source` 默认 `'cell_storage'`,无迁移风险,无需数据回填
|
||||
|
||||
### 2. 后端 Model 变更
|
||||
|
||||
**文件**:`backend/app/models/models.py` — `BizSampleReception` 类
|
||||
|
||||
新增字段:
|
||||
```python
|
||||
reception_source = Column(String(20), nullable=False, default="cell_storage", comment="来源类型 cell_storage/research_donation")
|
||||
donation_sample_id = Column(String(64), nullable=True, comment="捐赠样本ID(仅科研捐赠)")
|
||||
research_donation_id = Column(String(64), nullable=True, comment="科研捐赠单ID(仅科研捐赠)")
|
||||
```
|
||||
|
||||
### 3. 后端 CRUD 变更
|
||||
|
||||
**文件**:`backend/app/crud/sample_reception.py`
|
||||
|
||||
#### 3.1 新增捐赠样本查询函数
|
||||
|
||||
新增 `_donation_sample_detail_rows_query(db)` — 对应捐赠样本的四表 JOIN:
|
||||
- `BizResearchDonationSample` + `BizResearchDonation` + `BizResearchDonationParty` + `BizResearchDonationSampleTransport`
|
||||
|
||||
新增 `_donation_sample_pending_query(db, tenant_no, keyword)` — 查询未被接收的捐赠样本:
|
||||
- 排除条件:`BizSampleReception.donation_sample_id IN (已接收的捐赠样本ID)`
|
||||
- 关键词搜索:`donation_no`、`sample_code`、`mother_name`、`newborn_name`
|
||||
|
||||
新增 `_donation_rows_to_sample_list_items(db, rows, tenant_no, ...)` — 将捐赠样本行转为统一列表项字典,字段映射:
|
||||
```
|
||||
protocolSampleId → donation_sample.id(注意:字段名保持 protocolSampleId 不变,前端统一使用)
|
||||
protocolNo → donation.donation_no(协议号/捐赠编号)
|
||||
sourceType → 'research_donation'
|
||||
sourceTypeLabel → '科研捐赠'
|
||||
```
|
||||
|
||||
#### 3.2 修改待接收列表函数
|
||||
|
||||
修改 `list_pending_protocol_samples()`:
|
||||
- 分别查询细胞存储待接收样本和捐赠待接收样本
|
||||
- 合并结果列表
|
||||
- 按 eta_time 排序(统一排序)
|
||||
- 手动分页(先合并再截取)
|
||||
|
||||
修改 `list_received_protocol_samples()`:
|
||||
- 从 `BizSampleReception` 查询时,按 `reception_source` 分两组
|
||||
- `cell_storage` 组走现有 `_sample_detail_rows_query` 逻辑(不变)
|
||||
- `research_donation` 组走新增的捐赠查询逻辑
|
||||
- 合并后按 `reception_time DESC` 排序
|
||||
|
||||
#### 3.3 修改创建接收记录函数
|
||||
|
||||
修改 `create_sample_reception()`:
|
||||
- 新增参数:`reception_source: str = "cell_storage"`、`donation_sample_id: Optional[str] = None`、`research_donation_id: Optional[str] = None`
|
||||
- 当 `reception_source = 'research_donation'` 时:
|
||||
- 校验 `donation_sample_id` 对应的 `BizResearchDonationSample` 存在
|
||||
- 校验该捐赠样本未被接收(查 `BizSampleReception.donation_sample_id`)
|
||||
- `protocol_sample_id` 置为空字符串或 NULL
|
||||
- `collection_protocol_id` 置为空字符串或 NULL
|
||||
- 接收结论为 `js` 时,仍触发 `qc_wo_svc.create_work_order_from_reception()`
|
||||
|
||||
#### 3.4 统一列表项输出格式
|
||||
|
||||
两种来源的列表项保持统一字段名,前端无需区分:
|
||||
|
||||
| 字段名 | 细胞存储来源 | 科研捐赠来源 |
|
||||
|--------|-------------|-------------|
|
||||
| `protocolSampleId` | `biz_protocol_sample.id` | `biz_research_donation_sample.id` |
|
||||
| `protocolNo` | 采集协议号 | 捐赠编号 |
|
||||
| `sampleCode` | 样本编码 | 样本编码 |
|
||||
| `sampleTypeName` | 样本类型名 | 样本类型名 |
|
||||
| `motherName` | 母亲姓名 | 母亲姓名 |
|
||||
| `newbornName` | 新生儿姓名 | 新生儿姓名 |
|
||||
| `sourceType` | `cell_storage` | `research_donation` |
|
||||
| `sourceTypeLabel` | 细胞存储 | 科研捐赠 |
|
||||
| `etaTime` | 预计到达时间 | 预计到达时间 |
|
||||
| `transportType` | 运输方式 | 运输方式 |
|
||||
| `waybillNo` | 快递单号 | 快递单号 |
|
||||
| `expressCompanyName` | 快递公司名 | 快递公司名 |
|
||||
| `carrierName` | 携带人 | 携带人 |
|
||||
| `carrierPhone` | 携带人电话 | 携带人电话 |
|
||||
|
||||
### 4. 后端 API 变更
|
||||
|
||||
**文件**:`backend/app/api/sample_reception.py`
|
||||
|
||||
#### 4.1 待接收列表增加来源筛选
|
||||
|
||||
`GET /web/admin/sample-receptions/pending` 新增可选参数:
|
||||
- `sourceType`:`cell_storage` / `research_donation` / 不传(全部)
|
||||
|
||||
#### 4.2 创建接收记录支持捐赠来源
|
||||
|
||||
`SampleReceptionCreateBody` 新增字段:
|
||||
```python
|
||||
source_type: Optional[str] = Field("cell_storage", alias="sourceType") # cell_storage / research_donation
|
||||
donation_sample_id: Optional[str] = Field(None, alias="donationSampleId") # 科研捐赠时必传
|
||||
```
|
||||
|
||||
当 `source_type = 'research_donation'` 时,`protocolSampleId` 可不传,改为传 `donationSampleId`。
|
||||
|
||||
### 5. 前端变更
|
||||
|
||||
**文件**:`web-admin/src/views/quality-inspection/sample-reception/index.vue`
|
||||
|
||||
#### 5.1 搜索区增加来源类型筛选
|
||||
|
||||
在 `filter-grid` 中增加:
|
||||
```html
|
||||
<el-form-item label="来源类型">
|
||||
<el-select v-model="searchForm.sourceType" placeholder="全部" clearable>
|
||||
<el-option label="细胞存储" value="cell_storage" />
|
||||
<el-option label="科研捐赠" value="research_donation" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
```
|
||||
|
||||
#### 5.2 表格新增"来源类型"列
|
||||
|
||||
在序号列后增加:
|
||||
```html
|
||||
<el-table-column prop="sourceTypeLabel" label="来源类型" width="100" align="center" header-align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.sourceType === 'research_donation' ? 'warning' : 'success'" size="small">
|
||||
{{ row.sourceTypeLabel }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
```
|
||||
|
||||
#### 5.3 表格增加运输信息展示列
|
||||
|
||||
新增列(在快递单号之后):
|
||||
- `transportType`:运输方式(快递运输 / 人员携带)
|
||||
- `expressCompanyName`:快递公司
|
||||
- `carrierName`:携带人
|
||||
- `carrierPhone`:携带人电话
|
||||
|
||||
#### 5.4 接收弹窗展示完整运输信息
|
||||
|
||||
单个接收弹窗(`receiveDialogVisible`)和查看详情弹窗(`viewDialogVisible`)中,在"样本信息"区块后增加"运输信息"区块:
|
||||
|
||||
```
|
||||
运输信息
|
||||
运输方式:快递运输
|
||||
快递公司:顺丰速运
|
||||
快递单号:SF1234567890
|
||||
预计到达:2026-05-20 14:00:00
|
||||
携带人:张三 / 13800138000
|
||||
```
|
||||
|
||||
使用 `readonly-grid form-grid-2` 布局,运输方式为"快递运输"时显示快递公司和快递单号,为"人员携带"时显示携带人和电话。
|
||||
|
||||
#### 5.5 批量接收弹窗同步调整
|
||||
|
||||
`batch-receive-card__meta` 区域增加来源类型标签和运输信息展示。
|
||||
|
||||
#### 5.6 提交参数调整
|
||||
|
||||
`fetchSampleReceptionSubmit` 调用时,增加 `sourceType` 和 `donationSampleId` 参数:
|
||||
- 细胞存储样本:`sourceType: 'cell_storage'`,传 `protocolSampleId`
|
||||
- 科研捐赠样本:`sourceType: 'research_donation'`,传 `donationSampleId`
|
||||
|
||||
**文件**:`web-admin/src/api/sample-reception.ts`
|
||||
|
||||
`fetchSampleReceptionSubmit` 参数类型增加:
|
||||
```typescript
|
||||
sourceType?: 'cell_storage' | 'research_donation'
|
||||
donationSampleId?: string // sourceType=research_donation 时必传
|
||||
```
|
||||
|
||||
`fetchSampleReceptionPendingList` 参数增加 `sourceType?: string`。
|
||||
|
||||
#### 5.7 row-key 兼容
|
||||
|
||||
当前 `row-key="protocolSampleId"`,捐赠样本也复用此字段名(后端统一输出),无需修改。
|
||||
|
||||
### 6. 变更范围汇总
|
||||
|
||||
| 层 | 文件 | 变更类型 |
|
||||
|----|------|---------|
|
||||
| SQL | `docs/sql/sample_reception_add_donation_source.sql`(新建) | ALTER TABLE |
|
||||
| Model | `backend/app/models/models.py`(BizSampleReception) | 新增 3 字段 |
|
||||
| CRUD | `backend/app/crud/sample_reception.py` | 新增捐赠查询函数 + 修改 pending/received/create |
|
||||
| API | `backend/app/api/sample_reception.py` | 修改 schema + 路由参数 |
|
||||
| 前端 API | `web-admin/src/api/sample-reception.ts` | 参数扩展 |
|
||||
| 前端页面 | `web-admin/src/views/quality-inspection/sample-reception/index.vue` | UI 变更 |
|
||||
|
||||
**不涉及的文件**(零影响):
|
||||
- 采集协议单 CRUD/API/前端
|
||||
- 捐赠协议单 CRUD/API/前端
|
||||
- 质检工单 CRUD(`create_work_order_from_reception` 已基于 reception 对象创建,无需改动)
|
||||
|
||||
### 7. 质检工单衔接
|
||||
|
||||
`create_work_order_from_reception()` 接收 `BizSampleReception` 对象。新增的捐赠接收记录走同一函数,内部通过 `reception.collection_protocol_id` 查询协议信息。对于捐赠来源,需确认该函数是否依赖 `collection_protocol_id` 非空。
|
||||
|
||||
如依赖,则需在质检工单创建逻辑中增加 `reception_source` 判断,对捐赠来源改为通过 `research_donation_id` 查询捐赠单信息作为工单的关联协议。**实施时需读取 `qc_work_order.py` 的 `create_work_order_from_reception` 函数确认并适配。**
|
||||
|
||||
## 设计决策记录
|
||||
|
||||
| 决策 | 选择 | 理由 |
|
||||
|------|------|------|
|
||||
| 统一表 vs 独立表 | 统一表加字段 | 用户要求统一入口,且现有细胞存储流程零改动 |
|
||||
| 新增字段 vs 改用通用FK | 新增字段 | 不破坏现有数据引用,风险最低 |
|
||||
| 质检工单触发 | 捐赠也触发 | 用户确认需求一致 |
|
||||
| 前端字段名 | 保持 protocolSampleId 不变 | 后端统一输出,前端改动最小化 |
|
||||
@@ -1,253 +0,0 @@
|
||||
# 质检物料库 + 物料使用扣减设计
|
||||
|
||||
> 日期: 2026-05-20
|
||||
> 状态: 待审阅
|
||||
> 父模块: 质量检测 (质量检测一级菜单)
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
「质量检测」一级菜单下已实现质检工单和质检任务的完整流程(样本接收 → 质检工单 → 质检任务 → 填写检测结果)。但质检任务中只记录了质量检测结果,没有记录质量检测过程中使用的物料(如试剂、耗材等)。
|
||||
|
||||
### 目标
|
||||
1. 在「质量检测」一级菜单下新增 **质检物料库**,用于管理质检专用的物料信息及库存
|
||||
2. 每次质检任务完成时,登记使用的物料及用量,从物料库 **扣减库存**
|
||||
3. 支持手动入库补充库存
|
||||
4. 通过物料变动记录实现 **盘存** 目的
|
||||
|
||||
### 约束
|
||||
- 质检物料库 **独立于** 生产模块的耗材 (biz_consumable) 和试剂 (biz_reagent)
|
||||
- 简单模式:主表 + 库存量 + 变动记录,不做批次、有效期、库位管理
|
||||
- 扣减时机:质检任务完成时一次性扣减
|
||||
- 入库方式:手动入库(直接增加数量)
|
||||
|
||||
## 2. 数据库设计
|
||||
|
||||
### 2.1 biz_qc_material(质检物料主表)
|
||||
|
||||
```sql
|
||||
DROP TABLE IF EXISTS `biz_qc_material`;
|
||||
CREATE TABLE `biz_qc_material` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`material_code` varchar(64) NOT NULL COMMENT '物料编码',
|
||||
`material_name` varchar(200) NOT NULL COMMENT '物料名称',
|
||||
`spec_model` varchar(200) DEFAULT NULL COMMENT '规格型号',
|
||||
`unit` varchar(32) DEFAULT NULL COMMENT '单位',
|
||||
`stock_qty` decimal(18,4) NOT NULL DEFAULT 0.0000 COMMENT '当前库存量',
|
||||
`warning_qty` decimal(18,4) NOT NULL DEFAULT 0.0000 COMMENT '预警库存量',
|
||||
`status` char(1) NOT NULL DEFAULT '1' COMMENT '1-启用 0-停用',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_qc_mat_tenant_code` (`tenant_no`, `material_code`, `del_flag`),
|
||||
KEY `idx_qc_mat_tenant_status` (`tenant_no`, `status`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检物料';
|
||||
```
|
||||
|
||||
### 2.2 biz_qc_material_usage(物料变动记录)
|
||||
|
||||
```sql
|
||||
DROP TABLE IF EXISTS `biz_qc_material_usage`;
|
||||
CREATE TABLE `biz_qc_material_usage` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`material_id` varchar(64) NOT NULL COMMENT '物料ID',
|
||||
`material_code` varchar(64) DEFAULT NULL COMMENT '物料编码快照',
|
||||
`material_name` varchar(200) DEFAULT NULL COMMENT '物料名称快照',
|
||||
`change_type` varchar(16) NOT NULL COMMENT '变动类型:use使用 / in入库',
|
||||
`change_qty` decimal(18,4) NOT NULL COMMENT '变动数量(使用为负,入库为正)',
|
||||
`stock_after` decimal(18,4) NOT NULL COMMENT '变动后库存量',
|
||||
`qc_task_id` varchar(64) DEFAULT NULL COMMENT '关联质检任务ID(使用时有值)',
|
||||
`qc_task_no` varchar(32) DEFAULT NULL COMMENT '质检任务号快照',
|
||||
`source_type` varchar(16) NOT NULL COMMENT '来源类型:task_complete任务完成 / manual_in手动入库',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_qc_mu_material` (`material_id`, `del_flag`),
|
||||
KEY `idx_qc_mu_task` (`qc_task_id`, `del_flag`),
|
||||
KEY `idx_qc_mu_tenant_time` (`tenant_no`, `change_type`, `create_time`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检物料变动记录';
|
||||
```
|
||||
|
||||
### 2.3 菜单数据
|
||||
|
||||
在 `sys_menu` 表中,父菜单 `70000000000000000000000000000001`(质量检测)下新增:
|
||||
|
||||
```sql
|
||||
-- 质检物料库
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES ('70000000000000000000000000000009', '质检物料库', '70000000000000000000000000000001', 'C', 'qc-material', '/quality-inspection/qc-material/index', 'biz:qcMaterial:list', 1, '1', '1', 'zkxw', 8, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
|
||||
-- 物料变动记录
|
||||
INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
|
||||
VALUES ('70000000000000000000000000000010', '物料变动记录', '70000000000000000000000000000001', 'C', 'qc-material-usage', '/quality-inspection/qc-material-usage/index', 'biz:qcMaterialUsage:list', 1, '1', '1', 'zkxw', 9, NULL, NULL, '', NOW(), NULL, NOW(), 0);
|
||||
```
|
||||
|
||||
## 3. 业务流程
|
||||
|
||||
### 3.1 物料库管理
|
||||
|
||||
```
|
||||
新增物料:填写编码、名称、规格、单位、预警量 → stock_qty 初始为 0
|
||||
编辑物料:修改名称、规格、预警量等(编码不可改)
|
||||
停用物料:设置 status=0,不影响历史变动记录
|
||||
删除物料:软删除 del_flag=1,仅限库存为 0 的物料
|
||||
```
|
||||
|
||||
### 3.2 手动入库
|
||||
|
||||
```
|
||||
在物料库页面点击"入库"按钮 → 弹窗中填写入库数量、备注
|
||||
→ 校验:入库数量 > 0
|
||||
→ 更新 biz_qc_material.stock_qty += 入库数量
|
||||
→ 写入 biz_qc_material_usage(change_type=in, source_type=manual_in)
|
||||
```
|
||||
|
||||
### 3.3 质检任务完成 + 物料扣减
|
||||
|
||||
```
|
||||
质检人员点击"完成任务" → 弹窗:
|
||||
① 现有的检测结果填写区域
|
||||
② 新增:物料使用表格(可添加多行)
|
||||
- 从物料库下拉选择(仅显示 status=1 且 stock_qty > 0 的物料)
|
||||
- 自动带出:物料名称、规格、当前库存
|
||||
- 填写:使用数量
|
||||
|
||||
提交:
|
||||
① 保存检测结果(现有逻辑不变)
|
||||
② 遍历物料使用行:
|
||||
- 校验:使用数量 ≤ 物料当前 stock_qty
|
||||
- 更新 biz_qc_material.stock_qty -= 使用数量
|
||||
- 写入 biz_qc_material_usage(change_type=use, source_type=task_complete, qc_task_id=任务ID)
|
||||
③ 更新任务状态为已完成(现有逻辑不变)
|
||||
|
||||
失败回滚:任何一行物料校验不通过,整个提交回滚,任务状态不变
|
||||
```
|
||||
|
||||
### 3.4 盘存
|
||||
|
||||
```
|
||||
物料变动记录页面:
|
||||
- 支持按物料、变动类型、时间范围筛选
|
||||
- 每条记录显示:物料名称、变动类型、变动数量、变动后库存、关联任务号、操作人、时间
|
||||
- 可导出为盘点报表
|
||||
```
|
||||
|
||||
## 4. 后端实现
|
||||
|
||||
### 4.1 新增文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `backend/app/models/qc_material.py` | BizQcMaterial + BizQcMaterialUsage SQLAlchemy 模型 |
|
||||
| `backend/app/crud/qc_material.py` | 物料 CRUD: list/get/create/update/soft_delete + stock_in(入库) |
|
||||
| `backend/app/crud/qc_material_usage.py` | 变动记录: list + deduct_for_task(扣减) |
|
||||
|
||||
### 4.2 修改文件
|
||||
|
||||
| 文件 | 修改内容 |
|
||||
|------|----------|
|
||||
| `backend/app/api/qc.py` | 新增物料库和变动记录的路由端点 |
|
||||
| `backend/app/api/__init__.py` | 无需修改(共用 qc_router) |
|
||||
| `backend/app/crud/qc_task.py` | `complete_with_result` 方法扩展:接收物料使用数据,调用 deduct_for_task |
|
||||
|
||||
### 4.3 API 端点设计
|
||||
|
||||
```
|
||||
# 质检物料库
|
||||
GET /api/admin/web/admin/qc-materials # 物料列表(分页、关键词搜索)
|
||||
GET /api/admin/web/admin/qc-materials/options # 下拉选项(status=1)
|
||||
POST /api/admin/web/admin/qc-materials # 新增物料
|
||||
PUT /api/admin/web/admin/qc-materials/{id} # 编辑物料
|
||||
DELETE /api/admin/web/admin/qc-materials/{id} # 删除物料(软删除)
|
||||
POST /api/admin/web/admin/qc-materials/{id}/stock-in # 手动入库
|
||||
|
||||
# 物料变动记录
|
||||
GET /api/admin/web/admin/qc-material-usages # 变动记录列表(分页、筛选)
|
||||
|
||||
# 修改现有端点
|
||||
POST /api/admin/web/admin/qc-tasks/{id}/complete-with-result # 扩展请求体,增加 materialUsages 字段
|
||||
```
|
||||
|
||||
### 4.4 CRUD 模式
|
||||
|
||||
遵循 `backend/app/crud/qc_third_party_company.py` 的标准模式:
|
||||
- `_row_to_dict()` - 序列化,camelCase 键名
|
||||
- `list_xxx()` - 分页 + keyword 搜索 + tenant_no 过滤 + create_time DESC
|
||||
- `get_xxx()` - 按 ID + del_flag=0
|
||||
- `create_xxx()` - UUID ID,strip 字符串,编码唯一性校验
|
||||
- `update_xxx()` - 部分更新(仅非 None 字段)
|
||||
- `soft_delete_xxx()` - del_flag=1
|
||||
|
||||
## 5. 前端实现
|
||||
|
||||
### 5.1 新增文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `web-admin/src/api/qc-material.ts` | 物料 API 类型定义 + fetch 函数 |
|
||||
| `web-admin/src/api/qc-material-usage.ts` | 变动记录 API 类型定义 + fetch 函数 |
|
||||
| `web-admin/src/views/quality-inspection/qc-material/index.vue` | 质检物料库列表页 |
|
||||
| `web-admin/src/views/quality-inspection/qc-material-usage/index.vue` | 物料变动记录列表页 |
|
||||
|
||||
### 5.2 修改文件
|
||||
|
||||
| 文件 | 修改内容 |
|
||||
|------|----------|
|
||||
| `web-admin/src/router/modules/sqxp.ts` | 新增 qc-material 和 qc-material-usage 路由 |
|
||||
| `web-admin/src/views/quality-inspection/qc-task/index.vue` | 完成任务弹窗中嵌入物料使用表格 |
|
||||
| `web-admin/src/utils/status-tag-registry.ts` | 新增 changeType 注册(use/in) |
|
||||
|
||||
### 5.3 页面设计
|
||||
|
||||
**质检物料库页面**(参照 `production/consumable/index.vue`):
|
||||
- 标准列表:编码、名称、规格型号、单位、当前库存、预警库存、状态
|
||||
- 工具栏:搜索 + 新增按钮
|
||||
- 操作列:编辑、入库、停用/启用、删除
|
||||
- 入库弹窗:入库数量(el-input-number)+ 备注
|
||||
- 库存预警:stock_qty <= warning_qty 时,库存列标红显示
|
||||
|
||||
**物料变动记录页面**(参照标准列表页):
|
||||
- 筛选条件:物料(下拉)、变动类型(下拉)、时间范围
|
||||
- 列表列:物料名称、物料编码、变动类型(Tag)、变动数量、变动后库存、关联任务号、操作人、时间
|
||||
- 只读列表,无新增/编辑/删除操作
|
||||
|
||||
**完成任务弹窗扩展**(修改现有 qc-task 完成弹窗):
|
||||
- 在现有检测结果区域下方,新增"物料使用"折叠面板或分隔区域
|
||||
- 物料使用表格:物料选择(远程搜索下拉)、规格(自动带出)、当前库存(自动带出)、使用数量(el-input-number)、操作(删除行)
|
||||
- 添加物料行按钮
|
||||
- 提交时校验:每行使用数量 > 0 且 ≤ 当前库存
|
||||
|
||||
## 6. 影响范围
|
||||
|
||||
### 不影响的部分
|
||||
- 现有质检工单创建/配置流程不变
|
||||
- 现有质检任务列表/查看/启动逻辑不变
|
||||
- 现有检测结果保存逻辑不变
|
||||
- 生产模块的耗材/试剂管理不受影响
|
||||
- 物料使用是 **可选的**,不填物料也能完成任务(向后兼容)
|
||||
|
||||
### 需要注意的
|
||||
- `complete_with_result` API 的请求体扩展需要向后兼容:materialUsages 为可选字段,为空时不执行扣减
|
||||
- 并发扣减防护:在 deduct_for_task 中使用数据库行锁(SELECT ... FOR UPDATE)确保库存不超扣
|
||||
|
||||
## 7. 未来扩展(当前不做)
|
||||
|
||||
- 批次号管理
|
||||
- 有效期管理
|
||||
- 采购/入库单据流程
|
||||
- 库位管理
|
||||
- 自动盘点
|
||||
- 物料预警通知(当库存低于预警量时推送消息)
|
||||
@@ -1,322 +0,0 @@
|
||||
# 设计文档:储存证管理 + 满月待办管理 + 保险公司及项目价格
|
||||
|
||||
> 日期:2026-05-20
|
||||
> 状态:已审批
|
||||
> 涉及模块:细胞存储管理、基础信息管理
|
||||
|
||||
---
|
||||
|
||||
## 1. 需求概述
|
||||
|
||||
在系统中新增三个功能模块:
|
||||
|
||||
1. **储存证管理**(细胞存储管理 → 二级菜单):对已生效且样本已入库的采集协议单,管理储存证的上传和状态。
|
||||
2. **满月待办管理**(细胞存储管理 → 二级菜单):对已生效且新生儿满月的采集协议单,管理保险相关信息(保险单号、保险公司、保险险种、保单费用、生效/失效时间等)。
|
||||
3. **保险公司及项目价格**(基础信息管理 → 二级菜单):维护保险公司基础信息、开票信息、保险项目价格,供满月待办业务使用。
|
||||
|
||||
### 1.1 现有系统关联
|
||||
|
||||
- **储存证表** `biz_protocol_storage_cert`:已存在,当前作为采集协议单子资源管理,有 `make_status`、`cert_image_urls`、`make_date` 字段。后端 CRUD 已有 `get_storage_cert()`、`upsert_storage_cert()`。
|
||||
- **满月待办表** `biz_protocol_fullmoon_todo`:已存在,仅有基础字段(`todo_status`、`handle_date`、`handle_remark`、`insurance_attachments`),**缺少保险相关字段**。
|
||||
- **保险公司表**:**完全不存在**,需新建。
|
||||
- **体检机构模式**:系统中已有 `biz_checkup_institution` + `biz_checkup_institution_invoice` + `biz_checkup_institution_project` 的机构管理模式,保险公司模块参照此模式。
|
||||
|
||||
---
|
||||
|
||||
## 2. 数据库设计
|
||||
|
||||
### 2.1 模块 A:保险公司及项目价格(3 张新表)
|
||||
|
||||
#### 2.1.1 `biz_insurance_company` — 保险公司主表
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_insurance_company` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`company_name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '保险公司名称',
|
||||
`company_address` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '公司地址',
|
||||
`contact_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '联系人',
|
||||
`contact_phone` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '联系电话',
|
||||
`status` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT '1正常 0停用',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ins_company` (`tenant_no`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保险公司';
|
||||
```
|
||||
|
||||
#### 2.1.2 `biz_insurance_company_invoice` — 保险公司开票信息(1:N)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_insurance_company_invoice` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`insurance_company_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '保险公司ID',
|
||||
`company_name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '单位名称',
|
||||
`tax_no` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '税号',
|
||||
`company_address` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '单位地址',
|
||||
`company_phone` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '电话',
|
||||
`bank_name` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '开户银行',
|
||||
`bank_account` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '银行账号',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ins_inv` (`insurance_company_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保险公司开票信息';
|
||||
```
|
||||
|
||||
#### 2.1.3 `biz_insurance_project_price` — 保险项目价格(1:N)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_insurance_project_price` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`insurance_company_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '保险公司ID',
|
||||
`project_name` varchar(200) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '项目名称',
|
||||
`project_fee` decimal(18,2) DEFAULT NULL COMMENT '项目费用(元)',
|
||||
`status` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT '1正常 0停用',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_ins_proj` (`insurance_company_id`,`del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='保险项目价格';
|
||||
```
|
||||
|
||||
### 2.2 模块 B:满月待办管理(ALTER 扩展现有表)
|
||||
|
||||
在现有 `biz_protocol_fullmoon_todo` 表上新增 8 个字段:
|
||||
|
||||
```sql
|
||||
ALTER TABLE `biz_protocol_fullmoon_todo`
|
||||
ADD COLUMN `insurance_company_id` varchar(64) DEFAULT NULL COMMENT '保险公司ID' AFTER `insurance_attachments`,
|
||||
ADD COLUMN `insurance_company_name` varchar(200) DEFAULT NULL COMMENT '保险公司名称(冗余快照)' AFTER `insurance_company_id`,
|
||||
ADD COLUMN `insurance_type` varchar(200) DEFAULT NULL COMMENT '保险险种' AFTER `insurance_company_name`,
|
||||
ADD COLUMN `insurance_policy_no` varchar(100) DEFAULT NULL COMMENT '保险单号' AFTER `insurance_type`,
|
||||
ADD COLUMN `insurance_effective_date` char(8) DEFAULT NULL COMMENT '保险单生效时间YYYYMMDD' AFTER `insurance_policy_no`,
|
||||
ADD COLUMN `insurance_expiry_date` char(8) DEFAULT NULL COMMENT '保险单失效时间YYYYMMDD' AFTER `insurance_effective_date`,
|
||||
ADD COLUMN `insurance_subscribed` char(1) DEFAULT '0' COMMENT '是否已订购保险(1是 0否)' AFTER `insurance_expiry_date`,
|
||||
ADD COLUMN `insurance_fee` decimal(18,2) DEFAULT NULL COMMENT '保单费用(元)' AFTER `insurance_subscribed`;
|
||||
```
|
||||
|
||||
**数据筛选逻辑**:满月待办列表仅展示满足以下条件的采集协议单:
|
||||
- `biz_collection_protocol.protocol_status = 'sxz'`(生效中)
|
||||
- `biz_protocol_party_customer.newborn_delivery_time + 30天 ≤ 当前日期`(新生儿已满月)
|
||||
|
||||
**字段语义说明**:
|
||||
- `todo_status`:满月待办整体完成状态('0'未办保险 → '1'已办保险),表示整个流程是否结束
|
||||
- `insurance_subscribed`:是否已订购保险('0'否 → '1'是),表示保险购买这一步骤是否完成
|
||||
- 两者关系:`insurance_subscribed='1'` 是 `todo_status='1'` 的前提条件之一,但不是充分条件(办结需人工确认待办状态)
|
||||
- 前端更新保险信息时,如果 `insurance_subscribed` 设为 '1',可联动将 `todo_status` 更新为 '1'(用户可覆盖)
|
||||
|
||||
### 2.3 模块 C:储存证管理(复用现有表)
|
||||
|
||||
复用现有 `biz_protocol_storage_cert` 表,**不修改表结构**。
|
||||
|
||||
**数据筛选逻辑**:储存证管理列表仅展示满足以下条件的采集协议单:
|
||||
- `biz_collection_protocol.protocol_status = 'sxz'`(生效中)
|
||||
- 关联的 `biz_protocol_sample` 中存在 `sample_status = 'yrk'`(已入库)
|
||||
|
||||
---
|
||||
|
||||
## 3. 后端设计
|
||||
|
||||
### 3.1 模块 A:保险公司及项目价格
|
||||
|
||||
#### 新增文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `backend/app/api/insurance_company.py` | API 路由文件,参照 `pilot_service.py` 中体检机构的路由模式 |
|
||||
|
||||
#### API 接口设计
|
||||
|
||||
**保险公司 CRUD**:
|
||||
- `GET /web/admin/insurance-companies` — 分页列表
|
||||
- `POST /web/admin/insurance-companies` — 新增
|
||||
- `PUT /web/admin/insurance-companies/{id}` — 修改
|
||||
- `DELETE /web/admin/insurance-companies/{id}` — 软删除
|
||||
|
||||
**开票信息 CRUD**:
|
||||
- `GET /web/admin/insurance-company-invoices?insurance_company_id=xxx` — 按公司查列表
|
||||
- `POST /web/admin/insurance-company-invoices` — 新增
|
||||
- `PUT /web/admin/insurance-company-invoices/{id}` — 修改
|
||||
- `DELETE /web/admin/insurance-company-invoices/{id}` — 软删除
|
||||
|
||||
**保险项目价格 CRUD**:
|
||||
- `GET /web/admin/insurance-project-prices?insurance_company_id=xxx` — 按公司查列表
|
||||
- `POST /web/admin/insurance-project-prices` — 新增
|
||||
- `PUT /web/admin/insurance-project-prices/{id}` — 修改
|
||||
- `DELETE /web/admin/insurance-project-prices/{id}` — 软删除
|
||||
|
||||
#### 修改文件
|
||||
|
||||
| 文件 | 变更 |
|
||||
|------|------|
|
||||
| `backend/app/models/models.py` | 新增 3 个 Model:`BizInsuranceCompany`、`BizInsuranceCompanyInvoice`、`BizInsuranceProjectPrice` |
|
||||
| `backend/app/api/__init__.py` | 导入 `insurance_company_router` |
|
||||
| `backend/app/main.py` | 注册 `insurance_company_router` |
|
||||
|
||||
#### CRUD 函数
|
||||
|
||||
CRUD 函数直接写在 `insurance_company.py` 路由文件中(参照项目既有模式:`pilot_service.py` 中体检机构 CRUD 内联在路由文件中),使用 `_X_to_dict()` 手动序列化模式。
|
||||
|
||||
### 3.2 模块 B:满月待办管理
|
||||
|
||||
#### 修改文件
|
||||
|
||||
| 文件 | 变更 |
|
||||
|------|------|
|
||||
| `backend/app/api/collection_protocol.py` | 新增满月待办列表接口 + 保险信息更新接口 |
|
||||
| `backend/app/models/models.py` | `BizProtocolFullmoonTodo` 模型新增 8 个字段 |
|
||||
|
||||
#### API 接口设计
|
||||
|
||||
- `GET /web/admin/fullmoon-todos` — 满月待办分页列表(自动筛选已生效+已满月的协议单,关联查询客户信息和保险信息)
|
||||
- `PUT /web/admin/fullmoon-todos/{id}/insurance` — 更新保险信息(保险公司、保险险种、保险单号、保单费用、生效/失效时间、是否已订购保险、保险附件)
|
||||
|
||||
#### 满月待办列表返回数据结构
|
||||
|
||||
```json
|
||||
{
|
||||
"id": "满月待办ID",
|
||||
"collection_protocol_id": "协议单ID",
|
||||
"protocol_no": "采集协议号",
|
||||
"mother_name": "母亲姓名",
|
||||
"newborn_delivery_time": "新生儿分娩时间",
|
||||
"fullmoon_date": "满月日期(计算值:分娩时间+30天)",
|
||||
"todo_status": "满月待办状态",
|
||||
"insurance_company_id": "保险公司ID",
|
||||
"insurance_company_name": "保险公司名称",
|
||||
"insurance_type": "保险险种",
|
||||
"insurance_policy_no": "保险单号",
|
||||
"insurance_effective_date": "保险生效时间",
|
||||
"insurance_expiry_date": "保险失效时间",
|
||||
"insurance_subscribed": "是否已订购保险",
|
||||
"insurance_fee": "保单费用",
|
||||
"insurance_attachments": "保险附件",
|
||||
"handle_date": "办理日期",
|
||||
"handle_remark": "办理备注"
|
||||
}
|
||||
```
|
||||
|
||||
### 3.3 模块 C:储存证管理
|
||||
|
||||
#### 修改文件
|
||||
|
||||
| 文件 | 变更 |
|
||||
|------|------|
|
||||
| `backend/app/api/collection_protocol.py` | 新增储存证管理列表接口 |
|
||||
|
||||
#### API 接口设计
|
||||
|
||||
- `GET /web/admin/storage-certs` — 储存证管理分页列表(自动筛选已生效+样本已入库的协议单,关联查询储存证信息)
|
||||
- 现有 `upsert_storage_cert()` 函数可复用,前端通过采集协议单编辑接口保存储存证
|
||||
|
||||
#### 储存证列表返回数据结构
|
||||
|
||||
```json
|
||||
{
|
||||
"id": "储存证ID",
|
||||
"collection_protocol_id": "协议单ID",
|
||||
"protocol_no": "采集协议号",
|
||||
"mother_name": "母亲姓名",
|
||||
"newborn_delivery_time": "新生儿分娩时间",
|
||||
"sample_info": "样本信息概要(类型+编码)",
|
||||
"make_status": "制作状态(0未制作 1已制作)",
|
||||
"cert_image_urls": "储存证图片URL列表",
|
||||
"make_date": "制作日期",
|
||||
"storage_in_date": "入库日期"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 前端设计
|
||||
|
||||
### 4.1 菜单注册(`sqxp.ts` 变更)
|
||||
|
||||
**细胞存储管理**(id: `50000000000000000000000000000001`)新增 2 个 children:
|
||||
|
||||
```ts
|
||||
{
|
||||
id: '50000000000000000000000000000006',
|
||||
name: 'CellStorageStorageCert',
|
||||
path: 'storage-cert',
|
||||
component: '/cell-storage/storage-cert/index',
|
||||
meta: { title: '储存证管理', keepAlive: true, menuCode: 'cell-storage:storage-cert' }
|
||||
},
|
||||
{
|
||||
id: '50000000000000000000000000000008',
|
||||
name: 'CellStorageFullmoonTodo',
|
||||
path: 'fullmoon-todo',
|
||||
component: '/cell-storage/fullmoon-todo/index',
|
||||
meta: { title: '满月待办管理', keepAlive: true, menuCode: 'cell-storage:fullmoon-todo' }
|
||||
}
|
||||
```
|
||||
|
||||
**基础信息管理**(id: `40000000000000000000000000000001`)新增 1 个 child:
|
||||
|
||||
```ts
|
||||
{
|
||||
id: '40000000000000000000000000000007',
|
||||
name: 'BasicInfoInsuranceCompany',
|
||||
path: 'insurance-company',
|
||||
component: '/basic-info/insurance-company/index',
|
||||
meta: { title: '保险公司及项目价格', keepAlive: true, menuCode: 'basic-info:insurance-company' }
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 新增页面文件
|
||||
|
||||
| 文件路径 | 参照模板 | 说明 |
|
||||
|----------|---------|------|
|
||||
| `web-admin/src/views/cell-storage/storage-cert/index.vue` | `system/unit/index.vue` | 储存证管理列表页,含查看弹窗 + 上传储存证弹窗 |
|
||||
| `web-admin/src/views/cell-storage/fullmoon-todo/index.vue` | `system/order/index.vue` | 满月待办管理列表页(复杂列表),含保险信息编辑弹窗 |
|
||||
| `web-admin/src/views/basic-info/insurance-company/index.vue` | `pilot-service/checkup-institution/index.vue` | 保险公司管理页,含 Tab 切换(开票信息 / 项目价格) |
|
||||
|
||||
### 4.3 API 接口函数
|
||||
|
||||
新增文件或在现有 `web-admin/src/api/admin.ts` 中追加:
|
||||
|
||||
- 储存证列表:`getStorageCertList(params)`
|
||||
- 满月待办列表:`getFullmoonTodoList(params)`
|
||||
- 满月待办保险更新:`updateFullmoonTodoInsurance(id, data)`
|
||||
- 保险公司 CRUD:`getInsuranceCompanyList(params)`、`createInsuranceCompany(data)`、`updateInsuranceCompany(id, data)`、`deleteInsuranceCompany(id)`
|
||||
- 开票信息 CRUD:`getInsuranceInvoiceList(params)`、`createInsuranceInvoice(data)`、`updateInsuranceInvoice(id, data)`、`deleteInsuranceInvoice(id)`
|
||||
- 项目价格 CRUD:`getInsuranceProjectPriceList(params)`、`createInsuranceProjectPrice(data)`、`updateInsuranceProjectPrice(id, data)`、`deleteInsuranceProjectPrice(id)`
|
||||
|
||||
---
|
||||
|
||||
## 5. 菜单数据初始化
|
||||
|
||||
需在 `sys_menu` 表中插入 3 条新菜单记录,父菜单为 web 端对应的二级菜单节点。同时需要在角色的菜单权限中授权。
|
||||
|
||||
---
|
||||
|
||||
## 6. 约束与规范
|
||||
|
||||
- 所有表遵循公共字段规范(id, tenant_no, order_num, remark, create_by, create_dept_id, create_time, update_by, update_time, del_flag)
|
||||
- 所有查询必须加 `tenant_no` 过滤 + 数据权限过滤
|
||||
- 前端遵循 Fresh Mint 配色(`--primary #10b981`)
|
||||
- 弹窗表单 `label-position="top"`
|
||||
- 状态字段使用 `<el-tag>` 渲染
|
||||
- 附件使用 MinIO,多个附件逗号分隔
|
||||
- 列表默认按 `create_time DESC` 排序
|
||||
@@ -1,274 +0,0 @@
|
||||
# 细胞产品库(Cell Product Library)字段重设计
|
||||
|
||||
> 日期: 2026-05-21
|
||||
> 状态: 已确认,待实施
|
||||
> 范围: `web-admin/src/views/production/cell-product/` + `backend/app/` 相关文件
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 1.1 现状
|
||||
|
||||
`biz_cell_product` 表已有基本 CRUD 功能:产品编码、产品名称、产品类型、规格、批次号、储物格位置、数量、单位、有效期、产品图片、备注。状态字段使用 `zk`/`yc`/`ysy` 缩写且代码中存在不一致。
|
||||
|
||||
### 1.2 新需求
|
||||
|
||||
1. 细胞产品有**代次**(P1~P8,下拉选择)
|
||||
2. 有**冻存日期**(哪天开始冻存)
|
||||
3. 每份产品有**预计细胞数量**(单位:亿)
|
||||
4. 有**活性**百分比(用户填写 0~100 的数字)
|
||||
5. **状态**重新定义为:已冻存 / 已售卖 / 已使用
|
||||
6. **产品编码**自动生成(CP + YYYYMMDD + 6位序列号),生成后可编辑
|
||||
7. **产品图片**改为上传方式,参考【采集协议单录入】附件上传 UI 样式
|
||||
8. 新增**查看弹窗**(只读详情页)
|
||||
|
||||
### 1.3 不在本次范围
|
||||
|
||||
- 批量生成功能(后续对接生产模块时实现)
|
||||
- 生产任务自动生成细胞产品
|
||||
- 状态变更的审批流程
|
||||
|
||||
---
|
||||
|
||||
## 2. 数据库设计
|
||||
|
||||
### 2.1 新增字段
|
||||
|
||||
在 `biz_cell_product` 表中新增以下 4 个字段(放在业务字段区域,`tenant_no` 之前):
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_cell_product
|
||||
ADD COLUMN `passage` VARCHAR(8) DEFAULT NULL COMMENT '代次(P1~P8)' AFTER `storage_slot_id`,
|
||||
ADD COLUMN `freeze_date` DATETIME DEFAULT NULL COMMENT '冻存日期' AFTER `passage`,
|
||||
ADD COLUMN `expected_cell_count` DECIMAL(18,4) DEFAULT NULL COMMENT '预计细胞数量(单位:亿)' AFTER `freeze_date`,
|
||||
ADD COLUMN `viability` DECIMAL(5,2) DEFAULT NULL COMMENT '活性(百分比,0~100)' AFTER `expected_cell_count`;
|
||||
```
|
||||
|
||||
### 2.2 状态字段更新
|
||||
|
||||
`product_status` 字段(varchar(16))的值从 `zk`/`yc`/`ysy` 改为:
|
||||
|
||||
| 状态值 | 显示名 | Tag 颜色 | 说明 |
|
||||
|--------|--------|---------|------|
|
||||
| `frozen` | 已冻存 | `success`(绿色) | 新建时的默认状态 |
|
||||
| `sold` | 已售卖 | `warning`(橙色) | 通过编辑弹窗变更 |
|
||||
| `used` | 已使用 | `info`(灰色) | 通过编辑弹窗变更 |
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_cell_product
|
||||
MODIFY COLUMN `product_status` VARCHAR(16) DEFAULT 'frozen' COMMENT '状态: frozen已冻存/sold已售卖/used已使用';
|
||||
```
|
||||
|
||||
### 2.3 完整字段清单(按顺序)
|
||||
|
||||
| # | DB 列名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|---|---------|------|:----:|--------|------|
|
||||
| 1 | `id` | varchar(64) PK | ✓ | UUID | 主键 |
|
||||
| 2 | `product_code` | varchar(64) | ✓ | 自动生成 | 产品编码 CP+YYYYMMDD+6位序号 |
|
||||
| 3 | `product_name` | varchar(200) | ✓ | | 产品名称 |
|
||||
| 4 | `product_type_id` | varchar(64) | | | 细胞产品类型ID (FK) |
|
||||
| 5 | `spec_id` | varchar(64) | | | 规格ID (FK) |
|
||||
| 6 | `batch_no` | varchar(64) | ✓ | | 批次号 |
|
||||
| 7 | `storage_slot_id` | varchar(64) | | | 储物格ID (FK) |
|
||||
| 8 | **`passage`** | varchar(8) | | | 代次 P1~P8 |
|
||||
| 9 | **`freeze_date`** | datetime | | | 冻存日期 |
|
||||
| 10 | **`expected_cell_count`** | decimal(18,4) | | | 预计细胞数量(亿) |
|
||||
| 11 | **`viability`** | decimal(5,2) | | | 活性(0~100%) |
|
||||
| 12 | `product_status` | varchar(16) | ✓ | `frozen` | 状态 |
|
||||
| 13 | `source_type` | varchar(20) | | `manual` | 来源 |
|
||||
| 14 | `production_task_id` | varchar(64) | | | 来源生产任务ID |
|
||||
| 15 | `quantity` | decimal(18,4) | | | 数量 |
|
||||
| 16 | `unit` | varchar(64) | | | 单位 |
|
||||
| 17 | `expiry_date` | datetime | | | 有效期 |
|
||||
| 18 | `product_images` | varchar(4000) | | | 产品图片URL(逗号分隔) |
|
||||
| — | `tenant_no` ~ `del_flag` | — | — | — | 公共字段 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 状态流转
|
||||
|
||||
```
|
||||
新建 → 已冻存 (frozen, 默认)
|
||||
├─→ 已售卖 (sold) [编辑弹窗]
|
||||
└─→ 已使用 (used) [编辑弹窗]
|
||||
```
|
||||
|
||||
规则:
|
||||
- 状态变更仅通过**编辑弹窗**操作
|
||||
- 已售卖/已使用**不可回退**为已冻存(单向流转)
|
||||
- 只有 `frozen` 状态的产品才能被编辑改为 `sold` 或 `used`
|
||||
- 已售卖和已使用之间**不可互转**
|
||||
|
||||
---
|
||||
|
||||
## 4. 产品编码自动生成
|
||||
|
||||
### 4.1 规则
|
||||
|
||||
```
|
||||
格式: CP + YYYYMMDD + 6位序列号(左补零)
|
||||
示例: CP20260521000001
|
||||
```
|
||||
|
||||
### 4.2 后端接口
|
||||
|
||||
新增 `GET /web/admin/cell-products/next-code`:
|
||||
|
||||
- 查询当天已有最大编码,+1 返回下一个编码
|
||||
- 如果当天无记录,返回 `CPYYYYMMDD000001`
|
||||
- 响应:`{ "code": "CP20260521000001" }`
|
||||
|
||||
### 4.3 前端交互
|
||||
|
||||
- 新增弹窗打开时,自动调用 next-code 接口填充产品编码
|
||||
- 产品编码字段可编辑,用户可手动修改
|
||||
- 编辑弹窗中产品编码只读
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端界面设计
|
||||
|
||||
### 5.1 列表页
|
||||
|
||||
**页面路径**: `/production/cell-product`
|
||||
|
||||
**参考模板**: `src/views/system/order/index.vue`(复杂列表)
|
||||
|
||||
**表格列(14列)**:
|
||||
|
||||
| # | 列名 | 宽度 | 说明 |
|
||||
|---|------|------|------|
|
||||
| 1 | 序号 | 60 | type=index |
|
||||
| 2 | 产品编码 | 180 | product_code |
|
||||
| 3 | 产品名称 | 160 | product_name |
|
||||
| 4 | 产品类型 | 120 | 关联显示类型名称 |
|
||||
| 5 | 规格 | 120 | 关联显示规格名称 |
|
||||
| 6 | 代次 | 80 | passage |
|
||||
| 7 | 批次号 | 140 | batch_no |
|
||||
| 8 | 储物格位置 | 140 | 关联显示储物格路径 |
|
||||
| 9 | 预计细胞数量(亿) | 140 | expected_cell_count |
|
||||
| 10 | 活性(%) | 90 | viability |
|
||||
| 11 | 状态 | 100 | `<el-tag>` Tag 展示 |
|
||||
| 12 | 有效期 | 120 | expiry_date, YYYY-MM-DD |
|
||||
| 13 | 操作 | ≥260 | fixed="right": 查看、编辑、删除 |
|
||||
|
||||
**搜索筛选栏**:
|
||||
- 关键词(模糊搜索,搜索产品编码/产品名称)
|
||||
- 产品状态下拉(已冻存/已售卖/已使用)
|
||||
- 代次下拉(P1~P8)
|
||||
|
||||
**工具栏**:
|
||||
- 已选 N 项
|
||||
- 新增按钮(`type="primary"`)
|
||||
- 删除按钮(批量)
|
||||
|
||||
### 5.2 新增/编辑弹窗
|
||||
|
||||
**布局**: `label-position="top"`, 2 列网格 (`.form-grid-2`)
|
||||
|
||||
**字段排列(左列 → 右列)**:
|
||||
|
||||
| 行 | 左列 | 右列 |
|
||||
|----|------|------|
|
||||
| 1 | 产品编码(自动填充,可编辑;编辑时只读) | 产品名称(必填) |
|
||||
| 2 | 产品类型(下拉) | 规格(下拉) |
|
||||
| 3 | 代次(下拉 P1~P8) | 批次号(必填) |
|
||||
| 4 | 储物格位置(下拉) | 预计细胞数量(数字输入,label 显示"预计细胞数量(亿)") |
|
||||
| 5 | 活性(数字输入 0~100,label 显示"活性(%)") | 冻存日期(日期选择器) |
|
||||
| 6 | 数量 | 单位 |
|
||||
| 7 | 有效期(日期选择器) | 状态(编辑时可选,新增时隐藏/固定为 frozen) |
|
||||
| 8 | 产品图片(跨2列,上传组件,参考采集协议单附件上传样式) | |
|
||||
| 9 | 备注(跨2列,textarea) | |
|
||||
|
||||
**下拉数据来源**:
|
||||
- 产品类型:`/web/admin/cell-product-types` 接口
|
||||
- 规格:`/web/admin/cell-product-specs` 接口
|
||||
- 储物格位置:库位管理接口,显示完整路径(` / `分隔)
|
||||
- 代次:前端硬编码选项 P1~P8
|
||||
|
||||
**编辑弹窗状态字段**:
|
||||
- 仅当当前状态为 `frozen` 时,显示状态下拉可改为 `sold` 或 `used`
|
||||
- 状态已为 `sold` 或 `used` 时,状态字段只读
|
||||
|
||||
### 5.3 查看弹窗
|
||||
|
||||
**布局**: 参考 `SystemViewDialog` 组件模式
|
||||
|
||||
**展示字段**:
|
||||
- 产品编码、产品名称
|
||||
- 产品类型(名称)、规格(名称)
|
||||
- 代次、批次号
|
||||
- 储物格位置(完整路径)
|
||||
- 预计细胞数量(亿)、活性(%)
|
||||
- 数量、单位
|
||||
- 冻存日期、有效期
|
||||
- 状态(`<el-tag>` 展示)
|
||||
- 产品图片(缩略图展示)
|
||||
- 备注
|
||||
|
||||
**状态字段** 使用 `<el-tag>` 渲染:
|
||||
- `frozen` → `<el-tag type="success" size="small">已冻存</el-tag>`
|
||||
- `sold` → `<el-tag type="warning" size="small">已售卖</el-tag>`
|
||||
- `used` → `<el-tag type="info" size="small">已使用</el-tag>`
|
||||
|
||||
### 5.4 产品图片上传
|
||||
|
||||
- 参考【采集协议单录入】模块的附件上传 UI 样式
|
||||
- 上传触发器为卡片式(虚线边框),inline 排列
|
||||
- 支持多图上传
|
||||
- 上传后显示缩略图卡片,支持预览和删除
|
||||
- 图片存储使用 MinIO 对象存储
|
||||
|
||||
---
|
||||
|
||||
## 6. 后端改动
|
||||
|
||||
### 6.1 Model(`backend/app/models/models.py` — BizCellProduct)
|
||||
|
||||
新增 4 个 Column:`passage`、`freeze_date`、`expected_cell_count`、`viability`
|
||||
|
||||
更新 `product_status` 默认值为 `'frozen'`
|
||||
|
||||
### 6.2 Schema(`backend/app/schemas/cell_product.py`)
|
||||
|
||||
- `CellProductCreate`: 新增 `passage`、`freeze_date`、`expected_cell_count`、`viability`(均 Optional)
|
||||
- `CellProductUpdate`: 同上 + `product_status`(可选,校验只能从 frozen→sold/used)
|
||||
- `CellProductListQuery`: 保持不变
|
||||
|
||||
### 6.3 CRUD(`backend/app/crud/cell_product.py`)
|
||||
|
||||
- `_row_to_dict`: 新增 4 个字段的映射
|
||||
- `create` / `update`: 新增字段处理
|
||||
- 新增 `get_next_code` 方法:查询当天最大编码 +1
|
||||
|
||||
### 6.4 API(`backend/app/api/production.py`)
|
||||
|
||||
- 新增 `GET /web/admin/cell-products/next-code` 端点
|
||||
- `create` 端点:新增字段写入
|
||||
- `update` 端点:状态变更校验(只允许 frozen→sold/used)
|
||||
|
||||
---
|
||||
|
||||
## 7. 涉及文件清单
|
||||
|
||||
| 层级 | 文件 | 改动类型 |
|
||||
|------|------|---------|
|
||||
| SQL | `docs/sql/` 新增迁移文件 | ALTER TABLE |
|
||||
| Model | `backend/app/models/models.py` BizCellProduct 类 | 新增 4 个 Column + 更新默认值 |
|
||||
| Schema | `backend/app/schemas/cell_product.py` | 新增字段 + 状态校验 |
|
||||
| CRUD | `backend/app/crud/cell_product.py` | 字段映射 + next-code 方法 |
|
||||
| API | `backend/app/api/production.py` | 新增 next-code 端点 + 状态校验 |
|
||||
| 前端页面 | `web-admin/src/views/production/cell-product/index.vue` | 全面重写(表格+表单+查看弹窗) |
|
||||
| 前端API | `web-admin/src/api/cell-product.ts` | 新增 next-code 接口 |
|
||||
|
||||
---
|
||||
|
||||
## 8. 约定遵循
|
||||
|
||||
- UI 规范: `docs/web-admin-ui-spec-fresh-mint.md`(Fresh Mint 调色板)
|
||||
- 状态 Tag 颜色: `success`=已冻存, `warning`=已售卖, `info`=已使用
|
||||
- 弹窗表单: `label-position="top"`, 2列网格, `.dialog-form-layout`
|
||||
- 产品图片上传: 参考采集协议单附件上传卡片化布局
|
||||
- 公共字段: 遵循 `database-conventions`(id → 业务字段 → tenant_no ~ del_flag)
|
||||
- 编码生成: `CPYYYYMMDD` + 6位序号左补零
|
||||
@@ -1,236 +0,0 @@
|
||||
# 库位占用记录功能设计文档
|
||||
|
||||
> 日期: 2026-05-22
|
||||
> 状态: 已确认
|
||||
> 范围: 前后端全做(含细胞产品对接)
|
||||
|
||||
## 1. 背景与需求
|
||||
|
||||
### 1.1 现状
|
||||
|
||||
库位管理模块由两张表组成:
|
||||
- `biz_storage_facility`:树形结构(液氮罐 → 层 → 盒,`is_leaf=1` 为叶子存储节点)
|
||||
- `biz_storage_facility_slot`:叶子节点下的储物格(如 A1-3),仅有 `slot_code` 和 `slot_status`("空"/"占用")
|
||||
|
||||
细胞产品表 `biz_cell_product` 通过 `storage_slot_id` FK 指向 slot,但 **slot 本身不知道存了什么**。
|
||||
|
||||
### 1.2 问题
|
||||
|
||||
1. `slot_status` 只有"空/占用",不记录物品类型、编码、来源
|
||||
2. 多来源无法统一查询(想查"这格子里有什么"需逐表扫描)
|
||||
3. 一个格子可存放多个物品(一对多关系),当前设计无法支持
|
||||
4. 无出入库历史记录
|
||||
|
||||
### 1.3 需求确认
|
||||
|
||||
| 维度 | 决策 |
|
||||
|---|---|
|
||||
| 储物格与物品关系 | 一对多 |
|
||||
| 物品类型 | `cell_product`(细胞产品)+ `other`(其他,兜底) |
|
||||
| 入库触发 | 细胞产品自动同步 + 手动入库(其他物品) |
|
||||
| 出库触发 | 细胞产品状态变更自动出库 + 手动出库 |
|
||||
| 历史记录 | 需要完整出入库历史 |
|
||||
| 前端展示 | 点击储物格弹窗查看明细 + 手动出入库操作 |
|
||||
| 实施范围 | 前后端全做 |
|
||||
|
||||
## 2. 方案选型
|
||||
|
||||
| 方案 | 描述 | 优点 | 缺点 | 结论 |
|
||||
|---|---|---|---|---|
|
||||
| **A(采用)** | 独立占用表 + Slot 缓存字段 | 统一查询入口、性能好、可扩展 | 双写需事务保证 | ✅ 推荐 |
|
||||
| B | 纯占用表,无缓存 | 单一数据源 | 列表页性能差 | ❌ |
|
||||
| C | 只加字段到 Slot 表 | 最简单 | 不支持一对多、无历史 | ❌ 不满足需求 |
|
||||
|
||||
## 3. 数据模型
|
||||
|
||||
### 3.1 新增表 `biz_storage_slot_occupancy`
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_storage_slot_occupancy (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
slot_id VARCHAR(64) NOT NULL COMMENT '储物格ID (FK → biz_storage_facility_slot)',
|
||||
item_type VARCHAR(32) NOT NULL COMMENT '物品类型: cell_product=细胞产品, other=其他',
|
||||
item_id VARCHAR(64) NOT NULL COMMENT '物品ID (指向对应业务表主键)',
|
||||
item_code VARCHAR(64) NULL COMMENT '物品编码 (冗余展示)',
|
||||
item_name VARCHAR(200) NULL COMMENT '物品名称 (冗余展示)',
|
||||
item_source VARCHAR(32) NULL COMMENT '来源: production=生产入库, manual=手动入库, transfer=转移',
|
||||
stored_at DATETIME NULL COMMENT '入库时间',
|
||||
removed_at DATETIME NULL COMMENT '出库时间 (NULL=当前在库)',
|
||||
occupancy_status VARCHAR(16) NOT NULL DEFAULT 'stored' COMMENT 'stored=在库, removed=已出库',
|
||||
-- 标准公共字段
|
||||
tenant_no VARCHAR(64) NULL COMMENT '租户编号',
|
||||
order_num INT DEFAULT 0 COMMENT '排序',
|
||||
remark VARCHAR(500) NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) NULL COMMENT '创建者',
|
||||
create_dept_id VARCHAR(64) NULL COMMENT '创建部门',
|
||||
create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) NULL COMMENT '更新者',
|
||||
update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag CHAR(1) DEFAULT '0' COMMENT '删除标志(0存在 1删除)',
|
||||
PRIMARY KEY (id),
|
||||
INDEX idx_sso_slot (slot_id, occupancy_status, del_flag),
|
||||
INDEX idx_sso_item (item_type, item_id, del_flag),
|
||||
INDEX idx_sso_tenant (tenant_no, del_flag)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='库位占用记录表';
|
||||
```
|
||||
|
||||
### 3.2 增强 `biz_storage_facility_slot`
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_storage_facility_slot
|
||||
ADD COLUMN occupied_count INT DEFAULT 0 COMMENT '当前占用数量',
|
||||
ADD COLUMN last_item_type VARCHAR(32) NULL COMMENT '最近存储物品类型',
|
||||
ADD COLUMN last_stored_at DATETIME NULL COMMENT '最近入库时间';
|
||||
```
|
||||
|
||||
### 3.3 数据关系
|
||||
|
||||
```
|
||||
biz_storage_facility (树: 液氮罐→层→盒)
|
||||
└── biz_storage_facility_slot (储物格, 新增: occupied_count, last_item_type, last_stored_at)
|
||||
├── biz_storage_slot_occupancy (占用记录, 多态关联)
|
||||
│ ├── item_type='cell_product' → item_id 指向 biz_cell_product.id
|
||||
│ └── item_type='other' → item_id 为手动录入的标识
|
||||
└── biz_cell_product.storage_slot_id (保留, 向后兼容)
|
||||
```
|
||||
|
||||
### 3.4 一致性保证
|
||||
|
||||
- **入库**:同一事务内 → 写 occupancy 记录 + 更新 slot 缓存字段(`occupied_count += 1`)
|
||||
- **出库**:同一事务内 → 更新 occupancy 状态 + 更新 slot 缓存字段(`occupied_count -= 1`)
|
||||
- `occupied_count` 降到 0 时,`slot_status` 改回"空"
|
||||
|
||||
## 4. 后端 API 与业务逻辑
|
||||
|
||||
### 4.1 新增/修改文件
|
||||
|
||||
| 文件 | 作用 |
|
||||
|---|---|
|
||||
| `backend/app/models/models.py` | 新增 `BizStorageSlotOccupancy` 模型 |
|
||||
| `backend/app/schemas/storage_occupancy.py` | 新增,Pydantic schemas |
|
||||
| `backend/app/crud/storage_occupancy.py` | 新增,CRUD 层 |
|
||||
| `backend/app/api/operations.py` | 在现有 router 下新增路由 |
|
||||
| `backend/app/crud/cell_product.py` | 改造:入库/出库时同步写 occupancy |
|
||||
| `backend/app/models/__init__.py` | 新增导出 |
|
||||
|
||||
### 4.2 API 接口
|
||||
|
||||
所有接口挂载在 `/api/web/admin/` 下:
|
||||
|
||||
| 方法 | 路径 | 用途 |
|
||||
|---|---|---|
|
||||
| GET | `/storage-slot-occupancies` | 查询占用记录(按 slot_id / item_type / occupancy_status 筛选) |
|
||||
| POST | `/storage-slot-occupancies` | 手动入库(item_type=other) |
|
||||
| PUT | `/storage-slot-occupancies/{id}/remove` | 手动出库 |
|
||||
| GET | `/storage-slot-occupancies/history` | 出入库历史(支持时间范围、物品类型筛选) |
|
||||
|
||||
**GET `/storage-slot-occupancies` 查询参数**:
|
||||
- `slot_id`(必传):储物格 ID
|
||||
- `occupancy_status`(可选,默认 `stored`):stored / removed
|
||||
- `item_type`(可选):cell_product / other
|
||||
- `page` / `page_size`:分页
|
||||
|
||||
**GET `/storage-slot-occupancies/history` 查询参数**:
|
||||
- `slot_id`(可选):储物格 ID
|
||||
- `facility_node_id`(可选):设施节点 ID(查该节点下所有格子的历史)
|
||||
- `item_type`(可选)
|
||||
- `start_date` / `end_date`(可选):时间范围
|
||||
- `page` / `page_size`:分页
|
||||
|
||||
### 4.3 CRUD 核心函数
|
||||
|
||||
| 函数 | 说明 |
|
||||
|---|---|
|
||||
| `list_occupancies(db, slot_id, status, item_type, page, page_size)` | 分页查询占用记录 |
|
||||
| `list_occupancy_history(db, slot_id, facility_node_id, item_type, start_date, end_date, page, page_size)` | 出入库历史 |
|
||||
| `create_occupancy(db, data, current_user)` | 创建入库记录 + 更新 slot 缓存(同一事务)。`item_type=other` 时 `item_id` 自动生成 UUID |
|
||||
| `remove_occupancy(db, occupancy_id, current_user)` | 出库 + 更新 slot 缓存(同一事务) |
|
||||
| `batch_create_occupancies(db, items, current_user)` | 批量入库(细胞产品批量创建时调用) |
|
||||
| `remove_by_item(db, item_type, item_id, current_user)` | 按物品出库(细胞产品状态变更时调用) |
|
||||
| `_refresh_slot_cache(db, slot_id)` | 内部函数:刷新 slot 的 occupied_count / last_item_type / last_stored_at / slot_status |
|
||||
|
||||
### 4.4 细胞产品对接
|
||||
|
||||
| 触发点 | 改动 |
|
||||
|---|---|
|
||||
| `create_cell_product()` | 创建后同步调用 `create_occupancy()` |
|
||||
| `create_cell_products_batch()` | 批量创建后同步调用 `batch_create_occupancies()` |
|
||||
| `create_cell_products_by_quantity()` | 同上 |
|
||||
| `update_cell_product()` | 状态变为 sold/used/voided 时调用 `remove_by_item('cell_product', product_id)` |
|
||||
|
||||
## 5. 前端交互设计
|
||||
|
||||
### 5.1 库位管理页面改造
|
||||
|
||||
**页面**:`web-admin/src/views/operations/storage-facility/index.vue`
|
||||
|
||||
#### 5.1.1 储物格弹窗(新增)
|
||||
|
||||
点击储物格 → 弹出占用明细弹窗,包含两个 Tab:
|
||||
|
||||
**Tab 1:在库物品**
|
||||
|
||||
| 列 | 说明 |
|
||||
|---|---|
|
||||
| 物品类型 | Tag 标签:cell_product=细胞产品, other=其他 |
|
||||
| 物品编码 | item_code |
|
||||
| 物品名称 | item_name |
|
||||
| 来源 | production=生产入库, manual=手动入库, transfer=转移 |
|
||||
| 入库时间 | stored_at |
|
||||
| 操作 | [出库] 按钮 |
|
||||
|
||||
**Tab 2:出入库历史**
|
||||
|
||||
| 列 | 说明 |
|
||||
|---|---|
|
||||
| 物品类型 | 同上 |
|
||||
| 物品编码 | item_code |
|
||||
| 物品名称 | item_name |
|
||||
| 来源 | item_source |
|
||||
| 入库时间 | stored_at |
|
||||
| 出库时间 | removed_at |
|
||||
| 状态 | Tag:stored=在库, removed=已出库 |
|
||||
|
||||
#### 5.1.2 手动入库对话框(新增)
|
||||
|
||||
弹窗底部「入库」按钮触发,表单字段:
|
||||
|
||||
| 字段 | 控件 | 必填 |
|
||||
|---|---|---|
|
||||
| 物品编码 | el-input | 是 |
|
||||
| 物品名称 | el-input | 是 |
|
||||
| 来源 | el-select(manual/transfer) | 是 |
|
||||
| 备注 | el-input textarea | 否 |
|
||||
|
||||
提交后调用 `POST /storage-slot-occupancies`,刷新在库物品列表。
|
||||
|
||||
#### 5.1.3 库位网格增强
|
||||
|
||||
现有网格每个格子显示 `occupied_count` 数字角标。占用格子背景色保持橙色,角标显示数量。
|
||||
|
||||
### 5.2 细胞产品页面
|
||||
|
||||
**页面**:`web-admin/src/views/production/cell-product/index.vue`
|
||||
|
||||
改动极小:
|
||||
- 入库/出库由后端事务自动完成,前端无需额外逻辑
|
||||
- 可选:储物格列增加 tooltip 显示占用数量
|
||||
|
||||
### 5.3 新增前端 API
|
||||
|
||||
**文件**:`web-admin/src/api/admin.ts`(追加)
|
||||
|
||||
| 函数 | 接口 |
|
||||
|---|---|
|
||||
| `fetchSlotOccupancies(params)` | `GET /storage-slot-occupancies` |
|
||||
| `fetchSlotOccupancyHistory(params)` | `GET /storage-slot-occupancies/history` |
|
||||
| `fetchCreateOccupancy(data)` | `POST /storage-slot-occupancies` |
|
||||
| `fetchRemoveOccupancy(id)` | `PUT /storage-slot-occupancies/{id}/remove` |
|
||||
|
||||
### 5.4 SQL 迁移文件
|
||||
|
||||
**文件**:`docs/sql/2026-05-22-storage-slot-occupancy.sql`
|
||||
|
||||
包含:
|
||||
1. `CREATE TABLE biz_storage_slot_occupancy`
|
||||
2. `ALTER TABLE biz_storage_facility_slot` 增加缓存字段
|
||||
@@ -1,348 +0,0 @@
|
||||
# 生产任务 I/O 与细胞产品库联动设计
|
||||
|
||||
> 日期:2026-05-22
|
||||
> 状态:已确认,待实施
|
||||
> 范围:生产任务执行弹窗 — 原材料/产出与细胞产品库 + 库位联动
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景
|
||||
|
||||
### 当前问题
|
||||
|
||||
1. **产出脱节**:任务产出面板只有简单字段(名称、条码、数量、单位、备注),与细胞产品库完全脱节,产出的细胞产品不会自动入库。
|
||||
2. **原材料信息不足**:选择细胞产品作为原材料时,只显示编码和名称,无法查看产品类型、代次、储物格等关键信息。
|
||||
3. **库位不同步**:原材料消耗和产出创建不会联动库位状态(占用/释放)。
|
||||
4. **先选后删除**:删除已选的原材料后恢复,当前无联动处理。
|
||||
|
||||
### 已有基础
|
||||
|
||||
- `BizProductionTaskOutput` 表已有 `cell_product_id`、`storage_slot_id` 字段(未使用)
|
||||
- `BizCellProduct` 表已有 `production_task_id` 字段(未使用)
|
||||
- `BizCellProduct` CRUD 已有完整的库位占用自动创建/释放逻辑
|
||||
- `_refresh_slot_cache()` 已确保库位缓存一致性
|
||||
|
||||
---
|
||||
|
||||
## 2. 设计决策
|
||||
|
||||
| 维度 | 决策 |
|
||||
|------|------|
|
||||
| 产出联动模式 | **产出即入库** — 保存产出时自动在 `biz_cell_product` 创建记录 + 写入库位占用 |
|
||||
| 删除恢复策略 | **删除即释放** — 删除产出/原材料后立即释放库位,重新添加需重新选位 |
|
||||
| 产出表单范围 | **完整表单** — 与细胞产品库新增弹窗字段一致 |
|
||||
| 原材料面板 | **同步增强** — 选择细胞产品时展示完整产品信息 |
|
||||
| 产出交互方式 | **子弹窗 + 列表** — 添加/编辑弹出表单弹窗,列表展示核心字段 |
|
||||
| 实现架构 | **后端一体化** — 一个事务内完成 diff + 产品 CRUD + 库位联动 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据模型
|
||||
|
||||
### 3.1 无 DDL 变更
|
||||
|
||||
所有需要的字段已存在,只需激活:
|
||||
|
||||
- `biz_production_task_output.cell_product_id` — 开始写入实际产品 ID
|
||||
- `biz_production_task_output.storage_slot_id` — 开始写入实际库位 ID
|
||||
- `biz_cell_product.production_task_id` — 产出创建时写入任务 ID
|
||||
|
||||
### 3.2 数据流向
|
||||
|
||||
```
|
||||
产出保存 (set_task_outputs)
|
||||
├─ 新增 → create BizCellProduct (status=frozen, production_task_id=taskId)
|
||||
│ + create BizStorageSlotOccupancy (item_source=production)
|
||||
│ + _refresh_slot_cache()
|
||||
│ + create BizProductionTaskOutput (关联 cell_product_id)
|
||||
│
|
||||
├─ 删除 → update BizCellProduct (status=voided)
|
||||
│ + remove BizStorageSlotOccupancy
|
||||
│ + _refresh_slot_cache()
|
||||
│ + delete BizProductionTaskOutput
|
||||
│
|
||||
└─ 修改 → update BizCellProduct 字段
|
||||
+ 如库位变更:迁移 occupancy + _refresh_slot_cache()
|
||||
+ update BizProductionTaskOutput
|
||||
|
||||
原材料保存 (set_task_inputs)
|
||||
├─ 新增 cell_product → update BizCellProduct (status=used)
|
||||
│ + remove BizStorageSlotOccupancy
|
||||
│ + _refresh_slot_cache()
|
||||
│
|
||||
└─ 删除 cell_product → update BizCellProduct (status=frozen)
|
||||
+ create BizStorageSlotOccupancy (恢复原位)
|
||||
+ _refresh_slot_cache()
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 后端 API 改造
|
||||
|
||||
### 4.1 Schema 变更
|
||||
|
||||
**`backend/app/schemas/production_task.py`**
|
||||
|
||||
`TaskOutputItem` 扩展为包含完整细胞产品字段:
|
||||
|
||||
```python
|
||||
class TaskOutputItem(BaseModel):
|
||||
# 关联字段
|
||||
cell_product_id: str | None = None # 编辑已有产出时传入
|
||||
|
||||
# 细胞产品完整字段
|
||||
product_code: str
|
||||
product_name: str
|
||||
product_type_id: str | None = None
|
||||
spec_id: str | None = None
|
||||
passage: str | None = None # P1-P8
|
||||
batch_no: str | None = None
|
||||
storage_slot_id: str | None = None
|
||||
expected_cell_count: float | None = None
|
||||
viability: float | None = None # 0-100
|
||||
freeze_date: str | None = None # YYYY-MM-DD
|
||||
quantity: int = 1
|
||||
unit: str | None = None
|
||||
expiry_date: str | None = None # YYYY-MM-DD
|
||||
product_images: str | None = None # 逗号分隔 URL
|
||||
product_status: str = "frozen"
|
||||
remark: str | None = None
|
||||
```
|
||||
|
||||
`TaskInputItem` 不变更结构,但后端增加联动逻辑。
|
||||
|
||||
### 4.2 CRUD 改造
|
||||
|
||||
**`backend/app/crud/production_task.py`**
|
||||
|
||||
#### `set_task_outputs(db, task_id, items)`
|
||||
|
||||
伪代码:
|
||||
|
||||
```python
|
||||
async def set_task_outputs(db: AsyncSession, task_id: str, items: list[TaskOutputItem]):
|
||||
# 1. 加载旧的 outputs
|
||||
old_outputs = await _get_task_outputs(db, task_id)
|
||||
old_map = {o.cell_product_id: o for o in old_outputs if o.cell_product_id}
|
||||
|
||||
# 2. 构建 new map
|
||||
new_map = {}
|
||||
for item in items:
|
||||
if item.cell_product_id:
|
||||
new_map[item.cell_product_id] = item
|
||||
else:
|
||||
new_map[f"__new_{id(item)}"] = item
|
||||
|
||||
# 3. 处理删除
|
||||
for cp_id, old in old_map.items():
|
||||
if cp_id not in new_map:
|
||||
# 作废细胞产品
|
||||
await cell_product_svc.update_status(db, cp_id, "voided")
|
||||
# 释放库位
|
||||
await occupancy_svc.remove_by_item(db, "cell_product", cp_id)
|
||||
# 删除关联
|
||||
await db.delete(old)
|
||||
|
||||
# 4. 处理新增和修改
|
||||
result_outputs = []
|
||||
for key, item in new_map.items():
|
||||
if key.startswith("__new_"):
|
||||
# 新增:创建细胞产品 + 占位
|
||||
product = await cell_product_svc.create(db, {
|
||||
"product_code": item.product_code,
|
||||
"product_name": item.product_name,
|
||||
...全部字段,
|
||||
"product_status": "frozen",
|
||||
"production_task_id": task_id,
|
||||
})
|
||||
if item.storage_slot_id:
|
||||
await occupancy_svc.create(db, {
|
||||
"slot_id": item.storage_slot_id,
|
||||
"item_type": "cell_product",
|
||||
"item_id": product.id,
|
||||
"item_source": "production",
|
||||
})
|
||||
# 创建关联
|
||||
output = BizProductionTaskOutput(
|
||||
task_id=task_id,
|
||||
cell_product_id=product.id,
|
||||
storage_slot_id=item.storage_slot_id,
|
||||
output_name=item.product_name,
|
||||
output_barcode=item.product_code,
|
||||
quantity=item.quantity,
|
||||
unit=item.unit,
|
||||
remark=item.remark,
|
||||
)
|
||||
result_outputs.append(output)
|
||||
else:
|
||||
# 修改:更新细胞产品 + 处理库位变更
|
||||
await cell_product_svc.update(db, key, {...更新字段})
|
||||
old_output = old_map[key]
|
||||
if old_output.storage_slot_id != item.storage_slot_id:
|
||||
# 库位变更:释放旧位 + 占新位
|
||||
if old_output.storage_slot_id:
|
||||
await occupancy_svc.remove_by_item(db, "cell_product", key)
|
||||
if item.storage_slot_id:
|
||||
await occupancy_svc.create(db, {...新占位})
|
||||
# 更新关联表
|
||||
_update_output_fields(old_output, item)
|
||||
result_outputs.append(old_output)
|
||||
|
||||
await db.flush()
|
||||
return result_outputs
|
||||
```
|
||||
|
||||
#### `set_task_inputs(db, task_id, items)`
|
||||
|
||||
伪代码:
|
||||
|
||||
```python
|
||||
async def set_task_inputs(db: AsyncSession, task_id: str, items: list[TaskInputItem]):
|
||||
old_inputs = await _get_task_inputs(db, task_id)
|
||||
|
||||
old_cp_ids = {i.input_id for i in old_inputs if i.input_type == "cell_product" and i.input_id}
|
||||
new_cp_ids = {item.input_id for item in items if item.input_type == "cell_product" and item.input_id}
|
||||
|
||||
# 被移除的细胞产品 → 恢复 frozen + 恢复库位
|
||||
for pid in old_cp_ids - new_cp_ids:
|
||||
await cell_product_svc.update_status(db, pid, "frozen")
|
||||
# 查找该产品原来的 slot,重新占位
|
||||
product = await cell_product_svc.get(db, pid)
|
||||
if product and product.storage_slot_id:
|
||||
await occupancy_svc.create(db, {
|
||||
"slot_id": product.storage_slot_id,
|
||||
"item_type": "cell_product",
|
||||
"item_id": pid,
|
||||
"item_source": "production",
|
||||
})
|
||||
|
||||
# 新增的细胞产品 → used + 释放库位
|
||||
for pid in new_cp_ids - old_cp_ids:
|
||||
await cell_product_svc.update_status(db, pid, "used")
|
||||
await occupancy_svc.remove_by_item(db, "cell_product", pid)
|
||||
|
||||
# 替换 inputs
|
||||
await _replace_inputs(db, task_id, items)
|
||||
```
|
||||
|
||||
### 4.3 路由适配
|
||||
|
||||
**`backend/app/api/production.py`**
|
||||
|
||||
`set_task_outputs` 和 `set_task_inputs` 路由的请求体 schema 更新,其余不变。
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端改造
|
||||
|
||||
### 5.1 新增组件
|
||||
|
||||
#### `TaskOutputProductDialog.vue`
|
||||
|
||||
- 位置:`web-admin/src/views/production/production-work-order/TaskOutputProductDialog.vue`
|
||||
- Props:`visible`, `mode` (add/edit), `productData`, `dropdownOptions`
|
||||
- 功能:
|
||||
- 完整细胞产品表单(与 `cell-product/index.vue` 新增弹窗一致)
|
||||
- 4列栅格布局
|
||||
- 自动生成产品编码(调用 `fetchNextCellProductCode`)
|
||||
- 下拉选项由父组件传入(产品类型、规格、储物格、单位)
|
||||
- 产品图片卡片化上传
|
||||
- Emit:`save(formData)` / `cancel`
|
||||
|
||||
#### `TaskOutputList.vue`
|
||||
|
||||
- 位置:`web-admin/src/views/production/production-work-order/TaskOutputList.vue`
|
||||
- Props:`outputs`, `readonly`
|
||||
- 展示列:序号、产品编码、产品名称、产品类型(tag)、代次、储物格位置、数量/单位、状态(tag)、操作
|
||||
- Emit:`edit(row)` / `delete(index)` / `add()`
|
||||
|
||||
#### `TaskInputEnhancedTable.vue`
|
||||
|
||||
- 位置:`web-admin/src/views/production/production-work-order/TaskInputEnhancedTable.vue`
|
||||
- Props:`inputs`, `cellProductOptions`, `readonly`
|
||||
- 功能:
|
||||
- 类型切换(样本/细胞产品)
|
||||
- 样本行:编码、名称、备注
|
||||
- 细胞产品行:产品编码、产品名称、产品类型、代次、储物格位置、状态(tag)、备注
|
||||
- 选择细胞产品时自动填充所有展示列
|
||||
- Emit:`update(inputs)` / `add()` / `remove(index)`
|
||||
|
||||
### 5.2 现有组件修改
|
||||
|
||||
#### `useTaskStepEditor.ts`
|
||||
|
||||
**产出相关改造**:
|
||||
- `addTaskOutputRow()` → 不再添加空行,改为设置 `outputDialogVisible = true, outputDialogMode = 'add'`
|
||||
- `editTaskOutputRow(row)` → 设置 `outputDialogVisible = true, outputDialogMode = 'edit', editingOutputData = row`
|
||||
- `removeTaskOutputRow(i)` → 确认后从列表移除(实际库位释放在 `saveTaskOutputs` 时后端处理)
|
||||
- `saveTaskOutputs()` → 提交增强后的完整数据到后端
|
||||
- 新增状态:`outputDialogVisible`, `outputDialogMode`, `editingOutputData`
|
||||
- 新增方法:`handleOutputDialogSave(formData)` — 将表单数据合并到 `taskOutputs` 列表
|
||||
|
||||
**原材料相关改造**:
|
||||
- `onCellProductInputSelect(row, val)` → 从 `cellProductMasterById` 填充完整信息(产品类型、代次、储物格等)
|
||||
- 增加 `loadInputDropdownData()` — 加载细胞产品列表(含完整字段)
|
||||
|
||||
#### `TaskExecutionDialog.vue`
|
||||
|
||||
- 产出面板:替换为 `<TaskOutputList>` + `<TaskOutputProductDialog>`
|
||||
- 原材料面板:替换为 `<TaskInputEnhancedTable>`
|
||||
- 下拉数据加载:复用细胞产品库的 `loadDropdownData()` 逻辑
|
||||
|
||||
#### `api/production-task.ts`
|
||||
|
||||
- `fetchSetTaskOutputs` 参数适配新 schema(增加完整细胞产品字段)
|
||||
|
||||
---
|
||||
|
||||
## 6. 改造范围清单
|
||||
|
||||
### 后端
|
||||
|
||||
| 文件 | 操作 |
|
||||
|------|------|
|
||||
| `backend/app/schemas/production_task.py` | 修改 — `TaskOutputItem` 扩展完整细胞产品字段 |
|
||||
| `backend/app/crud/production_task.py` | 修改 — `set_task_outputs` 增加 diff + 产品 CRUD + 库位联动 |
|
||||
| `backend/app/crud/production_task.py` | 修改 — `set_task_inputs` 增加 diff + 产品状态变更 + 库位联动 |
|
||||
| `backend/app/api/production.py` | 修改 — 路由适配新 schema |
|
||||
| `backend/app/crud/cell_product.py` | 可能修改 — 提取 `create_single` / `update_fields` 供复用 |
|
||||
|
||||
### 前端
|
||||
|
||||
| 文件 | 操作 |
|
||||
|------|------|
|
||||
| `web-admin/src/views/production/production-work-order/TaskOutputProductDialog.vue` | **新建** |
|
||||
| `web-admin/src/views/production/production-work-order/TaskOutputList.vue` | **新建** |
|
||||
| `web-admin/src/views/production/production-work-order/TaskInputEnhancedTable.vue` | **新建** |
|
||||
| `web-admin/src/views/production/production-work-order/useTaskStepEditor.ts` | 修改 — 产出/原材料逻辑重构 |
|
||||
| `web-admin/src/views/production/production-work-order/TaskExecutionDialog.vue` | 修改 — 替换产出/原材料面板 |
|
||||
| `web-admin/src/api/production-task.ts` | 修改 — API 参数适配 |
|
||||
|
||||
### 不涉及
|
||||
|
||||
- 数据库 DDL(无新表、无新列)
|
||||
- 工艺路线/工序步骤相关代码
|
||||
- 细胞产品库独立页面
|
||||
- 库位管理独立页面
|
||||
|
||||
---
|
||||
|
||||
## 7. 风险和约束
|
||||
|
||||
1. **事务大小**:如果一次产出数量很多(如50份),事务内会创建大量记录。建议限制单次产出 ≤ 20 条。
|
||||
2. **库位冲突**:用户选择已被占用的库位时,后端应返回明确错误,前端应在下拉中标记已占位。
|
||||
3. **并发安全**:同一库位同时被两个任务选中 → 后端需在 occupancy 表加唯一约束或乐观锁。
|
||||
4. **原材料恢复**:删除原材料恢复细胞产品时,如果原库位已被其他产品占用 → 需要提示用户选择新库位或报错。
|
||||
|
||||
---
|
||||
|
||||
## 8. 验收标准
|
||||
|
||||
1. 产出面板能通过子弹窗新增完整的细胞产品(所有字段可填写)
|
||||
2. 保存产出后,细胞产品库页面能看到新创建的产品
|
||||
3. 产出产品在库位管理页面显示为已占用
|
||||
4. 删除产出后,细胞产品状态变为已作废,库位释放
|
||||
5. 原材料选择细胞产品后,展示完整信息(类型、代次、库位等)
|
||||
6. 保存原材料后,被消耗的细胞产品状态变为已使用,库位释放
|
||||
7. 删除原材料中的细胞产品后,产品状态恢复为已冻存,库位恢复占用
|
||||
8. 查看详情(readonly模式)下所有信息正确展示
|
||||
@@ -1,404 +0,0 @@
|
||||
# 入库放行审核 — 设计文档
|
||||
|
||||
> 日期:2026-05-23
|
||||
> 状态:待审阅
|
||||
> 模块:质检任务 → 入库放行审核
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
当前系统流程:采集协议单/捐赠协议单录入 → 样本接收 → 入库质检工单(含实验室自检和第三方检测)→ 入库生产工单 → 细胞产品入库。
|
||||
|
||||
### 需求
|
||||
|
||||
客户要求在上述流程中增加一个"入库放行审核"环节。所有采集协议单和捐赠协议单的样本,在经过接收、质检、生产后,需经过放行审核通过后才算真正通过并存入库中。
|
||||
|
||||
### 目标
|
||||
|
||||
在【质检任务】菜单下新增【入库放行审核】子菜单,提供:
|
||||
|
||||
1. 样本级别的放行审核列表(采集协议 + 捐赠协议混合展示)
|
||||
2. 查看每个样本的全链路信息(基础、运输、接收、质检、生产)
|
||||
3. 审核操作(通过/不通过 + 备注 + 附件),支持批量
|
||||
4. 样本入库操作,支持批量
|
||||
5. 审核后可继续修改结论、备注、附件
|
||||
|
||||
## 2. 需求确认记录
|
||||
|
||||
| 维度 | 决定 |
|
||||
|------|------|
|
||||
| 审核粒度 | 样本级别 — 每个样本一行,独立审核 |
|
||||
| 显示时机 | 样本接收后(accept_conclusion=js)即显示在列表中 |
|
||||
| 结论选项 | 通过 / 不通过(tg / btg) |
|
||||
| 审核后动作 | 仅记录结论;另设"样本入库"按钮单独触发入库 |
|
||||
| 入库动作 | 仅更新样本状态,不涉及库位分配 |
|
||||
| 批量操作 | 支持批量审核 + 批量入库 |
|
||||
| 审核可修改 | 审核完成后可继续修改结论、备注、附件 |
|
||||
|
||||
## 3. 数据模型
|
||||
|
||||
### 3.1 新增表 `biz_storage_release_review`
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_storage_release_review` (
|
||||
-- 主键
|
||||
`id` VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
|
||||
-- 业务字段
|
||||
`sample_code` VARCHAR(64) NOT NULL COMMENT '样本编码(关联键)',
|
||||
`reception_source` VARCHAR(32) NOT NULL COMMENT '来源:cell_storage=采集/research_donation=捐赠',
|
||||
`protocol_id` VARCHAR(64) DEFAULT NULL COMMENT '协议单ID(冗余加速查询)',
|
||||
`reception_id` VARCHAR(64) DEFAULT NULL COMMENT '样本接收记录ID',
|
||||
`protocol_no` VARCHAR(64) DEFAULT NULL COMMENT '协议编号(冗余展示用)',
|
||||
`sample_name` VARCHAR(128) DEFAULT NULL COMMENT '样本名称(冗余展示用)',
|
||||
|
||||
-- 审核字段
|
||||
`review_conclusion` VARCHAR(16) DEFAULT NULL COMMENT '审核结论:tg=通过/btg=不通过/NULL=待审核',
|
||||
`review_remark` VARCHAR(512) DEFAULT NULL COMMENT '审核备注',
|
||||
`review_attachments` VARCHAR(4000) DEFAULT NULL COMMENT '审核附件(逗号分隔URL)',
|
||||
`review_by` VARCHAR(64) DEFAULT NULL COMMENT '审核人ID',
|
||||
`review_by_name` VARCHAR(64) DEFAULT NULL COMMENT '审核人姓名',
|
||||
`review_time` DATETIME DEFAULT NULL COMMENT '审核时间',
|
||||
|
||||
-- 入库字段
|
||||
`storage_status` VARCHAR(16) NOT NULL DEFAULT 'drk' COMMENT '入库状态:drk=待入库/yrk=已入库',
|
||||
`storage_by` VARCHAR(64) DEFAULT NULL COMMENT '入库操作人ID',
|
||||
`storage_by_name` VARCHAR(64) DEFAULT NULL COMMENT '入库操作人姓名',
|
||||
`storage_time` DATETIME DEFAULT NULL COMMENT '入库时间',
|
||||
|
||||
-- 公共字段
|
||||
`tenant_no` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
`order_num` INT(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
`create_by` VARCHAR(64) DEFAULT NULL COMMENT '创建人ID',
|
||||
`create_dept_id` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` VARCHAR(64) DEFAULT NULL COMMENT '更新人ID',
|
||||
`update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` TINYINT(4) NOT NULL DEFAULT 0 COMMENT '删除标记:0-正常 1-已删除',
|
||||
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_srr_sample` (`tenant_no`, `sample_code`, `del_flag`),
|
||||
KEY `idx_srr_protocol` (`tenant_no`, `protocol_id`, `del_flag`),
|
||||
KEY `idx_srr_status` (`tenant_no`, `review_conclusion`, `storage_status`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='入库放行审核';
|
||||
```
|
||||
|
||||
### 3.2 跨表关联
|
||||
|
||||
```
|
||||
biz_storage_release_review
|
||||
├─ sample_code + tenant_no → biz_protocol_sample / biz_research_donation_sample
|
||||
├─ protocol_id → biz_collection_protocol / biz_research_donation(基础信息)
|
||||
├─ sample_code → biz_protocol_sample_transport / biz_research_donation_sample_transport(运输信息)
|
||||
├─ reception_id → biz_sample_reception + biz_sample_reception_check_result(接收信息)
|
||||
├─ sample_code → biz_qc_work_order + biz_qc_task(质检信息)
|
||||
└─ sample_code → biz_production_work_order + biz_production_task(生产信息)
|
||||
```
|
||||
|
||||
### 3.3 数据流转
|
||||
|
||||
```
|
||||
样本接收完成 (accept_conclusion=js)
|
||||
→ 自动 INSERT biz_storage_release_review (review_conclusion=NULL, storage_status=drk)
|
||||
→ 冗余写入 protocol_no, sample_name, protocol_id, reception_id, reception_source
|
||||
|
||||
审核人提交审核
|
||||
→ UPDATE review_conclusion/review_remark/review_attachments/review_by/review_by_name/review_time
|
||||
→ 可反复修改(每次 UPDATE 覆盖)
|
||||
|
||||
点击"样本入库"
|
||||
→ UPDATE storage_status=yrk, storage_by, storage_by_name, storage_time
|
||||
→ 同步 UPDATE biz_protocol_sample.sample_status = 'yrk'(仅采集协议样本)
|
||||
```
|
||||
|
||||
### 3.4 状态组合
|
||||
|
||||
| review_conclusion | storage_status | 列表标签 | 可用操作 |
|
||||
|---|---|---|---|
|
||||
| NULL | drk | 待审核 | 查看、审核 |
|
||||
| tg | drk | 审核通过 | 查看、审核(修改)、样本入库 |
|
||||
| btg | drk | 审核不通过 | 查看、审核(修改) |
|
||||
| tg | yrk | 已入库 | 查看、审核(修改) |
|
||||
| btg | yrk | 不通过-已入库 | 查看、审核(修改)— 异常状态,理论上不出现 |
|
||||
|
||||
## 4. 后端设计
|
||||
|
||||
### 4.1 新增/修改文件清单
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 新增 | `backend/app/schemas/storage_release_review.py` | Pydantic schemas |
|
||||
| 新增 | `backend/app/crud/storage_release_review.py` | CRUD + 聚合查询 |
|
||||
| 新增 | `backend/app/api/storage_release_review.py` | API 路由 |
|
||||
| 修改 | `backend/app/models/models.py` | 新增 BizStorageReleaseReview 模型 |
|
||||
| 修改 | `backend/app/api/__init__.py` | 注册新路由 |
|
||||
| 修改 | `backend/app/main.py` | 注册新路由 |
|
||||
| 修改 | `backend/app/crud/sample_reception.py` | 样本接收完成时自动创建审核记录 |
|
||||
|
||||
### 4.2 API 端点
|
||||
|
||||
| 方法 | 路径 | 功能 |
|
||||
|------|------|------|
|
||||
| GET | `/api/admin/storage-release-reviews` | 分页列表 |
|
||||
| GET | `/api/admin/storage-release-reviews/{id}/detail` | 详情(聚合全链路) |
|
||||
| POST | `/api/admin/storage-release-reviews/{id}/review` | 提交/修改审核 |
|
||||
| POST | `/api/admin/storage-release-reviews/batch-review` | 批量审核 |
|
||||
| POST | `/api/admin/storage-release-reviews/{id}/store` | 样本入库 |
|
||||
| POST | `/api/admin/storage-release-reviews/batch-store` | 批量入库 |
|
||||
|
||||
### 4.3 列表接口
|
||||
|
||||
`GET /api/admin/storage-release-reviews`
|
||||
|
||||
请求参数:
|
||||
- `page` / `pageSize` — 分页
|
||||
- `reception_source` — 筛选协议类别(cell_storage / research_donation)
|
||||
- `review_conclusion` — 筛选审核结论(tg / btg / null)
|
||||
- `storage_status` — 筛选入库状态(drk / yrk)
|
||||
- `keyword` — 模糊搜索(协议编号、样本编码、样本名称)
|
||||
- `tenant_no` — 租户隔离(从当前用户提取)
|
||||
|
||||
返回:分页列表,默认排序 `create_time DESC`。
|
||||
|
||||
### 4.4 详情接口
|
||||
|
||||
`GET /api/admin/storage-release-reviews/{id}/detail`
|
||||
|
||||
聚合查询逻辑:
|
||||
1. 读取 `biz_storage_release_review` 记录本身
|
||||
2. 根据 `reception_source` 决定 JOIN 哪张协议主表:
|
||||
- `cell_storage` → `biz_collection_protocol` + `biz_protocol_sample` + `biz_protocol_sample_transport`
|
||||
- `research_donation` → `biz_research_donation` + `biz_research_donation_sample` + `biz_research_donation_sample_transport`
|
||||
3. JOIN `biz_sample_reception` + `biz_sample_reception_check_result`(接收信息)
|
||||
4. JOIN `biz_qc_work_order` + `biz_qc_task` + `biz_qc_task_result`(质检信息)
|
||||
5. JOIN `biz_production_work_order` + `biz_production_task`(生产信息)
|
||||
|
||||
返回结构:
|
||||
```json
|
||||
{
|
||||
"review": { "...审核记录本身" },
|
||||
"protocolInfo": { "...协议基础信息" },
|
||||
"transportInfo": { "...运输信息" },
|
||||
"receptionInfo": { "...接收信息+检查项" },
|
||||
"qcInfo": {
|
||||
"workOrder": { "...工单信息" },
|
||||
"tasks": [{ "...任务列表含结论" }]
|
||||
},
|
||||
"productionInfo": {
|
||||
"workOrder": { "...生产工单" },
|
||||
"tasks": [{ "...生产任务" }]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 4.5 审核接口
|
||||
|
||||
`POST /api/admin/storage-release-reviews/{id}/review`
|
||||
|
||||
请求体:
|
||||
```json
|
||||
{
|
||||
"review_conclusion": "tg",
|
||||
"review_remark": "样本质量合格",
|
||||
"review_attachments": "url1,url2"
|
||||
}
|
||||
```
|
||||
|
||||
逻辑:
|
||||
- 验证记录存在 + 租户隔离
|
||||
- UPDATE review_conclusion, review_remark, review_attachments, review_by, review_by_name, review_time
|
||||
- 若 storage_status=yrk 且结论改为 btg,保持 storage_status 不变(入库动作不可通过改结论回退)
|
||||
|
||||
`POST /api/admin/storage-release-reviews/batch-review`
|
||||
|
||||
请求体:
|
||||
```json
|
||||
{
|
||||
"ids": ["id1", "id2"],
|
||||
"review_conclusion": "tg",
|
||||
"review_remark": "批量审核通过",
|
||||
"review_attachments": ""
|
||||
}
|
||||
```
|
||||
|
||||
### 4.6 入库接口
|
||||
|
||||
`POST /api/admin/storage-release-reviews/{id}/store`
|
||||
|
||||
前置条件:`review_conclusion = tg` 且 `storage_status = drk`
|
||||
|
||||
逻辑:
|
||||
- UPDATE storage_status=yrk, storage_by, storage_by_name, storage_time
|
||||
- 同步更新 `biz_protocol_sample.sample_status = 'yrk'`(采集协议样本,通过 sample_code + tenant_no 关联)
|
||||
|
||||
`POST /api/admin/storage-release-reviews/batch-store`
|
||||
|
||||
请求体:
|
||||
```json
|
||||
{ "ids": ["id1", "id2"] }
|
||||
```
|
||||
|
||||
前置条件:所有记录 review_conclusion=tg 且 storage_status=drk。
|
||||
|
||||
### 4.7 自动创建触发点
|
||||
|
||||
在 `backend/app/crud/sample_reception.py` 中,样本接收完成逻辑(accept_conclusion 设为 js 时):
|
||||
- INSERT `biz_storage_release_review`
|
||||
- 冗余写入 sample_code, reception_source, protocol_id, reception_id, protocol_no, sample_name
|
||||
- 初始状态:review_conclusion=NULL, storage_status=drk
|
||||
|
||||
## 5. 前端设计
|
||||
|
||||
### 5.1 新增/修改文件清单
|
||||
|
||||
| 操作 | 文件 | 职责 |
|
||||
|------|------|------|
|
||||
| 新增 | `web-admin/src/api/storage-release-review.ts` | API 调用模块 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/index.vue` | 列表页 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseViewDialog.vue` | 查看弹窗 |
|
||||
| 新增 | `web-admin/src/views/quality-inspection/storage-release-review/StorageReleaseReviewDialog.vue` | 审核弹窗 |
|
||||
| 修改 | `web-admin/src/router/modules/sqxp.ts` | 在质检任务路由组下添加子路由 |
|
||||
|
||||
### 5.2 路由配置
|
||||
|
||||
在 `sqxp.ts` 的质检任务(QualityInspection)路由组下添加:
|
||||
|
||||
```typescript
|
||||
{
|
||||
path: '/quality-inspection/storage-release-review',
|
||||
name: 'StorageReleaseReview',
|
||||
component: () => import('@views/quality-inspection/storage-release-review/index.vue'),
|
||||
meta: {
|
||||
title: '入库放行审核',
|
||||
// 菜单图标仅一级显示
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 5.3 列表页 (`index.vue`)
|
||||
|
||||
参照模板:`protocol-audit/index.vue`(含批量审核的列表页)
|
||||
|
||||
**筛选栏:**
|
||||
- 协议类别(下拉:全部 / 采集协议 / 捐赠协议)
|
||||
- 审核状态(下拉:全部 / 待审核 / 通过 / 不通过)
|
||||
- 入库状态(下拉:全部 / 待入库 / 已入库)
|
||||
- 搜索关键词(输入框:协议编号/样本编码/样本名称)
|
||||
|
||||
**工具栏:**
|
||||
- 左侧:已选 N 项
|
||||
- 右侧:[批量审核] [批量入库] — 仅一条按钮为 type="primary"
|
||||
|
||||
**表格列:**
|
||||
|
||||
| 列 | 字段 | 渲染 | 宽度 |
|
||||
|---|---|---|---|
|
||||
| 选择框 | — | el-table-column type=selection | 50 |
|
||||
| 协议编号 | protocol_no | 文本 | 160 |
|
||||
| 样本编码 | sample_code | 文本 | 140 |
|
||||
| 样本名称 | sample_name | 文本 | 140 |
|
||||
| 协议类别 | reception_source | el-tag: cell_storage→primary, research_donation→success | 100 |
|
||||
| 审核结论 | review_conclusion | el-tag: tg→success, btg→danger, null→info("待审核") | 100 |
|
||||
| 入库状态 | storage_status | el-tag: drk→warning("待入库"), yrk→success("已入库") | 100 |
|
||||
| 审核人 | review_by_name | 文本 | 100 |
|
||||
| 审核时间 | review_time | 日期时间 | 170 |
|
||||
| 操作 | — | fixed=right, min-width=260 | 260+ |
|
||||
|
||||
**操作按钮:**
|
||||
- 查看 — 始终显示
|
||||
- 审核 — 始终显示
|
||||
- 样本入库 — 仅 review_conclusion=tg 且 storage_status=drk 时显示
|
||||
|
||||
### 5.4 查看弹窗 (`StorageReleaseViewDialog.vue`)
|
||||
|
||||
参照模板:`qc-task-view-dialog/index.vue`(多分区信息展示弹窗)
|
||||
|
||||
布局:使用 `SystemViewDialog` 或自定义 el-dialog,内部分为 5 个信息区域:
|
||||
|
||||
1. **▎基础信息** — 协议编号、协议类别、样本编码、样本名称、客户姓名、联系电话
|
||||
2. **▎运输信息** — 运输方式、运输温度、运输时长、运输公司
|
||||
3. **▎接收信息** — 接收时间、接收人、接收结论(el-tag: js→success, bj→danger)、检查项表格
|
||||
4. **▎质检信息** — 工单编号、工单状态(el-tag)、任务列表(各任务名称 + 结论 el-tag)
|
||||
5. **▎生产信息** — 生产工单编号、工单状态(el-tag)、任务列表(各任务名称 + 状态 el-tag)
|
||||
6. **▎放行审核** — 审核结论(el-tag)、审核人、审核时间、审核备注、审核附件(文件列表,支持预览/下载)
|
||||
|
||||
所有区域均为只读展示。
|
||||
|
||||
### 5.5 审核弹窗 (`StorageReleaseReviewDialog.vue`)
|
||||
|
||||
参照模板:`ProtocolAuditDialog.vue`(审核弹窗)
|
||||
|
||||
上半部分:与查看弹窗完全相同(只读展示 5 个信息区域)
|
||||
|
||||
下半部分(表单区域):
|
||||
- 审核结论:el-radio-group(通过 / 不通过)
|
||||
- 备注:el-input type=textarea
|
||||
- 附件:使用 `ProtocolFinanceConfirmFields` 或类似上传组件
|
||||
|
||||
底部按钮:[取消] [确定]
|
||||
|
||||
**批量审核**:不展示上半部分信息,仅显示审核表单(结论 + 备注 + 附件)。参照 `ProtocolAuditDialog` 批量模式。
|
||||
|
||||
### 5.6 可复用组件
|
||||
|
||||
考虑将信息展示区域(基础信息 + 运输信息 + 接收信息 + 质检信息 + 生产信息)抽取为共享子组件,供查看弹窗和审核弹窗复用。
|
||||
|
||||
候选组件:
|
||||
- `SampleQcInfoCards` — 已有,可复用质检信息展示
|
||||
- 新建 `StorageReleaseInfoSection.vue` — 统一封装 5 个信息区域的只读展示
|
||||
|
||||
### 5.7 状态标签注册
|
||||
|
||||
在 `status-tag-registry.ts` 中新增:
|
||||
|
||||
```typescript
|
||||
storageReleaseConclusion: {
|
||||
tg: { label: '通过', type: 'success' },
|
||||
btg: { label: '不通过', type: 'danger' },
|
||||
null: { label: '待审核', type: 'info' },
|
||||
},
|
||||
storageStatus: {
|
||||
drk: { label: '待入库', type: 'warning' },
|
||||
yrk: { label: '已入库', type: 'success' },
|
||||
}
|
||||
```
|
||||
|
||||
## 6. 菜单配置
|
||||
|
||||
在系统管理的静态菜单树中,质检任务节点下添加:
|
||||
|
||||
| 字段 | 值 |
|
||||
|------|-----|
|
||||
| 菜单名称 | 入库放行审核 |
|
||||
| 路由路径 | /quality-inspection/storage-release-review |
|
||||
| 组件路径 | quality-inspection/storage-release-review/index |
|
||||
| 菜单类型 | 菜单(C) |
|
||||
| 上级菜单 | 质检任务 |
|
||||
| 排序 | 在现有质检子菜单之后 |
|
||||
| 图标 | 无(二级菜单不显示图标) |
|
||||
|
||||
## 7. 权限设计
|
||||
|
||||
使用现有角色-菜单权限体系:
|
||||
- 新增菜单节点后,由管理员在角色管理中分配权限
|
||||
- 数据权限遵循现有数据范围规则(全部/本部门/本部门及以下/仅本人/自定义)
|
||||
|
||||
## 8. 边界与约束
|
||||
|
||||
### 不做的事
|
||||
- 不涉及库位分配逻辑
|
||||
- 不涉及工作流引擎(使用简单直审模式)
|
||||
- 不改变现有样本接收、质检、生产工单的逻辑
|
||||
- 不新增独立的权限角色(复用现有菜单权限体系)
|
||||
|
||||
### 异常处理
|
||||
- 批量审核时,部分记录可能已被审核 → 覆盖更新(以最新提交为准)
|
||||
- 批量入库时,跳过不满足条件的记录(结论非 tg 或已入库),返回成功/失败数量
|
||||
- 修改审核结论时,已入库的记录不回退入库状态
|
||||
|
||||
### 附件处理
|
||||
- 遵循现有模式:`review_attachments` 字段存储逗号分隔的 MinIO URL
|
||||
- 上传使用现有 `fetchUploadAttachment` 接口
|
||||
- 附件业务类型:`storage-release-review`
|
||||
@@ -1,324 +0,0 @@
|
||||
# 细胞产品库 — 来源链路展示设计
|
||||
|
||||
> 日期:2026-05-24
|
||||
> 状态:待审核
|
||||
> 方案:A(自定义 Vue 组件 + CSS 绘制连线)
|
||||
> Demo:`docs/demo-source-chain-graph.html`
|
||||
|
||||
## 1. 需求概述
|
||||
|
||||
细胞产品库列表页(`/#/production/cell-product`)当前仅展示产品基础信息,缺少来源追溯能力。需要:
|
||||
|
||||
1. **列表新增来源信息列**:来源类型、来源协议号、来源工单号、来源任务号
|
||||
2. **列表新增来源类型筛选**:下拉筛选(全部/生产入库/手动录入)
|
||||
3. **查看弹窗新增链路图**:横向 DAG 可视化,展示从样本到当前产品的祖先链 + 当前产品到子代产品的后代链,双向递归到顶点/终点
|
||||
4. **链路图连线标注**:连线上方显示工单号、任务号
|
||||
|
||||
### 数据模型
|
||||
|
||||
溯源链路涉及 5 张核心表:
|
||||
|
||||
```
|
||||
biz_collection_protocol (采集协议单)
|
||||
↓ collection_protocol_id
|
||||
biz_protocol_sample (协议样本)
|
||||
↓ protocol_sample_id + collection_protocol_id
|
||||
biz_sample_reception (样本接收记录)
|
||||
↓ reception_id + protocol_sample_id + collection_protocol_id
|
||||
biz_production_work_order (生产工单) ← 冗余存储 protocol_no, sample_code
|
||||
↓ work_order_id
|
||||
biz_production_task (生产任务)
|
||||
↓ task_id
|
||||
biz_cell_product (细胞产品) ← production_task_id 关联到任务
|
||||
```
|
||||
|
||||
后代链路通过投入物/产出物表关联:
|
||||
|
||||
```
|
||||
父细胞产品 (biz_cell_product.id=A)
|
||||
↓ biz_production_task_input(input_type='cell_product', input_id=A, task_id=T)
|
||||
biz_production_task (id=T)
|
||||
↓ biz_production_task_output(task_id=T, cell_product_id=B, C, ...)
|
||||
子细胞产品们 (biz_cell_product.id=B, C, ...)
|
||||
```
|
||||
|
||||
## 2. 后端改造
|
||||
|
||||
### 2.1 列表 API 增强
|
||||
|
||||
**接口**:`GET /web/admin/cell-products`(已有)
|
||||
|
||||
**改造文件**:`backend/app/crud/cell_product.py`
|
||||
|
||||
#### 2.1.1 `_enrich_product_dicts()` 增加来源富化
|
||||
|
||||
在现有富化逻辑(productTypeName, specName, storageSlotName)之后,增加来源信息的批量富化查询:
|
||||
|
||||
1. 收集所有非空 `production_task_id`
|
||||
2. 一次查询 `biz_production_task`,获取 `task_no` 和 `work_order_id`
|
||||
3. 一次查询 `biz_production_work_order`,获取 `work_order_no`、`protocol_no`、`reception_source`
|
||||
4. 映射回每条产品记录
|
||||
|
||||
新增返回字段:
|
||||
|
||||
| 字段名 | 类型 | 来源路径 | 说明 |
|
||||
|--------|------|----------|------|
|
||||
| `sourceTypeLabel` | str | source_type 枚举映射 | 来源类型中文 |
|
||||
| `sourceProtocolNo` | str | task → work_order → protocol_no | 来源协议号 |
|
||||
| `sourceWorkOrderNo` | str | task → work_order → work_order_no | 来源工单号 |
|
||||
| `sourceTaskNo` | str | task → task_no | 来源生产任务号 |
|
||||
| `sourceReceptionSource` | str | work_order → reception_source | cell_storage/research_donation |
|
||||
|
||||
`source_type` 枚举映射:
|
||||
- `production` → "生产入库"
|
||||
- `manual` → "手动录入"
|
||||
|
||||
#### 2.1.2 `list_cell_products()` 增加筛选参数
|
||||
|
||||
入参新增 `source_type: Optional[str] = None`,在查询条件中增加:
|
||||
```python
|
||||
if source_type:
|
||||
query = query.filter(BizCellProduct.source_type == source_type)
|
||||
```
|
||||
|
||||
#### 2.1.3 Schema 更新
|
||||
|
||||
`CellProductListQuery` 新增 `source_type: Optional[str] = None`。
|
||||
|
||||
API 路由层 `production.py` 从 query params 读取 `source_type` 传入 service。
|
||||
|
||||
### 2.2 新增链路 API
|
||||
|
||||
**接口**:`GET /web/admin/cell-products/{product_id}/chain`
|
||||
|
||||
**新文件**:无(在 `backend/app/crud/cell_product.py` 中新增函数,在 `backend/app/api/production.py` 中新增路由)
|
||||
|
||||
#### 2.2.1 返回数据结构
|
||||
|
||||
```json
|
||||
{
|
||||
"current": {
|
||||
"id": "uuid",
|
||||
"productCode": "CP001",
|
||||
"productName": "脐带间充质干细胞",
|
||||
"nodeType": "cell_product",
|
||||
"productStatus": "frozen",
|
||||
"passage": "P2",
|
||||
"isCurrent": true
|
||||
},
|
||||
"ancestors": [
|
||||
{
|
||||
"node": {
|
||||
"id": "uuid",
|
||||
"productCode": "CP000",
|
||||
"productName": "...",
|
||||
"nodeType": "cell_product",
|
||||
"productStatus": "frozen",
|
||||
"passage": "P1",
|
||||
"isCurrent": false
|
||||
},
|
||||
"edge": {
|
||||
"workOrderNo": "WO001",
|
||||
"workOrderType": "cell_storage",
|
||||
"taskNo": "T001",
|
||||
"taskName": "制备任务"
|
||||
},
|
||||
"parent": null
|
||||
}
|
||||
],
|
||||
"descendants": [
|
||||
{
|
||||
"node": {
|
||||
"id": "uuid",
|
||||
"productCode": "CP002",
|
||||
"productName": "...",
|
||||
"nodeType": "cell_product",
|
||||
"productStatus": "frozen",
|
||||
"passage": "P3",
|
||||
"isCurrent": false
|
||||
},
|
||||
"edge": {
|
||||
"workOrderNo": "WO002",
|
||||
"workOrderType": "outbound",
|
||||
"taskNo": "T002",
|
||||
"taskName": "出库生产"
|
||||
},
|
||||
"children": []
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
当追溯链路中遇到样本节点(非细胞产品)时,`nodeType = "sample"`,包含 `sampleCode` 和 `sampleType` 字段。
|
||||
|
||||
#### 2.2.2 递归查询逻辑
|
||||
|
||||
**祖先方向**(从当前产品向上追溯):
|
||||
|
||||
1. 从 `biz_cell_product.production_task_id` 获取任务
|
||||
2. 从 `biz_production_task.work_order_id` 获取工单(含 protocol_no, sample_code)
|
||||
3. 检查该任务的投入物:`biz_production_task_input(input_type='cell_product')` 是否有父产品
|
||||
4. 如有父产品,递归继续(将父产品作为新的起点)
|
||||
5. 如投入物是样本(`input_type='sample'`),创建样本节点,终止递归
|
||||
6. 如 `production_task_id` 为空或 `source_type='manual'`,终止递归
|
||||
|
||||
**子代方向**(从当前产品向下追溯):
|
||||
|
||||
1. 查询 `biz_production_task_input(input_type='cell_product', input_id=当前产品id)` 找到所有引用此产品的任务
|
||||
2. 对每个任务,查询 `biz_production_task_output` 获取产出的细胞产品列表
|
||||
3. 对每个产出产品,递归继续(1对多分支)
|
||||
4. 如无任务引用此产品,终止递归
|
||||
|
||||
**性能保护**:最大递归深度 10 层。
|
||||
|
||||
#### 2.2.3 路由注册
|
||||
|
||||
在 `backend/app/api/production.py` Section 11(细胞产品库)中新增路由,放在 `GET /{product_id}` 之后。
|
||||
|
||||
## 3. 前端改造
|
||||
|
||||
### 3.1 列表页
|
||||
|
||||
**文件**:`web-admin/src/views/production/cell-product/index.vue`
|
||||
|
||||
#### 3.1.1 新增表格列
|
||||
|
||||
在 `productStatus`(状态)列之后,新增 4 列:
|
||||
|
||||
| prop | label | min-width | 渲染 |
|
||||
|------|-------|-----------|------|
|
||||
| `sourceTypeLabel` | 来源类型 | 120 | `<el-tag>`:生产入库=success、手动录入=info |
|
||||
| `sourceProtocolNo` | 来源协议号 | 160 | 文本,无值显示 "—" |
|
||||
| `sourceWorkOrderNo` | 来源工单号 | 140 | 文本,无值显示 "—" |
|
||||
| `sourceTaskNo` | 来源任务号 | 140 | 文本,无值显示 "—" |
|
||||
|
||||
#### 3.1.2 新增搜索筛选
|
||||
|
||||
搜索栏增加「来源类型」下拉,位于 `productStatus` 筛选之后:
|
||||
|
||||
```html
|
||||
<el-select v-model="searchForm.sourceType" placeholder="来源类型" clearable>
|
||||
<el-option label="生产入库" value="production" />
|
||||
<el-option label="手动录入" value="manual" />
|
||||
</el-select>
|
||||
```
|
||||
|
||||
#### 3.1.3 查看弹窗基础信息
|
||||
|
||||
在现有 `viewSections` 的「基本信息」section 中追加 2 个 `ViewField`:
|
||||
|
||||
| field | label | 渲染 |
|
||||
|-------|-------|------|
|
||||
| `sourceTypeLabel` | 来源类型 | `tagType` 映射 |
|
||||
| `sourceProtocolNo` | 来源协议号 | 文本 |
|
||||
|
||||
### 3.2 链路图组件
|
||||
|
||||
**新文件**:`web-admin/src/views/production/cell-product/SourceChainGraph.vue`
|
||||
|
||||
#### 3.2.1 组件职责
|
||||
|
||||
- 接收 `productId` prop
|
||||
- 调用 `GET /web/admin/cell-products/{id}/chain` 获取链路数据
|
||||
- 渲染横向 DAG:祖先 → 当前 → 子代
|
||||
- 支持节点点击查看详情(Element Plus Popover)
|
||||
|
||||
#### 3.2.2 组件 Props
|
||||
|
||||
| prop | type | 说明 |
|
||||
|------|------|------|
|
||||
| `productId` | string | 当前细胞产品 ID |
|
||||
| `visible` | boolean | 是否显示(由父组件控制) |
|
||||
|
||||
#### 3.2.3 布局结构
|
||||
|
||||
```
|
||||
SourceChainGraph
|
||||
├── 祖先区域(水平 flex,从左到右:最早祖先 → ... → 当前节点)
|
||||
│ ├── ChainNode(递归渲染祖先链)
|
||||
│ └── ChainConnector(连线 + 工单/任务标签)
|
||||
├── 当前节点(高亮样式,角标「当前」)
|
||||
└── 子代区域(支持分支,水平 flex-wrap)
|
||||
├── ChainNode(递归渲染子代链,1对多用 flex-wrap)
|
||||
└── ChainConnector(连线 + 工单/任务标签)
|
||||
```
|
||||
|
||||
#### 3.2.4 节点样式
|
||||
|
||||
| 节点类型 | 背景 | 边框 | 内容 |
|
||||
|----------|------|------|------|
|
||||
| 样本 | `#eff6ff`(浅蓝) | `#93c5fd` | 编码、类型 |
|
||||
| 细胞产品 | `#ecfdf5`(浅绿) | `#a7f3d0` | 编码、名称、代次 |
|
||||
| 当前产品 | `#ecfdf5` | `#10b981`(2px 加粗) | 编码、名称、代次 + 角标「当前」 |
|
||||
|
||||
节点尺寸:148×60px,内容过长用 `text-overflow: ellipsis` 截断。
|
||||
|
||||
#### 3.2.5 连线样式
|
||||
|
||||
- 水平线:2px border,颜色 `#d1d5db`
|
||||
- 箭头:CSS border 三角形
|
||||
- 连线上方标签:绝对定位 `<span>`,显示工单号和任务号,字号 10px
|
||||
- 分叉线:从父节点右侧引出竖线 + 横线到各子节点
|
||||
|
||||
#### 3.2.6 查看弹窗集成
|
||||
|
||||
在 `index.vue` 的 `SystemViewDialog` 中新增第三个 section「来源链路」,使用 `template #sourceChain` 自定义插槽:
|
||||
|
||||
```html
|
||||
<SystemViewDialog ...>
|
||||
<!-- 基本信息 section -->
|
||||
<!-- 产品图片 section -->
|
||||
<!-- 来源链路 section (新增) -->
|
||||
<template #sourceChain>
|
||||
<SourceChainGraph :product-id="currentRow.id" :visible="viewDialogVisible" />
|
||||
</template>
|
||||
</SystemViewDialog>
|
||||
```
|
||||
|
||||
`SystemViewDialog` 需支持第三个 section(通过 `viewSections` 配置中增加 `slot: 'sourceChain'`)。
|
||||
|
||||
### 3.3 API 层
|
||||
|
||||
**文件**:`web-admin/src/api/cell-product.ts`
|
||||
|
||||
新增接口函数:
|
||||
|
||||
```typescript
|
||||
export function fetchCellProductChain(productId: string) {
|
||||
return request.get({ url: `/web/admin/cell-products/${productId}/chain` })
|
||||
}
|
||||
```
|
||||
|
||||
`fetchCellProductList` 的参数类型新增 `sourceType?: string`。
|
||||
|
||||
## 4. 影响范围
|
||||
|
||||
### 后端文件
|
||||
|
||||
| 文件 | 改动类型 |
|
||||
|------|----------|
|
||||
| `backend/app/crud/cell_product.py` | 修改:`_enrich_product_dicts` 增加来源富化,新增 `get_product_chain()` 递归函数 |
|
||||
| `backend/app/schemas/cell_product.py` | 修改:`CellProductListQuery` 增加 `source_type` 参数 |
|
||||
| `backend/app/api/production.py` | 修改:列表路由读取 `source_type` 参数,新增 chain 路由 |
|
||||
|
||||
### 前端文件
|
||||
|
||||
| 文件 | 改动类型 |
|
||||
|------|----------|
|
||||
| `web-admin/src/views/production/cell-product/index.vue` | 修改:新增表格列、搜索筛选、查看弹窗字段 |
|
||||
| `web-admin/src/views/production/cell-product/SourceChainGraph.vue` | 新增:链路图组件 |
|
||||
| `web-admin/src/api/cell-product.ts` | 修改:新增 `fetchCellProductChain`,`fetchCellProductList` 参数增加 `sourceType` |
|
||||
|
||||
### 不涉及的文件
|
||||
|
||||
- 数据库无表结构变更(无新表、无新字段)
|
||||
- 不涉及其他模块(订单、协议单、质检等)
|
||||
|
||||
## 5. 约束与边界
|
||||
|
||||
1. **手动录入产品(起源节点)**:无 `production_task_id`,所以祖先链为空。但后续如果被用于生产,子代链路仍然会展示。只有**既无祖先又无子代的孤立产品**才显示空状态提示「该产品暂无来源及衍生链路信息」
|
||||
2. **最大递归深度**:10 层,防止异常数据导致无限递归
|
||||
3. **性能**:链路 API 单次查询,预估节点数 ≤ 50,响应时间 < 500ms
|
||||
4. **科研捐赠来源**:通过 `reception_source='research_donation'` 标识,链路追溯路径相同
|
||||
5. **子代追踪**:依赖 `biz_production_task_input(input_type='cell_product')` 记录,如投入物未正确录入则无法追踪子代
|
||||
6. **配色**:严格使用 Fresh Mint 色系(`#10b981`、`#ecfdf5`),样本节点使用蓝色系(`#eff6ff`、`#93c5fd`)做区分
|
||||
@@ -1,491 +0,0 @@
|
||||
# 渠道服务购买订单 — 功能设计文档
|
||||
|
||||
> 日期:2026-05-24
|
||||
> 状态:待审阅
|
||||
> 模块:中试服务管理
|
||||
> 参考页面:`system/order/index.vue`(复杂列表)、`cell-storage/payment-confirm/index.vue`(财务确认)
|
||||
|
||||
---
|
||||
|
||||
## 1. 业务背景
|
||||
|
||||
渠道商(如医院、合作机构)通过签订渠道协议,以协议价格购买细胞产品服务。渠道服务购买订单支持两种模式:
|
||||
|
||||
1. **充值(预付款)**:渠道向账户充值金额,财务确认后余额增加。后续可用于购买产品。
|
||||
2. **购买产品**:根据渠道协议价格购买细胞产品,直接从渠道账户余额扣减,同时增加产品份数库存。
|
||||
|
||||
后续中试服务单会从渠道产品份数库存中扣减。
|
||||
|
||||
---
|
||||
|
||||
## 2. 业务流程
|
||||
|
||||
### 2.1 充值订单 (order_type = yfk)
|
||||
|
||||
```
|
||||
创建充值(待确认 dqr) → 财务确认(已确认 yqr, 余额+) → 发起退费(退费确认中 tfqrz) → 财务确认退费(已退费 ytf, 余额-)
|
||||
```
|
||||
|
||||
| 状态 | 编码 | 操作角色 | 余额影响 |
|
||||
|------|------|----------|----------|
|
||||
| 待确认 | `dqr` | 采集人员创建 | 无 |
|
||||
| 已确认 | `yqr` | 财务确认 | +prepay_amount |
|
||||
| 退费确认中 | `tfqrz` | 采集人员发起退费 | 无 |
|
||||
| 已退费 | `ytf` | 财务确认退费 | -refund_amount |
|
||||
|
||||
### 2.2 购买产品订单 (order_type = gmcp)
|
||||
|
||||
```
|
||||
创建购买(生效中 sxz, 余额-, 份数+) → 作废(已作废 yzf, 余额+, 份数-)
|
||||
```
|
||||
|
||||
| 状态 | 编码 | 操作角色 | 余额影响 | 份数影响 |
|
||||
|------|------|----------|----------|----------|
|
||||
| 生效中 | `sxz` | 采集人员创建时直接扣减 | -purchase_total_amount | +各产品 buy_qty |
|
||||
| 已作废 | `yzf` | 采集人员/审核人员作废 | +purchase_total_amount | -各产品 buy_qty |
|
||||
|
||||
---
|
||||
|
||||
## 3. 数据库设计
|
||||
|
||||
### 3.1 现有表扩展 — `biz_channel_service_order`
|
||||
|
||||
现有 DDL(`docs/sql/zkxw.sql` 行 827-847)基础上新增以下字段:
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_channel_service_order
|
||||
ADD COLUMN channel_agreement_id VARCHAR(64) DEFAULT NULL COMMENT '渠道协议ID(购买订单必填,关联 biz_channel_agreement.id)',
|
||||
ADD COLUMN balance_before DECIMAL(18,2) DEFAULT NULL COMMENT '操作前余额快照',
|
||||
ADD COLUMN balance_after DECIMAL(18,2) DEFAULT NULL COMMENT '操作后余额快照',
|
||||
ADD COLUMN finance_confirm_time DATETIME DEFAULT NULL COMMENT '财务确认时间',
|
||||
ADD COLUMN finance_confirm_attachments VARCHAR(4000) DEFAULT NULL COMMENT '财务确认附件(逗号分隔URL)',
|
||||
ADD COLUMN finance_remark VARCHAR(512) DEFAULT NULL COMMENT '财务确认备注',
|
||||
ADD COLUMN refund_apply_by VARCHAR(64) DEFAULT NULL COMMENT '退费申请人ID',
|
||||
ADD COLUMN refund_apply_time DATETIME DEFAULT NULL COMMENT '退费申请时间',
|
||||
ADD COLUMN refund_amount DECIMAL(18,2) DEFAULT NULL COMMENT '退费金额',
|
||||
ADD COLUMN refund_remark VARCHAR(512) DEFAULT NULL COMMENT '退费备注',
|
||||
ADD COLUMN refund_attachments VARCHAR(4000) DEFAULT NULL COMMENT '退费附件(逗号分隔URL)',
|
||||
ADD COLUMN refund_finance_confirm_time DATETIME DEFAULT NULL COMMENT '退费财务确认时间',
|
||||
ADD COLUMN refund_finance_confirm_attachments VARCHAR(4000) DEFAULT NULL COMMENT '退费财务确认附件(逗号分隔URL)',
|
||||
ADD COLUMN refund_finance_remark VARCHAR(512) DEFAULT NULL COMMENT '退费财务确认备注';
|
||||
```
|
||||
|
||||
**设计决策:** 财务确认字段直接放主表(1:1 关系),不再使用现有空表 `biz_channel_service_order_finance_confirm`。余额变动历史通过 `balance_before / balance_after` 可追溯。
|
||||
|
||||
**完整字段清单(含原有 + 新增):**
|
||||
|
||||
| 字段 | 类型 | 说明 | 充值 | 购买 |
|
||||
|------|------|------|------|------|
|
||||
| id | VARCHAR(64) PK | 主键UUID | ✅ | ✅ |
|
||||
| channel_id | VARCHAR(64) NOT NULL | 渠道ID | ✅ | ✅ |
|
||||
| channel_name | VARCHAR(200) | 渠道名称冗余 | ✅ | ✅ |
|
||||
| dept_name | VARCHAR(200) | 科室/部门 | ✅ | ✅ |
|
||||
| order_type | VARCHAR(16) NOT NULL | yfk预付款 / gmcp购买产品 | ✅ | ✅ |
|
||||
| prepay_amount | DECIMAL(18,2) | 预付金额 | ✅ | — |
|
||||
| purchase_total_amount | DECIMAL(18,2) | 购买总金额 | — | ✅ |
|
||||
| order_status | VARCHAR(16) NOT NULL DEFAULT 'sxz' | 订单状态 | dqr/yqr/tfqrz/ytf | sxz/yzf |
|
||||
| channel_agreement_id | VARCHAR(64) | 渠道协议ID | — | ✅ 必填 |
|
||||
| balance_before | DECIMAL(18,2) | 操作前余额 | 财务确认时填 | 创建时填 |
|
||||
| balance_after | DECIMAL(18,2) | 操作后余额 | 财务确认时填 | 创建时填 |
|
||||
| finance_confirm_time | DATETIME | 财务确认时间 | ✅ | — |
|
||||
| finance_confirm_attachments | VARCHAR(4000) | 财务确认附件 | ✅ | — |
|
||||
| finance_remark | VARCHAR(512) | 财务确认备注 | ✅ | — |
|
||||
| refund_apply_by | VARCHAR(64) | 退费申请人 | ✅ | — |
|
||||
| refund_apply_time | DATETIME | 退费申请时间 | ✅ | — |
|
||||
| refund_amount | DECIMAL(18,2) | 退费金额 | ✅ | — |
|
||||
| refund_remark | VARCHAR(512) | 退费备注 | ✅ | — |
|
||||
| refund_attachments | VARCHAR(4000) | 退费附件 | ✅ | — |
|
||||
| refund_finance_confirm_time | DATETIME | 退费确认时间 | ✅ | — |
|
||||
| refund_finance_confirm_attachments | VARCHAR(4000) | 退费确认附件 | ✅ | — |
|
||||
| refund_finance_remark | VARCHAR(512) | 退费确认备注 | ✅ | — |
|
||||
|
||||
### 3.2 现有表保持 — `biz_channel_service_order_product`
|
||||
|
||||
现有 DDL(行 888-909)无需改动。字段:`service_order_id`, `project_code`, `project_name`, `cell_type`, `spec_text`, `agreement_unit_price`, `buy_qty`, `buy_amount`。
|
||||
|
||||
### 3.3 新增表 — `biz_channel_account`(渠道账户余额)
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_channel_account (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
channel_id VARCHAR(64) NOT NULL COMMENT '渠道ID',
|
||||
balance_amount DECIMAL(18,2) NOT NULL DEFAULT 0.00 COMMENT '当前余额(元)',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT(4) NOT NULL DEFAULT 0 COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_account_channel (channel_id, del_flag),
|
||||
KEY idx_ca_tenant (tenant_no, del_flag)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渠道账户余额';
|
||||
```
|
||||
|
||||
**业务规则:**
|
||||
- 一个渠道一条记录(UNIQUE KEY)
|
||||
- `balance_amount` 实时更新,不可为负
|
||||
- 余额变动历史通过 `biz_channel_service_order.balance_before / balance_after` 追溯
|
||||
- 首次充值/购买时自动创建账户记录
|
||||
|
||||
### 3.4 新增表 — `biz_channel_product_quota`(渠道产品份数库存)
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_channel_product_quota (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
channel_id VARCHAR(64) NOT NULL COMMENT '渠道ID',
|
||||
project_code VARCHAR(64) DEFAULT NULL COMMENT '项目编码',
|
||||
project_name VARCHAR(200) DEFAULT NULL COMMENT '项目名称',
|
||||
cell_type_code VARCHAR(64) DEFAULT NULL COMMENT '细胞类型编码',
|
||||
cell_type_name VARCHAR(200) DEFAULT NULL COMMENT '细胞类型名称',
|
||||
spec_text VARCHAR(200) DEFAULT NULL COMMENT '规格',
|
||||
total_qty DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '总购买份数',
|
||||
used_qty DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '已使用份数(中试服务扣减)',
|
||||
remaining_qty DECIMAL(18,4) NOT NULL DEFAULT 0 COMMENT '剩余份数 = total_qty - used_qty',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT(4) NOT NULL DEFAULT 0 COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_quota_channel_product (channel_id, project_code, cell_type_code, spec_text, del_flag),
|
||||
KEY idx_cpq_tenant (tenant_no, del_flag)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='渠道产品份数库存';
|
||||
```
|
||||
|
||||
**业务规则:**
|
||||
- 同一渠道同一产品规格只有一条库存记录(UNIQUE KEY)
|
||||
- 购买订单创建时:`total_qty += buy_qty`, `remaining_qty += buy_qty`
|
||||
- 购买订单作废时:`total_qty -= buy_qty`, `remaining_qty -= buy_qty`(需校验 remaining_qty >= buy_qty,防止已使用部分被退回)
|
||||
- 后续中试服务单扣减时:`used_qty += qty`, `remaining_qty -= qty`(本次不实现,但预留字段)
|
||||
|
||||
### 3.5 现有空表 — `biz_channel_service_order_finance_confirm`
|
||||
|
||||
保留不删(当前无数据)。本次不使用,财务确认字段已放入主表。
|
||||
|
||||
### 3.6 表关系图
|
||||
|
||||
```
|
||||
biz_channel (渠道)
|
||||
├── biz_channel_agreement (协议)
|
||||
│ └── biz_channel_agreement_product_price (协议产品价格)
|
||||
├── biz_channel_account (账户余额) [NEW]
|
||||
├── biz_channel_product_quota (产品份数库存) [NEW]
|
||||
└── biz_channel_service_order (服务购买订单) [EXTEND]
|
||||
├── biz_channel_service_order_product (产品明细)
|
||||
└── (finance_confirm 字段已在主表)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. 后端设计
|
||||
|
||||
### 4.1 SQLAlchemy 模型
|
||||
|
||||
在 `backend/app/models/models.py` 中新增:
|
||||
|
||||
1. **`BizChannelAccount`** — 对应 `biz_channel_account` 表
|
||||
2. **`BizChannelProductQuota`** — 对应 `biz_channel_product_quota` 表
|
||||
3. **`BizChannelServiceOrder`** — 扩展现有模型(如果已有则更新字段),对应 `biz_channel_service_order` + 新增字段
|
||||
4. **`BizChannelServiceOrderProduct`** — 对应 `biz_channel_service_order_product`(如果已有则保持)
|
||||
|
||||
### 4.2 API 端点
|
||||
|
||||
在 `backend/app/api/pilot_service.py` 中扩展。前缀 `/web/admin/`。
|
||||
|
||||
#### 4.2.1 订单 CRUD
|
||||
|
||||
| 方法 | URL | 说明 | 权限 |
|
||||
|------|-----|------|------|
|
||||
| GET | `/channel-service-orders` | 订单列表(支持 order_type, order_status, channel_id, keyword 筛选) | 中试服务 |
|
||||
| GET | `/channel-service-orders/{id}` | 订单详情(含产品明细列表) | 中试服务 |
|
||||
| POST | `/channel-service-orders` | 创建订单 | 中试服务 |
|
||||
| PUT | `/channel-service-orders/{id}` | 修改订单(仅 dqr/sxz 状态可改) | 中试服务 |
|
||||
| DELETE | `/channel-service-orders/{id}` | 删除订单(仅 dqr 状态可删,软删除) | 中试服务 |
|
||||
|
||||
#### 4.2.2 状态流转操作
|
||||
|
||||
| 方法 | URL | 前置状态 | 目标状态 | 说明 | 操作角色 |
|
||||
|------|-----|----------|----------|------|----------|
|
||||
| POST | `/channel-service-orders/{id}/confirm-receipt` | dqr | yqr | 财务确认充值(余额+) | 财务 |
|
||||
| POST | `/channel-service-orders/{id}/submit-refund` | yqr | tfqrz | 发起退费申请 | 中试服务 |
|
||||
| POST | `/channel-service-orders/{id}/confirm-refund` | tfqrz | ytf | 财务确认退费(余额-) | 财务 |
|
||||
| PUT | `/channel-service-orders/{id}/void` | sxz | yzf | 作废购买订单(余额+, 份数-) | 中试服务 |
|
||||
|
||||
#### 4.2.3 渠道账户 & 份数查询
|
||||
|
||||
| 方法 | URL | 说明 |
|
||||
|------|-----|------|
|
||||
| GET | `/channels/{channelId}/account` | 获取渠道账户余额(不存在则返回 balance=0) |
|
||||
| GET | `/channels/{channelId}/product-quotas` | 获取渠道产品份数列表 |
|
||||
|
||||
### 4.3 CRUD 函数
|
||||
|
||||
在 `backend/app/crud/pilot_service.py` 中新增。遵循现有 `_row_to_dict_*` 模式。
|
||||
|
||||
**核心函数:**
|
||||
|
||||
| 函数名 | 说明 |
|
||||
|--------|------|
|
||||
| `_row_to_dict_channel_service_order` | 订单行转字典(单一真相源) |
|
||||
| `list_channel_service_orders` | 列表查询(带筛选、分页、数据权限) |
|
||||
| `get_channel_service_order` | 获取单条(含产品明细) |
|
||||
| `create_channel_service_order` | 创建订单(充值直接创建;购买需扣余额+增份数) |
|
||||
| `update_channel_service_order` | 修改订单(校验状态、业务字段) |
|
||||
| `soft_delete_channel_service_order` | 软删除(仅 dqr 状态) |
|
||||
| `confirm_receipt` | 财务确认充值(dqr→yqr,余额+) |
|
||||
| `submit_refund` | 发起退费(yqr→tfqrz,记录退费信息) |
|
||||
| `confirm_refund` | 财务确认退费(tfqrz→ytf,余额-) |
|
||||
| `void_order` | 作废购买订单(sxz→yzf,余额+,份数-) |
|
||||
| `_get_or_create_channel_account` | 获取或创建渠道账户 |
|
||||
| `_upsert_channel_product_quota` | 新增或更新渠道产品份数 |
|
||||
| `_reduce_channel_product_quota` | 扣减渠道产品份数(作废时用) |
|
||||
|
||||
### 4.4 核心业务逻辑
|
||||
|
||||
#### 创建充值订单
|
||||
|
||||
```
|
||||
1. 校验 channel_id 存在
|
||||
2. 校验 prepay_amount > 0
|
||||
3. 创建订单 (order_type=yfk, order_status=dqr)
|
||||
4. 不动余额
|
||||
```
|
||||
|
||||
#### 创建购买订单
|
||||
|
||||
```
|
||||
1. 校验 channel_id 存在
|
||||
2. 校验 channel_agreement_id 存在且 agreement_status='sxz'
|
||||
3. 从 biz_channel_agreement_product_price 加载协议价格
|
||||
4. 校验所有产品明细的项目编码+细胞类型+规格在协议价格表中存在
|
||||
5. 允许用户修改单价(agreement_unit_price 可与协议价不同)
|
||||
6. 计算总金额 = sum(buy_qty * agreement_unit_price)
|
||||
7. 获取渠道账户,校验 balance_amount >= purchase_total_amount
|
||||
8. 扣减余额 (account.balance_amount -= total)
|
||||
9. 记录 balance_before / balance_after
|
||||
10. 创建订单 (order_type=gmcp, order_status=sxz) + 产品明细
|
||||
11. 对每个产品明细,upsert biz_channel_product_quota (total_qty+=, remaining_qty+=)
|
||||
```
|
||||
|
||||
#### 财务确认充值
|
||||
|
||||
```
|
||||
1. 校验 order_status == 'dqr'
|
||||
2. 获取/创建渠道账户
|
||||
3. account.balance_amount += prepay_amount
|
||||
4. 记录 balance_before, balance_after, finance_confirm_time, finance_confirm_attachments, finance_remark
|
||||
5. order_status = 'yqr'
|
||||
```
|
||||
|
||||
#### 发起退费
|
||||
|
||||
```
|
||||
1. 校验 order_status == 'yqr'
|
||||
2. 记录 refund_apply_by, refund_apply_time, refund_amount(=prepay_amount), refund_remark, refund_attachments
|
||||
3. order_status = 'tfqrz'
|
||||
```
|
||||
|
||||
#### 财务确认退费
|
||||
|
||||
```
|
||||
1. 校验 order_status == 'tfqrz'
|
||||
2. account.balance_amount -= refund_amount
|
||||
3. 记录 balance_before, balance_after, refund_finance_confirm_time, refund_finance_confirm_attachments, refund_finance_remark
|
||||
4. order_status = 'ytf'
|
||||
```
|
||||
|
||||
#### 作废购买订单
|
||||
|
||||
```
|
||||
1. 校验 order_status == 'sxz'
|
||||
2. 查询产品明细列表
|
||||
3. 对每个产品明细:
|
||||
a. 校验 remaining_qty >= buy_qty(防止已使用部分被退回)
|
||||
b. 如果 remaining_qty < buy_qty → 返回错误("产品 XXX 已使用 N 份,无法作废")
|
||||
4. account.balance_amount += purchase_total_amount
|
||||
5. 记录 balance_before, balance_after
|
||||
6. 对每个产品明细:total_qty -= buy_qty, remaining_qty -= buy_qty
|
||||
7. order_status = 'yzf'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端设计
|
||||
|
||||
### 5.1 菜单配置
|
||||
|
||||
在系统菜单管理中新增(中试服务管理 下):
|
||||
|
||||
| 菜单名称 | 路由路径 | 组件 | 说明 |
|
||||
|----------|----------|------|------|
|
||||
| 渠道服务购买订单 | `/pilot-service/channel-service-order` | `pilot-service/channel-service-order/index.vue` | 订单管理 |
|
||||
| 渠道服务购买订单(财务确认) | `/pilot-service/channel-service-order-finance` | `pilot-service/channel-service-order-finance/index.vue` | 财务确认 |
|
||||
|
||||
### 5.2 订单管理页
|
||||
|
||||
**参考页面:** `system/order/index.vue`(复杂列表)
|
||||
|
||||
**搜索条件:**
|
||||
- 订单类型(下拉:充值/购买产品)
|
||||
- 订单状态(下拉:根据类型动态切换选项)
|
||||
- 渠道名称(模糊搜索)
|
||||
- 创建时间范围
|
||||
|
||||
**列表列:**
|
||||
|
||||
| 列 | 字段 | 宽度 | 说明 |
|
||||
|----|------|------|------|
|
||||
| 订单编号 | id 后 6 位 | min-width 120 | |
|
||||
| 渠道名称 | channelName | min-width 160 | |
|
||||
| 订单类型 | orderType | min-width 100 | Tag: yfk=充值(info), gmcp=购买产品(primary) |
|
||||
| 订单金额 | prepayAmount / purchaseTotalAmount | min-width 120 | 根据 orderType 展示对应字段 |
|
||||
| 订单状态 | orderStatus | min-width 100 | Tag,颜色见 5.5 |
|
||||
| 操作前余额 | balanceBefore | min-width 120 | |
|
||||
| 操作后余额 | balanceAfter | min-width 120 | |
|
||||
| 创建时间 | createTime | min-width 160 | |
|
||||
| 操作 | — | min-width 260, fixed="right" | 按状态显示按钮 |
|
||||
|
||||
**操作按钮规则:**
|
||||
|
||||
| 状态 | 可用操作 |
|
||||
|------|----------|
|
||||
| dqr(待确认) | 编辑、删除 |
|
||||
| yqr(已确认) | 发起退费、查看 |
|
||||
| tfqrz(退费确认中) | 查看 |
|
||||
| ytf(已退费) | 查看 |
|
||||
| sxz(生效中) | 查看、作废 |
|
||||
| yzf(已作废) | 查看 |
|
||||
|
||||
**新增/编辑弹窗:**
|
||||
- 选择渠道(下拉搜索,`fetchChannelList`)
|
||||
- 订单类型(充值/购买产品,单选,新建后不可修改)
|
||||
- **充值模式字段:** 预付金额(number input, > 0)
|
||||
- **购买模式字段:**
|
||||
- 选择渠道协议(下拉,仅显示该渠道 `agreement_status='sxz'` 的协议)
|
||||
- 产品明细表格(动态行):
|
||||
- 「添加产品」按钮 → 弹窗选择协议产品价格 → 填入行
|
||||
- 每行:项目名称(只读)、细胞类型(只读)、规格(只读)、协议单价(可修改)、购买数量(必填)、购买金额(自动计算 = 单价 × 数量)
|
||||
- 可删除行
|
||||
- 底部汇总:合计金额 + 当前渠道余额(余额不足时红色提示)
|
||||
- 备注(textarea)
|
||||
|
||||
**查看弹窗:**
|
||||
- 展示订单基础信息 + 产品明细(只读表格)
|
||||
- 充值订单:展示财务确认信息(确认时间、附件、备注)、退费信息(如有)
|
||||
- 购买订单:展示余额变动信息
|
||||
|
||||
**作废确认弹窗:**
|
||||
- 展示订单信息和产品明细
|
||||
- 填写作废原因(textarea)
|
||||
- 确认作废
|
||||
|
||||
**发起退费弹窗:**
|
||||
- 展示充值金额
|
||||
- 退费金额(默认=充值金额,可修改但不能超过充值金额)
|
||||
- 退费备注(textarea)
|
||||
- 退费附件(上传)
|
||||
- 确认提交
|
||||
|
||||
### 5.3 财务确认页
|
||||
|
||||
**参考页面:** `cell-storage/payment-confirm/index.vue`
|
||||
|
||||
**Tab 1:待确认**
|
||||
- 列表显示所有 `order_status IN ('dqr', 'tfqrz')` 的订单
|
||||
- 操作:
|
||||
- dqr 订单 → 「确认收款」按钮 → 弹窗(只读订单信息 + 财务备注 textarea + 附件上传)
|
||||
- tfqrz 订单 → 「确认退费」按钮 → 弹窗(只读订单信息+退费信息 + 退费确认备注 + 退费确认附件)
|
||||
|
||||
**Tab 2:已确认**
|
||||
- 列表显示所有 `order_status IN ('yqr', 'ytf')` 的订单
|
||||
- 「查看详情」按钮 → 查看确认信息
|
||||
|
||||
### 5.4 渠道信息页扩展
|
||||
|
||||
在 `pilot-service/channel/index.vue` 的编辑弹窗或查看弹窗中新增「账户信息」Tab:
|
||||
- 展示当前余额
|
||||
- 展示产品份数库存列表(表格:项目名称、细胞类型、规格、总份数、已使用、剩余份数)
|
||||
|
||||
### 5.5 状态标签注册
|
||||
|
||||
在 `web-admin/src/utils/status-tag-registry.ts` 中新增:
|
||||
|
||||
```typescript
|
||||
serviceOrderType: {
|
||||
yfk: { label: '充值', tagType: 'info' },
|
||||
gmcp: { label: '购买产品', tagType: 'primary' },
|
||||
},
|
||||
|
||||
serviceOrderStatus: {
|
||||
dqr: { label: '待确认', tagType: 'info' },
|
||||
yqr: { label: '已确认', tagType: 'success' },
|
||||
tfqrz: { label: '退费确认中', tagType: 'warning' },
|
||||
ytf: { label: '已退费', tagType: 'danger' },
|
||||
sxz: { label: '生效中', tagType: 'success' },
|
||||
yzf: { label: '已作废', tagType: 'danger' },
|
||||
},
|
||||
```
|
||||
|
||||
### 5.6 前端 API 封装
|
||||
|
||||
在 `web-admin/src/api/admin.ts` 中新增:
|
||||
|
||||
```typescript
|
||||
// 渠道服务购买订单
|
||||
fetchChannelServiceOrderList(params) // GET /channel-service-orders
|
||||
fetchChannelServiceOrderDetail(id) // GET /channel-service-orders/{id}
|
||||
fetchCreateChannelServiceOrder(data) // POST /channel-service-orders
|
||||
fetchUpdateChannelServiceOrder(id, data) // PUT /channel-service-orders/{id}
|
||||
fetchDeleteChannelServiceOrder(id) // DELETE /channel-service-orders/{id}
|
||||
|
||||
// 状态流转
|
||||
fetchConfirmReceipt(id, data) // POST /channel-service-orders/{id}/confirm-receipt
|
||||
fetchSubmitRefund(id, data) // POST /channel-service-orders/{id}/submit-refund
|
||||
fetchConfirmRefund(id, data) // POST /channel-service-orders/{id}/confirm-refund
|
||||
fetchVoidChannelServiceOrder(id, data) // PUT /channel-service-orders/{id}/void
|
||||
|
||||
// 渠道账户 & 份数
|
||||
fetchChannelAccount(channelId) // GET /channels/{channelId}/account
|
||||
fetchChannelProductQuotas(channelId) // GET /channels/{channelId}/product-quotas
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. 开发范围边界
|
||||
|
||||
### 本次实现 ✅
|
||||
|
||||
1. 数据库:2 张新表 + 1 张表扩展字段
|
||||
2. 后端:4 个新 SQLAlchemy 模型 + CRUD 函数 + API 端点
|
||||
3. 前端:2 个新页面(订单管理 + 财务确认)+ 渠道信息页扩展(账户 Tab)
|
||||
4. 状态标签注册
|
||||
5. 菜单数据初始化 SQL
|
||||
|
||||
### 后续实现 ❌(不在本次范围)
|
||||
|
||||
1. 中试服务单(biz_channel_pilot_service)的创建和产品份数扣减
|
||||
2. 中试服务单与渠道购买订单的关联
|
||||
3. 渠道账户对账报表
|
||||
4. 渠道协议授信额度校验(可后续增强)
|
||||
|
||||
---
|
||||
|
||||
## 7. 注意事项
|
||||
|
||||
1. **并发安全:** 余额扣减和份数更新需使用数据库行锁(`SELECT ... FOR UPDATE`)或乐观锁,防止并发创建订单导致余额超扣。
|
||||
2. **作废校验:** 购买订单作废时,需校验产品份数的 `remaining_qty >= buy_qty`。如果部分份数已被中试服务消耗(后续功能),则不允许作废或只能部分退回。
|
||||
3. **数据权限:** 所有查询需应用 `apply_data_scope()` 数据范围过滤。
|
||||
4. **租户隔离:** 所有操作带 `tenant_no` 过滤。
|
||||
5. **操作日志:** 建议参考采集协议单的模式,记录订单状态变更日志(可选,后续增强)。
|
||||
6. **前端参考页面:** 新页面严格遵循 `docs/web-admin-ui-spec-fresh-mint.md` 的 Fresh Mint 色彩规范。
|
||||
7. **order_status 默认值:** 现有 DDL 中 `order_status DEFAULT 'sxz'`,但充值订单初始状态为 `dqr`。后端 create 函数必须根据 `order_type` 显式设置 order_status,不依赖 DDL 默认值:`order_type='yfk' → order_status='dqr'`,`order_type='gmcp' → order_status='sxz'`。
|
||||
8. **cell_type 字段映射:** `biz_channel_service_order_product.cell_type` 存储细胞类型名称(冗余文本),但 `biz_channel_product_quota` 使用 `cell_type_code` + `cell_type_name` 分开存储。创建份数库存时,`cell_type_code` 和 `cell_type_name` 从 `biz_channel_agreement_product_price` 协议产品价格表获取,不从订单明细的 `cell_type` 取值。
|
||||
9. **并发方案确定:** 余额扣减使用 `SELECT ... FOR UPDATE` 悲观行锁。在创建购买订单和财务确认充值时,先锁定 `biz_channel_account` 行再更新余额,防止并发超扣。整个余额操作在一个数据库事务内完成。
|
||||
@@ -1,256 +0,0 @@
|
||||
# 渠道服务订单 — 多次操作流水模型设计
|
||||
|
||||
## 背景
|
||||
|
||||
现有渠道服务订单(`biz_channel_service_order`)为单次操作模型:一个订单 = 一次充值或一次购买,退款只能做一次。业务要求每个订单支持多次充值、多次退款、多次购买产品、按份数退订产品,且所有涉及金额的操作都需走财务确认流程。
|
||||
|
||||
## 业务模型
|
||||
|
||||
```
|
||||
渠道服务订单(运营手动创建,选渠道+协议,选类型 yfk/gmcp)
|
||||
├── 充值型(yfk):独立充钱、独立退钱,走渠道账户余额
|
||||
│ ├── 多次充值 → 每次独立金额 + 财务确认 → 余额增加
|
||||
│ └── 多次退款 → 每次独立金额 + 财务确认 → 余额减少
|
||||
│
|
||||
└── 购买型(gmcp):独立买产品、独立退订,与余额无关
|
||||
├── 多次购买 → 每次独立购买产品(份数) + 财务确认 → 持仓增加
|
||||
└── 多次退订 → 按份数退订 + 财务确认 → 持仓减少
|
||||
```
|
||||
|
||||
两种类型完全独立。充值管渠道余额,购买管产品份数。
|
||||
|
||||
## 方案:操作流水子表
|
||||
|
||||
核心思路:订单主表管汇总,新增操作流水表管明细,产品表管持仓。
|
||||
|
||||
---
|
||||
|
||||
## 1. 数据模型
|
||||
|
||||
### 1.1 订单主表 `biz_channel_service_order`(改造)
|
||||
|
||||
**保留字段:**
|
||||
- `id`, `channel_id`, `channel_name`, `dept_name`, `order_type`(yfk/gmcp), `order_status`(dsx/sxz/yzf), `channel_agreement_id`
|
||||
- 公共字段:`tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
|
||||
**移除字段(迁移到流水表):**
|
||||
- `prepay_amount`, `purchase_total_amount`
|
||||
- `finance_submit_by`, `finance_submit_time`, `finance_submit_remark`, `finance_submit_attachments`
|
||||
- `finance_confirm_time`, `finance_confirm_attachments`, `finance_remark`
|
||||
- `refund_apply_by`, `refund_apply_time`, `refund_amount`, `refund_remark`, `refund_attachments`
|
||||
- `refund_finance_confirm_time`, `refund_finance_confirm_attachments`, `refund_finance_remark`
|
||||
- `balance_before`, `balance_after`
|
||||
|
||||
**新增汇总字段:**
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `total_recharge_amount` | decimal(18,2) DEFAULT 0 | 累计充值总额(yfk) |
|
||||
| `total_refund_amount` | decimal(18,2) DEFAULT 0 | 累计退款总额(yfk) |
|
||||
| `current_balance` | decimal(18,2) DEFAULT 0 | 当前余额(yfk),= 累计充值 - 累计退款 |
|
||||
|
||||
### 1.2 操作流水表 `biz_channel_service_order_txn`(新增)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_channel_service_order_txn` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`service_order_id` varchar(64) NOT NULL COMMENT '关联订单ID',
|
||||
`txn_type` varchar(16) NOT NULL COMMENT 'recharge/refund/purchase/unsubscribe',
|
||||
`amount` decimal(18,2) DEFAULT NULL COMMENT '本次操作金额',
|
||||
`txn_status` varchar(16) NOT NULL DEFAULT 'dsx' COMMENT 'dsx待生效 dqr待财务确认 yqr已确认 yzf已作废',
|
||||
`products_json` text COMMENT '产品明细JSON(purchase/unsubscribe类型)',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '备注',
|
||||
-- 发起财务确认
|
||||
`finance_submit_by` varchar(64) DEFAULT NULL COMMENT '发起确认人ID',
|
||||
`finance_submit_time` datetime DEFAULT NULL COMMENT '发起确认时间',
|
||||
`finance_submit_remark` varchar(512) DEFAULT NULL COMMENT '发起确认备注',
|
||||
`finance_submit_attachments` text COMMENT '发起确认附件',
|
||||
-- 财务确认
|
||||
`finance_confirm_time` datetime DEFAULT NULL COMMENT '财务确认时间',
|
||||
`finance_confirm_attachments` text COMMENT '财务确认附件',
|
||||
`finance_remark` varchar(512) DEFAULT NULL COMMENT '财务确认备注',
|
||||
-- 余额快照(仅 yfk 类型)
|
||||
`balance_before` decimal(18,2) DEFAULT NULL COMMENT '操作前余额',
|
||||
`balance_after` decimal(18,2) DEFAULT NULL COMMENT '操作后余额',
|
||||
-- 公共字段
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `idx_txn_order` (`service_order_id`, `del_flag`),
|
||||
KEY `idx_txn_status` (`txn_status`, `tenant_no`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='渠道服务订单操作流水';
|
||||
```
|
||||
|
||||
### 1.3 产品持仓表 `biz_channel_service_order_product`(改造)
|
||||
|
||||
在现有字段基础上新增:
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `total_buy_qty` | decimal(18,4) DEFAULT 0 | 累计购买数量 |
|
||||
| `total_unsubscribe_qty` | decimal(18,4) DEFAULT 0 | 累计退订数量 |
|
||||
| `current_qty` | decimal(18,4) DEFAULT 0 | 当前持有数量 |
|
||||
| `total_unsubscribe_amount` | decimal(18,2) DEFAULT 0 | 累计退订金额 |
|
||||
|
||||
保留现有字段:`agreement_unit_price`, `buy_qty`(首次购买), `buy_amount`。
|
||||
|
||||
### 1.4 关系图
|
||||
|
||||
```
|
||||
biz_channel_service_order(订单主表)
|
||||
│
|
||||
├── biz_channel_service_order_txn(操作流水)× N
|
||||
│ 每条流水 = 一次充值/退款/购买/退订
|
||||
│ 每条流水独立走财务确认流程
|
||||
│
|
||||
└── biz_channel_service_order_product(产品持仓)× N
|
||||
购买时增加 current_qty,退订时减少
|
||||
```
|
||||
|
||||
### 1.5 废弃表
|
||||
|
||||
`biz_channel_service_order_finance_confirm` — 已有但未使用,保留不删,不再使用。
|
||||
|
||||
---
|
||||
|
||||
## 2. 状态机
|
||||
|
||||
### 2.1 订单主表状态
|
||||
|
||||
| 状态 | 含义 | 说明 |
|
||||
|------|------|------|
|
||||
| `dsx` | 待生效 | 刚创建,尚无已确认的流水 |
|
||||
| `sxz` | 生效中 | 至少有一笔流水已确认 |
|
||||
| `yzf` | 已作废 | 手动作废,不再允许新操作 |
|
||||
|
||||
### 2.2 流水状态
|
||||
|
||||
| 状态 | 含义 | 可转至 |
|
||||
|------|------|--------|
|
||||
| `dsx` | 待生效 | `dqr`(发起确认)、`yzf`(作废) |
|
||||
| `dqr` | 待财务确认 | `yqr`(财务确认) |
|
||||
| `yqr` | 已确认(终态) | — |
|
||||
| `yzf` | 已作废(终态) | — |
|
||||
|
||||
### 2.3 操作流转
|
||||
|
||||
**充值型(yfk):**
|
||||
|
||||
```
|
||||
创建订单 → [dsx]
|
||||
├─ 发起充值 → txn(recharge, dsx)
|
||||
│ └─ 发起确认 → txn(dqr) → 财务确认 → txn(yqr)
|
||||
│ └─ order.total_recharge_amount += amount
|
||||
│ order.current_balance += amount
|
||||
│ order.status → sxz (首次确认时)
|
||||
│
|
||||
└─ 申请退款 → txn(refund, dsx), amount ≤ current_balance
|
||||
└─ 发起确认 → txn(dqr) → 财务确认 → txn(yqr)
|
||||
└─ order.total_refund_amount += amount
|
||||
order.current_balance -= amount
|
||||
```
|
||||
|
||||
**购买型(gmcp):**
|
||||
|
||||
```
|
||||
创建订单 → [dsx]
|
||||
├─ 购买产品 → txn(purchase, dsx) + 创建/更新 product 持仓
|
||||
│ └─ 发起确认 → txn(dqr) → 财务确认 → txn(yqr)
|
||||
│ └─ product.total_buy_qty += qty
|
||||
│ product.current_qty += qty
|
||||
│ order.status → sxz (首次确认时)
|
||||
│
|
||||
└─ 退订产品 → txn(unsubscribe, dsx), qty ≤ product.current_qty
|
||||
└─ 发起确认 → txn(dqr) → 财务确认 → txn(yqr)
|
||||
└─ product.total_unsubscribe_qty += qty
|
||||
product.current_qty -= qty
|
||||
product.total_unsubscribe_amount += qty × unit_price
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. API 设计
|
||||
|
||||
### 3.1 订单管理(`/api/admin/channel-service-orders`)
|
||||
|
||||
| 接口 | 方法 | 说明 | 变更 |
|
||||
|------|------|------|------|
|
||||
| `/` | GET | 订单列表 | 不变 |
|
||||
| `/{order_id}` | GET | 订单详情 + 流水列表 + 产品持仓 | **扩展返回** |
|
||||
| `/` | POST | 创建订单 | 不变 |
|
||||
| `/{order_id}` | PUT | 编辑订单基本信息 | 不变 |
|
||||
| `/{order_id}` | DELETE | 删除 dsx 状态订单 | 不变 |
|
||||
| `/{order_id}/void` | PUT | 作废订单 | 不变 |
|
||||
| `/{order_id}/recharge` | POST | **新增** 发起充值流水 | 新增 |
|
||||
| `/{order_id}/refund` | POST | **新增** 申请退款流水 | 替代原退款 |
|
||||
| `/{order_id}/purchase` | POST | **新增** 购买产品流水 | 新增 |
|
||||
| `/{order_id}/unsubscribe` | POST | **新增** 退订产品流水 | 新增 |
|
||||
|
||||
### 3.2 流水操作
|
||||
|
||||
| 接口 | 方法 | 说明 |
|
||||
|------|------|------|
|
||||
| `/channel-service-order-txns/{txn_id}/submit-finance` | POST | 发起财务确认 |
|
||||
| `/channel-service-order-txns/{txn_id}/confirm` | POST | 财务确认(收款/退付) |
|
||||
| `/channel-service-order-txns/{txn_id}/void` | PUT | 作废流水 |
|
||||
|
||||
### 3.3 财务确认页
|
||||
|
||||
| 接口 | 方法 | 说明 | 变更 |
|
||||
|------|------|------|------|
|
||||
| `/channel-service-order-txns` | GET | 查流水列表(按 status 筛选) | **改为查流水表** |
|
||||
| `/channel-service-order-txns/{txn_id}` | GET | 流水详情 | 新增 |
|
||||
| 确认 | POST | 复用 3.2 的 confirm 接口 | — |
|
||||
|
||||
---
|
||||
|
||||
## 4. 前端改造
|
||||
|
||||
### 4.1 订单管理页(`channel-service-order/index.vue`)
|
||||
|
||||
**操作按钮:**
|
||||
|
||||
| 条件 | 按钮 |
|
||||
|------|------|
|
||||
| yfk + dsx | 编辑、删除、发起充值 |
|
||||
| yfk + sxz | 发起充值、申请退款 |
|
||||
| gmcp + dsx | 编辑、删除、购买产品 |
|
||||
| gmcp + sxz | 购买产品、退订产品 |
|
||||
| 任意 + yzf | 仅查看 |
|
||||
|
||||
**详情弹窗改造:**
|
||||
- Section 1:基本信息(含余额/汇总金额)
|
||||
- Section 2:操作记录(流水时间线列表)
|
||||
- Section 3:产品持仓(gmcp 类型,显示当前持有份数)
|
||||
|
||||
**新增弹窗:**
|
||||
- 发起充值:金额、备注、凭证上传
|
||||
- 申请退款:金额(≤余额)、备注、凭证上传
|
||||
- 购买产品:选项目/规格、输入份数、自动算金额
|
||||
- 退订产品:选已持有项目、输入退订份数(≤持有量)
|
||||
|
||||
### 4.2 财务确认页(`channel-service-order-finance/index.vue`)
|
||||
|
||||
**改为以流水为维度展示:**
|
||||
|
||||
**待处理 Tab(status=dqr):**
|
||||
- 显示:流水类型标签、渠道名称、金额、产品明细、提交人/时间
|
||||
- 操作:查看详情、确认收款/退付
|
||||
|
||||
**已处理 Tab(status=yqr):**
|
||||
- 显示同上,操作仅查看
|
||||
|
||||
**确认弹窗:**
|
||||
- 上半部分展示流水详情(发起确认信息)
|
||||
- 下半部分输入财务确认备注+凭证
|
||||
|
||||
### 4.3 废弃功能
|
||||
|
||||
- 移除原订单级别的「发起财务确认」「申请退款」按钮和弹窗(改为流水级别操作)
|
||||
- 移除订单主表上平铺的 finance/refund 字段展示
|
||||
@@ -1,503 +0,0 @@
|
||||
# 中试服务申请单 Phase 1 设计文档
|
||||
|
||||
> 日期:2026-05-24
|
||||
> 模块:中试服务管理 > 中试服务申请单
|
||||
> 阶段:Phase 1(核心骨架)
|
||||
> 需求来源:`docs/中科兴皖需求V0.3.md` §2.3.9
|
||||
|
||||
## 1. 概述
|
||||
|
||||
实现中试服务申请单的完整 CRUD、患者信息管理、输注方案管理、输注计划管理。采用独立后端模块方案(方案A),与现有 `pilot_service.py` 分离。
|
||||
|
||||
### 分期规划
|
||||
|
||||
| 阶段 | 范围 | 状态 |
|
||||
|------|------|------|
|
||||
| Phase 1 | 申请单+患者+输注方案+输注计划 | 本文档 |
|
||||
| Phase 2 | 体检管理+交付交接+费用扣减 | 后续 |
|
||||
| Phase 3 | 出库生产/质检/放行审核联动 | 后续 |
|
||||
|
||||
### Phase 1 范围
|
||||
|
||||
- ✅ 中试申请单 CRUD + 状态流转(开始/完成/作废)
|
||||
- ✅ 患者信息(关联客户管理表 biz_customer,选填+新建模式)
|
||||
- ✅ 输注方案 CRUD
|
||||
- ✅ 输注计划(按疗程数自动生成 + 手动增删调整 + 标记完成)
|
||||
- ✅ 申请单列表页 + 详情 Tab 页
|
||||
- ❌ 体检管理(Phase 2)
|
||||
- ❌ 交付/交接模块(Phase 2)
|
||||
- ❌ 出库生产/质检/放行联动(Phase 3)
|
||||
- ❌ 费用扣减逻辑(Phase 2 交付模块中实现)
|
||||
|
||||
---
|
||||
|
||||
## 2. 数据库变更
|
||||
|
||||
### 2.1 ALTER biz_pilot_application
|
||||
|
||||
现有表仅含 `channel_service_order_id` + 公共字段,需增强:
|
||||
|
||||
```sql
|
||||
-- 迁移文件: docs/sql/pilot-application-migration.sql
|
||||
|
||||
ALTER TABLE biz_pilot_application
|
||||
ADD COLUMN application_no VARCHAR(64) DEFAULT NULL
|
||||
COMMENT '申请单号(自动生成,前缀ZSSQ)' AFTER id,
|
||||
ADD COLUMN application_status VARCHAR(16) NOT NULL DEFAULT 'dks'
|
||||
COMMENT 'dks待开始 jxz进行中 ywc已完成 yzf已作废' AFTER application_no,
|
||||
ADD COLUMN channel_id VARCHAR(64) DEFAULT NULL
|
||||
COMMENT '渠道ID(缓存自服务订单)' AFTER channel_service_order_id,
|
||||
ADD COLUMN channel_name VARCHAR(200) DEFAULT NULL
|
||||
COMMENT '渠道名称(缓存)' AFTER channel_id;
|
||||
|
||||
ALTER TABLE biz_pilot_application
|
||||
ADD UNIQUE KEY uk_application_no (application_no, del_flag);
|
||||
```
|
||||
|
||||
### 2.2 现有表不变
|
||||
|
||||
以下 3 张表结构已满足 Phase 1 需求,无需变更:
|
||||
|
||||
| 表 | 说明 |
|
||||
|---|---|
|
||||
| `biz_pilot_patient` | 患者信息,含 customer_id 关联 + 完整个人字段 |
|
||||
| `biz_pilot_infusion_plan` | 输注方案,含 cell_type/spec/total_course_count 等 |
|
||||
| `biz_pilot_infusion_schedule` | 输注计划,含 schedule_status/infusion_time 等 |
|
||||
|
||||
### 2.3 输注计划状态约定(Phase 1)
|
||||
|
||||
`biz_pilot_infusion_schedule.schedule_status` 已有值域:dsc/ysc/yjf/yqx。
|
||||
|
||||
Phase 1 简化使用:
|
||||
- 创建时 `schedule_status` 留空(前端显示"-")
|
||||
- 用户点击"完成"按钮后更新为 `ywc`(已完成)
|
||||
- Phase 3 出库联动时再启用 dsc/ysc/yjf/yqx 等详细状态
|
||||
|
||||
---
|
||||
|
||||
## 3. 后端架构
|
||||
|
||||
### 3.1 Model(models.py 新增)
|
||||
|
||||
在 `backend/app/models/models.py` 中新增 4 个 SQLAlchemy model:
|
||||
|
||||
| Model | 表 | 关键字段 |
|
||||
|-------|---|---------|
|
||||
| `BizPilotApplication` | biz_pilot_application | application_no, application_status, channel_service_order_id, channel_id, channel_name |
|
||||
| `BizPilotPatient` | biz_pilot_patient | pilot_application_id, customer_id, patient_name, sex, age, id_card_no, phone_no, emergency_contact, emergency_phone, clinical_diagnosis, diagnosis_attachments, need_checkup |
|
||||
| `BizPilotInfusionPlan` | biz_pilot_infusion_plan | pilot_application_id, cell_type, spec_text, total_course_count, course_interval, infusion_route, infusion_start_date |
|
||||
| `BizPilotInfusionSchedule` | biz_pilot_infusion_schedule | infusion_plan_id, cell_type, spec_text, infusion_time, schedule_status, attachments |
|
||||
|
||||
### 3.2 CRUD(新文件:backend/app/crud/pilot_application.py)
|
||||
|
||||
#### _row_to_dict 函数
|
||||
|
||||
每个实体一个 `_row_to_dict_*` 函数,作为可读字段的单一事实来源:
|
||||
|
||||
- `_row_to_dict_application(row)` — 含 channel_name、patient_name(子查询)、infusion_plan_count(子查询)
|
||||
- `_row_to_dict_patient(row)`
|
||||
- `_row_to_dict_infusion_plan(row)` — 含 schedule_count(子查询)
|
||||
- `_row_to_dict_infusion_schedule(row)`
|
||||
|
||||
#### CRUD 函数清单
|
||||
|
||||
**Application:**
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
| `list_applications(db, tenant_no, filters)` | 分页列表,支持按渠道/状态/服务订单筛选 |
|
||||
| `get_application(db, app_id, tenant_no)` | 获取单个申请单详情 |
|
||||
| `create_application(db, data, tenant_no, user_id)` | 创建申请单,校验服务订单存在且生效,缓存渠道信息,生成申请单号 |
|
||||
| `update_application(db, app_id, data, tenant_no)` | 更新申请单(仅 dks 状态可编辑) |
|
||||
| `soft_delete_application(db, app_id, tenant_no)` | 软删除(仅 dks 状态) |
|
||||
| `start_application(db, app_id, tenant_no, user_id)` | 状态:dks→jxz |
|
||||
| `complete_application(db, app_id, tenant_no, user_id)` | 状态:jxz→ywc |
|
||||
| `void_application(db, app_id, tenant_no, user_id)` | 状态:任意→yzf |
|
||||
|
||||
**Patient:**
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
| `get_patient_by_application(db, app_id, tenant_no)` | 获取某申请单的患者信息 |
|
||||
| `save_patient(db, app_id, data, tenant_no, user_id)` | 保存/替换患者信息,同步更新 biz_customer 表 |
|
||||
|
||||
**InfusionPlan:**
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
| `list_infusion_plans(db, app_id, tenant_no)` | 获取某申请单的输注方案列表 |
|
||||
| `create_infusion_plan(db, app_id, data, tenant_no, user_id)` | 创建输注方案 |
|
||||
| `update_infusion_plan(db, plan_id, data, tenant_no)` | 更新输注方案 |
|
||||
| `soft_delete_infusion_plan(db, plan_id, tenant_no)` | 软删除输注方案(级联删除其下所有计划) |
|
||||
|
||||
**InfusionSchedule:**
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
| `list_schedules_by_plan(db, plan_id, tenant_no)` | 获取某方案下的输注计划列表 |
|
||||
| `auto_generate_schedules(db, plan_id, tenant_no, user_id)` | 按方案的 total_course_count 批量生成计划记录 |
|
||||
| `create_schedule(db, plan_id, data, tenant_no, user_id)` | 手动添加单条计划 |
|
||||
| `update_schedule(db, schedule_id, data, tenant_no)` | 更新计划(时间/备注等) |
|
||||
| `soft_delete_schedule(db, schedule_id, tenant_no)` | 软删除单条计划 |
|
||||
| `mark_schedule_complete(db, schedule_id, tenant_no, user_id)` | 标记计划为已完成(schedule_status='ywc') |
|
||||
|
||||
#### 核心业务逻辑
|
||||
|
||||
**create_application:**
|
||||
1. 查询 `channel_service_order_id` 对应的服务订单,校验存在且状态为生效中(status='sxz')
|
||||
2. 从服务订单关联的渠道信息缓存 `channel_id` / `channel_name` 到申请单
|
||||
3. 生成 `application_no`:前缀 ZSSQ + YYYYMMDD + 4位序列号
|
||||
4. 默认 `application_status = 'dks'`
|
||||
|
||||
**save_patient(客户关联逻辑):**
|
||||
1. 如果传入 `customer_id`,从 `biz_customer` 表读取客户信息填充到患者字段
|
||||
2. 用户可修改已填充的字段
|
||||
3. 保存时:如果 `customer_id` 存在则更新 `biz_customer` 对应记录;如果不存在则新建 `biz_customer` 记录并回填 `customer_id`
|
||||
4. 与采集协议单的母亲信息模式一致
|
||||
|
||||
**auto_generate_schedules:**
|
||||
1. 读取方案的 `total_course_count`
|
||||
2. 批量插入 N 条 `biz_pilot_infusion_schedule` 记录
|
||||
3. 每条记录继承方案的 `cell_type` / `spec_text`
|
||||
4. `schedule_status` 留空,`infusion_time` 留空(用户后续手动填写)
|
||||
5. `order_num` 按序号 1, 2, 3... 排列
|
||||
6. 返回生成数量
|
||||
|
||||
### 3.3 API(新文件:backend/app/api/pilot_application.py)
|
||||
|
||||
**路由前缀:** `/web/admin`
|
||||
**Tag:** `中试服务申请单管理`
|
||||
|
||||
#### Pydantic Schemas(内联定义)
|
||||
|
||||
```
|
||||
ApplicationCreateBody:
|
||||
channel_service_order_id: str
|
||||
remark: Optional[str]
|
||||
|
||||
ApplicationUpdateBody:
|
||||
remark: Optional[str]
|
||||
|
||||
PatientSaveBody:
|
||||
customer_id: Optional[str]
|
||||
patient_name: str
|
||||
sex: Optional[str]
|
||||
age: Optional[int]
|
||||
id_card_no: Optional[str]
|
||||
phone_no: Optional[str]
|
||||
emergency_contact: Optional[str]
|
||||
emergency_phone: Optional[str]
|
||||
clinical_diagnosis: Optional[str]
|
||||
diagnosis_attachments: Optional[str]
|
||||
need_checkup: int = 1
|
||||
|
||||
InfusionPlanCreateBody:
|
||||
pilot_application_id: str
|
||||
cell_type: str
|
||||
spec_text: Optional[str]
|
||||
total_course_count: int
|
||||
course_interval: Optional[str]
|
||||
infusion_route: Optional[str]
|
||||
infusion_start_date: Optional[str]
|
||||
|
||||
InfusionPlanUpdateBody:
|
||||
cell_type: Optional[str]
|
||||
spec_text: Optional[str]
|
||||
total_course_count: Optional[int]
|
||||
course_interval: Optional[str]
|
||||
infusion_route: Optional[str]
|
||||
infusion_start_date: Optional[str]
|
||||
|
||||
InfusionScheduleUpdateBody:
|
||||
infusion_time: Optional[str]
|
||||
remark: Optional[str]
|
||||
attachments: Optional[str]
|
||||
```
|
||||
|
||||
#### API 路由清单
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/pilot-application/list` | 申请单分页列表 |
|
||||
| GET | `/pilot-application/detail` | 申请单详情(含患者+方案+计划) |
|
||||
| POST | `/pilot-application/create` | 创建申请单 |
|
||||
| PUT | `/pilot-application/update` | 更新申请单 |
|
||||
| DELETE | `/pilot-application/delete` | 删除申请单 |
|
||||
| POST | `/pilot-application/start` | 开始(dks→jxz) |
|
||||
| POST | `/pilot-application/complete` | 完成(jxz→ywc) |
|
||||
| POST | `/pilot-application/void` | 作废(→yzf) |
|
||||
| GET | `/pilot-patient/detail` | 获取患者信息 |
|
||||
| POST | `/pilot-patient/save` | 保存患者信息 |
|
||||
| GET | `/pilot-infusion-plan/list` | 输注方案列表 |
|
||||
| POST | `/pilot-infusion-plan/create` | 创建输注方案 |
|
||||
| PUT | `/pilot-infusion-plan/update` | 更新输注方案 |
|
||||
| DELETE | `/pilot-infusion-plan/delete` | 删除输注方案 |
|
||||
| POST | `/pilot-infusion-schedule/auto-generate` | 自动生成计划 |
|
||||
| POST | `/pilot-infusion-schedule/create` | 手动添加计划 |
|
||||
| PUT | `/pilot-infusion-schedule/update` | 更新计划 |
|
||||
| DELETE | `/pilot-infusion-schedule/delete` | 删除计划 |
|
||||
| POST | `/pilot-infusion-schedule/mark-complete` | 标记计划完成 |
|
||||
|
||||
**路由注册:** 在 `app/api/__init__.py` 和 `app/main.py` 中追加 `pilot_application` router。
|
||||
|
||||
**权限:** 使用 `require_admin_or_super_admin` 装饰器(与现有 pilot_service 一致)。
|
||||
|
||||
---
|
||||
|
||||
## 4. 前端架构
|
||||
|
||||
### 4.1 路由(sqxp.ts 追加)
|
||||
|
||||
```typescript
|
||||
{
|
||||
path: 'pilot-application',
|
||||
name: 'PilotApplication',
|
||||
component: () => import('@views/pilot-service/pilot-application/index.vue'),
|
||||
meta: { title: '中试服务申请单', icon: '...' }
|
||||
},
|
||||
{
|
||||
path: 'pilot-application/detail',
|
||||
name: 'PilotApplicationDetail',
|
||||
component: () => import('@views/pilot-service/pilot-application/ApplicationDetail.vue'),
|
||||
meta: { title: '申请单详情', hidden: true }
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 页面文件
|
||||
|
||||
```
|
||||
web-admin/src/views/pilot-service/pilot-application/
|
||||
├── index.vue ← 申请单列表页
|
||||
└── ApplicationDetail.vue ← 详情页(Tab布局)
|
||||
```
|
||||
|
||||
### 4.3 列表页 index.vue
|
||||
|
||||
**参考模板页:** `src/views/system/order/index.vue`(复杂列表页)
|
||||
|
||||
**筛选条件:**
|
||||
- 申请单号(文本输入)
|
||||
- 渠道(下拉选择,数据源:已有渠道 API)
|
||||
- 服务订单(下拉选择,联动渠道筛选)
|
||||
- 状态(Tag 筛选按钮组)
|
||||
|
||||
**表格列:**
|
||||
|
||||
| 列名 | 字段 | 宽度 | 说明 |
|
||||
|------|------|------|------|
|
||||
| 申请单号 | application_no | 180 | |
|
||||
| 渠道名称 | channel_name | 150 | |
|
||||
| 关联服务订单 | service_order_no | 180 | 显示订单号 + 类型标签 |
|
||||
| 患者姓名 | patient_name | 100 | |
|
||||
| 输注方案数 | infusion_plan_count | 100 | |
|
||||
| 状态 | application_status | 100 | el-tag:dks(info) / jxz(primary) / ywc(success) / yzf(danger) |
|
||||
| 创建时间 | create_time | 160 | |
|
||||
| 操作 | — | 260+ | 查看/编辑/删除 + 状态按钮 |
|
||||
|
||||
**操作按钮逻辑:**
|
||||
- 新增:弹窗选择渠道 + 服务订单 → 创建成功后跳转详情页
|
||||
- 状态按钮动态显示:
|
||||
- dks(待开始):显示"开始"按钮
|
||||
- jxz(进行中):显示"完成"和"作废"按钮
|
||||
- ywc(已完成) / yzf(已作废):无状态按钮
|
||||
- 点击行 → router.push 跳转详情页(携带 application_id 参数)
|
||||
|
||||
### 4.4 详情页 ApplicationDetail.vue
|
||||
|
||||
**参考模板页:** `src/views/system/product/index.vue`(含 ViewDialog 的详情展示)
|
||||
|
||||
**Tab 布局:**
|
||||
|
||||
| Tab | 内容 | 阶段 |
|
||||
|-----|------|------|
|
||||
| 基本信息 | 申请单信息 + 患者信息 | Phase 1 ✅ |
|
||||
| 输注方案 | 方案列表 + 计划管理 | Phase 1 ✅ |
|
||||
| 体检信息 | 占位(Phase 2 实现) | Phase 2 🔒 |
|
||||
| 交付信息 | 占位(Phase 2 实现) | Phase 2 🔒 |
|
||||
|
||||
#### 基本信息 Tab
|
||||
|
||||
**上半区 — 申请单信息(只读):**
|
||||
- 申请单号、渠道名称、关联服务订单、状态、备注
|
||||
- 状态以 el-tag 展示
|
||||
|
||||
**下半区 — 患者信息面板(可编辑):**
|
||||
- "选择客户"按钮 → 弹窗从客户管理表(biz_customer)选取
|
||||
- 弹窗展示客户列表,支持搜索(姓名/手机号)
|
||||
- 选中后自动填充:姓名、性别、年龄、身份证号、联系电话、紧急联系人、紧急联系人电话
|
||||
- 已填充字段可手动修改
|
||||
- "是否需要体检"开关(need_checkup)
|
||||
- 临床诊断文本框 + 诊断附件上传
|
||||
- "保存患者信息"按钮
|
||||
- 保存时同步更新 biz_customer 表(与采集协议单母亲信息模式一致)
|
||||
|
||||
#### 输注方案 Tab
|
||||
|
||||
**方案列表(表格或卡片):**
|
||||
|
||||
每行显示:
|
||||
- 细胞类型(cell_type)
|
||||
- 规格(spec_text)
|
||||
- 总疗程数(total_course_count)
|
||||
- 疗程间隔(course_interval)
|
||||
- 输注途径(infusion_route)
|
||||
- 输注开始日期(infusion_start_date)
|
||||
- 计划数 / 已完成数(如 3/5)
|
||||
- 操作:编辑 / 删除
|
||||
|
||||
**展开行 — 输注计划列表:**
|
||||
|
||||
每个方案可展开显示其下的输注计划:
|
||||
|
||||
| 列 | 说明 |
|
||||
|---|---|
|
||||
| 序号 | order_num |
|
||||
| 细胞类型 | cell_type |
|
||||
| 规格 | spec_text |
|
||||
| 输注时间 | infusion_time(可编辑) |
|
||||
| 状态 | "-" 或 "已完成"(el-tag) |
|
||||
| 操作 | 编辑 / 删除 / 标记完成 |
|
||||
|
||||
**操作流程:**
|
||||
1. 点击"新增输注方案" → 弹窗填写方案信息 → 保存
|
||||
2. 保存方案后**自动弹出提示**:"是否立即生成 X 条输注计划?"
|
||||
3. 确认后调用 auto_generate 接口批量生成
|
||||
4. 生成后可手动编辑每条计划的时间/备注
|
||||
5. 可手动新增/删除计划
|
||||
6. 每条计划有"标记完成"按钮
|
||||
|
||||
### 4.5 API 函数(admin.ts 追加)
|
||||
|
||||
在 `web-admin/src/api/admin.ts` 末尾追加以下函数:
|
||||
|
||||
```typescript
|
||||
// 中试申请单
|
||||
fetchPilotApplicationList(params)
|
||||
fetchPilotApplicationDetail(params)
|
||||
createPilotApplication(data)
|
||||
updatePilotApplication(data)
|
||||
deletePilotApplication(data)
|
||||
startPilotApplication(data)
|
||||
completePilotApplication(data)
|
||||
voidPilotApplication(data)
|
||||
|
||||
// 患者信息
|
||||
fetchPilotPatient(params)
|
||||
savePilotPatient(data)
|
||||
|
||||
// 输注方案
|
||||
fetchPilotInfusionPlanList(params)
|
||||
createPilotInfusionPlan(data)
|
||||
updatePilotInfusionPlan(data)
|
||||
deletePilotInfusionPlan(data)
|
||||
|
||||
// 输注计划
|
||||
fetchPilotInfusionScheduleList(params)
|
||||
autoGenerateSchedules(data)
|
||||
updatePilotInfusionSchedule(data)
|
||||
deletePilotInfusionSchedule(data)
|
||||
markScheduleComplete(data)
|
||||
```
|
||||
|
||||
### 4.6 状态标签注册
|
||||
|
||||
在 `web-admin/src/utils/status-tag-registry.ts` 追加:
|
||||
|
||||
```typescript
|
||||
// 申请单状态
|
||||
applicationStatusLabel(status) → '待开始'/'进行中'/'已完成'/'已作废'
|
||||
applicationStatusTagType(status) → 'info'/'primary'/'success'/'danger'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. 关键交互流程
|
||||
|
||||
### 5.1 创建申请单流程
|
||||
|
||||
```
|
||||
列表页 → 点击"新增"
|
||||
→ 弹窗:选择渠道(下拉)→ 联动加载该渠道的服务订单(下拉)
|
||||
→ 选择服务订单 → 填写备注
|
||||
→ 提交 → 后端校验订单状态 → 生成申请单号 → 创建成功
|
||||
→ 跳转详情页
|
||||
```
|
||||
|
||||
### 5.2 患者信息录入流程
|
||||
|
||||
```
|
||||
详情页基本信息Tab → 点击"选择客户"
|
||||
→ 弹窗展示客户列表(姓名/手机搜索)
|
||||
→ 选中客户 → 自动填充患者字段
|
||||
→ 可手动修改字段
|
||||
→ 填写临床诊断 + 上传诊断附件
|
||||
→ 点击"保存" → 后端同步更新 biz_customer
|
||||
```
|
||||
|
||||
### 5.3 输注方案+计划管理流程
|
||||
|
||||
```
|
||||
详情页输注方案Tab → 点击"新增输注方案"
|
||||
→ 弹窗填写:细胞类型、规格、总疗程数(N)、疗程间隔、输注途径、开始日期
|
||||
→ 保存 → ElMessageBox.confirm("是否立即生成 N 条输注计划?")
|
||||
→ 确认 → 调用 auto_generate → 生成 N 条计划
|
||||
→ 取消 → 仅创建方案,后续手动添加
|
||||
→ 展开方案 → 查看/编辑每条计划
|
||||
→ 手动新增/删除/编辑计划
|
||||
→ 标记计划完成
|
||||
```
|
||||
|
||||
### 5.4 申请单状态流转
|
||||
|
||||
```
|
||||
dks(待开始) ──开始──→ jxz(进行中) ──完成──→ ywc(已完成)
|
||||
│ │
|
||||
└────作废──→ yzf(已作废) ←──作废──┘
|
||||
|
||||
约束:
|
||||
- 编辑/删除:仅 dks 状态可操作
|
||||
- 开始:仅 dks → jxz
|
||||
- 完成:仅 jxz → ywc
|
||||
- 作废:dks 或 jxz → yzf
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. 文件清单
|
||||
|
||||
### 新增文件
|
||||
|
||||
| # | 文件路径 | 说明 |
|
||||
|---|---------|------|
|
||||
| 1 | `docs/sql/pilot-application-migration.sql` | 数据库迁移 SQL |
|
||||
| 2 | `backend/app/crud/pilot_application.py` | 后端 CRUD |
|
||||
| 3 | `backend/app/api/pilot_application.py` | 后端 API 路由 |
|
||||
| 4 | `web-admin/src/views/pilot-service/pilot-application/index.vue` | 列表页 |
|
||||
| 5 | `web-admin/src/views/pilot-service/pilot-application/ApplicationDetail.vue` | 详情页 |
|
||||
|
||||
### 修改文件
|
||||
|
||||
| # | 文件路径 | 变更 |
|
||||
|---|---------|------|
|
||||
| 6 | `backend/app/models/models.py` | 新增 4 个 Model 类 |
|
||||
| 7 | `backend/app/api/__init__.py` | 注册新 router |
|
||||
| 8 | `backend/app/main.py` | 引入新 router |
|
||||
| 9 | `web-admin/src/api/admin.ts` | 追加 19 个 API 函数 |
|
||||
| 10 | `web-admin/src/utils/status-tag-registry.ts` | 追加申请单状态标签函数 |
|
||||
| 11 | `web-admin/src/router/modules/sqxp.ts` | 追加 2 个路由 |
|
||||
|
||||
---
|
||||
|
||||
## 7. 不在范围内
|
||||
|
||||
以下内容不在 Phase 1 中:
|
||||
|
||||
- 体检预约/报告/费用管理(biz_pilot_checkup + reserve_item + actual_item)
|
||||
- 交付信息/物料清单/交付方式(biz_pilot_delivery + delivery_material + delivery_method)
|
||||
- 应用确认(biz_pilot_infusion_confirm)
|
||||
- 输注计划→出库生产工单自动联动
|
||||
- 出库质检工单
|
||||
- 出库放行审核
|
||||
- 费用/份数扣减逻辑
|
||||
- 工作流集成
|
||||
- 数据权限(使用 require_admin_or_super_admin)
|
||||
@@ -1,312 +0,0 @@
|
||||
# 临时工单模块设计文档
|
||||
|
||||
> 日期: 2026-05-24
|
||||
> 状态: 待审核
|
||||
> 模块: 临时质检工单 + 临时生产工单
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
系统已有 4 个模块:
|
||||
|
||||
| 模块 | 表名 | 说明 |
|
||||
|------|------|------|
|
||||
| 入库质检工单 | `biz_qc_work_order` | 关联样本接收记录和协议 |
|
||||
| 质检任务 | `biz_qc_task` | 由入库质检工单配置检测项目后自动生成 |
|
||||
| 入库生产工单 | `biz_production_work_order` | 关联样本接收记录和协议 |
|
||||
| 生产任务 | `biz_production_task` | 由入库生产工单手动派发创建 |
|
||||
|
||||
### 目标
|
||||
|
||||
新增 2 个临时工单模块,复用现有任务生成机制,在任务表中记录工单来源:
|
||||
|
||||
1. **临时质检工单** — 独立工单(不关联样本/协议),配置检测项目后自动生成质检任务
|
||||
2. **临时生产工单** — 独立工单(不关联样本/协议),选择工艺路线后创建生产任务(自动克隆路线步骤+子表,流程与入库生产工单一致)
|
||||
|
||||
### 设计决策记录
|
||||
|
||||
| 决策项 | 选择 | 原因 |
|
||||
|--------|------|------|
|
||||
| 关联关系 | 完全不关联 reception/protocol | 临时工单独立于入库流程 |
|
||||
| 来源追踪 | 任务表新增 `order_source` 字段 | 最小侵入,清晰区分来源 |
|
||||
| 任务生成方式 | 配置→自动批量生成 | 和入库模式一致 |
|
||||
| 工单字段 | 极简(工单号+状态+备注) | 用户要求简单 |
|
||||
| 工单号前缀 | LSZJ(临时质检)、LSSC(临时生产) | 区分于入库前缀 |
|
||||
| 实现方案 | 新建独立临时工单表 | 和入库完全解耦,避免混合复杂度 |
|
||||
|
||||
---
|
||||
|
||||
## 2. 数据库设计
|
||||
|
||||
### 2.1 新建 `biz_temp_qc_work_order`(临时质检工单)
|
||||
|
||||
```sql
|
||||
DROP TABLE IF EXISTS biz_temp_qc_work_order;
|
||||
CREATE TABLE biz_temp_qc_work_order (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
work_order_no VARCHAR(64) NOT NULL COMMENT '工单号(LSZJ+日期+序号)',
|
||||
work_order_status VARCHAR(20) NOT NULL DEFAULT 'dpz' COMMENT '状态: dpz=待配置, ypz=已配置, ywc=已完成',
|
||||
configured_time DATETIME DEFAULT NULL COMMENT '配置时间',
|
||||
configured_by VARCHAR(64) DEFAULT NULL COMMENT '配置人',
|
||||
has_lab TINYINT DEFAULT 0 COMMENT '是否含实验室自检: 0=否, 1=是',
|
||||
has_third_party TINYINT DEFAULT 0 COMMENT '是否含第三方检测: 0=否, 1=是',
|
||||
third_party_fee_total DECIMAL(12,2) DEFAULT NULL COMMENT '第三方费用合计',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标记: 0=正常, 1=已删除',
|
||||
PRIMARY KEY (id),
|
||||
KEY idx_temp_qc_wo_tenant (tenant_no, del_flag),
|
||||
KEY idx_temp_qc_wo_no (work_order_no, tenant_no)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='临时质检工单';
|
||||
```
|
||||
|
||||
### 2.2 新建 `biz_temp_production_work_order`(临时生产工单)
|
||||
|
||||
```sql
|
||||
DROP TABLE IF EXISTS biz_temp_production_work_order;
|
||||
CREATE TABLE biz_temp_production_work_order (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
work_order_no VARCHAR(64) NOT NULL COMMENT '工单号(LSSC+日期+序号)',
|
||||
work_order_status VARCHAR(20) NOT NULL DEFAULT 'dpz' COMMENT '状态: dpz=待配置, jxz=进行中, ywc=已完成',
|
||||
configured_time DATETIME DEFAULT NULL COMMENT '配置时间',
|
||||
configured_by VARCHAR(64) DEFAULT NULL COMMENT '配置人',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT '' COMMENT '租户编号',
|
||||
order_num INT DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标记: 0=正常, 1=已删除',
|
||||
PRIMARY KEY (id),
|
||||
KEY idx_temp_prod_wo_tenant (tenant_no, del_flag),
|
||||
KEY idx_temp_prod_wo_no (work_order_no, tenant_no)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='临时生产工单';
|
||||
```
|
||||
|
||||
### 2.3 任务表新增 `order_source` 字段
|
||||
|
||||
```sql
|
||||
-- 质检任务表新增来源字段
|
||||
ALTER TABLE biz_qc_task
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
|
||||
-- 生产任务表新增来源字段
|
||||
ALTER TABLE biz_production_task
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
```
|
||||
|
||||
### 2.4 明细表处理(复用现有表)
|
||||
|
||||
临时质检工单复用现有 `biz_qc_work_order_lab_item` 和 `biz_qc_work_order_third_item` 表,通过 `order_source` 字段区分来源。
|
||||
|
||||
```sql
|
||||
-- 实验室项目明细表新增来源字段
|
||||
ALTER TABLE biz_qc_work_order_lab_item
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
|
||||
-- 第三方项目明细表新增来源字段
|
||||
ALTER TABLE biz_qc_work_order_third_item
|
||||
ADD COLUMN order_source VARCHAR(20) NOT NULL DEFAULT 'inbound'
|
||||
COMMENT '工单来源: inbound=入库, temporary=临时' AFTER work_order_id;
|
||||
```
|
||||
|
||||
### 2.5 关联关系
|
||||
|
||||
```
|
||||
biz_temp_qc_work_order
|
||||
├─(work_order_id + order_source='temporary')→ biz_qc_work_order_lab_item
|
||||
├─(work_order_id + order_source='temporary')→ biz_qc_work_order_third_item
|
||||
└─(work_order_id + order_source='temporary')→ biz_qc_task
|
||||
→ biz_qc_task_result
|
||||
|
||||
biz_temp_production_work_order
|
||||
└─(work_order_id + order_source='temporary')→ biz_production_task
|
||||
→ biz_production_task_step + 子表
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. 后端架构
|
||||
|
||||
### 3.1 新增文件清单
|
||||
|
||||
| 层 | 临时质检工单 | 临时生产工单 |
|
||||
|----|-------------|-------------|
|
||||
| Model | `models.py` 新增 `BizTempQcWorkOrder` | `models.py` 新增 `BizTempProductionWorkOrder` |
|
||||
| Schema | 新建 `schemas/temp_qc_work_order.py` | 新建 `schemas/temp_production_work_order.py` |
|
||||
| CRUD | 新建 `crud/temp_qc_work_order.py` | 新建 `crud/temp_production_work_order.py` |
|
||||
| API | `api/qc.py` 新增路由组 | `api/production.py` 新增路由组 |
|
||||
|
||||
### 3.2 API 路由设计
|
||||
|
||||
**临时质检工单:**
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| POST | `/api/admin/temp-qc-work-orders` | 创建 |
|
||||
| GET | `/api/admin/temp-qc-work-orders` | 列表 |
|
||||
| GET | `/api/admin/temp-qc-work-orders/{id}` | 详情 |
|
||||
| DELETE | `/api/admin/temp-qc-work-orders/{id}` | 删除(软删除) |
|
||||
| POST | `/api/admin/temp-qc-work-orders/{id}/configure` | 配置检测项目(→自动生成任务) |
|
||||
|
||||
**临时生产工单:**
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| POST | `/api/admin/temp-production-work-orders` | 创建 |
|
||||
| GET | `/api/admin/temp-production-work-orders` | 列表 |
|
||||
| GET | `/api/admin/temp-production-work-orders/{id}` | 详情 |
|
||||
| DELETE | `/api/admin/temp-production-work-orders/{id}` | 删除(软删除) |
|
||||
| POST | `/api/admin/temp-production-work-orders/{id}/configure` | 配置→自动生成任务 |
|
||||
|
||||
### 3.3 核心业务逻辑
|
||||
|
||||
#### 3.3.1 工单号生成
|
||||
|
||||
- 临时质检:`LSZJ` + `YYYYMMDD` + 4位序号(如 `LSZJ202605240001`)
|
||||
- 临时生产:`LSSC` + `YYYYMMDD` + 4位序号(如 `LSSC202605240001`)
|
||||
- 生成逻辑:参照现有 `_gen_qc_work_order_no()` 模式,按日期+租户查询当日最大序号+1
|
||||
|
||||
#### 3.3.2 创建工单
|
||||
|
||||
极简创建:仅需 `remark`(可选),自动生成工单号,状态默认 `dpz`(待配置)。
|
||||
|
||||
#### 3.3.3 配置检测项目(临时质检工单)
|
||||
|
||||
流程与入库质检工单的 `configure_work_order()` 一致:
|
||||
|
||||
```
|
||||
用户选择检测项目 (lab_item_ids, third_party_ids)
|
||||
├─ 校验工单状态 (dpz/ypz)
|
||||
├─ 清除旧的待执行任务(order_source='temporary')
|
||||
├─ 遍历 lab_item_ids:
|
||||
│ ├─ 创建 BizQcWorkOrderLabItem (order_source='temporary')
|
||||
│ └─ 调用 qc_task.create_task_for_line(order_source='temporary')
|
||||
├─ 遍历 third_party_ids:
|
||||
│ ├─ 创建 BizQcWorkOrderThirdItem (order_source='temporary')
|
||||
│ └─ 调用 qc_task.create_task_for_line(order_source='temporary')
|
||||
└─ 更新工单状态为 'ypz'
|
||||
```
|
||||
|
||||
#### 3.3.4 配置→生成任务(临时生产工单)
|
||||
|
||||
与入库生产工单完全一致,选择工艺路线后创建生产任务(自动克隆路线步骤+4类子表):
|
||||
|
||||
```
|
||||
用户配置任务信息 (task_name, task_type, route_id 工艺路线, description 可选)
|
||||
├─ 创建 BizProductionTask (order_source='temporary', task_status='dpz')
|
||||
├─ 如果选择了工艺路线: _clone_route_to_task() — 深拷贝路线步骤 + 子表
|
||||
├─ 工单状态更新为 'jxz'
|
||||
└─ 流程与入库生产工单的 create_production_task() 完全一致
|
||||
```
|
||||
|
||||
后需复用 `production_task.create_production_task()` + `_clone_route_to_task()` 机制。
|
||||
|
||||
#### 3.3.5 状态同步
|
||||
|
||||
- **质检**:任务完成时检查同工单下所有任务(order_source='temporary')是否都已完成,若是则工单标记 `ywc`
|
||||
- **生产**:任务完成时同步工单状态(复用 `sync_production_work_order_status_from_tasks()` 逻辑)
|
||||
|
||||
#### 3.3.6 删除
|
||||
|
||||
软删除(`del_flag=1`),级联删除关联的任务(仅 `order_source='temporary'`)和明细行。
|
||||
|
||||
---
|
||||
|
||||
## 4. 前端架构
|
||||
|
||||
### 4.1 新增文件清单
|
||||
|
||||
| 类型 | 临时质检工单 | 临时生产工单 |
|
||||
|------|-------------|-------------|
|
||||
| API | 新建 `api/temp-qc-work-order.ts` | 新建 `api/temp-production-work-order.ts` |
|
||||
| 视图 | 新建 `views/quality-inspection/temp-qc-work-order/index.vue` | 新建 `views/production/temp-production-work-order/index.vue` |
|
||||
|
||||
### 4.2 页面设计
|
||||
|
||||
#### 临时质检工单页
|
||||
|
||||
参照模板页 `views/system/unit/index.vue`(标准列表页),功能简化:
|
||||
|
||||
- **列表列**:工单号、状态(Tag)、是否含实验室自检、是否含第三方、配置时间、创建时间、操作
|
||||
- **创建弹窗**:仅备注字段
|
||||
- **配置弹窗**:复用现有配置检测项目组件(选择实验室自检项目/第三方检测项目+公司+费用)
|
||||
- **详情弹窗**:工单基本信息 + 关联任务列表
|
||||
- **状态 Tag**:dpz→待配置(info)、ypz→已配置(warning)、ywc→已完成(success)
|
||||
|
||||
#### 临时生产工单页
|
||||
|
||||
同样参照标准列表页:
|
||||
|
||||
- **列表列**:工单号、状态(Tag)、配置时间、创建时间、操作
|
||||
- **创建弹窗**:仅备注字段
|
||||
- **配置弹窗**:简单表单(任务名称、任务类型 cell_storage/outbound、描述)
|
||||
- **详情弹窗**:工单基本信息 + 关联任务列表
|
||||
- **状态 Tag**:dpz→待配置(info)、jxz→进行中(primary)、ywc→已完成(success)
|
||||
|
||||
### 4.3 任务来源展示
|
||||
|
||||
在现有质检任务和生产任务列表页中:
|
||||
|
||||
- 新增"来源"列,使用 Tag 展示:
|
||||
- `inbound` → Tag `<el-tag type="success" size="small">入库</el-tag>`
|
||||
- `temporary` → Tag `<el-tag type="warning" size="small">临时</el-tag>`
|
||||
|
||||
### 4.4 路由配置
|
||||
|
||||
在 `src/router/modules/` 中对应的质量检验和生产管理路由组下新增子路由:
|
||||
|
||||
```typescript
|
||||
// 质量检验路由组下
|
||||
{ path: 'temp-qc-work-order', name: 'TempQcWorkOrder', component: () => import('@views/quality-inspection/temp-qc-work-order/index.vue') }
|
||||
|
||||
// 生产管理路由组下
|
||||
{ path: 'temp-production-work-order', name: 'TempProductionWorkOrder', component: () => import('@views/production/temp-production-work-order/index.vue') }
|
||||
```
|
||||
|
||||
### 4.5 菜单配置
|
||||
|
||||
需要在系统菜单管理中添加对应菜单项(数据库 `sys_menu` 表插入)。
|
||||
|
||||
---
|
||||
|
||||
## 5. 修改现有代码清单
|
||||
|
||||
以下列出需要修改的现有文件(非新增文件):
|
||||
|
||||
| 文件 | 修改内容 |
|
||||
|------|---------|
|
||||
| `backend/app/models/models.py` | 新增 `BizTempQcWorkOrder`、`BizTempProductionWorkOrder` 模型;`BizQcTask`、`BizProductionTask` 新增 `order_source` 列;`BizQcWorkOrderLabItem`、`BizQcWorkOrderThirdItem` 新增 `order_source` 列 |
|
||||
| `backend/app/crud/qc_task.py` | `create_task_for_line()` 接受 `order_source` 参数;`list_tasks()` 展示 `order_source`;`_task_to_dict()` 序列化 `order_source` |
|
||||
| `backend/app/crud/production_task.py` | `create_production_task()` 接受 `order_source` 参数;`list_production_tasks()` 展示 `order_source`;序列化 `order_source` |
|
||||
| `backend/app/api/qc.py` | 新增临时质检工单路由组 |
|
||||
| `backend/app/api/production.py` | 新增临时生产工单路由组 |
|
||||
| `backend/app/api/__init__.py` | 如有新路由文件则注册 |
|
||||
| `web-admin/src/api/qc-task.ts` | 类型定义新增 `orderSource` 字段 |
|
||||
| `web-admin/src/api/production-task.ts` | 类型定义新增 `orderSource` 字段 |
|
||||
| `web-admin/src/views/quality-inspection/qc-task/index.vue` | 列表新增"来源"Tag 列 |
|
||||
| `web-admin/src/views/production/production-task/index.vue` | 列表新增"来源"Tag 列 |
|
||||
| `docs/sql/zkxw.sql` | 同步新增表和 ALTER 语句 |
|
||||
|
||||
---
|
||||
|
||||
## 6. 风险与注意事项
|
||||
|
||||
1. **order_source 默认值**:所有现有数据默认为 `inbound`,无需数据迁移
|
||||
2. **现有查询兼容**:所有现有查询 `work_order_id` 关联时,默认只查 `order_source='inbound'` 或不加过滤(因为现有数据的 work_order_id 不会和临时工单冲突——指向不同表的主键)
|
||||
3. **工单号唯一性**:LSZJ/LSSC 前缀确保不与 ZJ/SC 冲突
|
||||
4. **权限**:临时工单菜单需要在系统中配置,遵循现有 RBAC 权限体系
|
||||
5. **软删除级联**:删除临时工单时,仅删除 `order_source='temporary'` 的任务,不影响入库任务
|
||||
6. **工艺路线克隆**:临时生产工单复用 `_clone_route_to_task()` 机制,与入库生产工单完全一致(步骤+试剂+耗材+产出物+数据采集项全部深拷贝)
|
||||
@@ -1,181 +0,0 @@
|
||||
# 工单/任务编辑与生产结论 — 设计文档
|
||||
|
||||
> 日期: 2026-05-24
|
||||
> 状态: 已实现(2026-05-24)
|
||||
> 范围: 质检工单、生产工单、生产任务(web-admin + backend)
|
||||
|
||||
## 1. 背景
|
||||
|
||||
在工单融合(`work_order_type`: inbound / temporary)之后,列表侧缺少对**备注**与**生产任务结论**的维护入口。本变更补齐编辑能力,并复用既有 API/组件,控制改动面。
|
||||
|
||||
## 2. 已确认的产品决策
|
||||
|
||||
| 问题 | 决策 |
|
||||
|------|------|
|
||||
| 入库工单编辑备注:已完成状态是否可改? | **可以**(任意工单状态均可改备注) |
|
||||
| 临时生产工单「编辑信息」范围? | **仅备注** |
|
||||
| 生产任务结论「失败」是否触发业务副作用? | **不触发**;v1 仅结果存储 |
|
||||
| 结论字段编码? | **拼音缩写**存库;界面展示**中文** |
|
||||
| 生产任务列表:已完成任务是否可编辑基础信息? | **不需要**(已完成任务不展示「编辑」) |
|
||||
|
||||
## 3. 功能清单
|
||||
|
||||
### 3.1 质检工单 — 入库 Tab
|
||||
|
||||
- 列表操作列增加 **「编辑」**(`EditPen`)。
|
||||
- 弹窗字段:**仅备注**(`textarea`,max 512)。
|
||||
- 任意 `work_order_status`(含 `ywc`)可保存。
|
||||
- 与临时 Tab 的「编辑」(细胞产品 + 备注)区分:入库仅走备注弹窗。
|
||||
|
||||
### 3.2 生产工单 — 入库 Tab
|
||||
|
||||
- 列表增加 **「编辑」** → 仅备注弹窗(同上)。
|
||||
- 任意工单状态可改备注。
|
||||
|
||||
### 3.3 生产工单 — 临时 Tab
|
||||
|
||||
- 列表增加 **「编辑」** → 仅备注弹窗(与入库共用交互)。
|
||||
- 不包含改任务名称/工艺路线(任务级能力保留在「派发任务」「编辑任务」)。
|
||||
|
||||
### 3.4 生产任务 — 列表
|
||||
|
||||
- 列表增加 **「编辑」** → 复用 `EditTaskInfoDialog`(`taskName` / `description` / `remark`)。
|
||||
- **显示条件**:`task_status` 为 `dpz` 或 `jxz`;`ywc` **不展示**编辑按钮。
|
||||
- 后端可对 `ywc` 拒绝更新(双保险,可选)。
|
||||
|
||||
### 3.5 生产任务 — 完成任务结论
|
||||
|
||||
- 入口:任务执行弹窗 `TaskExecutionDialog` →「完成任务」。
|
||||
- 流程:现有 I/O 校验通过 → 弹出**结论弹窗**(非简单 `confirm`)→ 提交完成。
|
||||
- 结论(必填):
|
||||
- 存库:`cg` = 成功,`sb` = 失败
|
||||
- 展示:成功 / 失败;Tag:`success` / `danger`
|
||||
- 可选备注(`textarea`)。
|
||||
- v1:**不**改变细胞产品入库、工单状态同步、通知等既有逻辑;仅写入 `conclusion`(及可选 `remark`)并置 `task_status=ywc`。
|
||||
|
||||
## 4. 数据模型
|
||||
|
||||
### 4.1 已有字段(无需 DDL)
|
||||
|
||||
- `biz_qc_work_order.remark`
|
||||
- `biz_production_work_order.remark`
|
||||
- `biz_production_task.remark` / `task_name` / `description`
|
||||
|
||||
### 4.2 新增字段
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_production_task
|
||||
ADD COLUMN conclusion VARCHAR(16) NULL
|
||||
COMMENT '生产结论 cg=成功 sb=失败'
|
||||
AFTER completed_time;
|
||||
```
|
||||
|
||||
- 迁移脚本:`docs/sql/production_task_conclusion.sql`
|
||||
- 全量基线:同步 `docs/sql/zkxw.sql`
|
||||
|
||||
### 4.3 结论枚举
|
||||
|
||||
| 编码 | 中文标签 | Tag type |
|
||||
|------|----------|----------|
|
||||
| `cg` | 成功 | `success` |
|
||||
| `sb` | 失败 | `danger` |
|
||||
|
||||
## 5. API 设计
|
||||
|
||||
### 5.1 质检工单 `PUT /web/admin/qc-work-orders/{id}`
|
||||
|
||||
**现状**:仅 `temporary` 可更新(`update_temp_qc_work_order`)。
|
||||
|
||||
**调整**:
|
||||
|
||||
- `inbound`:仅接受 `remark`(忽略 `cellProductId`)。
|
||||
- `temporary`:保持 `cellProductId` + `remark`。
|
||||
- 不校验工单是否已完成(备注始终可改)。
|
||||
|
||||
### 5.2 生产工单 `PUT /web/admin/production-work-orders/{id}`(新增)
|
||||
|
||||
- Body:`{ remark?: string }`
|
||||
- 入库/临时均可更新备注;任意 `work_order_status`。
|
||||
- CRUD:`update_production_work_order(db, wo_id, tenant_no, user_id, remark=...)`
|
||||
|
||||
### 5.3 生产任务 `PUT /web/admin/production-tasks/{id}/status`
|
||||
|
||||
**扩展 Body**(完成时):
|
||||
|
||||
```json
|
||||
{
|
||||
"taskStatus": "ywc",
|
||||
"conclusion": "cg",
|
||||
"remark": "可选"
|
||||
}
|
||||
```
|
||||
|
||||
- `taskStatus=ywc` 时 **`conclusion` 必填**,且必须为 `cg` | `sb`。
|
||||
- `remark` 可选;若传入则更新任务 `remark`(与完成备注合并策略:写入 `remark` 字段)。
|
||||
- `jxz` / `dpz` 状态变更逻辑不变。
|
||||
|
||||
### 5.4 列表/详情响应
|
||||
|
||||
- `biz_production_task` 序列化增加:`conclusion`、`conclusionLabel`(后端映射中文)。
|
||||
|
||||
## 6. 前端设计
|
||||
|
||||
### 6.1 共用组件(建议)
|
||||
|
||||
`components/business/work-order-remark-dialog/index.vue`(可选抽取)
|
||||
|
||||
- Props:`visible`, `title`, `initialRemark`, `loading`
|
||||
- Emit:`submit(remark)`, `update:visible`
|
||||
- 规范:`dialog-form-layout`、`label-position="top"`、底栏 Close/Check
|
||||
|
||||
若不抽取,各页内联单字段弹窗亦可(最小 diff)。
|
||||
|
||||
### 6.2 页面改动
|
||||
|
||||
| 页面 | 文件 | 改动 |
|
||||
|------|------|------|
|
||||
| 质检工单 | `views/quality-inspection/qc-work-order/index.vue` | 入库 Tab「编辑」+ 备注弹窗;`handleEditRemark` |
|
||||
| 生产工单 | `views/production/production-work-order/index.vue` | 入库/临时 Tab「编辑」+ 备注弹窗 |
|
||||
| 生产任务 | `views/production/production-task/index.vue` | `EditTaskInfoDialog`;`v-if` 非 `ywc` |
|
||||
| 任务执行 | `useTaskStepEditor.ts` + 新 `CompleteProductionTaskDialog.vue` | 完成前结论弹窗 |
|
||||
| API | `qc-work-order.ts`, `production-work-order.ts`, `production-task.ts` | 新增/扩展类型 |
|
||||
|
||||
### 6.3 生产任务列表(可选增强)
|
||||
|
||||
- 增加列「生产结论」:`ywc` 行展示 `el-tag`;未完成显示 `—`。
|
||||
|
||||
### 6.4 UI 规范
|
||||
|
||||
- 操作列 `fixed="right"`,宽度预留(质检约 +60px,生产工单约 +60px,生产任务约 +80px)。
|
||||
- 结论 Tag 遵循 OpenSpec ui-conventions(状态/结论字段用 `el-tag`)。
|
||||
|
||||
## 7. 权限
|
||||
|
||||
- 质检:沿用 `biz:qcWorkOrder:list`(现有 PUT)。
|
||||
- 生产工单/任务:沿用 `require_admin_or_super_admin`。
|
||||
|
||||
## 8. 不在本期范围
|
||||
|
||||
- 结论为 `sb` 时禁止产出、回滚库存、消息通知。
|
||||
- 已完成生产任务的基础信息编辑。
|
||||
- 质检任务完成结论(已有 `tg`/`btg` 流程,不改动)。
|
||||
|
||||
## 9. 实施顺序
|
||||
|
||||
1. DDL + Model `BizProductionTask.conclusion`
|
||||
2. 后端:QC 工单 PUT 扩展、生产工单 PUT 新增、完成任务 conclusion 校验
|
||||
3. 前端 API 类型
|
||||
4. 质检/生产工单备注编辑 UI
|
||||
5. 生产任务列表编辑(非 ywc)
|
||||
6. 完成任务结论弹窗 + 列表结论列(可选)
|
||||
7. `scripts/check_field_consistency.py`(若扩展 schema)
|
||||
8. `./scripts/update-graph.sh backend` + `frontend`
|
||||
|
||||
## 10. 验收要点
|
||||
|
||||
- [ ] 入库质检工单:任意状态可改备注并列表刷新
|
||||
- [ ] 临时质检工单:原编辑(产品+备注)不受影响
|
||||
- [ ] 入库/临时生产工单:任意状态可改备注
|
||||
- [ ] 生产任务:`dpz`/`jxz` 可编辑基础信息;`ywc` 无编辑按钮
|
||||
- [ ] 完成任务:必须选成功/失败;完成后详情/列表可见中文结论
|
||||
- [ ] 失败结论不改变细胞产品/工单等下游行为
|
||||
@@ -1,127 +0,0 @@
|
||||
# 渠道服务订单(gmcp)— 建单不带产品 + 编辑规则
|
||||
|
||||
**日期:** 2026-05-25
|
||||
**状态:** 已确认(方案 A + 编辑规则)
|
||||
**关联:** `2026-05-24-channel-service-order-multi-txn-design.md`
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
「购买产品份数」(`gmcp`)订单应作为**渠道 + 协议**下的长期容器;每次实际购买通过**操作流水**(`purchase`)完成,且须经**财务确认**后生效。新增订单时不应录入产品明细,避免与「购买产品」流水入口重复,并防止用户误以为建单即已购买。
|
||||
|
||||
---
|
||||
|
||||
## 2. 方案 A:建单(新增)
|
||||
|
||||
### 2.1 前端(`channel-service-order/index.vue` 新增弹窗)
|
||||
|
||||
| 字段 | gmcp 新增 |
|
||||
|------|-----------|
|
||||
| 订单类型 | 必选(创建后不可改,沿用现有) |
|
||||
| 渠道 | 必选 |
|
||||
| 渠道协议 | 必选(须为渠道下生效中协议) |
|
||||
| 部门名称 | 可填 |
|
||||
| 备注 | 可填 |
|
||||
| 产品明细 / 购买合计 | **不展示、不校验、不提交** |
|
||||
|
||||
### 2.2 后端(`create_channel_service_order`)
|
||||
|
||||
- `order_type=gmcp` 时 **`products` 可选**,不传或空数组均允许。
|
||||
- 不调用 `_save_gmcp_product_rows`。
|
||||
- `purchase_total_amount` 初始为 `NULL` 或 `0`(与列表展示约定一致)。
|
||||
- `order_status` 仍为 `dsx`(待生效)。
|
||||
- 仍校验 `channel_agreement_id` 存在且协议生效。
|
||||
|
||||
### 2.3 购买入口(不变)
|
||||
|
||||
- 列表「购买产品」→ `POST /channel-service-orders/{id}/purchase` → `purchase` 流水 `dsx`。
|
||||
- 流水「发起财务确认」→ `dqr` → 财务确认 → `yqr` 后持仓与订单状态生效。
|
||||
|
||||
---
|
||||
|
||||
## 3. 编辑规则(gmcp,用户确认)
|
||||
|
||||
订单创建后(`dsx` 或 `sxz`,**非** `yzf`)允许编辑,字段权限如下:
|
||||
|
||||
| 字段 | 是否可改 | 条件 |
|
||||
|------|----------|------|
|
||||
| 渠道 | **否** | 始终只读(新增可选,编辑禁用) |
|
||||
| 渠道协议 | **条件可改** | 见 §3.1 |
|
||||
| 部门名称 | **是** | 任意非作废状态 |
|
||||
| 备注 | **是** | 任意非作废状态 |
|
||||
| 订单类型 | **否** | 沿用现有 `disabled` |
|
||||
| 产品明细 | **否** | 不在编辑弹窗维护;仅「购买产品」流水 |
|
||||
|
||||
### 3.1 「是否已有购买」— 锁定渠道协议
|
||||
|
||||
**定义:** 存在至少一条 **未作废** 的 `purchase` 类型流水(`txn_type=purchase` 且 `txn_status != yzf`)。
|
||||
|
||||
- **无购买流水:** 可修改 `channel_agreement_id`(须为新渠道下生效协议;渠道本身不可改)。
|
||||
- **已有购买流水:** `channel_agreement_id` 只读,后端拒绝变更。
|
||||
|
||||
**补充(历史数据):** 若订单无 `purchase` 流水但存在建单时写入的 `biz_channel_service_order_product` 行(旧逻辑迁移数据),视同「已有购买」,协议不可改。
|
||||
|
||||
**作废后:** 若所有 `purchase` 流水均为 `yzf` 且无有效持仓行,协议可再次修改(与「从未购买」一致)。
|
||||
|
||||
### 3.2 编辑入口与订单状态(已确认)
|
||||
|
||||
| 订单状态 | 中文 | gmcp 是否显示「编辑」 |
|
||||
|----------|------|----------------------|
|
||||
| `dsx` | 待生效 | 是 |
|
||||
| `sxz` | 生效中 | **是**(可改备注、部门;协议见 §3.1) |
|
||||
| `yzf` | 已作废 | 否 |
|
||||
|
||||
### 3.3 后端(`update_channel_service_order`)
|
||||
|
||||
- **gmcp + `yzf`:** 拒绝更新。
|
||||
- **gmcp + `dsx` / `sxz`:**
|
||||
- 允许更新 `dept_name`、`remark`。
|
||||
- `channel_id`:拒绝(或不接受该字段)。
|
||||
- `channel_agreement_id`:仅当 §3.1 判定「无购买」时允许;否则 `ValueError("已有购买流水,不可修改渠道协议")`。
|
||||
- **`products`:** 不再接受;若传入则忽略或 400(推荐拒绝,避免旧客户端误用)。
|
||||
- **移除** gmcp 下通过 PUT 整单替换产品明细的逻辑。
|
||||
|
||||
### 3.4 详情接口扩展(建议)
|
||||
|
||||
`GET /channel-service-orders/{id}` 增加只读字段,供前端控制协议下拉禁用:
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| `agreementEditable` | boolean | 是否允许修改协议 |
|
||||
| `hasPurchaseTxn` | boolean | 是否存在未作废的 purchase 流水 |
|
||||
|
||||
---
|
||||
|
||||
## 4. yfk(预付款)— 本需求范围
|
||||
|
||||
- **新增:** 维持仅渠道 + 协议,不录充值金额(已有)。
|
||||
- **编辑:** 维持仅 `dsx` 可编辑;本 spec **不扩展** yfk 在 `sxz` 下改备注(除非后续单独需求)。
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端编辑弹窗(gmcp)
|
||||
|
||||
- 与新增相同布局:**无产品明细区块**。
|
||||
- 渠道:`el-select` **disabled**。
|
||||
- 渠道协议:`:disabled="!agreementEditable"`(或 `hasPurchaseTxn`)。
|
||||
- 部门、备注:可编辑。
|
||||
- 提交 payload 仅含 `deptName`、`remark`、及条件允许时的 `channelAgreementId`;不传 `channelId`、`products`。
|
||||
|
||||
---
|
||||
|
||||
## 6. 不在本需求范围
|
||||
|
||||
- 调整 `create_purchase_txn` 在财务确认前是否预占 `current_qty`(与 multi-txn 文档「确认后累加」的差异,另开任务)。
|
||||
- 历史订单数据迁移脚本(仅新规则应用于新单与编辑校验;旧 `order_product` 按 §3.1 锁定协议)。
|
||||
- `yzf` 订单编辑。
|
||||
|
||||
---
|
||||
|
||||
## 7. 验收要点
|
||||
|
||||
1. gmcp 新增:仅渠道+协议+部门+备注,保存成功,详情无产品、无购买总额(或为 0)。
|
||||
2. gmcp 无购买前编辑:可改协议、部门、备注;渠道不可改。
|
||||
3. 发起一次「购买产品」后:协议控件禁用,仍可改部门、备注;后端改协议返回错误。
|
||||
4. gmcp `sxz` 订单仍显示编辑,可改备注与部门。
|
||||
5. 购买仅通过「购买产品」流水,财务确认前订单仍为待生效或生效中但持仓以流水状态为准(与现网一致)。
|
||||
@@ -1,189 +0,0 @@
|
||||
# Web 管理端金额/单价千分位输入与展示 — 设计说明
|
||||
|
||||
## 背景
|
||||
|
||||
业务人员在录入或核对大额「单价」「金额」时,需要千分位逗号辅助阅读,但输入过程中插入逗号会干扰光标与连续键入。渠道服务订单「发起充值」已在 `channel-service-order/index.vue` 用页面内局部函数实现「聚焦纯数字、失焦千分位」,尚未复用到其他页面。
|
||||
|
||||
本设计将交互固化为**统一工具 + 统一组件**,并明确**可编辑输入**与**只读展示**两类场景,避免再次在 `.vue` 中复制正则或误用前瞻表达式导致编译错误。
|
||||
|
||||
## 目标行为(SHALL)
|
||||
|
||||
| 时机 | 可编辑输入框 | 列表/查看等只读展示 |
|
||||
|------|----------------|---------------------|
|
||||
| 聚焦输入中 | 纯数字,如 `1234567.89`(无逗号) | — |
|
||||
| 失焦后 | 千分位,如 `1,234,567.89` | 始终千分位(同上格式) |
|
||||
| 再次聚焦 | 去掉逗号,恢复纯数字 | — |
|
||||
| 提交/API | `number` 或约定精度的小数,**不受逗号影响** | — |
|
||||
|
||||
**不在范围:** 数量、份数、排序号、百分比系数等非金额字段(仍用 `el-input-number` 整数或原控件)。
|
||||
|
||||
## 范围
|
||||
|
||||
### 纳入(单价 / 金额类)
|
||||
|
||||
**中试服务(pilot-service)**
|
||||
|
||||
| 页面 | 路由 | 可编辑 | 只读展示 |
|
||||
|------|------|--------|----------|
|
||||
| 渠道服务购买订单 | `/#/pilot-service/channel-service-order` | 充值金额、退款金额、产品明细单价;发起充值已改 | 列表余额/购买总额、查看流水与持仓、合计 |
|
||||
| 渠道服务订单财务确认 | `/#/pilot-service/channel-service-order-finance` | — | 列表/详情金额、单价 |
|
||||
| 渠道信息管理 | `/#/pilot-service/channel` | 协议价(元)行内编辑 | 价格选择器单价列 |
|
||||
| 细胞产品价格体系 | `/#/pilot-service/cell-product-price` | 表单单价 | 列表单价 |
|
||||
| 细胞产品项目价格 | `/#/pilot-service/project-price-system` | 表格单价 | 查看单价 |
|
||||
| 体检机构及项目 | `/#/pilot-service/checkup-institution` | 项目费用等 | 套餐合计费用 |
|
||||
|
||||
**细胞存储(cell-storage)**
|
||||
|
||||
| 页面 | 路由 | 可编辑 | 只读展示 |
|
||||
|------|------|--------|----------|
|
||||
| 采集协议单录入 | `/#/cell-storage/protocol` | 合同金额、应缴费、转账金额、采集金额等 | 查看弹窗同字段 |
|
||||
| 缴费信息 | `/#/cell-storage/payment-info` | 退费金额 | 应缴/实缴列 |
|
||||
| 缴费/退费确认(财务) | `/#/cell-storage/payment-confirm`、`refund-confirm` | — | 金额列 |
|
||||
|
||||
**其他(第二批)**
|
||||
|
||||
| 页面 | 说明 |
|
||||
|------|------|
|
||||
| 订单 Demo `system/order/index.vue` | 供货价/售价及金额(若仍为可编辑控件则纳入) |
|
||||
| 研究捐赠 `DonationFormDialog` | 采集金额等 |
|
||||
| 第三方检测公司等 | `feeAmount` 等 `:precision="2"` 的金额 |
|
||||
|
||||
### 明确排除
|
||||
|
||||
- 小程序端 `miniprogram/`
|
||||
- 后端 API(仍接收 JSON number)
|
||||
- 非金额 `el-input-number`(数量、排序、`priceCoefficient` 百分比等)
|
||||
|
||||
## 方案对比
|
||||
|
||||
### 方案 A:每页复制 focus/blur 函数(现状扩展)
|
||||
|
||||
- 优点:无新依赖,单页改动快
|
||||
- 缺点:已出现正则笔误导致整页无法加载;难维护;`formatAmount` 与输入逻辑不一致
|
||||
|
||||
### 方案 B:工具函数 + `AmountInput` 组件(推荐)
|
||||
|
||||
- `@/utils/money-format.ts`:`sanitizeMoneyInput`、`formatMoneyDisplay`、`parseMoneyToNumber`
|
||||
- `@/components/common/amount-input/index.vue`:`v-model` 绑定 `number | null`,封装 focus/blur/input
|
||||
- 只读:`formatMoneyDisplay(n)` 或增强现有列表 `formatAmount` 的展示路径
|
||||
|
||||
- 优点:单测友好、符合 Fresh Mint 组件化、表格/弹窗同一套
|
||||
- 缺点:需逐页替换 `el-input-number`(金额类)
|
||||
|
||||
### 方案 C:全局指令 `v-money-input`
|
||||
|
||||
- 优点:模板改动小
|
||||
- 缺点:难支持 `min`/`max`/`precision`、表格行绑定不清晰、与 Element Plus 集成弱
|
||||
|
||||
**结论:采用方案 B。**
|
||||
|
||||
## 技术设计
|
||||
|
||||
### 1. 工具模块 `web-admin/src/utils/money-format.ts`
|
||||
|
||||
```typescript
|
||||
// 展示:整数千分位 + 最多 precision 位小数(默认 2)
|
||||
export function formatMoneyDisplay(value: string | number | null | undefined, precision?: number): string
|
||||
|
||||
// 输入清洗:去逗号、仅保留数字与一个点
|
||||
export function sanitizeMoneyInput(value: string, precision?: number): string
|
||||
|
||||
// 提交:number | null;空串 / 仅 '.' → null
|
||||
export function parseMoneyToNumber(value: string, precision?: number): number | null
|
||||
```
|
||||
|
||||
实现要点:
|
||||
|
||||
- 千分位用**字符串分段拼接**(`addThousandSeparators`),**禁止**在 `.vue` 内联复杂前瞻正则。
|
||||
- 小数位截断与 `el-input-number` 的 `:precision="2"` 行为对齐。
|
||||
|
||||
### 2. 组件 `AmountInput`
|
||||
|
||||
路径:`web-admin/src/components/common/amount-input/index.vue`
|
||||
|
||||
| Prop | 类型 | 默认 | 说明 |
|
||||
|------|------|------|------|
|
||||
| `modelValue` | `number \| null` | — | 双向绑定数值 |
|
||||
| `min` | `number` | — | 可选下限 |
|
||||
| `max` | `number` | — | 可选上限 |
|
||||
| `precision` | `number` | `2` | 小数位数;单价/金额均为 2 |
|
||||
| `placeholder` | `string` | — | |
|
||||
| `disabled` | `boolean` | `false` | |
|
||||
| `clearable` | `boolean` | `true` | |
|
||||
|
||||
事件:`update:modelValue`、`change`(失焦且数值变化时,便于触发行内 `calcAmount`)
|
||||
|
||||
内部状态:
|
||||
|
||||
- `displayText: ref<string>` — 绑定 `el-input`
|
||||
- `@focus` → `displayText = sanitize(modelValue)`
|
||||
- `@input` → 清洗 + 临时更新 `displayText`;可选同步 `modelValue` 为中间值
|
||||
- `@blur` → `emit(update:modelValue, parseMoneyToNumber(...))`;`displayText = formatMoneyDisplay(...)`
|
||||
|
||||
校验:`min`/`max` 在 blur 或 submit 时由父级 `el-form` rules 负责;组件可在 blur 时 `ElMessage.warning` 可选(默认不弹,避免表格内刷屏)。
|
||||
|
||||
样式:宽度 `100%`;与现有 `el-input` 高度 36px 规范一致。
|
||||
|
||||
### 3. 只读展示
|
||||
|
||||
- 列表列、查看弹窗、合计文案:统一 `formatMoneyDisplay(v)`,前缀 `¥` 仍在模板侧拼接(与现网 `¥{{ formatAmount(...) }}` 一致)。
|
||||
- **迁移策略:** 在 `money-format.ts` 导出 `formatMoneyDisplay`;各页逐步将只读 `formatAmount` 替换为 `formatMoneyDisplay`(或全局别名 `formatAmount = formatMoneyDisplay` 仅用于金额列——需逐文件审查,避免误改非金额 toFixed)。
|
||||
|
||||
建议新增 `formatMoneyAmount(v)` 专用于金额展示,保留原 `formatAmount` 为两位小数无逗号直至迁移完成,**P0 页面直接使用 `formatMoneyDisplay`**。
|
||||
|
||||
### 4. 与 OpenSpec / UI 规范
|
||||
|
||||
在 `openspec/changes/zkxw-engineering-standards/specs/ui-conventions/spec.md`(或归档后 `openspec/specs/ui-conventions/spec.md`)增补一节:
|
||||
|
||||
- 金额/单价**可编辑**字段 SHALL 使用 `AmountInput`(或经评审的等价封装),SHALL 满足聚焦/失焦/提交行为表。
|
||||
- 金额/单价**只读**展示 SHALL 使用 `formatMoneyDisplay`,整数部分千分位、小数位默认 2 位。
|
||||
- SHALL NOT 在业务 `.vue` 中复制千分位正则实现。
|
||||
|
||||
### 5. 渠道服务订单页迁移(含已改充值)
|
||||
|
||||
- 删除页面内 `addThousandSeparators`、`formatRechargeAmountDisplay` 等重复函数,改为 import 工具 + `AmountInput`。
|
||||
- 「发起充值」「申请退款」弹窗金额 → `AmountInput`。
|
||||
- 新增/编辑订单产品明细「单价」列 → `AmountInput`(`@change` 仍调 `calcItemAmount`)。
|
||||
|
||||
### 6. 测试与验收
|
||||
|
||||
**单元(建议)** `web-admin/src/utils/money-format.spec.ts` 或 vitest:
|
||||
|
||||
- `formatMoneyDisplay(1234567.89)` → `1,234,567.89`
|
||||
- `sanitizeMoneyInput('1,234.5')` → `1234.5`
|
||||
- `parseMoneyToNumber('1,234.56')` → `1234.56`
|
||||
|
||||
**手工验收(每批至少 1 页)**
|
||||
|
||||
1. 聚焦输入 `1000000.5`,框内无逗号
|
||||
2. 失焦显示 `1,000,000.5`
|
||||
3. 再聚焦变回 `1000000.5`
|
||||
4. 保存后网络请求 payload 为数字 `1000000.5`
|
||||
5. 列表只读列为千分位
|
||||
|
||||
## 分期交付
|
||||
|
||||
| 阶段 | 内容 | 产出 |
|
||||
|------|------|------|
|
||||
| P0 | 工具 + 组件 + 规范 + 渠道服务订单全页 | 可复用基座 |
|
||||
| P1 | 渠道信息、细胞价格、项目价格、财务确认页只读列 | 中试服务闭环 |
|
||||
| P2 | 细胞存储协议/缴费/退费 | 存储线金额 |
|
||||
| P3 | Demo 订单、捐赠、第三方费用等 | 余量 |
|
||||
|
||||
## 风险与约束
|
||||
|
||||
- **表格行内多个 `AmountInput`**:须 `row-key` 稳定,避免 Vue 复用 DOM 导致显示串行。
|
||||
- **`el-form` 校验**:rules 仍针对 `number` 字段,blur 后须已 `emit` 最新值。
|
||||
- **min/max**:退款金额等保留 `max=currentBalance`,在 `AmountInput` 上透传并在 blur 校验。
|
||||
- **不要**对 `quantity` 等整数字段使用本组件。
|
||||
|
||||
## 非目标(YAGNI)
|
||||
|
||||
- 货币符号内置于组件(仍由模板加 `¥`)
|
||||
- 多币种、汇率
|
||||
- 输入法全角数字自动转换(可后续加)
|
||||
|
||||
---
|
||||
|
||||
**状态:** 待评审
|
||||
**关联实现:** `docs/superpowers/plans/2026-05-25-money-input-thousand-separator.md`
|
||||
@@ -1,89 +0,0 @@
|
||||
# ToolbarAction 组件设计
|
||||
|
||||
## 问题
|
||||
|
||||
web-admin 列表页操作列按钮过多(3-6 个),导致操作列宽度达 320-480px,挤压数据列空间。部分页面(如耗材管理)工具栏和操作列的按钮存在功能重复。
|
||||
|
||||
## 方案
|
||||
|
||||
取消操作列,所有操作按钮移到表格上方工具栏。用户通过勾选行来激活操作按钮,实现「选择 → 操作」的交互模式。
|
||||
|
||||
### 交互规则
|
||||
|
||||
| 选中状态 | 批量按钮(mode: batch) | 单行按钮(mode: single) |
|
||||
|----------|------------------------|-------------------------|
|
||||
| 0 行 | 禁用 | 禁用 |
|
||||
| 1 行 | 可操作 | 可操作 |
|
||||
| 多行 | 可操作 | 禁用 + tooltip「请选择单条记录」 |
|
||||
|
||||
### 行为细节
|
||||
|
||||
- 双击行 → 等同于「查看」(保留现有 `@row-dblclick` 模式)
|
||||
- 勾选 0 行时:所有操作按钮 disabled
|
||||
- 勾选 1 行时:所有按钮可用
|
||||
- 勾选多行时:单行操作按钮 disabled + tooltip 提示
|
||||
- 工具栏左对齐:「已选 N 项」→ 主操作按钮
|
||||
|
||||
## 组件 API
|
||||
|
||||
### 文件位置
|
||||
|
||||
```
|
||||
src/components/common/toolbar-action/
|
||||
index.vue
|
||||
types.ts
|
||||
```
|
||||
|
||||
### 类型定义
|
||||
|
||||
```ts
|
||||
import type { Component } from 'vue'
|
||||
|
||||
export interface ToolbarActionItem {
|
||||
label: string
|
||||
icon?: Component
|
||||
handler: (rows: any[]) => void
|
||||
mode: 'batch' | 'single'
|
||||
danger?: boolean
|
||||
disabled?: boolean
|
||||
visible?: boolean
|
||||
}
|
||||
```
|
||||
|
||||
### Props
|
||||
|
||||
```ts
|
||||
interface Props {
|
||||
selected: any[]
|
||||
actions: ToolbarActionItem[]
|
||||
}
|
||||
```
|
||||
|
||||
### 行为
|
||||
|
||||
- 过滤 `visible !== false` 的 actions
|
||||
- 根据 `selected.length` 和 `action.mode` 自动控制按钮 disabled 状态
|
||||
- `danger=true` 的按钮使用 `btn-ghost` + `type="danger"` 样式
|
||||
- `disabled=true` 的按钮始终禁用(调用方控制)
|
||||
- 非 danger 按钮使用 `btn-ghost` 样式
|
||||
|
||||
### 样式
|
||||
|
||||
- 复用现有 `.btn-ghost` 按钮样式(已在 `el-ui.scss` 中定义)
|
||||
- 不新增全局 CSS
|
||||
- 组件 scoped 样式
|
||||
|
||||
### 不做的事
|
||||
|
||||
- 不处理权限(由调用方通过 `visible` 控制)
|
||||
- 不处理 el-popconfirm(由调用方在 handler 中自行处理)
|
||||
- 不做全局注册(按需 import)
|
||||
- 不封装「新增」按钮(新增不属于行操作,由调用方自行放置)
|
||||
|
||||
## 全局样式调整
|
||||
|
||||
使用 ToolbarAction 组件的页面将移除操作列(`fixed="right"`),`el-ui.scss` 中现有 `min-width: 260px` 规则不再对这些页面生效(因为不再有 `.btn-op-item`)。无需修改全局样式。
|
||||
|
||||
## 改造范围
|
||||
|
||||
仅新建组件。不改造现有页面(后续按需逐步替换)。
|
||||
@@ -1,386 +0,0 @@
|
||||
# 体检管理页面设计
|
||||
|
||||
> 日期:2026-05-26
|
||||
> 状态:待审核
|
||||
> 需求来源:用户提出新增独立的体检管理界面
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
- 体检信息管理目前嵌入在中试服务申请单详情弹窗的 Tab 3 中(`ApplicationDetailDialog.vue`)
|
||||
- `biz_pilot_checkup` 表按 `pilot_application_id` 关联,一条申请单对应一条体检记录
|
||||
- 后端 API 只有 `get_checkup_by_application`(按申请单ID查单条),无分页列表接口
|
||||
- 运营人员需要进入每个申请单才能操作体检,效率低
|
||||
|
||||
### 目标
|
||||
|
||||
新增独立的**体检管理**页面,以**患者**为维度管理体检全流程:
|
||||
|
||||
1. 查看所有需要体检的中试服务订单中的患者
|
||||
2. 批量选择患者,统一登记体检机构和体检项目
|
||||
3. 对单个患者上传体检报告、登记实际项目和价格
|
||||
4. 标记已体检、费用结算
|
||||
|
||||
### 关键数据模型变更
|
||||
|
||||
当前 `biz_pilot_checkup` 只有 `pilot_application_id`,没有 `pilot_patient_id`。需要增加该字段,使体检记录对应到具体患者。
|
||||
|
||||
## 2. 数据模型变更
|
||||
|
||||
### 2.1 `biz_pilot_checkup` 新增字段
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_pilot_checkup
|
||||
ADD COLUMN pilot_patient_id VARCHAR(64) DEFAULT NULL COMMENT '中试患者ID'
|
||||
AFTER pilot_application_id;
|
||||
```
|
||||
|
||||
**影响范围**:
|
||||
- `backend/app/models/models.py` — `BizPilotCheckup` 类新增 `pilot_patient_id` 列
|
||||
- `backend/app/crud/pilot_checkup.py` — `_row_to_dict_checkup`、`create_checkup`、`update_checkup` 需处理该字段
|
||||
- 前端 API 和表单数据需同步
|
||||
|
||||
### 2.2 兼容性
|
||||
|
||||
- 现有申请单详情弹窗中的体检 Tab 继续工作(查询时 `pilot_patient_id` 为空则按 `pilot_application_id` 匹配)
|
||||
- 新的体检管理页面同时使用 `pilot_application_id` 和 `pilot_patient_id`
|
||||
|
||||
## 3. 后端 API 变更
|
||||
|
||||
### 3.1 新增:分页列表
|
||||
|
||||
```
|
||||
GET /web/admin/pilot-checkup/list
|
||||
```
|
||||
|
||||
**查询参数**:
|
||||
|
||||
| 参数 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| page | int | 是 | 页码 |
|
||||
| pageSize | int | 是 | 每页条数 |
|
||||
| checkupStatus | string | 否 | 体检状态:dtj/ytj |
|
||||
| feeStatus | string | 否 | 费用状态:wjs/yjs |
|
||||
| checkupInstitutionId | string | 否 | 体检机构ID |
|
||||
| applicationNo | string | 否 | 申请单号(模糊搜索) |
|
||||
| patientName | string | 否 | 患者姓名(模糊搜索) |
|
||||
| channelId | string | 否 | 渠道ID |
|
||||
|
||||
**返回数据**:JOIN `biz_pilot_patient` + `biz_pilot_application` + `biz_checkup_institution`,返回:
|
||||
|
||||
```json
|
||||
{
|
||||
"id": "checkup_id",
|
||||
"pilotApplicationId": "...",
|
||||
"pilotPatientId": "...",
|
||||
"applicationNo": "ZSSQ202605260001",
|
||||
"channelName": "XX医院",
|
||||
"patientName": "张三",
|
||||
"sex": "1",
|
||||
"age": 45,
|
||||
"phoneNo": "138xxxx",
|
||||
"checkupInstitutionId": "...",
|
||||
"institutionName": "XX体检中心",
|
||||
"reserveTime": "2026-05-28 10:00:00",
|
||||
"reserveFee": 500.00,
|
||||
"actualCheckupTime": "",
|
||||
"actualCheckupFee": null,
|
||||
"checkupStatus": "dtj",
|
||||
"feeStatus": "wjs",
|
||||
"reportAttachments": "",
|
||||
"checkupRemark": "",
|
||||
"createTime": "2026-05-26 14:00:00"
|
||||
}
|
||||
```
|
||||
|
||||
### 3.2 新增:未登记体检的患者列表
|
||||
|
||||
用于体检管理页面的"待登记"患者数据源——查询所有 `need_checkup=1` 但尚未创建 `biz_pilot_checkup` 记录的患者:
|
||||
|
||||
```
|
||||
GET /web/admin/pilot-checkup/pending-patients
|
||||
```
|
||||
|
||||
**查询参数**:
|
||||
|
||||
| 参数 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| page | int | 是 | 页码 |
|
||||
| pageSize | int | 是 | 每页条数 |
|
||||
| applicationNo | string | 否 | 申请单号(模糊搜索) |
|
||||
| patientName | string | 否 | 患者姓名(模糊搜索) |
|
||||
| channelId | string | 否 | 渠道ID |
|
||||
|
||||
**返回数据**:JOIN `biz_pilot_patient` + `biz_pilot_application`,返回患者信息 + 申请单信息。
|
||||
|
||||
### 3.3 新增:批量创建体检记录
|
||||
|
||||
```
|
||||
POST /web/admin/pilot-checkup/batch-save
|
||||
```
|
||||
|
||||
**请求体**:
|
||||
|
||||
```json
|
||||
{
|
||||
"patientIds": ["patient_id_1", "patient_id_2"],
|
||||
"checkupInstitutionId": "institution_id",
|
||||
"reserveTime": "2026-05-28 10:00:00",
|
||||
"reserveItems": [
|
||||
{ "projectName": "血常规", "projectFee": 50.00 },
|
||||
{ "projectName": "肝功能", "projectFee": 120.00 }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
为每个 `patientId` 创建独立的 `biz_pilot_checkup` 记录 + `biz_pilot_checkup_reserve_item` 记录。
|
||||
|
||||
### 3.4 现有 API 适配
|
||||
|
||||
- `CheckupSaveBody` 新增可选字段 `patient_id`
|
||||
- `create_checkup` 同时写入 `pilot_patient_id`
|
||||
- `_row_to_dict_checkup` 返回 `pilotPatientId` 字段
|
||||
- `get_checkup_by_application` 保持不变(向后兼容)
|
||||
|
||||
## 4. 前端设计
|
||||
|
||||
### 4.1 路由
|
||||
|
||||
在 `sqxp.ts` 的 `PilotService` 路由组下新增:
|
||||
|
||||
```typescript
|
||||
{
|
||||
id: '80000000000000000000000000000011',
|
||||
name: 'CheckupManagement',
|
||||
path: 'checkup-management',
|
||||
component: '/pilot-service/checkup-management/index',
|
||||
meta: {
|
||||
title: '体检管理',
|
||||
keepAlive: true,
|
||||
menuCode: 'pilot-service:checkup-management:list'
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
菜单位置:「中试服务管理」→「体检管理」,排在「体检机构及项目价格」之后。
|
||||
|
||||
### 4.2 文件结构
|
||||
|
||||
```
|
||||
web-admin/src/views/pilot-service/checkup-management/
|
||||
├── index.vue # 主列表页
|
||||
├── CheckupRegisterDialog.vue # 登记体检弹窗(批量选择患者 + 填写机构/项目/时间)
|
||||
├── CheckupDetailDialog.vue # 详情弹窗(查看信息 + 上传报告 + 登记实际项目)
|
||||
```
|
||||
|
||||
### 4.3 列表页 (`index.vue`)
|
||||
|
||||
**模板参考**:`channel-service-order/index.vue`(复杂列表模式 P07)
|
||||
|
||||
**页面布局**:
|
||||
|
||||
```
|
||||
┌──────────────────────────────────────────────────┐
|
||||
│ 体检管理 │
|
||||
├──────────────────────────────────────────────────┤
|
||||
│ 筛选条件: │
|
||||
│ [体检状态▼] [费用状态▼] [体检机构▼] │
|
||||
│ [申请单号____] [患者姓名____] [渠道____] │
|
||||
│ [查询] [重置] │
|
||||
├──────────────────────────────────────────────────┤
|
||||
│ 已选 0 项 [登记体检] │
|
||||
│ ───────────────────────────────────────────────── │
|
||||
│ ☐ | 申请单号 | 患者 | 性别 | 年龄 | 渠道 | │
|
||||
│ | 体检机构 | 预约时间 | 体检状态 | 费用状态 | │
|
||||
│ | 实际费用 | 操作 │
|
||||
│ │
|
||||
│ [分页] │
|
||||
└──────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
**表格列定义**:
|
||||
|
||||
| 列 | 字段 | 宽度 | 说明 |
|
||||
|---|---|---|---|
|
||||
| ☐选择 | — | 55 | `type="selection"`,仅 `checkupStatus=dtj` 的行可勾选 |
|
||||
| 申请单号 | applicationNo | 160 | |
|
||||
| 患者姓名 | patientName | 100 | |
|
||||
| 性别 | sex | 60 | `el-tag`:男/女 |
|
||||
| 年龄 | age | 60 | |
|
||||
| 渠道名称 | channelName | 140 | |
|
||||
| 体检机构 | institutionName | 160 | 未登记时显示 "—" |
|
||||
| 预约时间 | reserveTime | 160 | |
|
||||
| 体检状态 | checkupStatus | 100 | `el-tag`:待体检(warning)/已体检(success) |
|
||||
| 费用状态 | feeStatus | 100 | `el-tag`:未结算(info)/已结算(success) |
|
||||
| 实际费用 | actualCheckupFee | 100 | `formatMoneyDisplay` |
|
||||
| 操作 | — | 260 | fixed="right":查看、编辑项目、标记已体检、费用结算 |
|
||||
|
||||
**操作按钮逻辑**:
|
||||
|
||||
- **查看**:所有状态可用 → 打开 `CheckupDetailDialog`(只读模式)
|
||||
- **编辑项目**:`checkupStatus=dtj` 可用 → 打开 `CheckupDetailDialog`(编辑模式)
|
||||
- **标记已体检**:`checkupStatus=dtj` 可用 → 调用 `markPilotCheckupChecked`
|
||||
- **费用结算**:`checkupStatus=ytj` 且 `feeStatus=wjs` 可用 → 调用 `settlePilotCheckupFee`
|
||||
- **登记体检**(工具栏):选中 1+ 条 `checkupStatus=dtj` 的记录 → 打开 `CheckupRegisterDialog`
|
||||
|
||||
**双数据源**:
|
||||
|
||||
列表页有两组数据:
|
||||
1. **已登记的患者**(有 `biz_pilot_checkup` 记录):通过 `/pilot-checkup/list` 获取
|
||||
2. **未登记的患者**(`need_checkup=1` 但无体检记录):通过 `/pilot-checkup/pending-patients` 获取
|
||||
|
||||
使用 Tab 切换:「全部」「待登记」「已登记」「待体检」「已体检」。
|
||||
|
||||
或者简化为:默认只展示已登记的(有 `biz_pilot_checkup` 记录),通过体检状态筛选。待登记的患者通过独立的"登记体检"按钮触发,弹窗中搜索并选择。
|
||||
|
||||
**最终选择简化方案**:列表只展示已有体检记录的患者。工具栏"登记体检"按钮打开弹窗,弹窗内搜索并勾选未登记的患者。
|
||||
|
||||
### 4.4 登记体检弹窗 (`CheckupRegisterDialog.vue`)
|
||||
|
||||
**交互流程**:
|
||||
|
||||
```
|
||||
┌─ 登记体检 ─────────────────────────────────────┐
|
||||
│ │
|
||||
│ 搜索患者:[申请单号/患者姓名________] [搜索] │
|
||||
│ │
|
||||
│ ☐ | 申请单号 | 患者姓名 | 性别 | 年龄 | 渠道 | │
|
||||
│ ☑ | ZSSQ...001 | 张三 | 男 | 45 | XX医院 | │
|
||||
│ ☑ | ZSSQ...001 | 李四 | 女 | 52 | XX医院 | │
|
||||
│ ☐ | ZSSQ...002 | 王五 | 男 | 38 | YY医院 | │
|
||||
│ │
|
||||
│ 已选 2 名患者 │
|
||||
│ │
|
||||
│ ── 体检信息 ─────────────────────────────────── │
|
||||
│ │
|
||||
│ 体检机构: [选择体检机构 ▼] │
|
||||
│ 预约时间: [2026-05-28 10:00 🕐] │
|
||||
│ │
|
||||
│ ── 体检项目 ─────────────────────────────────── │
|
||||
│ [从套餐添加] [添加单项] │
|
||||
│ │
|
||||
│ | 项目名称 | 项目费用 | 操作 | │
|
||||
│ | 血常规 | ¥50.00 | [删除] | │
|
||||
│ | 肝功能 | ¥120.00 | [删除] | │
|
||||
│ │
|
||||
│ 预约费用合计:¥170.00 │
|
||||
│ │
|
||||
│ [取消] [确定] │
|
||||
└──────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
**关键组件交互**:
|
||||
|
||||
1. **搜索患者**:调用 `/pilot-checkup/pending-patients` 接口,搜索 `need_checkup=1` 且无体检记录的患者
|
||||
2. **选择体检机构**:下拉选择,数据来自 `fetchCheckupInstitutionList`(现有 API)
|
||||
3. **从套餐添加**:选择机构后,展示该机构的套餐列表,选择套餐后自动填充项目
|
||||
4. **添加单项**:展示该机构的所有项目列表,多选后添加
|
||||
5. **保存**:调用 `/pilot-checkup/batch-save`,为每个选中的患者创建体检记录 + 预约项目
|
||||
|
||||
**项目选择器**(复用 `CheckupPackagePanel.vue` 的模式):
|
||||
- Tab 1:套餐选择 — 按机构筛选套餐 → 选择套餐 → 自动填充项目
|
||||
- Tab 2:单项添加 — 按机构筛选项目 → 多选添加
|
||||
|
||||
### 4.5 详情弹窗 (`CheckupDetailDialog.vue`)
|
||||
|
||||
**模板参考**:`ApplicationDetailDialog.vue` 的体检 Tab 部分
|
||||
|
||||
**布局**:
|
||||
|
||||
```
|
||||
┌─ 体检详情 ─ 张三 ──────────────────────────────┐
|
||||
│ │
|
||||
│ ── 基本信息 ────────────────────────────────── │
|
||||
│ 申请单号:ZSSQ202605260001 │
|
||||
│ 患者姓名:张三 性别:男 年龄:45 │
|
||||
│ 渠道名称:XX医院 │
|
||||
│ 体检机构:XX体检中心 │
|
||||
│ 预约时间:2026-05-28 10:00 │
|
||||
│ 体检状态:[待体检] 费用状态:[未结算] │
|
||||
│ │
|
||||
│ ── 预约项目 ────────────────────────────────── │
|
||||
│ | 项目名称 | 项目费用 | │
|
||||
│ | 血常规 | ¥50.00 | │
|
||||
│ | 肝功能 | ¥120.00 | │
|
||||
│ 合计:¥170.00 │
|
||||
│ │
|
||||
│ ── 实际项目 ───────────────── [添加单项] ────── │
|
||||
│ | 项目名称 | 项目费用 | 操作 | │
|
||||
│ | 血常规 | ¥50.00 | [删除] | │
|
||||
│ | 肝功能 | ¥120.00 | [删除] | │
|
||||
│ | 胸部CT | ¥300.00 | [删除] | │
|
||||
│ 合计:¥470.00 │
|
||||
│ │
|
||||
│ ── 体检报告 ────────────────────────────────── │
|
||||
│ [上传附件] [报告1.pdf] [报告2.jpg] │
|
||||
│ │
|
||||
│ ── 备注 ────────────────────────────────────── │
|
||||
│ 患者体检一切正常... │
|
||||
│ │
|
||||
│ [标记已体检] [费用结算] [取消] │
|
||||
└──────────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
**交互**:
|
||||
- 打开时加载 `fetchPilotCheckupDetail` + `fetchPilotCheckupReserveItems` + `fetchPilotCheckupActualItems`
|
||||
- 实际项目可增删,调用现有 `savePilotCheckupActualItems` / `deletePilotCheckupActualItem`
|
||||
- 附件上传使用卡片化上传模式(参考 `ProtocolFormDialog.vue`),调用 `fetchUploadAttachment`
|
||||
- 标记已体检 / 费用结算复用现有 API
|
||||
|
||||
### 4.6 前端 API 新增
|
||||
|
||||
```typescript
|
||||
// web-admin/src/api/admin.ts
|
||||
|
||||
// 体检记录分页列表
|
||||
export const fetchPilotCheckupList = (params: any) =>
|
||||
request.get({ url: '/web/admin/pilot-checkup/list', params })
|
||||
|
||||
// 待登记体检的患者列表
|
||||
export const fetchPilotCheckupPendingPatients = (params: any) =>
|
||||
request.get({ url: '/web/admin/pilot-checkup/pending-patients', params })
|
||||
|
||||
// 批量创建体检记录
|
||||
export const batchSavePilotCheckup = (data: any) =>
|
||||
request.post({ url: '/web/admin/pilot-checkup/batch-save', params: data })
|
||||
```
|
||||
|
||||
## 5. 改动范围总结
|
||||
|
||||
### 后端
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `app/models/models.py` | `BizPilotCheckup` 新增 `pilot_patient_id` 字段 |
|
||||
| `app/crud/pilot_checkup.py` | `_row_to_dict_checkup` 返回新字段;新增 `list_checkups_paginated`、`list_pending_patients`、`batch_create_checkups` 函数 |
|
||||
| `app/api/pilot_checkup.py` | 新增 3 个 API 端点;`CheckupSaveBody` 新增 `patient_id` 字段 |
|
||||
| `docs/sql/` | 新增迁移 SQL |
|
||||
|
||||
### 前端
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `src/views/pilot-service/checkup-management/index.vue` | **新建** — 主列表页 |
|
||||
| `src/views/pilot-service/checkup-management/CheckupRegisterDialog.vue` | **新建** — 登记体检弹窗 |
|
||||
| `src/views/pilot-service/checkup-management/CheckupDetailDialog.vue` | **新建** — 详情弹窗 |
|
||||
| `src/api/admin.ts` | 新增 3 个 API 函数 |
|
||||
| `src/router/modules/sqxp.ts` | 新增路由 |
|
||||
|
||||
### 复用的现有代码
|
||||
|
||||
- `status-tag-registry.ts` — `checkupStatusLabel` / `checkupStatusTagType`(现有)
|
||||
- `fetchCheckupInstitutionList` — 体检机构列表 API(现有)
|
||||
- `fetchCheckupInstitutionProjects` — 机构项目列表 API(现有)
|
||||
- `fetchCheckupInstitutionPackages` — 机构套餐列表 API(现有)
|
||||
- `fetchUploadAttachment` / `fetchAttachmentDownloadUrl` — 附件上传下载(现有)
|
||||
- `savePilotCheckupReserveItems` / `savePilotCheckupActualItems` — 预约/实际项目保存(现有)
|
||||
- `markPilotCheckupChecked` / `settlePilotCheckupFee` — 状态变更(现有)
|
||||
- `formatMoneyDisplay` / `AmountInput` — 金额显示/输入(现有)
|
||||
|
||||
## 6. 不做的事
|
||||
|
||||
- **不修改**现有申请单详情弹窗中的体检 Tab(保持向后兼容)
|
||||
- **不新增**数据库表(复用现有 3 张体检表 + 增加一个字段)
|
||||
- **不做**体检结果录入(如检查指标、异常标记等)——仅管理项目、费用和报告附件
|
||||
- **不做**自动费用计算——实际费用由运营手动录入
|
||||
@@ -1,315 +0,0 @@
|
||||
# 出库生产工单设计文档
|
||||
|
||||
> 日期: 2026-05-26
|
||||
> 状态: 待实施
|
||||
> 方案: A(在现有生产工单页面扩展 tab)
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
- 生产工单界面有 3 个 tab:入库生产工单、临时生产工单、全部生产工单
|
||||
- 后端 CRUD 层已存在 `create_outbound_production_work_order()` 函数,通用列表 API 已支持 `workOrderType=outbound` 过滤
|
||||
- 出库工单目前只能通过输注计划管理页面的"生成出库工单"按钮手动触发创建
|
||||
- 中试服务申请单、体检管理、输注计划管理三个界面已调通
|
||||
|
||||
### 目标
|
||||
- 在生产工单页面新增「出库生产工单」tab
|
||||
- 输注计划创建时自动创建出库生产工单
|
||||
- 输注计划删除时关联出库工单状态变为已作废
|
||||
- 出库工单详情展示关联的中试申请单信息和输注计划信息
|
||||
- 全部生产工单 tab 隐藏操作列
|
||||
|
||||
## 2. 需求确认
|
||||
|
||||
| # | 需求项 | 确认结果 |
|
||||
|---|--------|----------|
|
||||
| 1 | 出库工单生成时机 | 输注计划创建时立即自动创建 |
|
||||
| 2 | 输注计划删除时出库工单行为 | 保留工单,状态变为已作废(yzf) |
|
||||
| 3 | 业务类型字段 | 新增 biz_type 字段区分中试服务(pilot_service)/临床应用(clinical_application) |
|
||||
| 4 | 详情弹窗 | 复用现有 SystemViewDialog,增加申请单信息和输注计划信息区块 |
|
||||
| 5 | 操作按钮 | 查看详情、编辑(仅备注)、删除、编辑任务、派发任务、完成工单 |
|
||||
| 6 | 列表列 | 工单号、业务类型、申请单号、细胞类型、规格、输注时间、备注、工单状态、创建时间 |
|
||||
| 7 | 全部 tab 操作列 | 隐藏 |
|
||||
|
||||
## 3. 数据库变更
|
||||
|
||||
### 3.1 biz_production_work_order 表新增字段
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_production_work_order
|
||||
ADD COLUMN biz_type VARCHAR(20) NULL COMMENT '业务类型: pilot_service=中试服务, clinical_application=临床应用' AFTER infusion_schedule_id;
|
||||
```
|
||||
|
||||
### 3.2 工单状态枚举扩展
|
||||
|
||||
现有:`dpz`(待配置), `jxz`(进行中), `ywc`(已完成)
|
||||
新增:`yzf`(已作废)
|
||||
|
||||
无需 ALTER TABLE,VARCHAR(16) 已足够容纳。仅需更新模型 comment:
|
||||
```sql
|
||||
ALTER TABLE biz_production_work_order
|
||||
MODIFY COLUMN work_order_status VARCHAR(16) NOT NULL DEFAULT 'dpz' COMMENT '工单状态 dpz待配置 jxz进行中 ywc已完成 yzf已作废';
|
||||
```
|
||||
|
||||
### 3.3 模型 comment 更新
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_production_work_order
|
||||
MODIFY COLUMN work_order_type VARCHAR(20) NOT NULL DEFAULT 'inbound' COMMENT '工单类型: inbound=入库, temporary=临时, outbound=出库';
|
||||
```
|
||||
|
||||
## 4. 后端变更
|
||||
|
||||
### 4.1 模型层 — `backend/app/models/models.py`
|
||||
|
||||
`BizProductionWorkOrder` 新增:
|
||||
```python
|
||||
biz_type = Column(String(20), nullable=True, comment="业务类型: pilot_service=中试服务, clinical_application=临床应用")
|
||||
```
|
||||
|
||||
更新 `work_order_type` 和 `work_order_status` 字段 comment。
|
||||
|
||||
### 4.2 CRUD 层 — `backend/app/crud/production_work_order.py`
|
||||
|
||||
#### 4.2.1 状态映射扩展
|
||||
```python
|
||||
_WORK_ORDER_STATUS_LABELS = {
|
||||
"dpz": "待配置",
|
||||
"jxz": "进行中",
|
||||
"ywc": "已完成",
|
||||
"yzf": "已作废", # 新增
|
||||
}
|
||||
```
|
||||
|
||||
#### 4.2.2 `_wo_to_dict()` 增加字段
|
||||
返回值新增:
|
||||
```python
|
||||
"bizType": getattr(wo, "biz_type", None) or None,
|
||||
"bizTypeLabel": {"pilot_service": "中试服务", "clinical_application": "临床应用"}.get(getattr(wo, "biz_type", None), ""),
|
||||
```
|
||||
|
||||
#### 4.2.3 `create_outbound_production_work_order()` 增加 biz_type 参数
|
||||
函数签名新增 `biz_type: str = "pilot_service"` 参数,创建时写入 `biz_type` 字段。
|
||||
|
||||
#### 4.2.4 列表增强 — outbound 类型工单附加业务数据
|
||||
在 `_enrich_wo_items()` 或列表返回后,对 `workOrderType == "outbound"` 的记录:
|
||||
- 通过 `infusion_schedule_id` 关联 `BizPilotInfusionSchedule`
|
||||
- 通过 `infusion_plan_id` 关联 `BizPilotInfusionPlan`
|
||||
- 通过 `pilot_application_id` 关联 `BizPilotApplication`
|
||||
- 附加字段:`applicationNo`, `applicationName`, `cellType`, `specText`, `infusionTime`, `infusionLocation`
|
||||
|
||||
#### 4.2.5 详情增强 — outbound 类型工单详情
|
||||
在 `_wo_to_response_dict()` 中对 outbound 类型,增加返回:
|
||||
```python
|
||||
"pilotApplication": {
|
||||
"applicationNo": "...",
|
||||
"applicationName": "...",
|
||||
"applicationStatus": "...",
|
||||
},
|
||||
"infusionSchedule": {
|
||||
"cellType": "...",
|
||||
"specText": "...",
|
||||
"infusionTime": "...",
|
||||
"infusionLocation": "...",
|
||||
"infusionMethod": "...",
|
||||
"scheduleStatus": "...",
|
||||
}
|
||||
```
|
||||
|
||||
### 4.3 自动创建钩子 — `backend/app/crud/pilot_application.py`
|
||||
|
||||
在 `create_schedule()` 函数末尾(`db.commit()` 之前),增加:
|
||||
```python
|
||||
# 自动创建出库生产工单
|
||||
from app.crud import production_work_order as pwo_svc
|
||||
pwo_svc.create_outbound_production_work_order(
|
||||
db,
|
||||
schedule_id=schedule_id,
|
||||
tenant_no=tenant_no,
|
||||
user_id=user_id,
|
||||
create_dept_id=dept_id,
|
||||
biz_type="pilot_service",
|
||||
)
|
||||
```
|
||||
|
||||
注意:`create_outbound_production_work_order` 内部已有幂等检查(通过 `infusion_schedule_id` 查重),重复调用不会产生重复工单。
|
||||
|
||||
### 4.4 自动作废钩子 — `backend/app/crud/pilot_application.py`
|
||||
|
||||
在 `soft_delete_schedule()` 函数中,`row.del_flag = 1` 之前,增加:
|
||||
```python
|
||||
# 关联的出库生产工单标记为已作废
|
||||
outbound_wo = (
|
||||
db.query(BizProductionWorkOrder)
|
||||
.filter(
|
||||
BizProductionWorkOrder.infusion_schedule_id == schedule_id,
|
||||
BizProductionWorkOrder.tenant_no == tenant_no,
|
||||
BizProductionWorkOrder.del_flag == 0,
|
||||
BizProductionWorkOrder.work_order_type == "outbound",
|
||||
)
|
||||
.first()
|
||||
)
|
||||
if outbound_wo:
|
||||
outbound_wo.work_order_status = "yzf"
|
||||
outbound_wo.update_time = datetime.now()
|
||||
```
|
||||
|
||||
需在文件头部导入 `BizProductionWorkOrder`。
|
||||
|
||||
### 4.5 Schema 层 — `backend/app/schemas/production_work_order.py`
|
||||
|
||||
`ProductionWorkOrderListQuery` 如需支持按 `biz_type` 筛选,新增可选字段。当前需求未要求筛选,暂不增加。
|
||||
|
||||
## 5. 前端变更
|
||||
|
||||
### 5.1 Tab 结构 — `web-admin/src/views/production/production-work-order/index.vue`
|
||||
|
||||
#### 类型定义扩展
|
||||
```typescript
|
||||
type WorkOrderTypeTab = 'inbound' | 'temporary' | 'outbound' | 'all'
|
||||
```
|
||||
|
||||
#### Tab 面板
|
||||
```html
|
||||
<el-tabs v-model="activeTypeTab" class="work-order-type-tabs" @tab-change="handleTypeTabChange">
|
||||
<el-tab-pane label="入库生产工单" name="inbound" />
|
||||
<el-tab-pane label="临时生产工单" name="temporary" />
|
||||
<el-tab-pane label="出库生产工单" name="outbound" />
|
||||
<el-tab-pane label="全部生产工单" name="all" />
|
||||
</el-tabs>
|
||||
```
|
||||
|
||||
### 5.2 列表列配置
|
||||
|
||||
#### 工具栏
|
||||
- outbound tab 不显示新增按钮
|
||||
- 条件:`v-if="activeTypeTab !== 'all' && activeTypeTab !== 'outbound'"`
|
||||
|
||||
#### 关键词搜索框 placeholder
|
||||
```typescript
|
||||
const searchPlaceholder = computed(() => {
|
||||
if (activeTypeTab.value === 'temporary') return '工单号'
|
||||
if (activeTypeTab.value === 'outbound') return '工单号/申请单号'
|
||||
return '工单号/协议号/样本编码'
|
||||
})
|
||||
```
|
||||
|
||||
#### 表格列
|
||||
新增出库工单专属列(仅在 outbound tab 显示):
|
||||
- 业务类型(tag):`v-if="activeTypeTab === 'outbound'"`
|
||||
- 申请单号:`v-if="activeTypeTab === 'outbound'"`
|
||||
- 细胞类型:`v-if="activeTypeTab === 'outbound'"`
|
||||
- 规格:`v-if="activeTypeTab === 'outbound'"`
|
||||
- 输注时间:`v-if="activeTypeTab === 'outbound'"`
|
||||
|
||||
#### 全部 tab 的工单类型 Tag
|
||||
更新 tag 映射:
|
||||
```typescript
|
||||
// 工单类型 tag(全部 tab 显示)
|
||||
const woTypeTag = (type: string) => {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
inbound: { label: '入库', type: 'success' },
|
||||
temporary: { label: '临时', type: 'warning' },
|
||||
outbound: { label: '出库', type: 'primary' },
|
||||
}
|
||||
return map[type] || { label: type, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
#### 全部 tab 隐藏操作列
|
||||
操作列 `<el-table-column>` 添加条件:
|
||||
```html
|
||||
<el-table-column
|
||||
v-if="activeTypeTab !== 'all'"
|
||||
label="操作"
|
||||
...
|
||||
>
|
||||
```
|
||||
|
||||
#### 工单状态 Tag
|
||||
```typescript
|
||||
const woStatusTag = (status: string) => {
|
||||
const map: Record<string, { label: string; type: string }> = {
|
||||
dpz: { label: '待配置', type: 'info' },
|
||||
jxz: { label: '进行中', type: 'warning' },
|
||||
ywc: { label: '已完成', type: 'success' },
|
||||
yzf: { label: '已作废', type: 'danger' }, // 新增
|
||||
}
|
||||
return map[status] || { label: status, type: 'info' }
|
||||
}
|
||||
```
|
||||
|
||||
#### 状态筛选下拉
|
||||
增加已作废选项:
|
||||
```html
|
||||
<el-option label="已作废" value="yzf" />
|
||||
```
|
||||
|
||||
### 5.3 详情弹窗 — viewSections computed
|
||||
|
||||
对 outbound 类型(`isOutbound = d.workOrderType === 'outbound'`):
|
||||
|
||||
**基本信息 section**:
|
||||
- 工单号、工单类型(出库 tag=primary)、业务类型(中试服务 tag=primary)、工单状态、备注、创建时间
|
||||
- 不显示:协议号、协议状态、样本编码、来源类型、样本类型
|
||||
|
||||
**中试申请信息 section**(新增,仅 outbound):
|
||||
```typescript
|
||||
{
|
||||
title: '中试申请信息',
|
||||
fields: [
|
||||
{ label: '申请单号', value: d.pilotApplication?.applicationNo || '—' },
|
||||
{ label: '申请名称', value: d.pilotApplication?.applicationName || '—' },
|
||||
{ label: '申请状态', value: applicationStatusLabel(d.pilotApplication?.applicationStatus), tagType: ... },
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**输注计划信息 section**(新增,仅 outbound):
|
||||
```typescript
|
||||
{
|
||||
title: '输注计划信息',
|
||||
fields: [
|
||||
{ label: '细胞类型', value: d.infusionSchedule?.cellType || '—' },
|
||||
{ label: '规格', value: d.infusionSchedule?.specText || '—' },
|
||||
{ label: '输注时间', value: d.infusionSchedule?.infusionTime || '—' },
|
||||
{ label: '输注地点', value: d.infusionSchedule?.infusionLocation || '—' },
|
||||
{ label: '输注方式', value: d.infusionSchedule?.infusionMethod || '—' },
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**不显示**:运输信息 section、样本接收 section(这些是入库工单特有的)
|
||||
|
||||
### 5.4 操作按钮逻辑
|
||||
|
||||
outbound tab 的操作按钮与 inbound/temporary 基本一致:
|
||||
- 查看详情:始终显示
|
||||
- 编辑:始终显示(仅改备注)
|
||||
- 编辑任务:始终显示
|
||||
- 派发任务:状态为 dpz/jxz 时显示
|
||||
- 完成工单:状态为 dpz/jxz 时显示
|
||||
- 删除:非 ywc 状态时显示(yzf 状态也可删除)
|
||||
|
||||
### 5.5 showReceptionCols 逻辑
|
||||
|
||||
```typescript
|
||||
const showReceptionCols = computed(() => activeTypeTab.value !== 'temporary' && activeTypeTab.value !== 'outbound')
|
||||
```
|
||||
|
||||
## 6. 影响文件清单
|
||||
|
||||
| 文件 | 改动类型 | 说明 |
|
||||
|------|----------|------|
|
||||
| `docs/sql/2026-05-26-outbound-work-order.sql` | 新增 | ALTER TABLE SQL 脚本 |
|
||||
| `backend/app/models/models.py` | 修改 | BizProductionWorkOrder 新增 biz_type 字段,更新 comment |
|
||||
| `backend/app/crud/production_work_order.py` | 修改 | 状态映射、biz_type 字段、出库工单创建参数、列表增强、详情增强 |
|
||||
| `backend/app/crud/pilot_application.py` | 修改 | create_schedule 自动创建钩子、soft_delete_schedule 作废钩子 |
|
||||
| `web-admin/src/views/production/production-work-order/index.vue` | 修改 | 新增 tab、列配置、操作按钮逻辑、详情弹窗、状态映射 |
|
||||
|
||||
## 7. 不涉及的改动
|
||||
|
||||
- 不新增路由或菜单项(复用现有生产工单页面)
|
||||
- 不新增 API 端点(复用现有通用列表/详情 API)
|
||||
- 不修改输注计划管理页面的"生成出库工单"按钮(保持兼容,该按钮仍可手动触发,幂等逻辑保证不重复创建)
|
||||
- 不修改生产任务相关的弹窗组件(派发、执行、完成等逻辑通用,无需改动)
|
||||
@@ -1,321 +0,0 @@
|
||||
# 出库质检工单功能设计
|
||||
|
||||
> 日期:2026-05-26
|
||||
> 状态:待实现
|
||||
> 方案:A — 在现有质检工单页面内新增出库 Tab
|
||||
|
||||
## 1. 需求概述
|
||||
|
||||
在现有质检工单页面 (`quality-inspection/qc-work-order`) 中新增"出库质检工单"Tab,展示由中试服务申请单/输注计划触发的出库质检工单。支持查看(含完整申请单+输注计划信息)、编辑备注、配置检测。不支持新建和删除。输注计划取消/删除时,关联的出库质检工单自动作废。
|
||||
|
||||
### 1.1 关键约束
|
||||
|
||||
- 出库质检工单仅由外部触发创建(输注计划页面),出库 Tab 不提供新建入口
|
||||
- 编辑仅限备注字段
|
||||
- 不支持删除操作
|
||||
- 配置检测功能与现有入库/临时质检完全一致
|
||||
- 输注计划取消时后端自动作废关联质检工单
|
||||
- 工单类型 `biz_type`:`pilot_service`=中试服务、`clinical_application`=临床应用
|
||||
|
||||
### 1.2 已有基础设施
|
||||
|
||||
| 组件 | 状态 | 说明 |
|
||||
|------|------|------|
|
||||
| `biz_qc_work_order.work_order_type='outbound'` | 已有 | 数据库字段已支持 |
|
||||
| `biz_qc_work_order.qc_biz_type='outbound'` | 已有 | 数据库字段已支持 |
|
||||
| `biz_qc_work_order.infusion_schedule_id` | 已有 | 关联输注计划 |
|
||||
| `create_outbound_qc_work_order()` | 已有 | 后端创建逻辑已实现 |
|
||||
| `POST /web/admin/pilot-infusion-schedule/create-qc-work-order` | 已有 | API 端点已存在 |
|
||||
|
||||
### 1.3 需新增的数据库字段
|
||||
|
||||
> **重要发现**:`biz_qc_work_order` 表当前没有 `biz_type` 字段来区分"中试服务/临床应用"。`biz_production_work_order` 已有此字段(通过 `2026-05-26-outbound-work-order.sql` 新增),但质检工单表没有。
|
||||
|
||||
需新增 SQL:
|
||||
```sql
|
||||
ALTER TABLE biz_qc_work_order
|
||||
ADD COLUMN biz_type VARCHAR(20) NULL COMMENT '业务类型: pilot_service=中试服务, clinical_application=临床应用' AFTER infusion_schedule_id;
|
||||
```
|
||||
|
||||
同时更新 `create_outbound_qc_work_order()` 函数,创建出库质检工单时写入 `biz_type='pilot_service'`(来自中试服务申请单触发的场景)。
|
||||
|
||||
## 2. 前端设计
|
||||
|
||||
### 2.1 Tab 结构
|
||||
|
||||
在 `web-admin/src/views/quality-inspection/qc-work-order/index.vue` 的 `el-tabs` 中新增第 4 个 Tab:
|
||||
|
||||
```
|
||||
┌──────────┬──────────┬──────────┬──────────┐
|
||||
│ 入库质检 │ 临时质检 │ 出库质检 │ 全部工单 │
|
||||
│ inbound │ temporary│ outbound │ all │
|
||||
└──────────┴──────────┴──────────┴──────────┘
|
||||
```
|
||||
|
||||
- `activeTypeTab` 类型扩展为 `'inbound' | 'temporary' | 'outbound' | 'all'`
|
||||
- Tab 切换时重置分页并重新加载数据
|
||||
- API 调用复用 `fetchQcWorkOrderList`,传入 `workOrderType='outbound'`
|
||||
|
||||
### 2.2 列表筛选条件
|
||||
|
||||
| 筛选项 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| 工单状态 | `el-select` | 待配置(dpz) / 已配置(ypz) / 已完成(ywc) / 已作废(yzf) |
|
||||
| 业务类型 | `el-select` | 中试服务(pilot_service) / 临床应用(clinical_application) |
|
||||
| 创建时间 | `el-date-picker` | 日期范围选择 |
|
||||
| 关键词 | `el-input` | 搜索工单号、申请单号、申请单名称 |
|
||||
|
||||
### 2.3 表格列
|
||||
|
||||
| 列名 | 字段 | 宽度 | 说明 |
|
||||
|------|------|------|------|
|
||||
| 序号 | — | — | 分页计算 |
|
||||
| 工单号 | `workOrderNo` | min-width:160 | CKZJ 前缀 |
|
||||
| 业务类型 | `bizType` | min-width:100 | `el-tag`: pilot_service=primary, clinical_application=warning |
|
||||
| 申请单号 | `applicationNo` | min-width:160 | 从关联申请单带入 |
|
||||
| 申请单名称 | `applicationName` | min-width:200 | 从关联申请单带入 |
|
||||
| 渠道名称 | `channelName` | min-width:140 | 从关联申请单带入 |
|
||||
| 输注时间 | `infusionTime` | min-width:160 | 从输注计划带入 |
|
||||
| 检测方式 | 计算字段 | min-width:140 | 格式化 "实验室 \ 第三方" |
|
||||
| 备注 | `remark` | min-width:160 | — |
|
||||
| 状态 | `workOrderStatus` | min-width:100 | `el-tag`: dpz=info, ypz=warning, ywc=success, yzf=danger |
|
||||
| 创建时间 | `createTime` | min-width:160 | — |
|
||||
| 操作 | — | min-width:260, fixed="right" | 查看/编辑/配置检测 |
|
||||
|
||||
**操作列按钮可见性**:
|
||||
|
||||
| 按钮 | 显示条件 |
|
||||
|------|---------|
|
||||
| 查看 | 所有状态 |
|
||||
| 编辑(备注) | 非已完成、非已作废 |
|
||||
| 配置检测 | 待配置、已配置 |
|
||||
| 删除 | 不显示 |
|
||||
| 新增 | 不显示 |
|
||||
|
||||
### 2.4 查看对话框 — OutboundQcViewDialog.vue
|
||||
|
||||
新建组件:`web-admin/src/views/quality-inspection/qc-work-order/OutboundQcViewDialog.vue`
|
||||
|
||||
使用 `SystemViewDialog` 组件,宽度 1200px,4列网格,compact 模式。
|
||||
|
||||
#### Section 结构
|
||||
|
||||
**Section 1: 工单基本信息**
|
||||
|
||||
| 字段 | 来源 |
|
||||
|------|------|
|
||||
| 工单号 | `workOrderNo` |
|
||||
| 工单类型 | `workOrderType` → `el-tag` |
|
||||
| 业务类型 | `bizType` → `el-tag` |
|
||||
| 工单状态 | `workOrderStatus` → `el-tag` |
|
||||
| 检测方式 | 计算字段(实验室/第三方) |
|
||||
| 配置时间 | `configuredTime` |
|
||||
| 配置人 | `configuredBy` |
|
||||
| 备注 | `remark` |
|
||||
|
||||
**Section 2: 中试服务申请单信息**
|
||||
|
||||
| 字段 | 来源 |
|
||||
|------|------|
|
||||
| 申请单号 | `application.applicationNo` |
|
||||
| 申请单名称 | `application.applicationName` |
|
||||
| 申请单状态 | `application.applicationStatus` → `el-tag` |
|
||||
| 渠道名称 | `application.channelName` |
|
||||
|
||||
**Section 3: 患者信息**
|
||||
|
||||
| 字段 | 来源 |
|
||||
|------|------|
|
||||
| 患者姓名 | `patient.patientName` |
|
||||
| 性别 | `patient.sex` |
|
||||
| 年龄 | `patient.age` |
|
||||
| 联系电话 | `patient.phoneNo` |
|
||||
| 证件号码 | `patient.idCardNo` |
|
||||
| 紧急联系人 | `patient.emergencyContact` |
|
||||
| 紧急联系电话 | `patient.emergencyPhone` |
|
||||
| 临床诊断 | `patient.clinicalDiagnosis`(跨列) |
|
||||
| 诊断附件 | `patient.diagnosisAttachments`(跨列,附件预览组件) |
|
||||
|
||||
**Section 4: 输注方案信息**
|
||||
|
||||
| 字段 | 来源 |
|
||||
|------|------|
|
||||
| 细胞类型 | `infusionPlan.cellType` |
|
||||
| 规格 | `infusionPlan.specText` |
|
||||
| 总疗程数 | `infusionPlan.totalCourseCount` |
|
||||
| 疗程间隔 | `infusionPlan.courseInterval` |
|
||||
| 输注途径 | `infusionPlan.infusionRoute` |
|
||||
| 输注开始日期 | `infusionPlan.infusionStartDate` |
|
||||
|
||||
**Section 5: 本次输注计划信息**
|
||||
|
||||
| 字段 | 来源 |
|
||||
|------|------|
|
||||
| 输注时间 | `infusionSchedule.infusionTime` |
|
||||
| 输注地点 | `infusionSchedule.infusionLocation` |
|
||||
| 输注方式 | `infusionSchedule.infusionMethod` |
|
||||
| 生产状态 | `infusionSchedule.scheduleStatus` → `el-tag` |
|
||||
| 输注状态 | `infusionSchedule.infusionStatus` → `el-tag` |
|
||||
| 质检状态 | `infusionSchedule.qcStatus` → `el-tag` |
|
||||
| 取消原因 | `infusionSchedule.cancelReason`(仅已取消时显示) |
|
||||
|
||||
**Section 6: 产品明细(表格)**
|
||||
|
||||
| 列 | 字段 |
|
||||
|----|------|
|
||||
| 项目编码 | `projectCode` |
|
||||
| 项目名称 | `projectName` |
|
||||
| 细胞类型 | `cellTypeName` |
|
||||
| 规格 | `specText` |
|
||||
| 协议单价 | `agreementPrice` |
|
||||
| 实际单价 | `actualPrice` |
|
||||
| 份数 | `quantity` |
|
||||
| 产品状态 | `productStatus` → `el-tag` |
|
||||
|
||||
**Section 7+: 检测结果(动态,每个任务一个 Section)**
|
||||
|
||||
复用现有的任务结果展示逻辑(实验室参数表 + 第三方附件),与入库质检查看对话框的检测结果 Section 一致。
|
||||
|
||||
#### 数据加载
|
||||
|
||||
1. 调用新聚合 API `GET /web/admin/qc-work-orders/{id}/outbound-detail`
|
||||
2. 一次性获取工单 + 申请单 + 患者 + 方案 + 计划 + 产品 + 任务结果的全部数据
|
||||
3. 无需前端多次请求
|
||||
|
||||
#### 状态标签映射
|
||||
|
||||
所有状态/类型字段使用 `el-tag` 渲染,复用 `status-tag-registry.ts` 中的映射函数:
|
||||
- `workOrderStatus`: dpz=info, ypz=warning, ywc=success, yzf=danger
|
||||
- `applicationStatus`: dks=info, jxz=warning, ywc=success, yzf=danger
|
||||
- `scheduleStatus`: dsc=info, ysc=primary, yjf=success, yqx=danger
|
||||
- `infusionStatus`: dtz=info, yrqr=warning, yqx=danger, ywc=success
|
||||
- `qcStatus`: dzc=info, yzj=success, yqx=danger
|
||||
- `productStatus`: dtz=info, yrqr=warning, yqx=danger, ywc=success
|
||||
|
||||
## 3. 后端设计
|
||||
|
||||
### 3.1 列表 API 扩展返回字段
|
||||
|
||||
**修改文件**:`backend/app/crud/qc_work_order.py`
|
||||
|
||||
当 `work_order_type='outbound'` 时,在列表 SQL 中 LEFT JOIN 以下链路:
|
||||
|
||||
```
|
||||
biz_qc_work_order
|
||||
→ biz_pilot_infusion_schedule (ON infusion_schedule_id)
|
||||
→ biz_pilot_infusion_plan (ON infusion_plan_id)
|
||||
→ biz_pilot_application (ON pilot_application_id)
|
||||
```
|
||||
|
||||
在 `_row_to_dict()` 中为 outbound 类型额外返回:
|
||||
|
||||
| 字段 | SQL 来源 |
|
||||
|------|---------|
|
||||
| `bizType` | `biz_qc_work_order.biz_type`(**新增字段**,pilot_service/clinical_application) |
|
||||
| `applicationNo` | `biz_pilot_application.application_no` |
|
||||
| `applicationName` | `biz_pilot_application.application_name` |
|
||||
| `channelName` | `biz_pilot_application.channel_name` |
|
||||
| `infusionTime` | `biz_pilot_infusion_schedule.infusion_time` |
|
||||
|
||||
**新增列表查询参数**:`bizType`(可选),用于前端按业务类型筛选。
|
||||
|
||||
### 3.2 新增出库质检查看聚合 API
|
||||
|
||||
**新增端点**:`GET /web/admin/qc-work-orders/{id}/outbound-detail`
|
||||
|
||||
**修改文件**:
|
||||
- `backend/app/api/qc.py` — 新增路由
|
||||
- `backend/app/crud/qc_work_order.py` — 新增 `get_outbound_qc_detail()` 函数
|
||||
|
||||
**返回数据结构**:
|
||||
|
||||
```json
|
||||
{
|
||||
"workOrder": {
|
||||
"id", "workOrderNo", "workOrderType", "workOrderStatus",
|
||||
"bizType", "hasLab", "hasThirdParty", "remark",
|
||||
"configuredTime", "configuredBy", "createTime"
|
||||
},
|
||||
"application": {
|
||||
"applicationNo", "applicationName", "applicationStatus", "channelName"
|
||||
},
|
||||
"patient": {
|
||||
"patientName", "sex", "age", "phoneNo", "idCardNo",
|
||||
"emergencyContact", "emergencyPhone",
|
||||
"clinicalDiagnosis", "diagnosisAttachments"
|
||||
},
|
||||
"infusionPlan": {
|
||||
"cellType", "specText", "totalCourseCount",
|
||||
"courseInterval", "infusionRoute", "infusionStartDate"
|
||||
},
|
||||
"infusionSchedule": {
|
||||
"infusionTime", "infusionLocation", "infusionMethod",
|
||||
"scheduleStatus", "infusionStatus", "qcStatus", "cancelReason"
|
||||
},
|
||||
"products": [
|
||||
{
|
||||
"projectCode", "projectName", "cellTypeName", "specText",
|
||||
"agreementPrice", "actualPrice", "quantity", "productStatus"
|
||||
}
|
||||
],
|
||||
"tasks": [
|
||||
{
|
||||
"taskNo", "taskType", "taskStatus", "conclusion",
|
||||
"results": [...],
|
||||
"thirdPartyAttachments": "...",
|
||||
"materialUsages": [...]
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
**实现**:通过工单的 `infusion_schedule_id` JOIN 链路一次性获取,tasks 复用现有的任务查询逻辑。
|
||||
|
||||
### 3.3 输注计划取消时自动作废质检工单
|
||||
|
||||
**修改文件**:`backend/app/crud/pilot_infusion_schedule_mgmt.py`
|
||||
|
||||
在输注计划取消/删除的状态更新逻辑中,新增:
|
||||
|
||||
```python
|
||||
# 当输注计划状态变更为取消时
|
||||
if new_status in ('yqx',):
|
||||
# 查找关联的未完成出库质检工单
|
||||
pending_orders = session.query(BizQcWorkOrder).filter(
|
||||
BizQcWorkOrder.infusion_schedule_id == schedule_id,
|
||||
BizQcWorkOrder.work_order_status.notin_(['ywc', 'yzf']),
|
||||
BizQcWorkOrder.del_flag == '0'
|
||||
).all()
|
||||
for order in pending_orders:
|
||||
order.work_order_status = 'yzf'
|
||||
```
|
||||
|
||||
### 3.4 不需要改动的部分
|
||||
|
||||
| 功能 | 原因 |
|
||||
|------|------|
|
||||
| 配置检测 | 完全复用 `configure_work_order()` |
|
||||
| 质检任务执行 | 复用现有任务开始/完成/填写结果流程 |
|
||||
| 工单创建 | 复用 `create_outbound_qc_work_order()` |
|
||||
| 编辑备注 | 复用现有 PUT 端点 |
|
||||
|
||||
## 4. 涉及文件清单
|
||||
|
||||
### 新增文件
|
||||
|
||||
| 文件 | 说明 |
|
||||
|------|------|
|
||||
| `web-admin/src/views/quality-inspection/qc-work-order/OutboundQcViewDialog.vue` | 出库质检查看对话框组件 |
|
||||
| `docs/sql/2026-05-26-qc-work-order-add-biz-type.sql` | 质检工单表新增 biz_type 字段 |
|
||||
|
||||
### 修改文件
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `web-admin/src/views/quality-inspection/qc-work-order/index.vue` | 新增 outbound Tab、列表列、筛选条件、操作按钮 |
|
||||
| `web-admin/src/api/qc-work-order.ts` | 新增 `fetchOutboundQcDetail` API 函数 |
|
||||
| `web-admin/src/utils/status-tag-registry.ts` | 确保 outbound 相关状态标签映射完整 |
|
||||
| `backend/app/api/qc.py` | 新增 `GET /qc-work-orders/{id}/outbound-detail` 路由 |
|
||||
| `backend/app/crud/qc_work_order.py` | 扩展 `_row_to_dict()` outbound 字段 + 新增聚合查询函数 + 列表查询支持 bizType 筛选 |
|
||||
| `backend/app/crud/pilot_infusion_schedule_mgmt.py` | 输注计划取消时自动作废关联质检工单 |
|
||||
| `backend/app/schemas/qc_work_order.py` | 新增出库详情返回 Schema |
|
||||
@@ -1,198 +0,0 @@
|
||||
# 协议号自动生成设计文档
|
||||
|
||||
> 日期:2026-05-27
|
||||
> 方案:**B — 提交时后端生成**
|
||||
> 状态:待评审
|
||||
|
||||
## 背景
|
||||
|
||||
采集协议单录入/管理、捐赠协议单录入/管理 4 个界面,新增弹窗中协议号当前为**下拉选择号池**(`biz_collection_protocol_no`)。需改为按时间序列自动编号,生成后不可修改。
|
||||
|
||||
## 已确认决策
|
||||
|
||||
| 项 | 决策 |
|
||||
|----|------|
|
||||
| 实现方案 | **方案 B**:保存(create)时由后端原子生成,前端新增态不预占号 |
|
||||
| 采集协议前缀 | `XBCC` |
|
||||
| 捐赠协议前缀 | `JZCC` |
|
||||
| 日期段 | `YYYYMMDD`(服务器本地时区,建议 `Asia/Shanghai`) |
|
||||
| 序号 | 6 位左补零,当日从 `000001` 递增 |
|
||||
| 示例 | 采集:`XBCC20260527000001`;捐赠:`JZCC20260527000003` |
|
||||
| 序号范围 | **按前缀独立计数**(XBCC 与 JZCC 各自维护当日序号,互不影响) |
|
||||
| 不可修改 | 创建后协议号只读;编辑/更新接口拒绝修改 |
|
||||
|
||||
## 编号格式
|
||||
|
||||
```
|
||||
{PREFIX}{YYYYMMDD}{SEQ6}
|
||||
|
||||
PREFIX 采集 = XBCC | 捐赠 = JZCC
|
||||
YYYYMMDD 创建时刻服务器日期
|
||||
SEQ6 同租户、同前缀、同日期下递增,000001–999999
|
||||
```
|
||||
|
||||
总长度:4 + 8 + 6 = **18** 字符(现有字段足够)。
|
||||
|
||||
## 现状与改动范围
|
||||
|
||||
### 共用组件(改 2 个弹窗覆盖 4 页)
|
||||
|
||||
| 页面 | 弹窗 |
|
||||
|------|------|
|
||||
| 采集协议单录入 | `web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue` |
|
||||
| 采集协议单管理 | 同上 |
|
||||
| 捐赠协议单录入 | `web-admin/src/views/research-donation/list/DonationFormDialog.vue` |
|
||||
| 捐赠协议单管理 | 同上 |
|
||||
|
||||
### 后端
|
||||
|
||||
| 模块 | 改动 |
|
||||
|------|------|
|
||||
| `backend/app/crud/collection_protocol_no.py` 或新建 `biz_no_generator.py` | 原子发号函数 |
|
||||
| `backend/app/crud/collection_protocol.py` | `create_collection_protocol` 内发号;`update` 禁止改 `protocol_no` |
|
||||
| `backend/app/crud/research_donation.py` | `create_research_donation` 内发号;`update` 禁止改 `donation_no` |
|
||||
| `backend/app/api/collection_protocol.py` | CreateBody 中 `protocolNo` / `protocolNoId` 改为可选或忽略 |
|
||||
| `backend/app/api/research_donation.py` | CreateBody 中 `donationNo` 改为可选或忽略 |
|
||||
|
||||
## 方案 B 数据流
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant U as 用户
|
||||
participant FE as 前端弹窗
|
||||
participant API as 后端 create
|
||||
participant DB as MySQL
|
||||
|
||||
U->>FE: 打开新增弹窗
|
||||
FE->>U: 协议号展示「保存后自动生成」(只读占位)
|
||||
U->>FE: 填写表单并提交
|
||||
FE->>API: POST create(不传 protocolNo / donationNo)
|
||||
API->>DB: 事务:查当日最大序号 + 1
|
||||
DB-->>API: 新号 XBCC/JZCC...
|
||||
API->>DB: INSERT 协议单/捐赠单
|
||||
API-->>FE: 返回含 protocolNo / donationNo
|
||||
FE->>U: 成功提示,列表刷新
|
||||
```
|
||||
|
||||
### 为何选方案 B
|
||||
|
||||
- 用户取消新增不产生跳号
|
||||
- 并发安全:序号仅在 create 事务内分配
|
||||
- 跨日边界以**提交时刻**为准,无「打开弹窗到保存跨零点」歧义
|
||||
|
||||
## 发号算法
|
||||
|
||||
### 序号来源(同前缀、同租户、同日期)
|
||||
|
||||
在事务内查询以下三处 `protocol_no` / `donation_no` 的最大后缀,取 **MAX + 1**:
|
||||
|
||||
1. `biz_collection_protocol.protocol_no` — 匹配 `XBCC{date}%`(仅采集发号时)
|
||||
2. `biz_research_donation.donation_no` — 匹配 `JZCC{date}%`(仅捐赠发号时)
|
||||
3. `biz_collection_protocol_no.protocol_no` — 同前缀同日期(兼容历史号池数据,避免撞号)
|
||||
|
||||
过滤条件:`tenant_no = 当前租户`,`del_flag = 0`。
|
||||
|
||||
### 并发控制
|
||||
|
||||
- 使用 `SELECT ... FOR UPDATE` 锁定序列表行,或
|
||||
- 新建 `biz_biz_no_sequence` 表:`(tenant_no, prefix, biz_date, last_seq)` 唯一键,update 时 `last_seq = last_seq + 1`
|
||||
|
||||
**推荐序列表**(清晰、可扩展):
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_biz_no_sequence (
|
||||
id VARCHAR(64) NOT NULL PRIMARY KEY,
|
||||
tenant_no VARCHAR(64) NOT NULL,
|
||||
prefix VARCHAR(16) NOT NULL COMMENT 'XBCC / JZCC',
|
||||
biz_date CHAR(8) NOT NULL COMMENT 'YYYYMMDD',
|
||||
last_seq INT NOT NULL DEFAULT 0 COMMENT '当日已分配最大序号',
|
||||
-- 公共字段 tenant_no 已在业务字段,其余 public fields 按 database-conventions
|
||||
...
|
||||
UNIQUE KEY uk_tenant_prefix_date (tenant_no, prefix, biz_date)
|
||||
);
|
||||
```
|
||||
|
||||
发号:`INSERT ... ON DUPLICATE KEY UPDATE last_seq = last_seq + 1`,再读回 `last_seq` 拼完整编号。
|
||||
|
||||
### 唯一性兜底
|
||||
|
||||
生成后仍调用现有 `assert_biz_no_available`(采集与捐赠跨表校验),防止极端竞态。
|
||||
|
||||
## 前端 UI
|
||||
|
||||
### 新增态
|
||||
|
||||
- 协议号字段:`el-input`,`disabled`,placeholder / 固定文案:**「保存后自动生成」**
|
||||
- 移除:`el-select` 远程检索、`protocolNoOptions`、`remoteSearchProtocolNos`、占用/下发校验
|
||||
- 表单校验:`protocolNo` / `donationNo` **新增时不必填**(由后端生成)
|
||||
- 提交 payload:**不传** `protocolNo` / `protocolNoId` / `donationNo`(或传空,后端忽略)
|
||||
|
||||
### 编辑态
|
||||
|
||||
- 协议号:`el-input` 只读展示已有值
|
||||
- 提交 payload:**不传**协议号字段
|
||||
|
||||
### 创建成功
|
||||
|
||||
- 使用接口返回的 `protocolNo` / `donationNo` 刷新列表(现有逻辑一般已满足)
|
||||
|
||||
## 后端 API 契约变更
|
||||
|
||||
### 采集协议单 POST create
|
||||
|
||||
- **Before**:`protocolNo` 必填,`protocolNoId` 可选
|
||||
- **After**:`protocolNo`、`protocolNoId` 均可选;若客户端传入非空 `protocolNo`,**忽略**并服务端生成(或 400 拒绝客户端传号,推荐忽略以降低前端耦合)
|
||||
- **Response**:保持返回完整协议对象,含生成的 `protocolNo`
|
||||
|
||||
### 科研捐赠 POST create
|
||||
|
||||
- **Before**:`donationNo` 必填
|
||||
- **After**:`donationNo` 可选,服务端生成
|
||||
- **Response**:含 `donationNo`
|
||||
|
||||
### PUT update
|
||||
|
||||
- 若 body 含 `protocolNo` / `donationNo` 且与库中不一致 → **400**「协议号不可修改」
|
||||
- 或不接受该字段(Pydantic 从 UpdateBody 移除)
|
||||
|
||||
## 特殊场景
|
||||
|
||||
| 场景 | 行为 |
|
||||
|------|------|
|
||||
| 协议转科研 / 转存储 | **保留原号**,不走新发号(现有 `protocol_donation_convert` 逻辑不变) |
|
||||
| 历史数据 | 旧号格式不受影响;新规则仅作用于新 create |
|
||||
| 号池 Tab(采集协议号管理) | 短期保留,与新自动发号并行;新单不再依赖下拉选号 |
|
||||
| `protocol_no_id` | 新单可置 `NULL`;若需审计可发号时同步写入号池并标记已使用 |
|
||||
| 单日超 999999 条 | 返回业务错误「当日序号已用尽」 |
|
||||
|
||||
## 测试要点
|
||||
|
||||
1. 同租户同日前后 create 两条采集单 → `...000001`、`...000002`
|
||||
2. 同租户同日采集 + 捐赠 → XBCC 与 JZCC 序号各自从 1 起
|
||||
3. 并发 10 次 create → 无重复号
|
||||
4. 编辑提交不改号;强行 API 改号 → 400
|
||||
5. 转科研/转存储后编号与源单一致
|
||||
|
||||
## 不在本次范围
|
||||
|
||||
- 改造「采集协议号」Tab 的批量生成/下发流程
|
||||
- 历史协议单批量洗号
|
||||
- 小程序端(若存在同类选号逻辑,另开任务)
|
||||
|
||||
## 实现文件清单(预估)
|
||||
|
||||
**后端**
|
||||
|
||||
- `docs/sql/biz_biz_no_sequence.sql`(序列表 DDL)
|
||||
- `backend/app/crud/biz_no_generator.py`(新建)
|
||||
- `backend/app/crud/collection_protocol.py`
|
||||
- `backend/app/crud/research_donation.py`
|
||||
- `backend/app/api/collection_protocol.py`
|
||||
- `backend/app/api/research_donation.py`
|
||||
- `backend/app/models/models.py`(序列表 Model,可选)
|
||||
|
||||
**前端**
|
||||
|
||||
- `web-admin/src/views/cell-storage/protocol/ProtocolFormDialog.vue`
|
||||
- `web-admin/src/views/research-donation/list/DonationFormDialog.vue`
|
||||
- `web-admin/src/types/api.d.ts`(CreateBody 字段可选化)
|
||||
@@ -1,299 +0,0 @@
|
||||
# 临床应用业务 — 功能设计文档
|
||||
|
||||
> 日期:2026-05-27
|
||||
> 状态:待审阅
|
||||
> 模块:中试服务管理 > 临床应用
|
||||
> 需求来源:用户提出新增临床应用业务线
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
中试服务已完成完整业务闭环:渠道管理 → 渠道服务购买订单 → 中试申请单 → 体检 → 输注计划 → 出库生产/质检/放行 → 交付 → 输注确认。现需新增**临床应用**业务线。
|
||||
|
||||
### 临床应用 vs 中试服务差异
|
||||
|
||||
| 维度 | 中试服务 | 临床应用 |
|
||||
|------|---------|---------|
|
||||
| 渠道充值 | 渠道有充值/余额管理,从余额扣款 | 不充值,直接按次缴费 |
|
||||
| 缴费主体 | 渠道方(B 端) | 患者(C 端) |
|
||||
| 金额计算 | 从渠道协议产品价格自动带入 | 手动填写 |
|
||||
| 缴费流程 | 嵌入渠道服务订单内部 | 独立缴费流程(参照细胞存储缴费) |
|
||||
| 其他流程 | 完整链路 | **完全一致** |
|
||||
|
||||
### 目标
|
||||
|
||||
1. 在现有中试服务的表结构和代码基础上,通过 `biz_type` 字段区分两条业务线
|
||||
2. 新增缴费信息/缴费确认/退费确认三个独立菜单,实现临床应用的缴费闭环
|
||||
3. 最大化复用现有页面和组件,最小化代码改动
|
||||
|
||||
---
|
||||
|
||||
## 2. 数据库变更
|
||||
|
||||
### 2.1 ALTER `biz_pilot_application` — 新增 `biz_type` 字段
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_pilot_application
|
||||
ADD COLUMN biz_type VARCHAR(20) NOT NULL DEFAULT 'pilot_service'
|
||||
COMMENT '业务类型: pilot_service=中试服务, clinical_application=临床应用'
|
||||
AFTER channel_name;
|
||||
|
||||
-- 更新已有数据
|
||||
UPDATE biz_pilot_application SET biz_type = 'pilot_service' WHERE biz_type = 'pilot_service';
|
||||
```
|
||||
|
||||
**影响**:
|
||||
- `channel_service_order_id` 对临床应用可为 NULL(不走渠道充值)
|
||||
- `channel_id` 已有,临床应用直接关联渠道
|
||||
- 申请单号前缀:中试 `ZSSQ`,临床应用 `LCSQ`(需调整生成逻辑)
|
||||
|
||||
### 2.2 ALTER `biz_pilot_infusion_schedule` — 新增 `amount` 字段
|
||||
|
||||
```sql
|
||||
ALTER TABLE biz_pilot_infusion_schedule
|
||||
ADD COLUMN amount DECIMAL(18,2) DEFAULT NULL
|
||||
COMMENT '临床应用-手动填写的输注金额(中试为NULL,从协议价格计算)'
|
||||
AFTER qc_status;
|
||||
```
|
||||
|
||||
### 2.3 新建 `biz_pilot_payment` — 缴费记录表
|
||||
|
||||
临床采用趸交模式,一个输注计划一条缴费记录,无需主表/明细二层结构。
|
||||
|
||||
```sql
|
||||
CREATE TABLE biz_pilot_payment (
|
||||
id VARCHAR(64) NOT NULL COMMENT '主键ID',
|
||||
pilot_application_id VARCHAR(64) NOT NULL COMMENT '临床申请单ID',
|
||||
infusion_schedule_id VARCHAR(64) NOT NULL COMMENT '输注计划ID(唯一约束)',
|
||||
biz_type VARCHAR(20) NOT NULL DEFAULT 'clinical_application' COMMENT '业务类型',
|
||||
amount DECIMAL(18,2) NOT NULL COMMENT '缴费金额(手动填写)',
|
||||
transfer_type VARCHAR(16) DEFAULT NULL COMMENT '转账方式: wxzz微信 zzfbzz支付宝 yhkzz银行卡 xj现金',
|
||||
transfer_amount DECIMAL(18,2) DEFAULT NULL COMMENT '实际转账金额',
|
||||
transfer_time DATETIME DEFAULT NULL COMMENT '转账时间',
|
||||
transfer_attachments TEXT DEFAULT NULL COMMENT '转账凭证附件(逗号分隔URL)',
|
||||
pay_status VARCHAR(32) NOT NULL DEFAULT 'dfj' COMMENT '缴费状态: dfj待缴费 jfqrz缴费确认中 yjf已缴费 tfqrz退费确认中 ytf已退费',
|
||||
finance_confirm_attachments TEXT DEFAULT NULL COMMENT '财务确认收款附件',
|
||||
finance_remark VARCHAR(512) DEFAULT NULL COMMENT '财务确认收款备注',
|
||||
finance_confirm_time DATETIME DEFAULT NULL COMMENT '财务确认收款时间',
|
||||
refund_amount DECIMAL(18,2) DEFAULT NULL COMMENT '退费金额',
|
||||
refund_remark VARCHAR(512) DEFAULT NULL COMMENT '退费备注',
|
||||
refund_attachments TEXT DEFAULT NULL COMMENT '退费附件(逗号分隔URL)',
|
||||
refund_apply_by VARCHAR(64) DEFAULT NULL COMMENT '退费申请人ID',
|
||||
refund_apply_time DATETIME DEFAULT NULL COMMENT '退费申请时间',
|
||||
refund_finance_confirm_attachments TEXT DEFAULT NULL COMMENT '退费财务确认附件',
|
||||
refund_finance_remark VARCHAR(512) DEFAULT NULL COMMENT '退费财务确认备注',
|
||||
refund_finance_confirm_time DATETIME DEFAULT NULL COMMENT '退费财务确认时间',
|
||||
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
order_num INT(11) DEFAULT NULL COMMENT '排序号',
|
||||
remark VARCHAR(512) DEFAULT NULL COMMENT '备注',
|
||||
create_by VARCHAR(64) DEFAULT NULL COMMENT '创建人id',
|
||||
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
update_by VARCHAR(64) DEFAULT NULL COMMENT '更新人id',
|
||||
update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
del_flag TINYINT(4) NOT NULL DEFAULT '0' COMMENT '删除标记: 0-正常 1-已删除',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY uk_infusion_schedule (infusion_schedule_id, del_flag),
|
||||
KEY idx_pilot_app (pilot_application_id, del_flag),
|
||||
KEY idx_pay_status (pay_status, del_flag),
|
||||
KEY idx_tenant (tenant_no, del_flag)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='临床应用缴费记录';
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. 缴费状态流转
|
||||
|
||||
```
|
||||
[dfj 待缴费] ── 市场发起缴费确认 ──→ [jfqrz 缴费确认中]
|
||||
│
|
||||
财务确认收款
|
||||
│
|
||||
▼
|
||||
[yjf 已缴费]
|
||||
│
|
||||
市场发起退费
|
||||
│
|
||||
▼
|
||||
[tfqrz 退费确认中]
|
||||
│
|
||||
财务确认退费
|
||||
│
|
||||
▼
|
||||
[ytf 已退费]
|
||||
```
|
||||
|
||||
复用已有状态枚举 `payStatus`(`status-tag-registry.ts`):
|
||||
- `dfj` 待缴费 → `info`
|
||||
- `jfqrz` 缴费确认中 → `warning`
|
||||
- `yjf` 已缴费 → `success`
|
||||
- `tfqrz` 退费确认中 → `warning`
|
||||
- `ytf` 已退费 → `danger`
|
||||
|
||||
---
|
||||
|
||||
## 4. 后端 API 设计
|
||||
|
||||
新建 `backend/app/api/clinical_payment.py`,前缀 `/web/admin`。
|
||||
|
||||
### 4.1 缴费信息页面
|
||||
|
||||
| 方法 | 路径 | 功能 | 状态变更 |
|
||||
|------|------|------|---------|
|
||||
| GET | `/clinical-payments` | 缴费列表(按 payStatus 筛选) | — |
|
||||
| GET | `/clinical-payments/{id}` | 缴费详情 | — |
|
||||
| POST | `/clinical-payments/{id}/submit-receipt` | 单条缴费确认 | dfj → jfqrz |
|
||||
| POST | `/clinical-payments/submit-receipt-batch` | 批量缴费确认 | dfj → jfqrz |
|
||||
| POST | `/clinical-payments/{id}/submit-refund` | 发起退费(填退费金额/备注/附件) | yjf → tfqrz |
|
||||
| POST | `/clinical-payments/submit-refund-batch` | 批量发起退费 | yjf → tfqrz |
|
||||
|
||||
### 4.2 缴费确认(财务)
|
||||
|
||||
| 方法 | 路径 | 功能 | 状态变更 |
|
||||
|------|------|------|---------|
|
||||
| GET | `/clinical-payments/receipt-pending` | 待确认收款列表(jfqrz) | — |
|
||||
| GET | `/clinical-payments/receipt-confirmed` | 已确认收款列表(yjf) | — |
|
||||
| POST | `/clinical-payments/{id}/confirm-receipt` | 确认收款(填财务备注/附件) | jfqrz → yjf |
|
||||
|
||||
### 4.3 退费确认(财务)
|
||||
|
||||
| 方法 | 路径 | 功能 | 状态变更 |
|
||||
|------|------|------|---------|
|
||||
| GET | `/clinical-payments/refund-pending` | 待确认退费列表(tfqrz) | — |
|
||||
| GET | `/clinical-payments/refund-confirmed` | 已确认退费列表(ytf) | — |
|
||||
| POST | `/clinical-payments/{id}/confirm-refund` | 确认退费(填财务备注/附件) | tfqrz → ytf |
|
||||
|
||||
### 4.4 自动创建缴费记录
|
||||
|
||||
当临床应用的输注计划创建时,自动在 `biz_pilot_payment` 中生成一条 `pay_status=dfj` 的缴费记录。触发点:`pilot_application.py` 中创建输注计划的 API,当 `biz_type='clinical_application'` 时自动插入。
|
||||
|
||||
---
|
||||
|
||||
## 5. 前端页面设计
|
||||
|
||||
### 5.1 菜单结构
|
||||
|
||||
```
|
||||
临床应用管理(一级菜单,独立于"中试服务管理")
|
||||
├── 临床申请单
|
||||
├── 体检管理
|
||||
├── 输注计划管理
|
||||
├── 缴费信息 ← 独立菜单
|
||||
├── 缴费确认(财务) ← 独立菜单
|
||||
├── 退费确认(财务) ← 独立菜单
|
||||
└── 出库放行审核
|
||||
```
|
||||
|
||||
### 5.2 页面复用策略
|
||||
|
||||
| 菜单 | 前端页面目录 | 复用方式 |
|
||||
|------|------------|---------|
|
||||
| 临床申请单 | `pilot-service/pilot-application/` | 共用组件,路由 prop `bizType='clinical_application'`,隐藏渠道订单选择器 |
|
||||
| 体检管理 | `pilot-service/checkup-management/` | 完全共用 |
|
||||
| 输注计划管理 | `pilot-service/infusion-schedule-management/` | 共用,临床多渲染"金额"列和"缴费状态"列 |
|
||||
| **缴费信息** | **新建** `pilot-service/clinical-payment-info/` | 参照 `cell-storage/payment-info/index.vue` |
|
||||
| **缴费确认(财务)** | **新建** `pilot-service/clinical-payment-confirm/` | 参照 `cell-storage/payment-confirm/index.vue` |
|
||||
| **退费确认(财务)** | **新建** `pilot-service/clinical-refund-confirm/` | 参照 `cell-storage/refund-confirm/index.vue` |
|
||||
| 出库放行审核 | `pilot-service/outbound-release-review/` | 共用,按 `biz_type` 过滤 |
|
||||
|
||||
### 5.3 缴费信息页面 (`clinical-payment-info/index.vue`)
|
||||
|
||||
参照 `cell-storage/payment-info/index.vue`,核心结构:
|
||||
|
||||
- **Tab 切换**:`dfj` 待缴费 / `yjf` 已缴费(退费操作入口)
|
||||
- **列表表格列**:申请单号、患者姓名、渠道名称、细胞类型/规格、输注时间、缴费金额、缴费状态、操作
|
||||
- **操作按钮**:
|
||||
- 待缴费 Tab:单条缴费确认、批量缴费确认
|
||||
- 已缴费 Tab:单条退费、批量退费
|
||||
- **缴费确认弹窗**:展示缴费明细只读信息,无需额外填写(直接提交)
|
||||
- **退费弹窗**:填写退费金额(必填)+ 退费备注 + 退费附件
|
||||
|
||||
### 5.4 缴费确认页面 (`clinical-payment-confirm/index.vue`)
|
||||
|
||||
参照 `cell-storage/payment-confirm/index.vue`:
|
||||
|
||||
- **Tab 切换**:待确认(jfqrz)/ 已确认(yjf)
|
||||
- **操作**:确认收款 → 弹窗填财务备注 + 财务附件
|
||||
- **复用组件**:`ProtocolFinanceConfirmFields`(备注 + 附件上传表单)
|
||||
|
||||
### 5.5 退费确认页面 (`clinical-refund-confirm/index.vue`)
|
||||
|
||||
参照 `cell-storage/refund-confirm/index.vue`:
|
||||
|
||||
- **Tab 切换**:待确认(tfqrz)/ 已确认(ytf)
|
||||
- **操作**:确认退费 → 弹窗展示退费申请信息(只读)+ 财务确认表单
|
||||
- **复用组件**:`ProtocolFinanceConfirmFields`
|
||||
|
||||
### 5.6 申请单页面改造
|
||||
|
||||
`pilot-application/` 组件通过路由 prop `bizType` 控制行为差异:
|
||||
|
||||
| 字段/行为 | 中试 (`pilot_service`) | 临床 (`clinical_application`) |
|
||||
|----------|----------------------|------------------------------|
|
||||
| 渠道订单选择器 | 显示(必选) | **隐藏** |
|
||||
| 渠道选择器 | 从订单自动带入 | **直接选择渠道** |
|
||||
| 输注方案-协议价格 | 从渠道协议产品价格带入 | **不显示** |
|
||||
| 输注方案-细胞产品 | 从渠道协议/服务订单持仓选择 | **从细胞价格体系**(`biz_cell_product_price`)选择,见 `2026-05-28-clinical-application-cell-product-design.md` |
|
||||
| 输注计划-金额 | 不显示(从产品价格计算) | **手动填写** |
|
||||
| 是否需要体检 | 患者信息可配置 | **隐藏**,固定不体检 |
|
||||
| 申请单号前缀 | ZSSQ | LCSQ |
|
||||
|
||||
### 5.7 输注计划管理页面改造
|
||||
|
||||
`infusion-schedule-management/` 新增:
|
||||
|
||||
- 当 `bizType === 'clinical_application'` 时,表格新增"缴费金额"列和"缴费状态"列
|
||||
- 缴费状态使用 `payStatusLabel` + `payStatusTagType` 渲染
|
||||
|
||||
---
|
||||
|
||||
## 6. 复用清单
|
||||
|
||||
### 后端复用
|
||||
|
||||
| 复用项 | 来源 | 说明 |
|
||||
|--------|------|------|
|
||||
| `pilot_application.py` | 申请单 API | 加 `biz_type` 参数过滤和差异化逻辑 |
|
||||
| `pilot_checkup.py` | 体检 API | 按 `biz_type` 过滤申请单 |
|
||||
| `pilot_infusion_schedule_mgmt.py` | 输注计划管理 | 共用,临床多返回金额和缴费状态 |
|
||||
| `outbound_release_review.py` | 出库放行审核 | 按 `biz_type` 过滤 |
|
||||
| `crud/pilot_outbound_status_sync.py` | 出库状态同步 | 共用 |
|
||||
| `crud/pilot_application.py` | 申请单 CRUD | 加 `biz_type` 字段处理 |
|
||||
|
||||
### 前端复用
|
||||
|
||||
| 复用项 | 来源 | 说明 |
|
||||
|--------|------|------|
|
||||
| `payStatusLabel` / `payStatusTagType` | `status-tag-registry.ts` | 缴费状态枚举直接复用 |
|
||||
| `ProtocolFinanceConfirmFields` | `components/business/` | 财务确认表单(备注+附件) |
|
||||
| `ProtocolPaymentDetailReadonly` | `components/business/` | 缴费明细只读展示(需微调字段映射) |
|
||||
| `formatMoneyDisplay` | 金额格式化工具 | 金额展示 |
|
||||
| 申请单页面组件 | `pilot-application/` | 共用,通过 prop 区分行为 |
|
||||
|
||||
---
|
||||
|
||||
## 7. 改动量估算
|
||||
|
||||
| 层级 | 改动内容 | 工作量 |
|
||||
|------|---------|--------|
|
||||
| SQL | 2 个 ALTER + 1 个 CREATE TABLE | 小 |
|
||||
| 后端模型 | `BizPilotApplication` + `BizPilotInfusionSchedule` 加字段 + 新增 `BizPilotPayment` | 小 |
|
||||
| 后端 CRUD | 新增 `clinical_payment.py`,改造 `pilot_application.py` | 中 |
|
||||
| 后端 API | 新增 `clinical_payment.py`(10 个端点),改造申请单/输注计划 API | 中 |
|
||||
| 后端注册 | `api/__init__.py` + `main.py` 注册新路由 | 小 |
|
||||
| 前端路由 | `sqxp.ts` 新增临床应用一级菜单 + 7 个子路由 | 小 |
|
||||
| 前端页面 | 新建 3 个缴费页面,改造申请单/输注计划页面 | 中 |
|
||||
| 前端 API | `business.ts` 新增 clinical payment 接口 | 小 |
|
||||
|
||||
---
|
||||
|
||||
## 8. 约束与风险
|
||||
|
||||
1. **`biz_type` 一致性**:所有查询必须带 `biz_type` 过滤,防止中试和临床数据混在一起
|
||||
2. **缴费记录自动创建**:输注计划创建时自动生成 `dfj` 记录,需确保事务一致性
|
||||
3. **`channel_service_order_id` 可空**:临床应用不走服务订单,该字段为 NULL,需确认现有代码是否有 NOT NULL 校验
|
||||
4. **前端 prop 传递**:共用页面通过路由 prop 传入 `bizType`,需确保所有子组件都能正确接收
|
||||
5. **权限区分**:临床应用菜单和中试服务菜单需要独立的 `menuCode`,便于权限控制
|
||||
@@ -1,349 +0,0 @@
|
||||
# 输注计划管理 · 出库交接设计
|
||||
|
||||
> 日期: 2026-05-27
|
||||
> 状态: 已实现
|
||||
> 父模块: 中试服务管理 → 输注计划管理
|
||||
> 关联: `2026-05-27-outbound-release-material-design.md`(出库物料台账)、`outbound-release-review`
|
||||
> **库存策略(已确认)**: **台账模式 — 与出库物料准备一致,保存时不联动库存**
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
- **出库放行审核**页已实现「出库物料准备」:按输注计划登记细胞 / 质检物料 / 纸质材料(台账,不扣库存)。
|
||||
- **输注计划管理**页仅有编辑、确认、完成、取消、查看,无出库相关操作。
|
||||
- 全库尚无独立的「出库交接」记录表与 API。
|
||||
|
||||
### 目标
|
||||
|
||||
在**输注计划管理**列表操作列新增「**出库交接**」按钮。点击后打开弹窗:
|
||||
|
||||
| 区块 | 行为 |
|
||||
|------|------|
|
||||
| 出库物料 | 展示并可编辑(与「出库物料准备」相同三区 + 物料备注) |
|
||||
| 交接信息 | 填写交接人、交接时间、交接地点、接收人、备注 |
|
||||
| 保存 | **一次提交**,同时保存物料台账 + 交接记录 |
|
||||
|
||||
### 非目标
|
||||
|
||||
- 不改动细胞产品状态、不扣质检物料库存(沿用台账策略)。
|
||||
- v1 **不自动修改**输注计划 `schedule_status` / `infusion_status`(避免与「完成」结算逻辑冲突)。
|
||||
- 不与中试申请单「交付方式 / 交接温度」合并。
|
||||
|
||||
---
|
||||
|
||||
## 2. 已确认的产品规则
|
||||
|
||||
| 项 | 决策 |
|
||||
|----|------|
|
||||
| **交接人** | 默认当前登录用户;`el-select` 远程搜索 `sys_user`(参考 `dept/index.vue` 负责人选择器);存 `handoverUserId` + 姓名快照 `handoverPerson` |
|
||||
| **接收人** | 自由文本 `el-input`,存 `receiverPerson` |
|
||||
| **交接时间** | 必填;`el-date-picker` type=`datetime`;**首次打开且无历史记录时默认此刻**(客户端 `new Date()`,格式 `YYYY-MM-DD HH:mm:ss`) |
|
||||
| **交接地点** | 可选文本 |
|
||||
| **备注** | 可选文本(交接区块独立备注,与物料 remark 分开) |
|
||||
| **再次编辑** | **已交接后仍可再次打开「出库交接」编辑并 upsert**(非只读、非一次性锁定) |
|
||||
| **查看弹窗** | **输注计划「查看」弹窗须只读展示交接信息**(见 §6.5) |
|
||||
| **按钮可见性** | `infusionStatus !== 'yqx'`(已取消计划不显示) |
|
||||
| **保存后状态** | v1 不改输注/生产状态 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 架构决策
|
||||
|
||||
| 项 | 决策 |
|
||||
|----|------|
|
||||
| 方案 | **方案 A**:独立交接表 + 组合弹窗 + 单事务保存 |
|
||||
| UI 模式 | **P22** 审核/子表编辑弹窗 + 表单区(参考 `OutboundReleaseMaterialDialog` + `ScheduleEditDialog`) |
|
||||
| 物料数据 | 复用 `biz_outbound_release_material` 及 cells / qc / paper 子表(与放行审核共用) |
|
||||
| 交接数据 | 新建 `biz_outbound_handover`(1:1 输注计划) |
|
||||
| API 归属 | 挂在 **输注计划管理** 路由 `/web/admin/pilot-infusion-schedule-mgmt/` |
|
||||
| 组件复用 | 从 `OutboundReleaseMaterialDialog.vue` 抽取 `OutboundMaterialFormSections.vue` 公共组件 |
|
||||
|
||||
### 与出库物料准备的关系
|
||||
|
||||
```
|
||||
出库放行审核 ──「出库物料」──┐
|
||||
├──► biz_outbound_release_material (+ 子表)
|
||||
输注计划管理 ──「出库交接」──┘ │
|
||||
└──► biz_outbound_handover(仅交接页写入)
|
||||
```
|
||||
|
||||
两处编辑**同一份物料台账**;交接页额外写入交接元数据。
|
||||
|
||||
---
|
||||
|
||||
## 4. 数据库设计
|
||||
|
||||
SQL 文件:`docs/sql/outbound_handover.sql`
|
||||
|
||||
### 4.1 `biz_outbound_handover`(交接主表,1:1 输注计划)
|
||||
|
||||
```sql
|
||||
CREATE TABLE IF NOT EXISTS `biz_outbound_handover` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`infusion_schedule_id` varchar(64) NOT NULL COMMENT '输注计划ID',
|
||||
`handover_user_id` varchar(64) DEFAULT NULL COMMENT '交接人用户ID',
|
||||
`handover_person` varchar(64) DEFAULT NULL COMMENT '交接人姓名快照',
|
||||
`handover_time` datetime DEFAULT NULL COMMENT '交接时间',
|
||||
`handover_location` varchar(200) DEFAULT NULL COMMENT '交接地点',
|
||||
`receiver_person` varchar(200) DEFAULT NULL COMMENT '接收人(文本)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) DEFAULT NULL COMMENT '交接备注',
|
||||
`create_by` varchar(64) DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_oh_schedule` (`infusion_schedule_id`, `del_flag`),
|
||||
KEY `idx_oh_tenant` (`tenant_no`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='输注计划-出库交接';
|
||||
```
|
||||
|
||||
> 物料表结构不变,见 `docs/sql/outbound_release_material.sql`、`docs/sql/outbound_release_paper_material.sql`。
|
||||
|
||||
---
|
||||
|
||||
## 5. API 设计
|
||||
|
||||
前缀:`/web/admin/pilot-infusion-schedule-mgmt`
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/{scheduleId}/outbound-handover` | 获取交接信息 + 出库物料(编辑弹窗用) |
|
||||
| PUT | `/{scheduleId}/outbound-handover` | 保存交接 + 出库物料(单事务) |
|
||||
| GET | `/detail?scheduleId=` | **扩展**:响应增加 `outboundHandover`(查看弹窗用,见 §5.4) |
|
||||
|
||||
### 5.1 GET 响应
|
||||
|
||||
```json
|
||||
{
|
||||
"scheduleSummary": {
|
||||
"applicationNo": "SQ20260527001",
|
||||
"patientName": "张三",
|
||||
"infusionTime": "2026-05-28 10:00:00"
|
||||
},
|
||||
"outboundMaterial": {
|
||||
"cells": [],
|
||||
"qcMaterials": [],
|
||||
"paperMaterials": [],
|
||||
"remark": ""
|
||||
},
|
||||
"handover": {
|
||||
"handoverUserId": "user-uuid",
|
||||
"handoverPerson": "李四",
|
||||
"handoverTime": "2026-05-27 14:30:00",
|
||||
"handoverLocation": "中试库房",
|
||||
"receiverPerson": "王五(渠道)",
|
||||
"remark": ""
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- 若无交接记录:`handover` 各字段为空;编辑弹窗前端默认 **当前用户 + 此刻**。
|
||||
- `outboundMaterial` 结构同 `GET .../outbound-materials`。
|
||||
|
||||
### 5.2 PUT Body
|
||||
|
||||
```json
|
||||
{
|
||||
"outboundMaterial": {
|
||||
"remark": "",
|
||||
"cells": [{ "cellProductId": "..." }],
|
||||
"qcMaterials": [{ "materialId": "...", "qty": 1.5 }],
|
||||
"paperMaterials": [{ "paperName": "知情同意书", "copies": 2, "attachmentUrl": "..." }]
|
||||
},
|
||||
"handover": {
|
||||
"handoverUserId": "user-uuid",
|
||||
"handoverTime": "2026-05-27 14:30:00",
|
||||
"handoverLocation": "中试库房",
|
||||
"receiverPerson": "王五",
|
||||
"remark": ""
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- `handoverPerson` **不由前端提交**,后端根据 `handoverUserId` 查 `sys_user.nick_name` 写入快照。
|
||||
- 校验:`handoverUserId`、`handoverTime`、`receiverPerson` 必填;物料校验复用 `save_outbound_material` 规则。
|
||||
|
||||
### 5.3 保存流程(单事务)
|
||||
|
||||
```
|
||||
save_outbound_handover(schedule_id, payload):
|
||||
1. 校验输注计划存在 + 租户 + 数据权限
|
||||
2. 校验 handover 必填字段;handoverUserId 对应用户存在
|
||||
3. 调用 save_outbound_material(...) — 全量替换物料台账
|
||||
4. upsert biz_outbound_handover(写 handover_person 快照)
|
||||
5. db.commit()
|
||||
```
|
||||
|
||||
### 5.4 扩展输注计划 Detail(查看弹窗)
|
||||
|
||||
现有 `GET /web/admin/pilot-infusion-schedule-mgmt/detail` 响应增加:
|
||||
|
||||
```json
|
||||
{
|
||||
"...": "原有 schedule / application / patient / products 字段",
|
||||
"outboundHandover": {
|
||||
"handoverPerson": "李四",
|
||||
"handoverTime": "2026-05-27 14:30:00",
|
||||
"handoverLocation": "中试库房",
|
||||
"receiverPerson": "王五",
|
||||
"remark": ""
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- 无交接记录时:`outboundHandover` 为 `null` 或各字段空;查看弹窗 Section 仍展示,字段为 `—`。
|
||||
- 查看弹窗**仅展示交接五字段**,不在此版扩展出库物料只读区(物料仍通过「出库交接」编辑弹窗维护)。
|
||||
|
||||
---
|
||||
|
||||
## 6. 前端设计
|
||||
|
||||
### 6.1 页面改动
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `infusion-schedule-management/index.vue` | 操作列「出库交接」;`min-width` 调至 ≥ 500px |
|
||||
| `InfusionScheduleHandoverDialog.vue` | **新建**组合弹窗 |
|
||||
| `ScheduleViewDialog.vue` | 新增「出库交接」只读 Section |
|
||||
| `components/business/outbound-material-form-sections/index.vue` | **新建**(从 MaterialDialog 抽取) |
|
||||
| `OutboundReleaseMaterialDialog.vue` | 改为引用公共组件(可选,建议同期重构) |
|
||||
| `api/admin.ts` 或 `api/infusion-schedule-handover.ts` | fetch/save API |
|
||||
|
||||
### 6.2 弹窗结构
|
||||
|
||||
```
|
||||
标题:出库交接
|
||||
宽度:1120px(与出库物料准备一致)
|
||||
class:dialog-form-layout
|
||||
|
||||
┌─ 摘要条 ─────────────────────────────────────┐
|
||||
│ 申请单号 / 患者姓名 / 输注时间 │
|
||||
├─ OutboundMaterialFormSections ──────────────┤
|
||||
│ 出库细胞 | 使用的物料 | 其他纸质材料 | 物料备注 │
|
||||
├─ 交接信息 (form-grid-2, label-position=top) ─┤
|
||||
│ 交接人 [用户搜索 select,默认当前用户] │
|
||||
│ 交接时间 [datetime picker,默认 now] │
|
||||
│ 交接地点 [text] │
|
||||
│ 接收人 [text,必填] │
|
||||
│ 备注 [textarea,通栏] │
|
||||
├─ footer: 取消 / 保存 ─────────────────────────┤
|
||||
```
|
||||
|
||||
### 6.3 交接人选择器
|
||||
|
||||
- 复用 `fetchUserList({ keyword, status: '1' })` 远程搜索。
|
||||
- 打开弹窗时:
|
||||
- 若 GET 返回已有 `handoverUserId` → 回填;
|
||||
- 否则默认 `useUserStore().info.userId` / `nickName`,并写入 options 首项。
|
||||
- 选项 label:`nickName · userNo · phoneNo`(与部门负责人选择器一致)。
|
||||
- `@change` 时更新本地 `handoverUserId`;展示名由后端快照为准。
|
||||
|
||||
### 6.4 交互规则
|
||||
|
||||
- 保存成功:`ElMessage.success('出库交接已保存')`。
|
||||
- 物料区校验、附件上传、细胞选择逻辑与 `OutboundReleaseMaterialDialog` 完全一致。
|
||||
- 取消关闭不保存;destroy-on-close 重置状态。
|
||||
- **已保存过的计划**:再次点「出库交接」正常打开并回填;保存为 upsert,不提示「已完成不可改」。
|
||||
|
||||
### 6.5 查看弹窗(`ScheduleViewDialog.vue`)
|
||||
|
||||
在现有 `SystemViewDialog` sections 中,于「产品列表」与「其他信息」之间插入:
|
||||
|
||||
```text
|
||||
Section 标题:出库交接
|
||||
fields(只读 ViewField):
|
||||
交接人 handoverPerson
|
||||
交接时间 handoverTime
|
||||
交接地点 handoverLocation
|
||||
接收人 receiverPerson
|
||||
备注 remark(span: true)
|
||||
```
|
||||
|
||||
- 数据来源:`fetchInfusionScheduleMgmtDetail` 返回的 `outboundHandover`(后端 detail 聚合查询 `biz_outbound_handover`)。
|
||||
- 无记录:该 Section 仍展示,各字段值为 `—`,或在 Section 内用一行 muted 文案「暂无出库交接记录」(与 `SystemViewDialog` 空值展示习惯一致,实现时二选一,推荐字段 `—` + section 始终可见)。
|
||||
- 布局:`grid-columns` 保持与现有一致(3 列);备注 `span: true`。
|
||||
|
||||
---
|
||||
|
||||
## 7. 后端模块划分
|
||||
|
||||
| 文件 | 职责 |
|
||||
|------|------|
|
||||
| `app/crud/outbound_handover.py` | GET/PUT 聚合、upsert 交接、按 schedule 查询交接(供 detail 用) |
|
||||
| `app/crud/pilot_infusion_schedule_mgmt.py` | detail 聚合 `outboundHandover` |
|
||||
| `app/schemas/outbound_handover.py` | Pydantic |
|
||||
| `app/api/pilot_infusion_schedule_mgmt.py` | outbound-handover 两个端点 + detail 扩展 |
|
||||
| `app/models/models.py` | `BizOutboundHandover` ORM |
|
||||
|
||||
**不修改:** `cell_product`、`qc_material_usage` 库存逻辑。
|
||||
|
||||
---
|
||||
|
||||
## 8. 权限
|
||||
|
||||
- 建议菜单/按钮权限:`pilot-service:infusion-schedule-management:handover`
|
||||
- v1 可与列表 edit 权限共用(`require_admin_or_super_admin`),上线前按产品确认。
|
||||
|
||||
---
|
||||
|
||||
## 9. 错误处理
|
||||
|
||||
| 场景 | HTTP | 说明 |
|
||||
|------|------|------|
|
||||
| 输注计划不存在 | 404 | — |
|
||||
| 交接人用户不存在 | 400 | handoverUserId 无效 |
|
||||
| 接收人为空 | 400 | — |
|
||||
| 交接时间为空 | 400 | — |
|
||||
| 物料校验失败 | 400 | 复用现有物料错误文案 |
|
||||
|
||||
---
|
||||
|
||||
## 10. 测试要点
|
||||
|
||||
1. 首次保存:物料 + 交接均写入;交接人快照与所选用户 nickName 一致。
|
||||
2. 再次打开:物料与交接均正确回填;交接人 select 显示已选用户。
|
||||
3. 新建弹窗默认:交接人 = 当前用户,交接时间 = **打开弹窗此刻**。
|
||||
4. 已交接计划:再次打开编辑弹窗可修改并保存;查看弹窗展示最新交接信息。
|
||||
5. 查看弹窗:有交接记录时五字段正确展示;无记录时 Section 可见且为空态。
|
||||
6. 放行审核页改动物料后,交接页打开应看到最新物料。
|
||||
7. 交接页改动物料后,放行审核页「出库物料」应看到同步结果。
|
||||
8. 已取消计划(`yqx`)不显示「出库交接」按钮。
|
||||
9. 保存后:`biz_cell_product` / `biz_qc_material.stock_qty` **不变**。
|
||||
|
||||
---
|
||||
|
||||
## 11. OpenSpec 增量(建议)
|
||||
|
||||
- `infusion-schedule-outbound-handover-api`: GET/PUT outbound-handover
|
||||
- `infusion-schedule-outbound-handover-ui`: 列表按钮 + 组合弹窗 + 物料组件抽取
|
||||
|
||||
---
|
||||
|
||||
## 12. 工作量估算
|
||||
|
||||
| 项 | 人天 |
|
||||
|----|------|
|
||||
| SQL + Model + CRUD + API | 0.5 |
|
||||
| 抽取物料公共组件 + 交接弹窗 | 1.0 |
|
||||
| 查看弹窗 Section + detail 聚合 | 0.25 |
|
||||
| 列表入口 + 联调 | 0.5 |
|
||||
| **合计** | **~2.25** |
|
||||
|
||||
---
|
||||
|
||||
## 附录:决策记录
|
||||
|
||||
| 日期 | 议题 | 决策 |
|
||||
|------|------|------|
|
||||
| 2026-05-27 | 交接人 / 接收人 | 交接人:默认当前用户 + 用户表搜索;接收人:文本 |
|
||||
| 2026-05-27 | 数据模型 | 独立 `biz_outbound_handover`,物料共用现有表 |
|
||||
| 2026-05-27 | 保存语义 | 单事务:物料 + 交接一并保存 |
|
||||
| 2026-05-27 | 状态联动 | v1 不改 schedule/infusion 状态 |
|
||||
| 2026-05-27 | 交接时间 | 首次打开默认此刻 |
|
||||
| 2026-05-27 | 编辑策略 | 已交接后可再次编辑(upsert) |
|
||||
| 2026-05-27 | 查看弹窗 | 输注计划 ScheduleViewDialog 展示交接五字段 |
|
||||
@@ -1,284 +0,0 @@
|
||||
# 出库放行审核 · 出库物料准备(台账)设计
|
||||
|
||||
> 日期: 2026-05-27
|
||||
> 状态: 待审阅
|
||||
> 父模块: 中试服务管理 → 出库放行审核
|
||||
> 关联: `openspec/changes/outbound-release-review`、方案 A(独立弹窗 + 子表)
|
||||
> **库存策略(已确认)**: **台账模式 — 出库物料准备界面仅记录,不联动库存**
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
### 现状
|
||||
|
||||
- 出库放行审核列表/查看/审核已实现,审核记录存于 `biz_outbound_release_review`。
|
||||
- 每条输注计划尚无「出库物料准备」维护入口。
|
||||
- 细胞产品库、质检物料库已有独立库存/状态管理(生产任务、质检任务等场景会真实扣减)。
|
||||
|
||||
### 目标
|
||||
|
||||
针对**每条输注计划**,提供「**出库物料准备**」界面,用于登记拟出库内容(台账),**保存时不改变细胞产品状态、不扣质检物料库存**:
|
||||
|
||||
| 区块 | 数据来源 | 保存行为 |
|
||||
|------|----------|----------|
|
||||
| 出库细胞 | 细胞产品库勾选 | 写入关联 ID + 字段快照,**不改** `biz_cell_product` |
|
||||
| 使用的物料 | 质检物料库勾选 + 用量 | 写入关联 ID + 用量 + 快照,**不扣** `stock_qty` |
|
||||
| 其他纸质材料 | 附件上传 | 仅存 URL |
|
||||
|
||||
### 非目标
|
||||
|
||||
- **不在本界面做真实出库**(不改细胞状态、不释库位、不写 `biz_qc_material_usage`)。
|
||||
- 不与「交付物料清单」(`biz_pilot_delivery_material`)合并或自动同步。
|
||||
- 批量审核弹窗不涉及出库物料(仍按条维护)。
|
||||
- 真实出库若后续需要,另开能力/节点实现(本 spec 不覆盖)。
|
||||
|
||||
## 2. 架构决策
|
||||
|
||||
| 项 | 决策 |
|
||||
|----|------|
|
||||
| UI 定位 | 「出库物料**准备**」— 台账登记,非库存事务 |
|
||||
| UI | 列表操作列「出库物料」→ `OutboundReleaseMaterialDialog.vue` |
|
||||
| 数据 | 1 主表 + 2 子表;纸质附件放主表 |
|
||||
| 保存语义 | **全量替换**:软删旧子表行 → 写入新行 + 主数据快照 |
|
||||
| 库存 | **零联动**;前端可展示当前库存/状态作参考,保存时不校验库存是否足够 |
|
||||
| 复杂度 | 无 revert/apply、无 `qc_material_usage` 扩展、无库位占用变更 |
|
||||
|
||||
## 3. 数据库设计
|
||||
|
||||
SQL 文件:`docs/sql/outbound_release_material.sql`
|
||||
|
||||
### 3.1 `biz_outbound_release_material`(主表,1:1 输注计划)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_outbound_release_material` (
|
||||
`id` varchar(64) NOT NULL COMMENT '主键ID',
|
||||
`infusion_schedule_id` varchar(64) NOT NULL COMMENT '输注计划ID',
|
||||
`paper_attachments` varchar(4000) DEFAULT NULL COMMENT '其他纸质材料附件(逗号分隔URL)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw',
|
||||
`order_num` int(11) DEFAULT NULL,
|
||||
`remark` varchar(512) DEFAULT NULL,
|
||||
`create_by` varchar(64) DEFAULT NULL,
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`update_by` varchar(64) DEFAULT NULL,
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_orm_schedule` (`infusion_schedule_id`, `del_flag`),
|
||||
KEY `idx_orm_tenant` (`tenant_no`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='出库放行-出库物料准备主表';
|
||||
```
|
||||
|
||||
### 3.2 `biz_outbound_release_cell`(出库细胞行)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_outbound_release_cell` (
|
||||
`id` varchar(64) NOT NULL,
|
||||
`material_id` varchar(64) NOT NULL COMMENT '关联 biz_outbound_release_material.id',
|
||||
`infusion_schedule_id` varchar(64) NOT NULL COMMENT '冗余,便于查询',
|
||||
`cell_product_id` varchar(64) NOT NULL COMMENT '细胞产品ID',
|
||||
`product_code` varchar(128) DEFAULT NULL COMMENT '保存时快照',
|
||||
`product_name` varchar(200) DEFAULT NULL,
|
||||
`product_type_name` varchar(100) DEFAULT NULL,
|
||||
`spec_name` varchar(100) DEFAULT NULL,
|
||||
`passage` varchar(32) DEFAULT NULL,
|
||||
`batch_no` varchar(64) DEFAULT NULL,
|
||||
`storage_slot_name` varchar(200) DEFAULT NULL,
|
||||
`product_status` varchar(32) DEFAULT NULL COMMENT '保存时状态快照(只读展示)',
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw',
|
||||
`order_num` int(11) DEFAULT NULL,
|
||||
`remark` varchar(512) DEFAULT NULL,
|
||||
`create_by` varchar(64) DEFAULT NULL,
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`update_by` varchar(64) DEFAULT NULL,
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_orc_schedule_product` (`infusion_schedule_id`, `cell_product_id`, `del_flag`),
|
||||
KEY `idx_orc_product` (`cell_product_id`, `del_flag`),
|
||||
KEY `idx_orc_material` (`material_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='出库放行-出库细胞(台账)';
|
||||
```
|
||||
|
||||
> 不需要 `product_status_before` / `storage_slot_id` 回滚字段。
|
||||
|
||||
### 3.3 `biz_outbound_release_qc_material`(质检物料行)
|
||||
|
||||
```sql
|
||||
CREATE TABLE `biz_outbound_release_qc_material` (
|
||||
`id` varchar(64) NOT NULL,
|
||||
`material_id` varchar(64) NOT NULL COMMENT '关联 biz_outbound_release_material.id',
|
||||
`infusion_schedule_id` varchar(64) NOT NULL,
|
||||
`qc_material_id` varchar(64) NOT NULL,
|
||||
`qty` decimal(18,4) NOT NULL COMMENT '计划用量(台账)',
|
||||
`material_code` varchar(64) DEFAULT NULL,
|
||||
`material_name` varchar(200) DEFAULT NULL,
|
||||
`spec_model` varchar(200) DEFAULT NULL,
|
||||
`unit` varchar(32) DEFAULT NULL,
|
||||
`tenant_no` varchar(64) NOT NULL DEFAULT 'zkxw',
|
||||
`order_num` int(11) DEFAULT NULL,
|
||||
`remark` varchar(512) DEFAULT NULL,
|
||||
`create_by` varchar(64) DEFAULT NULL,
|
||||
`create_dept_id` varchar(64) NOT NULL DEFAULT '',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`update_by` varchar(64) DEFAULT NULL,
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_orqm_schedule_material` (`infusion_schedule_id`, `qc_material_id`, `del_flag`),
|
||||
KEY `idx_orqm_material` (`material_id`, `del_flag`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='出库放行-质检物料(台账)';
|
||||
```
|
||||
|
||||
> **不**关联 `biz_qc_material_usage`;**不**扩展 `source_type`。
|
||||
|
||||
## 4. 核心业务流程
|
||||
|
||||
### 4.1 保存出库物料准备(单事务)
|
||||
|
||||
```
|
||||
save_outbound_release_material(schedule_id, payload):
|
||||
1. 校验输注计划存在 + 租户 + 数据权限
|
||||
2. 校验 payload:
|
||||
- cells 内 cell_product_id 不重复
|
||||
- qcMaterials 内 material_id 不重复
|
||||
- qty > 0
|
||||
- 关联主数据存在且未软删(产品/物料)
|
||||
3. upsert 主表(paper_attachments、remark)
|
||||
4. 软删本 schedule 下旧 cell / qc_material 子行
|
||||
5. 对每个 cell_product_id:读主数据 → 写快照 → insert 子行
|
||||
6. 对每个 qc_material + qty:读主数据 → 写快照 → insert 子行
|
||||
7. db.commit()
|
||||
```
|
||||
|
||||
**明确不做:**
|
||||
|
||||
- 不调用 `cell_product.update` / 不改 `product_status`
|
||||
- 不调用 `occupancy_svc.remove_by_item`
|
||||
- 不调用 `qc_material_usage.deduct_*`
|
||||
- 不校验质检库存是否 ≥ 用量(用量仅作计划登记)
|
||||
|
||||
### 4.2 编辑
|
||||
|
||||
- 再次保存 = 全量替换子表(软删旧行 + 插入新行)。
|
||||
- 无库存回滚逻辑。
|
||||
|
||||
### 4.3 业务校验(台账级)
|
||||
|
||||
| 规则 | 说明 |
|
||||
|------|------|
|
||||
| 同计划细胞不重复 | 同一 `infusion_schedule_id` 下 `cell_product_id` 唯一 |
|
||||
| 同计划物料不重复 | 同一 schedule 下 `qc_material_id` 唯一 |
|
||||
| 跨计划可重复引用 | 不同输注计划可登记同一细胞/物料(台账互不排斥) |
|
||||
| 主数据存在性 | 保存时产品/物料须存在;已软删的主数据不允许新增引用 |
|
||||
| 细胞状态 | **不限制**可选状态;选择器展示状态供人判断,保存时不拦截 |
|
||||
|
||||
### 4.4 细胞产品选择范围
|
||||
|
||||
- 从细胞产品库分页/搜索勾选(复用 `TaskInputEnhancedTable` 选择弹窗模式)。
|
||||
- 列表展示编码、名称、类型、代次、储物格、**当前状态**(参考信息)。
|
||||
- **可选增强(v1.1)**:默认筛选与本计划出库生产工单产出相关的产品,仍允许从全库补选。
|
||||
|
||||
## 5. API 设计
|
||||
|
||||
前缀:`/web/admin/pilot-release-reviews`
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/{scheduleId}/outbound-materials` | 获取出库物料准备(主表 + 细胞行 + 质检行) |
|
||||
| PUT | `/{scheduleId}/outbound-materials` | 全量保存(仅写台账) |
|
||||
|
||||
**PUT Body:**
|
||||
|
||||
```json
|
||||
{
|
||||
"paperAttachments": "url1,url2",
|
||||
"remark": "",
|
||||
"cells": [{ "cellProductId": "..." }],
|
||||
"qcMaterials": [{ "materialId": "...", "qty": 1.5, "remark": "" }]
|
||||
}
|
||||
```
|
||||
|
||||
- `cells` / `qcMaterials` 可为空数组。
|
||||
- `GET .../detail` 响应增加 `outboundMaterial` 域(查看弹窗只读)。
|
||||
|
||||
## 6. 前端设计
|
||||
|
||||
### 6.1 模式
|
||||
|
||||
- **P22** 审核列表 + 子表编辑弹窗。
|
||||
- 弹窗标题建议:**「出库物料准备」**(与「真实出库」区分)。
|
||||
- 参考:
|
||||
- 细胞选择:`TaskInputEnhancedTable.vue`
|
||||
- 质检物料:`qc-task/index.vue` 物料使用区(**去掉库存不足拦截**)
|
||||
- 纸质附件:`OutboundReleaseReviewDialog.vue` 卡片上传
|
||||
|
||||
### 6.2 页面改动
|
||||
|
||||
| 文件 | 改动 |
|
||||
|------|------|
|
||||
| `outbound-release-review/index.vue` | 操作列「出库物料」 |
|
||||
| `OutboundReleaseMaterialDialog.vue` | **新建** |
|
||||
| `OutboundReleaseViewDialog.vue` | Section「出库物料准备」只读 |
|
||||
| `api/outbound-release-review.ts` | fetch/save API |
|
||||
|
||||
### 6.3 交互规则
|
||||
|
||||
- 保存成功:「出库物料准备已保存」(**不提**库存更新)。
|
||||
- 质检物料表可展示「当前库存」列作参考,**不**因库存不足阻止保存。
|
||||
- 删除行:前端移除,点保存后生效。
|
||||
- 操作列宽度:约 260px(查看 / 审核 / 出库物料)。
|
||||
|
||||
## 7. 后端模块划分
|
||||
|
||||
| 文件 | 职责 |
|
||||
|------|------|
|
||||
| `app/crud/outbound_release_material.py` | 查询、全量 save、主数据快照 |
|
||||
| `app/schemas/outbound_release_material.py` | Pydantic |
|
||||
| `app/api/outbound_release_review.py` | 两个端点 |
|
||||
| `app/models/models.py` | 三个 ORM 模型 |
|
||||
|
||||
**不修改:** `qc_material_usage.py`、`cell_product.py` 库存/状态逻辑。
|
||||
|
||||
## 8. 错误处理
|
||||
|
||||
| 场景 | HTTP | 说明 |
|
||||
|------|------|------|
|
||||
| 细胞/物料不存在 | 400 | ID 无效或已删除 |
|
||||
| 同计划重复勾选 | 400 | 同一产品/物料不可重复 |
|
||||
| qty ≤ 0 | 400 | 用量须大于 0 |
|
||||
| 输注计划不存在 | 404 | — |
|
||||
|
||||
## 9. 测试要点
|
||||
|
||||
1. 保存后:`biz_cell_product` 状态/库位**不变**;`biz_qc_material.stock_qty` **不变**。
|
||||
2. 编辑替换细胞/物料行:仅子表与快照更新。
|
||||
3. 两计划登记同一细胞:均允许保存(台账)。
|
||||
4. 查看弹窗正确展示快照与附件。
|
||||
5. 主数据后续变更:已保存台账仍显示保存时快照。
|
||||
|
||||
## 10. OpenSpec 增量
|
||||
|
||||
- `outbound-release-material-api`: GET/PUT outbound-materials(台账 CRUD)
|
||||
- `outbound-release-material-ui`: 出库物料准备弹窗 + 查看 Section
|
||||
|
||||
## 11. 工作量估算
|
||||
|
||||
| 项 | 人天 |
|
||||
|----|------|
|
||||
| SQL + Model + CRUD | 1.0 |
|
||||
| API + 详情聚合 | 0.5 |
|
||||
| 前端弹窗 + 查看 | 1.5 |
|
||||
| 联调 | 0.5 |
|
||||
| **合计** | **~3.5** |
|
||||
|
||||
---
|
||||
|
||||
## 附录:策略变更记录
|
||||
|
||||
| 版本 | 策略 | 说明 |
|
||||
|------|------|------|
|
||||
| v0(讨论稿) | B 真实出库 | 保存时改状态 + 扣库存 + 回滚 |
|
||||
| **v1(当前)** | **台账模式** | 出库物料**准备**界面仅记录;与交付清单类似,不联动库存 |
|
||||
|
||||
若后续需要在「审核通过」或独立「确认出库」节点做真实出库,应新建 spec,与本台账表通过 `infusion_schedule_id` 衔接,避免在本界面混入库存事务。
|
||||
@@ -1,62 +0,0 @@
|
||||
# 临床申请单 · 表单与细胞产品选型
|
||||
|
||||
> 日期:2026-05-28
|
||||
> 状态:已实现(前端)
|
||||
> 关联:`2026-05-27-clinical-application-design.md`、`ApplicationFormDialog.vue`
|
||||
|
||||
---
|
||||
|
||||
## 1. 决策摘要
|
||||
|
||||
| 项 | 结论 |
|
||||
|----|------|
|
||||
| 细胞产品数据来源 | **整张申请单固定**:`biz_cell_product_price`(细胞价格体系) |
|
||||
| 项目价格体系 | **本期不使用**(`biz_cell_product_project_system`) |
|
||||
| 渠道协议价 | 临床**不依赖**渠道协议 / 服务订单 |
|
||||
| 是否需要体检 | 临床表单**隐藏**,提交固定 `needCheckup: 0` |
|
||||
|
||||
---
|
||||
|
||||
## 2. 界面变更
|
||||
|
||||
### 2.1 申请单信息(仅临床)
|
||||
|
||||
四列栅格一行展示:**申请单名称 | 渠道 | 备注(占 2 列)**。
|
||||
|
||||
### 2.2 患者信息
|
||||
|
||||
隐藏「是否需要体检」开关。
|
||||
|
||||
### 2.3 输注方案 · 细胞产品
|
||||
|
||||
- 打开弹窗时调用 `fetchCellProductPriceList`(分页拉全租户细胞价格行)填充选项池。
|
||||
- `canAddCellProduct`:已选渠道 **且** 选项池非空。
|
||||
- 列名:「参考单价(元)」替代「协议单价(元)」;`agreementPrice` 字段存参考价,疗程「金额(元)」仍手填。
|
||||
- `priceId` = 细胞价格行 `id`。
|
||||
|
||||
### 2.4 保存接口
|
||||
|
||||
- `POST /pilot-application/save`:`channelServiceOrderId` 可选;临床须传 `channelId` + `bizType=clinical_application`。
|
||||
- `InfusionScheduleNestedBody` 含 `amount` 字段(疗程缴费金额)。
|
||||
|
||||
### 2.5 出库联动 biz_type
|
||||
|
||||
- 创建输注计划时:`create_outbound_production_work_order` / `create_outbound_qc_work_order` 均传入申请单 `biz_type`(临床为 `clinical_application`)。
|
||||
- 出库放行审核列表/详情:按申请单或工单 `biz_type` 展示「临床应用」;临床菜单传 `bizType=clinical_application` 过滤。
|
||||
- 历史错误数据:执行 `docs/sql/migrate_outbound_work_order_clinical_biz_type.sql`。
|
||||
|
||||
---
|
||||
|
||||
## 3. 与中试服务对比
|
||||
|
||||
| 维度 | 中试 | 临床 |
|
||||
|------|------|------|
|
||||
| 选项池 | 服务订单 → 协议价 / 订单持仓 | 细胞价格体系列表 |
|
||||
| 添加按钮前置 | 渠道 + 服务订单 | 渠道 + 价格数据已加载 |
|
||||
| 单价语义 | 协议单价 | 参考单价 |
|
||||
|
||||
---
|
||||
|
||||
## 4. 后续扩展(未做)
|
||||
|
||||
若需「项目价格体系」:在申请单级增加来源切换,切换时清空已选细胞产品并改加载 API 为 `fetchProjectSystemItems`。
|
||||
@@ -1,257 +0,0 @@
|
||||
# 临床应用缴退费 Tab 与提交信息展示 — 设计说明
|
||||
|
||||
**日期**:2026-05-28
|
||||
**状态**:已实现
|
||||
**关联页面**:
|
||||
- `web-admin/src/views/pilot-service/clinical-payment-info/index.vue`(缴费信息)
|
||||
- `web-admin/src/views/pilot-service/clinical-payment-confirm/index.vue`(缴退费财务确认)
|
||||
- `web-admin/src/views/pilot-service/clinical-payment-confirm/RefundConfirmTab.vue`
|
||||
|
||||
**参考实现**:
|
||||
- 5 Tab 结构:`web-admin/src/views/cell-storage/protocol-audit/PaymentInfoTab.vue`
|
||||
- 财务确认只读区:`web-admin/src/components/business/protocol-payment-detail-readonly/index.vue`
|
||||
- 细胞存储财务确认弹窗:`web-admin/src/views/cell-storage/payment-confirm/index.vue`
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
临床应用菜单下「缴费信息」当前仅 2 个 Tab(待缴费 / 已缴费),提交缴费确认无表单;「缴退费财务确认」在确认收款/退款时无法完整看到业务侧提交的备注与附件。
|
||||
|
||||
**目标**:
|
||||
|
||||
1. 缴费信息改为 **5 个状态 Tab**,每个 Tab 只展示对应状态数据。
|
||||
2. **提交缴费确认**、**提交退费确认**均支持填写备注、上传附件;金额规则见 §3.2。
|
||||
3. **缴退费财务确认**在确认收款/确认退款及查看弹窗中,展示业务侧提交的金额、备注、附件。
|
||||
|
||||
---
|
||||
|
||||
## 2. 状态流转(不变)
|
||||
|
||||
| 状态码 | 含义 | 触发动作 |
|
||||
|--------|------|----------|
|
||||
| `dfj` | 待缴费 | 输注计划创建时自动生成 |
|
||||
| `jfqrz` | 缴费确认中 | 缴费信息 · 提交缴费确认 |
|
||||
| `yjf` | 已缴费 | 缴退费财务确认 · 确认收款 |
|
||||
| `tfqrz` | 退费确认中 | 缴费信息 · 提交退费确认 |
|
||||
| `ytf` | 已退费 | 缴退费财务确认 · 确认退费 |
|
||||
|
||||
---
|
||||
|
||||
## 3. 业务规则
|
||||
|
||||
### 3.1 金额语义(已确认)
|
||||
|
||||
**提交缴费确认时的金额:必须等于计划金额,仅确认不可改。**
|
||||
|
||||
- 计划金额来源:输注计划创建缴费记录时写入的 `biz_pilot_payment.amount`。
|
||||
- 弹窗中 **只读展示**计划金额,不提供输入控件。
|
||||
- 提交时后端 **校验**(若传入 `transferAmount` 则须与 `amount` 相等;推荐前端不传、后端自动 `transfer_amount = amount`)。
|
||||
- **不允许**通过提交缴费确认修改 `amount` 字段。
|
||||
|
||||
**提交退费确认时的金额**(已有逻辑,保持不变):
|
||||
|
||||
- 用户 **必填** `refund_amount`,默认带出计划/实缴金额供参考,允许填写(≤ 已缴金额的业务校验若后续需要可单独补充,本次不扩大范围)。
|
||||
|
||||
### 3.2 提交缴费确认 — 表单字段
|
||||
|
||||
| 展示标签 | 可编辑 | 存储字段 | 说明 |
|
||||
|----------|--------|----------|------|
|
||||
| 缴费金额(元) | 否(只读) | `amount` | 展示计划金额 |
|
||||
| 备注 | 是 | `remark` | 选填 |
|
||||
| 附件 | 是 | `transfer_attachments` | 选填,逗号分隔 MinIO URL |
|
||||
|
||||
提交成功后:`pay_status` `dfj → jfqrz`;写入 `transfer_amount = amount`、`remark`、`transfer_attachments`、`update_by/time`。
|
||||
|
||||
### 3.3 提交退费确认 — 表单字段(已有,微调联动)
|
||||
|
||||
| 展示标签 | 可编辑 | 存储字段 |
|
||||
|----------|--------|----------|
|
||||
| 退费金额(元) | 是(必填) | `refund_amount` |
|
||||
| 退费备注 | 是 | `refund_remark` |
|
||||
| 退费附件 | 是 | `refund_attachments` |
|
||||
|
||||
### 3.4 批量操作
|
||||
|
||||
- **批量缴费确认**:打开同一弹窗;金额按 **每条记录各自的计划金额** 只读(弹窗文案说明「共 N 条,每条按各自计划金额提交」),**共用**一组备注与附件。
|
||||
- **批量退费确认**:保持现有逻辑,共用退费金额/备注/附件(与现实现一致)。
|
||||
|
||||
---
|
||||
|
||||
## 4. 缴费信息页(5 Tab)
|
||||
|
||||
### 4.1 Tab 定义
|
||||
|
||||
对齐 `PaymentInfoTab.vue`,使用 `el-tabs` + `work-order-type-tabs`:
|
||||
|
||||
| Tab name | 标签 | payStatus 参数 |
|
||||
|----------|------|----------------|
|
||||
| `dfj` | 待缴费 | `dfj` |
|
||||
| `jfqrz` | 缴费确认中 | `jfqrz` |
|
||||
| `yjf` | 已缴费 | `yjf` |
|
||||
| `tfqrz` | 退费确认中 | `tfqrz` |
|
||||
| `ytf` | 已退费 | `ytf` |
|
||||
|
||||
### 4.2 筛选区
|
||||
|
||||
- 保留「关键词」(申请单号)。
|
||||
- **移除「缴费状态」下拉**(与 Tab 职责重复,避免冲突)。
|
||||
|
||||
### 4.3 工具栏与操作列
|
||||
|
||||
| Tab | 勾选列 | 工具栏 | 操作列 |
|
||||
|-----|--------|--------|--------|
|
||||
| `dfj` | 有 | 批量缴费确认 | 查看 + 缴费确认 |
|
||||
| `jfqrz` | 无 | — | 查看 |
|
||||
| `yjf` | 有 | 批量退费确认 | 查看 + 退费确认 |
|
||||
| `tfqrz` | 无 | — | 查看 |
|
||||
| `ytf` | 无 | — | 查看 |
|
||||
|
||||
### 4.4 新增弹窗
|
||||
|
||||
**缴费确认弹窗**(替代现有 `ElMessageBox.confirm`):
|
||||
|
||||
- 只读:申请单号、患者姓名、计划缴费金额(元)。
|
||||
- 可编辑:备注(textarea)、附件(卡片上传,folder=`clinical-payment-receipt`)。
|
||||
- 批量时展示选中条数 + 说明文案。
|
||||
|
||||
**退费确认弹窗**:保持现有实现,仅适配 5 Tab 与查看能力。
|
||||
|
||||
**查看弹窗**(全 Tab 可用):
|
||||
|
||||
- 基础信息:申请单号、患者、渠道、细胞类型/规格、输注时间、缴费状态。
|
||||
- 按状态展示已提交信息:
|
||||
- 曾提交缴费:`amount`(计划/实缴一致)、`remark`、`transfer_attachments`
|
||||
- 曾提交退费:`refund_amount`、`refund_remark`、`refund_attachments`
|
||||
- 已财务确认:追加 `finance_*` / `refund_finance_*` 字段
|
||||
|
||||
### 4.5 列表列(建议)
|
||||
|
||||
- 公共列不变。
|
||||
- `jfqrz` / `yjf` / `ytf`:可增加「实缴金额」列(读 `amount` 或 `transfer_amount`,二者提交后一致)。
|
||||
- `tfqrz` / `ytf`:可增加「退费金额」列(`refund_amount`)。
|
||||
|
||||
---
|
||||
|
||||
## 5. 缴退费财务确认页
|
||||
|
||||
### 5.1 确认收款(`jfqrz`)
|
||||
|
||||
弹窗结构(参照细胞存储 `payment-confirm/index.vue`):
|
||||
|
||||
```
|
||||
┌─ 缴费申请信息(只读) ─────────────────────┐
|
||||
│ 申请单号、患者、渠道、细胞规格、输注时间 │
|
||||
│ 缴费金额(元):amount(只读) │
|
||||
│ 备注:remark │
|
||||
│ 附件:transfer_attachments │
|
||||
└────────────────────────────────────────────┘
|
||||
─── 分隔线 ───
|
||||
┌─ 财务确认(可编辑) ───────────────────────┐
|
||||
│ 财务确认收款备注、财务确认附件 │
|
||||
└────────────────────────────────────────────┘
|
||||
```
|
||||
|
||||
**查看确认信息**弹窗:上述两段均只读(含财务确认字段)。
|
||||
|
||||
### 5.2 确认退费(`tfqrz`)
|
||||
|
||||
在现有「退费申请信息」区块补全:
|
||||
|
||||
- 退费金额、退费备注(已有)
|
||||
- **退费附件**(`refund_attachments`,只读卡片列表,当前缺失)
|
||||
|
||||
查看弹窗同步补全退费附件;财务确认段保持不变。
|
||||
|
||||
### 5.3 组件策略
|
||||
|
||||
新建 `ClinicalPaymentSubmitReadonly.vue`(或等价命名):
|
||||
|
||||
- Props:`detail`(缴费记录 dict)、`mode: 'receipt' | 'refund' | 'full'`
|
||||
- 复用 `ProtocolAttachmentReadonly` 展示附件
|
||||
- 缴费侧金额 **只读展示 `amount`**,不展示可编辑控件
|
||||
|
||||
---
|
||||
|
||||
## 6. 后端 API 变更
|
||||
|
||||
文件:`backend/app/api/clinical_payment.py`、`backend/app/crud/clinical_payment.py`
|
||||
|
||||
### 6.1 扩展提交缴费确认
|
||||
|
||||
**`POST /clinical-payments/{payment_id}/submit-receipt`**
|
||||
|
||||
Request body(新增,均可选除校验外):
|
||||
|
||||
```json
|
||||
{
|
||||
"remark": "备注",
|
||||
"transferAttachments": "url1,url2"
|
||||
}
|
||||
```
|
||||
|
||||
- 不接受与计划金额不一致的 `transferAmount`;若传入则须 `== amount`,否则 400。
|
||||
- 未传 `transferAmount` 时 CRUD 自动 `transfer_amount = amount`。
|
||||
|
||||
**`POST /clinical-payments/submit-receipt-batch`**
|
||||
|
||||
Body 增加同上 `remark`、`transferAttachments`,批量共用。
|
||||
|
||||
### 6.2 `_row_to_dict` 字段补齐
|
||||
|
||||
在 `_row_to_dict` / `_enrich_payment` 中补充前端已用别名,避免列表空白:
|
||||
|
||||
| 别名 | 来源 |
|
||||
|------|------|
|
||||
| `paymentAmount` | `amount` |
|
||||
| `cellTypeSpec` | `cellType` + `specText` 拼接(` / ` 或 `·`,与列表现有展示习惯一致) |
|
||||
|
||||
已有字段保持:`amount`、`transferAmount`、`transferAttachments`、`remark`、`refundAmount`、`refundRemark`、`refundAttachments`、`financeRemark`、`financeConfirmAttachments`、`refundFinanceRemark`、`refundFinanceConfirmAttachments`。
|
||||
|
||||
### 6.3 数据库
|
||||
|
||||
**无需 schema 变更**。复用现有列:
|
||||
|
||||
- 缴费提交:`amount`(只读源)、`transfer_amount`(提交时设为等于 amount)、`remark`、`transfer_attachments`
|
||||
- 退费提交:`refund_amount`、`refund_remark`、`refund_attachments`
|
||||
|
||||
---
|
||||
|
||||
## 7. 前端 API 变更
|
||||
|
||||
文件:`web-admin/src/api/business.ts`
|
||||
|
||||
- `submitClinicalReceipt(id, data?)` — POST body 传 `remark`、`transferAttachments`
|
||||
- `batchSubmitClinicalReceipt(ids, data?)` — 同上
|
||||
|
||||
---
|
||||
|
||||
## 8. 不在本次范围
|
||||
|
||||
- 修改计划金额 `amount` 的业务流程
|
||||
- 退费金额与已缴金额的大小校验(除非现网已有,不新增)
|
||||
- 转账方式 `transfer_type`、转账时间 `transfer_time` 字段(用户未要求)
|
||||
- 菜单结构调整
|
||||
|
||||
---
|
||||
|
||||
## 9. 验收标准
|
||||
|
||||
1. 缴费信息 5 Tab 切换后,列表仅展示对应 `pay_status` 数据。
|
||||
2. `dfj` Tab 单条/批量「缴费确认」弹出表单:金额只读等于计划金额,可填备注与附件,提交后状态变为 `jfqrz`。
|
||||
3. `yjf` Tab 退费确认仍支持金额/备注/附件(行为与改前一致)。
|
||||
4. 缴退费财务确认 · 确认收款弹窗顶部可见业务提交的备注与附件;金额只读等于计划金额。
|
||||
5. 缴退费财务确认 · 确认退费弹窗可见退费附件。
|
||||
6. 两页「查看」弹窗均可看到完整的业务提交信息与财务确认信息(若已确认)。
|
||||
7. 列表「缴费金额」列正常显示(`paymentAmount` 别名生效)。
|
||||
|
||||
---
|
||||
|
||||
## 10. 实现顺序建议
|
||||
|
||||
1. 后端:`_row_to_dict` 别名 + `submit_receipt` / `batch_submit_receipt` 扩展
|
||||
2. 前端 API 层
|
||||
3. 缴费信息:5 Tab + 缴费确认弹窗 + 查看弹窗
|
||||
4. 新建 `ClinicalPaymentSubmitReadonly` 组件
|
||||
5. 缴退费财务确认:接入只读区 + 退费附件展示
|
||||
6. 字段一致性脚本(如有需要):`python scripts/check_field_consistency.py`
|
||||
@@ -1,41 +0,0 @@
|
||||
# 菜单级业务类型数据隔离
|
||||
|
||||
> 日期:2026-05-28
|
||||
> 状态:已实现
|
||||
|
||||
## 目标
|
||||
|
||||
| 一级菜单 | 二级菜单 | 仅展示 `biz_type` |
|
||||
|---------|---------|-------------------|
|
||||
| 中试服务 | 中试服务申请单、出库放行审核 | `pilot_service` |
|
||||
| 临床应用 | 临床申请单、输注计划、出库放行、缴费三页 | `clinical_application` |
|
||||
|
||||
## 实现
|
||||
|
||||
1. **路由** `sqxp.ts`:中试子路由 `props: { bizType: 'pilot_service' }`;临床子路由 `clinical_application`(已有)。
|
||||
2. **前端列表**:共用 Tab/页在请求中始终带 `bizType`(缺省按中试/临床推断)。
|
||||
3. **后端列表**:`pilot-application/list`、`pilot-release-reviews`、`pilot-infusion-schedule-mgmt` 按 `bizType` 过滤申请单或关联计划。
|
||||
|
||||
缴费模块使用 `biz_pilot_payment` + `/clinical-payments`,天然仅临床,无需改。
|
||||
|
||||
## 临床申请单页内 Tab(2026-05-28)
|
||||
|
||||
与中试「三卡片」一致,临床为 **两卡片**(不含体检):
|
||||
|
||||
- 临床申请单 → `PilotApplicationTab`
|
||||
- 输注计划管理 → `InfusionScheduleTab`
|
||||
|
||||
独立菜单「输注计划管理」隐藏(`sqxp.ts` `isHide` + `sys_menu_hide_clinical_infusion_schedule.sql`),旧链接触发重定向至 `ClinicalApplicationList?tab=infusion`。
|
||||
|
||||
## 缴退费财务确认 Tab(2026-05-28)
|
||||
|
||||
对齐细胞存储「缴退费财务确认」:`clinical-payment-confirm/index.vue` 双卡片(缴费确认 | 退费确认),退费逻辑在 `RefundConfirmTab.vue`;侧栏菜单名「缴退费财务确认」;待确认/已确认使用 `el-tabs`(`work-order-type-tabs`)。
|
||||
|
||||
- 隐藏菜单「退费确认(财务)」:`sys_menu_hide_clinical_refund_confirm.sql`
|
||||
- 旧路径 `/clinical-refund-confirm` 重定向至 `ClinicalPaymentConfirm?tab=refund`
|
||||
|
||||
## 验证
|
||||
|
||||
- 中试申请单列表不出现 `LCSQ` 前缀临床单。
|
||||
- 临床输注计划不出现中试申请单关联计划。
|
||||
- 两侧出库放行审核列表类型列与菜单一致。
|
||||
Reference in new issue
Block a user