diff --git a/backend/app/api/qc.py b/backend/app/api/qc.py index c81d7f0b..3c5635ea 100644 --- a/backend/app/api/qc.py +++ b/backend/app/api/qc.py @@ -29,6 +29,7 @@ from app.crud import qc_lab_test_item as lab_svc from app.crud import qc_inspection_item_template as iit_svc from app.crud import qc_item_param as param_svc from app.crud import qc_task_result as result_svc +from app.crud import qc_task_result_change_log as result_change_log_svc from app.crud import qc_task as task_svc from app.crud import qc_third_party_company as tpc_svc from app.crud import qc_third_party_item as tpi_svc @@ -1349,6 +1350,48 @@ async def get_task_material_usages( return error_response(400, str(e)) +@router.get("/qc-tasks/result-change-logs") +async def list_qc_task_result_change_logs_batch( + taskIds: str = Query(..., description="逗号分隔的任务ID"), + db: Session = Depends(get_db), + user: dict = Depends(require_any_menu_code(*QC_TASK_READONLY_MENU_CODES)), +): + try: + tenant_no = _get_tenant_no(db, user) + ids = [x.strip() for x in (taskIds or "").split(",") if x.strip()] + return success_response( + result_change_log_svc.list_task_result_change_logs_by_task_ids( + db, task_ids=ids, tenant_no=tenant_no + ) + ) + except PermissionError as e: + return error_response(403, str(e)) + except Exception as e: + return error_response(400, str(e)) + + +@router.get("/qc-tasks/{task_id}/result-change-logs") +async def list_qc_task_result_change_logs( + task_id: str, + db: Session = Depends(get_db), + user: dict = Depends(require_any_menu_code(*QC_TASK_READONLY_MENU_CODES)), +): + try: + tenant_no = _get_tenant_no(db, user) + t = task_svc.get_task(db, task_id, tenant_no=tenant_no) + if not t: + return error_response(404, "任务不存在") + return success_response( + result_change_log_svc.list_task_result_change_logs( + db, task_id=task_id, tenant_no=tenant_no + ) + ) + except PermissionError as e: + return error_response(403, str(e)) + except Exception as e: + return error_response(400, str(e)) + + @router.post("/qc-tasks/{task_id}/complete-with-result") async def complete_task_with_result( task_id: str, @@ -1364,6 +1407,7 @@ async def complete_task_with_result( if not t: return error_response(404, "任务不存在") was_done = (t.task_status or "").strip() == "ywc" + before = result_change_log_svc.snapshot_task_result_state(db, t, tenant_no) if body.results: result_svc.save_results_for_task( db, task_id, body.results, tenant_no, user_id, commit=False, @@ -1384,6 +1428,16 @@ async def complete_task_with_result( task_status=body.task_status, commit=False, ) + after = result_change_log_svc.snapshot_task_result_state(db, obj, tenant_no) + result_change_log_svc.append_task_result_change_log( + db, + task=obj, + tenant_no=tenant_no, + user_id=user_id, + operator_user_name=str(user.get("nickName") or user.get("nick_name") or ""), + before=before, + after=after, + ) db.commit() db.refresh(obj) if (obj.task_status or "").strip() == "ywc": diff --git a/backend/app/crud/qc_task_result_change_log.py b/backend/app/crud/qc_task_result_change_log.py new file mode 100644 index 00000000..d932e5ef --- /dev/null +++ b/backend/app/crud/qc_task_result_change_log.py @@ -0,0 +1,250 @@ +"""质检任务检测结果操作留痕""" +from __future__ import annotations + +import json +from datetime import datetime +from typing import Any, Dict, List, Optional + +from sqlalchemy.orm import Session + +from app.core.utils import generate_uuid +from app.models.models import BizQcTask, BizQcTaskResultChangeLog, SysUser +from app.models.qc_param import BizQcTaskResult + +_TASK_STATUS_LABELS = {"dzx": "待执行", "jxz": "进行中", "ywc": "已完成"} +_CONCLUSION_LABELS = {"": "待结论", "tg": "通过", "btg": "不通过"} + + +def _fmt_dt(v: Optional[datetime]) -> str: + if not v: + return "" + return v.strftime("%Y-%m-%d %H:%M:%S") + + +def _display_status(code: Optional[str]) -> str: + c = (code or "").strip() + return _TASK_STATUS_LABELS.get(c, c or "—") + + +def _display_conclusion(code: Optional[str]) -> str: + c = (code or "").strip() + return _CONCLUSION_LABELS.get(c, c or "待结论") + + +def _norm_text(v: Any) -> str: + if v is None: + return "" + return str(v).strip() + + +def _param_key(param_id: Optional[str], param_code: Optional[str], param_name: Optional[str]) -> str: + pid = _norm_text(param_id) + if pid: + return f"paramId:{pid}" + code = _norm_text(param_code) + if code: + return f"paramCode:{code}" + return f"paramName:{_norm_text(param_name)}" + + +def snapshot_task_result_state(db: Session, task: BizQcTask, tenant_no: str) -> Dict[str, Any]: + """保存前快照:任务结论字段 + 已存参数值。""" + rows = ( + db.query(BizQcTaskResult) + .filter( + BizQcTaskResult.task_id == task.id, + BizQcTaskResult.tenant_no == tenant_no, + BizQcTaskResult.del_flag == 0, + ) + .order_by(BizQcTaskResult.create_time.asc()) + .all() + ) + params: Dict[str, Dict[str, str]] = {} + for r in rows: + key = _param_key(r.param_id, r.param_code, r.param_name) + params[key] = { + "label": _norm_text(r.param_name) or key, + "value": _norm_text(r.param_value), + } + return { + "taskStatus": _norm_text(task.task_status), + "conclusion": _norm_text(task.conclusion), + "remark": _norm_text(task.remark), + "attachments": _norm_text(task.third_party_attachments), + "params": params, + } + + +def build_result_changes( + before: Dict[str, Any], + after: Dict[str, Any], +) -> List[Dict[str, str]]: + changes: List[Dict[str, str]] = [] + + def add(field_key: str, label: str, old_v: str, new_v: str) -> None: + if old_v == new_v: + return + changes.append( + { + "fieldKey": field_key, + "fieldLabel": label, + "oldValue": old_v, + "newValue": new_v, + } + ) + + add( + "taskStatus", + "任务状态", + _display_status(before.get("taskStatus")), + _display_status(after.get("taskStatus")), + ) + add( + "conclusion", + "结论", + _display_conclusion(before.get("conclusion")), + _display_conclusion(after.get("conclusion")), + ) + add("remark", "备注", _norm_text(before.get("remark")), _norm_text(after.get("remark"))) + add( + "attachments", + "检测材料", + _norm_text(before.get("attachments")), + _norm_text(after.get("attachments")), + ) + + before_params: Dict[str, Dict[str, str]] = before.get("params") or {} + after_params: Dict[str, Dict[str, str]] = after.get("params") or {} + keys = sorted(set(before_params.keys()) | set(after_params.keys())) + for key in keys: + b = before_params.get(key) or {"label": key, "value": ""} + a = after_params.get(key) or {"label": b.get("label") or key, "value": ""} + label = _norm_text(a.get("label")) or _norm_text(b.get("label")) or key + add(key, label, _norm_text(b.get("value")), _norm_text(a.get("value"))) + return changes + + +def _resolve_operator_name(db: Session, user_id: Optional[str], fallback: str = "") -> str: + uid = _norm_text(user_id) + if not uid: + return _norm_text(fallback) + row = db.query(SysUser.nick_name).filter(SysUser.id == uid).first() + if row and row[0]: + return str(row[0]).strip() + return _norm_text(fallback) or uid + + +def append_task_result_change_log( + db: Session, + *, + task: BizQcTask, + tenant_no: str, + user_id: Optional[str], + operator_user_name: str = "", + before: Dict[str, Any], + after: Dict[str, Any], + operate_time: Optional[datetime] = None, +) -> BizQcTaskResultChangeLog: + """追加一条检测结果保存留痕(不 commit)。无字段差异也写入。""" + now = operate_time or datetime.now() + changes = build_result_changes(before, after) + has_change = "1" if changes else "0" + name = _resolve_operator_name(db, user_id, operator_user_name) + obj = BizQcTaskResultChangeLog( + id=generate_uuid(), + task_id=task.id, + work_order_id=_norm_text(task.work_order_id) or None, + sample_code=_norm_text(task.sample_code) or None, + item_name=_norm_text(task.item_name) or None, + operate_time=now, + operator_user_id=user_id, + operator_user_name=name or None, + has_field_change=has_change, + changes_json=json.dumps(changes, ensure_ascii=False), + tenant_no=tenant_no, + order_num=0, + 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) + return obj + + +def _row_to_dict(row: BizQcTaskResultChangeLog) -> Dict[str, Any]: + changes: List[Dict[str, Any]] = [] + raw = row.changes_json or "" + if raw.strip(): + try: + parsed = json.loads(raw) + if isinstance(parsed, list): + changes = parsed + except json.JSONDecodeError: + changes = [] + return { + "id": row.id, + "taskId": row.task_id, + "workOrderId": row.work_order_id or "", + "sampleCode": row.sample_code or "", + "itemName": row.item_name or "", + "operateTime": _fmt_dt(row.operate_time), + "operatorUserId": row.operator_user_id or "", + "operatorUserName": row.operator_user_name or "", + "hasFieldChange": row.has_field_change == "1", + "changes": changes, + "createTime": _fmt_dt(row.create_time), + } + + +def list_task_result_change_logs( + db: Session, + *, + task_id: str, + tenant_no: str, +) -> List[Dict[str, Any]]: + tid = _norm_text(task_id) + if not tid: + return [] + rows = ( + db.query(BizQcTaskResultChangeLog) + .filter( + BizQcTaskResultChangeLog.task_id == tid, + BizQcTaskResultChangeLog.tenant_no == tenant_no, + BizQcTaskResultChangeLog.del_flag == 0, + ) + .order_by( + BizQcTaskResultChangeLog.operate_time.desc(), + BizQcTaskResultChangeLog.create_time.desc(), + ) + .all() + ) + return [_row_to_dict(r) for r in rows] + + +def list_task_result_change_logs_by_task_ids( + db: Session, + *, + task_ids: List[str], + tenant_no: str, +) -> List[Dict[str, Any]]: + ids = [_norm_text(x) for x in task_ids if _norm_text(x)] + if not ids: + return [] + rows = ( + db.query(BizQcTaskResultChangeLog) + .filter( + BizQcTaskResultChangeLog.task_id.in_(ids), + BizQcTaskResultChangeLog.tenant_no == tenant_no, + BizQcTaskResultChangeLog.del_flag == 0, + ) + .order_by( + BizQcTaskResultChangeLog.operate_time.desc(), + BizQcTaskResultChangeLog.create_time.desc(), + ) + .all() + ) + return [_row_to_dict(r) for r in rows] diff --git a/backend/app/models/models.py b/backend/app/models/models.py index 9b296777..7fb1eaf9 100644 --- a/backend/app/models/models.py +++ b/backend/app/models/models.py @@ -2394,6 +2394,32 @@ class BizQcTask(Base): del_flag = Column(SmallInteger, nullable=False, default=0, comment="删除标记") +class BizQcTaskResultChangeLog(Base): + """质检任务检测结果操作留痕 biz_qc_task_result_change_log(Issue #148/#149)""" + + __tablename__ = "biz_qc_task_result_change_log" + + id = Column(String(64), primary_key=True, comment="主键ID") + task_id = Column(String(64), nullable=False, comment="质检任务ID") + work_order_id = Column(String(64), nullable=True, comment="质检工单ID快照") + sample_code = Column(String(32), nullable=True, comment="样本编码快照") + item_name = Column(String(200), nullable=True, comment="检测项目名称快照") + operate_time = Column(DateTime, nullable=False, comment="业务操作时间") + operator_user_id = Column(String(64), nullable=True, comment="操作人用户ID") + operator_user_name = Column(String(64), nullable=True, comment="操作人姓名快照") + has_field_change = Column(CHAR(1), nullable=False, default="0", comment="1有字段变更 0仅保存无变更") + changes_json = Column(Text, nullable=True, comment="变更明细JSON") + 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 BizQcTaskAssignee(Base): """质检任务负责人 biz_qc_task_assignee""" diff --git a/backend/tests/test_qc_task_result_change_log.py b/backend/tests/test_qc_task_result_change_log.py new file mode 100644 index 00000000..efebcda7 --- /dev/null +++ b/backend/tests/test_qc_task_result_change_log.py @@ -0,0 +1,38 @@ +"""质检检测结果留痕:字段差异与空保存。""" +from app.crud.qc_task_result_change_log import build_result_changes + + +def test_build_changes_for_status_and_param(): + before = { + "taskStatus": "dzx", + "conclusion": "", + "remark": "", + "attachments": "", + "params": {"paramCode:HBsAg": {"label": "HBsAg", "value": "阴性"}}, + } + after = { + "taskStatus": "ywc", + "conclusion": "tg", + "remark": "", + "attachments": "", + "params": {"paramCode:HBsAg": {"label": "HBsAg", "value": "阳性"}}, + } + changes = build_result_changes(before, after) + keys = {c["fieldKey"] for c in changes} + assert "taskStatus" in keys + assert "conclusion" in keys + assert "paramCode:HBsAg" in keys + hbs = next(c for c in changes if c["fieldKey"] == "paramCode:HBsAg") + assert hbs["oldValue"] == "阴性" + assert hbs["newValue"] == "阳性" + + +def test_build_changes_empty_when_identical(): + state = { + "taskStatus": "ywc", + "conclusion": "tg", + "remark": "ok", + "attachments": "a.png", + "params": {"paramCode:X": {"label": "X", "value": "1"}}, + } + assert build_result_changes(state, state) == [] diff --git a/docs/sql/migrations/2026-11-20-qc-task-result-change-log.sql b/docs/sql/migrations/2026-11-20-qc-task-result-change-log.sql new file mode 100644 index 00000000..e96dfb40 --- /dev/null +++ b/docs/sql/migrations/2026-11-20-qc-task-result-change-log.sql @@ -0,0 +1,27 @@ +-- 质检任务检测结果操作留痕(Issue #148 / #149) +-- 每次「填写检测结果」保存追加一条;即使字段无变更也记录操作人与时间。 + +CREATE TABLE IF NOT EXISTS `biz_qc_task_result_change_log` ( + `id` varchar(64) NOT NULL COMMENT '主键ID', + `task_id` varchar(64) NOT NULL COMMENT '质检任务ID', + `work_order_id` varchar(64) DEFAULT NULL COMMENT '质检工单ID快照', + `sample_code` varchar(32) DEFAULT NULL COMMENT '样本编码快照', + `item_name` varchar(200) DEFAULT NULL COMMENT '检测项目名称快照', + `operate_time` datetime NOT NULL COMMENT '业务操作时间', + `operator_user_id` varchar(64) DEFAULT NULL COMMENT '操作人用户ID', + `operator_user_name` varchar(64) DEFAULT NULL COMMENT '操作人姓名快照', + `has_field_change` char(1) NOT NULL DEFAULT '0' COMMENT '1有字段变更 0仅保存无变更', + `changes_json` mediumtext COMMENT '变更明细JSON:[{fieldKey,fieldLabel,oldValue,newValue}]', + `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` smallint(6) NOT NULL DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`), + KEY `idx_qc_result_chg_task` (`tenant_no`,`task_id`,`del_flag`,`operate_time`), + KEY `idx_qc_result_chg_wo` (`tenant_no`,`work_order_id`,`del_flag`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='质检任务检测结果操作留痕'; diff --git a/web-admin/src/api/qc-task-result.ts b/web-admin/src/api/qc-task-result.ts index 8f9111fa..5ac3f3d7 100644 --- a/web-admin/src/api/qc-task-result.ts +++ b/web-admin/src/api/qc-task-result.ts @@ -66,3 +66,38 @@ export function fetchCompleteTaskWithResult( data }) } + +export type QcTaskResultChangeItem = { + fieldKey: string + fieldLabel: string + oldValue: string + newValue: string +} + +export type QcTaskResultChangeLog = { + id: string + taskId: string + workOrderId?: string + sampleCode?: string + itemName?: string + operateTime: string + operatorUserId?: string + operatorUserName?: string + hasFieldChange: boolean + changes: QcTaskResultChangeItem[] + createTime?: string +} + +export function fetchQcTaskResultChangeLogs(taskId: string) { + return request.get({ + url: `/web/admin/qc-tasks/${taskId}/result-change-logs` + }) +} + +export function fetchQcTaskResultChangeLogsBatch(taskIds: string[]) { + const ids = taskIds.map((x) => (x || '').trim()).filter(Boolean) + return request.get({ + url: `/web/admin/qc-tasks/result-change-logs`, + params: { taskIds: ids.join(',') } + }) +} diff --git a/web-admin/src/utils/qc-result-fill-defaults.ts b/web-admin/src/utils/qc-result-fill-defaults.ts new file mode 100644 index 00000000..dd113bc8 --- /dev/null +++ b/web-admin/src/utils/qc-result-fill-defaults.ts @@ -0,0 +1,43 @@ +/** 填写检测结果弹窗默认值(Issue #148):未落结论时默认已完成 + 通过 */ + +export type QcResultFillStatus = 'dzx' | 'jxz' | 'ywc' +export type QcResultFillConclusion = '' | 'tg' | 'btg' + +export function normalizeFillConclusion(raw?: string | null): QcResultFillConclusion { + const c = (raw || '').trim() + return c === 'tg' || c === 'btg' ? c : '' +} + +/** + * 打开填写弹窗时的任务状态 / 结论默认。 + * - 已有结论或已是已完成:回显实际值 + * - 尚未落结论:默认 已完成 + 通过 + */ +export function resolveQcResultFillDefaults(input: { + taskStatus?: string | null + conclusion?: string | null +}): { saveStatus: QcResultFillStatus; conclusion: QcResultFillConclusion } { + const status = (input.taskStatus || '').trim() + const conclusion = normalizeFillConclusion(input.conclusion) + if (conclusion || status === 'ywc') { + const saveStatus: QcResultFillStatus = + status === 'dzx' || status === 'jxz' || status === 'ywc' ? status : 'ywc' + return { + saveStatus: saveStatus === 'ywc' ? 'ywc' : saveStatus, + conclusion: conclusion || (saveStatus === 'ywc' ? 'tg' : '') + } + } + return { saveStatus: 'ywc', conclusion: 'tg' } +} + +/** 第三方弹窗仅展示待执行/已完成 */ +export function resolveThirdPartyFillDefaults(input: { + taskStatus?: string | null + conclusion?: string | null +}): { saveStatus: 'dzx' | 'ywc'; conclusion: QcResultFillConclusion } { + const resolved = resolveQcResultFillDefaults(input) + return { + saveStatus: resolved.saveStatus === 'ywc' ? 'ywc' : 'dzx', + conclusion: resolved.conclusion + } +} diff --git a/web-admin/src/views/quality-inspection/qc-work-order/QcCompanyTaskResultDialog.vue b/web-admin/src/views/quality-inspection/qc-work-order/QcCompanyTaskResultDialog.vue index 3478087b..6cdeea6a 100644 --- a/web-admin/src/views/quality-inspection/qc-work-order/QcCompanyTaskResultDialog.vue +++ b/web-admin/src/views/quality-inspection/qc-work-order/QcCompanyTaskResultDialog.vue @@ -154,6 +154,7 @@ type QcTaskResultItem } from '@/api/qc-task-result' import { taskStatusLabel, taskStatusTagType } from '@/utils/qc-labels' + import { resolveThirdPartyFillDefaults } from '@/utils/qc-result-fill-defaults' import { parseQcParamOptions } from '@/utils/qc-item-param-options' import { pickSharedRemarkAndAttachments, @@ -233,16 +234,6 @@ emit('update:visible', false) } - /** 第三方弹窗仅展示待执行/已完成;其它状态按待执行回显 */ - function normalizeThirdPartySaveStatus(status?: string): 'dzx' | 'ywc' { - return (status || '').trim() === 'ywc' ? 'ywc' : 'dzx' - } - - function normalizeConclusion(raw?: string): '' | 'tg' | 'btg' { - const c = (raw || '').trim() - return c === 'tg' || c === 'btg' ? c : '' - } - function normalizeResultParams(items: QcTaskResultItem[]): QcTaskResultItem[] { return (items || []).map((p) => ({ ...p, @@ -319,13 +310,17 @@ companyId: detail?.companyId ?? task.companyId, companyName: detail?.companyName ?? task.companyName } + const fillDefaults = resolveThirdPartyFillDefaults({ + taskStatus: merged.taskStatus, + conclusion: merged.conclusion + }) const item: ItemState = { taskId: task.id, itemName: merged.itemName || '—', companyName: thirdPartyCompanyDisplayName(merged), params: normalizeResultParams(results || []), - saveStatus: normalizeThirdPartySaveStatus(merged.taskStatus), - conclusion: normalizeConclusion(merged.conclusion) + saveStatus: fillDefaults.saveStatus, + conclusion: fillDefaults.conclusion } return { item, merged } }) diff --git a/web-admin/src/views/quality-inspection/qc-work-order/QcTaskResultChangeLogDialog.vue b/web-admin/src/views/quality-inspection/qc-work-order/QcTaskResultChangeLogDialog.vue new file mode 100644 index 00000000..34e75305 --- /dev/null +++ b/web-admin/src/views/quality-inspection/qc-work-order/QcTaskResultChangeLogDialog.vue @@ -0,0 +1,205 @@ + + + + + + diff --git a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue index fb94cc1b..b59b1da0 100644 --- a/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue +++ b/web-admin/src/views/quality-inspection/qc-work-order/QcWorkOrderTaskSubList.vue @@ -50,6 +50,13 @@ uniqueAssigneeNames(item.tasks) }}
+ + 修改记录 +
+ + 修改记录 +