From e54c9427f7b5d9c26639f2c9cea8df58b5e151f4 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Wed, 25 Feb 2026 11:52:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20YP002+=E5=89=8D=E5=BA=8F=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/public/public.js | 8 + src/components/Template/HandleFormItem.vue | 3 +- src/lang/en/template/yp.js | 30 ++- src/lang/zh/template/yp.js | 30 ++- src/utils/index.js | 13 +- .../business/comps/template/TemplateTable.vue | 6 +- .../business/comps/template/comps/lba/LBA004.vue | 1 + .../business/comps/template/comps/lba/LBA005.vue | 1 + .../business/comps/template/comps/lba/LBA006.vue | 1 - .../business/comps/template/comps/lba/LBA007.vue | 1 + .../business/comps/template/comps/yp/YP002.vue | 218 +++++++++++++++++++++ .../template/dialog/SelectMixReagentDialog.vue | 10 +- .../comps/template/formConfig/formConfig.js | 32 +++ 13 files changed, 346 insertions(+), 8 deletions(-) create mode 100644 src/views/business/comps/template/comps/yp/YP002.vue diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js index f8d8b6a..dc0f8b5 100644 --- a/src/api/business/public/public.js +++ b/src/api/business/public/public.js @@ -139,3 +139,11 @@ export function public_jcbList(query) { params: query }) } +// 前序表单 +export function public_qxFormFillList(query) { + return request({ + url: '/system/business/public/qxFormFillList', + method: 'get', + params: query + }) +} diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 3bdbb3f..d852790 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -232,7 +232,7 @@ export default { visible: false,//是否显示弹窗 checkboxValue: this.getChecked(),//是否选中 uuid: getuuid(), // 唯一标识符,用于EventBus事件匹配 - regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq', 'jcb'], //试剂/仪器/供试品等类型 + regentType: ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq', 'jcb', 'qxbd'], //试剂/仪器/供试品等类型 selectRegentInfo: {},//选择的试剂/仪器/供试品等信息 fileList: [],//上传的文件列表 uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", @@ -505,6 +505,7 @@ export default { xj: "9",//细菌 xb: "11",//细胞 jcb: "13",//检测板 + qxbd: "15",//前序表单 } params = { ...params, diff --git a/src/lang/en/template/yp.js b/src/lang/en/template/yp.js index ac318f0..9348a2c 100644 --- a/src/lang/en/template/yp.js +++ b/src/lang/en/template/yp.js @@ -1,4 +1,32 @@ //样品 export default { - yp001: {} //用的SP001 + yp001: {}, //用的SP001 + yp002: { + swypyjjlbxx: 'Biological Sample Transfer Record Information', + + qxbd: 'Related Earlier Form', + xzbd: '请选表单', + bdmc: 'Record Name', + cjr: 'Creator', + cjsj: 'Creation Date', + bdzt: 'Status', + + qbjsxx: 'Sample Receiving Information', + jsdd: 'Receiving Location', + jsscftj: 'Storage Condition upon receipt', + jssj: 'Receiving Time', + hqsj: '获取时间', + jsqk: 'Receiving Status', + mcysl: 'Name and Quantity', + yz: 'Consistent', + byz: 'Inconsistent', + ypgzk: 'Sample Tube Condition', + zc: 'Normal', + yc: 'Abnormal', + zyhxx: 'Transfer Box Information', + kzyh: 'empty transfer box', + gyzyzh: 'Dosing Group Box', + qt: 'other', + jsbz: 'Comment on Receiving' + } } diff --git a/src/lang/zh/template/yp.js b/src/lang/zh/template/yp.js index ac318f0..1051021 100644 --- a/src/lang/zh/template/yp.js +++ b/src/lang/zh/template/yp.js @@ -1,4 +1,32 @@ //样品 export default { - yp001: {} //用的SP001 + yp001: {}, //用的SP001 + yp002: { + swypyjjlbxx: '生物样品移交记录表信息', + + qxbd: '前序表单', + xzbd: '请选表单', + bdmc: '表单名称', + cjr: '创建人', + cjsj: '创建时间', + bdzt: '表单状态', + + qbjsxx: '样品接收信息', + jsdd: '接收地点', + jsscftj: '接收时存放条件', + jssj: '接收时间', + hqsj: '获取时间', + jsqk: '接收情况', + mcysl: '名称与数量', + yz: '一致', + byz: '不一致', + ypgzk: '样品管状况', + zc: '正常', + yc: '异常', + zyhxx: '转运盒信息', + kzyh: '空转运盒', + gyzyzh: '给药组转运盒', + qt: '其他', + jsbz: '接收备注' + } } diff --git a/src/utils/index.js b/src/utils/index.js index 6a83a42..2eb7065 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -549,6 +549,17 @@ export function duplicateResource(sj, yq) { //是不是试剂/仪器等弹窗类型 export function isRegent(item, fieldCode = 'type') { const type = item[fieldCode] - const typeList = ['sj', 'gsp', 'mix', 'xj', 'xb', 'gyzj', 'mjy', 'yq', 'jcb'] + const typeList = [ + 'sj', + 'gsp', + 'mix', + 'xj', + 'xb', + 'gyzj', + 'mjy', + 'yq', + 'jcb', + 'qxbd' + ] return typeList.includes(type) } diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index a567a3a..c835625 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -69,6 +69,7 @@ import LBA007 from "./comps/lba/LBA007.vue"; //样品 // YP001-使用SP001 +import YP002 from "./comps/yp/YP002.vue"; export default { name: "TemplateTable", @@ -89,7 +90,9 @@ export default { LBA004, LBA005, LBA006, - LBA007 + LBA007, + //样品 + YP002 }, props: { sn: { @@ -174,6 +177,7 @@ export default { 'ADA006': 'LBA006', //样品 'YP001': 'SP001', + 'YP002': 'YP002', } } return this.componentMap || "Demo" diff --git a/src/views/business/comps/template/comps/lba/LBA004.vue b/src/views/business/comps/template/comps/lba/LBA004.vue index 2b62a67..4f2aee6 100644 --- a/src/views/business/comps/template/comps/lba/LBA004.vue +++ b/src/views/business/comps/template/comps/lba/LBA004.vue @@ -113,6 +113,7 @@ export default { bodyType: 'input', bodyFillType: 'preFill', width: 280, + bodyMaxlength:20 },{ label: '', prop: 'jcbBh', diff --git a/src/views/business/comps/template/comps/lba/LBA005.vue b/src/views/business/comps/template/comps/lba/LBA005.vue index 399fe08..4cfb313 100644 --- a/src/views/business/comps/template/comps/lba/LBA005.vue +++ b/src/views/business/comps/template/comps/lba/LBA005.vue @@ -173,6 +173,7 @@ export default { bodyType: 'input', bodyFillType: 'preFill', width: 280, + bodyMaxlength:20 },{ label: '', prop: 'jcbBh', diff --git a/src/views/business/comps/template/comps/lba/LBA006.vue b/src/views/business/comps/template/comps/lba/LBA006.vue index 62256e1..61c5155 100644 --- a/src/views/business/comps/template/comps/lba/LBA006.vue +++ b/src/views/business/comps/template/comps/lba/LBA006.vue @@ -156,7 +156,6 @@ export default { label: 'template.lba.lba006.jcb', type: 'jcb', fillType: 'actFill', - maxlength: 20 }, jg: { label: 'template.lba.lba006.jg', diff --git a/src/views/business/comps/template/comps/lba/LBA007.vue b/src/views/business/comps/template/comps/lba/LBA007.vue index 6e3ae3e..509b198 100644 --- a/src/views/business/comps/template/comps/lba/LBA007.vue +++ b/src/views/business/comps/template/comps/lba/LBA007.vue @@ -173,6 +173,7 @@ export default { bodyType: 'input', bodyFillType: 'preFill', width: 280, + bodyMaxlength:20 },{ label: '', prop: 'jcbBh', diff --git a/src/views/business/comps/template/comps/yp/YP002.vue b/src/views/business/comps/template/comps/yp/YP002.vue new file mode 100644 index 0000000..801b97f --- /dev/null +++ b/src/views/business/comps/template/comps/yp/YP002.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue index 595c6d3..13b6420 100644 --- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue +++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue @@ -25,8 +25,8 @@