From 4b60b7e0bff9dcdb3bd1678fd42c34616e94f986 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Fri, 17 Apr 2026 22:03:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?= =?UTF-8?q?ate]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/BaseInfoFormPackage.vue | 2 +- src/components/Template/HandleFormItem.vue | 14 ++++++++ src/components/Template/mixins/stepMixins.js | 4 +-- src/utils/formPackageCommon.js | 2 +- .../business/comps/template/comps/sp/SP0021.vue | 37 +++++++++++----------- .../comps/template/dialog/SubPackageDialog.vue | 5 +-- .../comps/template/formConfig/sp/SP0019.js | 26 +++++++-------- .../comps/template/formConfig/sp/SP0020.js | 2 +- 8 files changed, 53 insertions(+), 39 deletions(-) diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue index debf7d4..fba7b62 100644 --- a/src/components/Template/BaseInfoFormPackage.vue +++ b/src/components/Template/BaseInfoFormPackage.vue @@ -345,7 +345,7 @@
{{ $t(sItem.label) }}
-
+
+ +
+ + {{ option.label }} + +
+ +
{ //checkboxTree判断是否显示其他输入框 export const isShowOtherByCheckboxTree = (v = "") => { - const otherArr = ['其他', '其它', '样品信息', '样品', '部分接受', '给药 ', + const otherArr = ['其他', '其它', '样品信息', '样品', '部分接受','分析批拒绝', '给药 ', '样本采集', '日常观察 ', '皮肤评分', diff --git a/src/views/business/comps/template/comps/sp/SP0021.vue b/src/views/business/comps/template/comps/sp/SP0021.vue index 43c0682..54e82f7 100644 --- a/src/views/business/comps/template/comps/sp/SP0021.vue +++ b/src/views/business/comps/template/comps/sp/SP0021.vue @@ -26,10 +26,11 @@ 导入动物 - - + @@ -208,19 +209,17 @@ export default { //获取填写完成的表单数据 async getFormData() { // 基础表单验证 - let content = await this.validFormFields(compRefs); - if (!content) return null; - + + const refs = []; // 验证多个样本说明项 for (let index = 0; index < this.formData.ybsmDataList.length; index++) { + refs.push(`ybsmFormPackageRef${index}`) + refs.push(`ybsmTableRef${index}`) + refs.push(`stepRef${index}`) // 验证样本说明表单 - const ybsmFormValid = await this.$refs[`ybsmFormPackageRef${index}`][0]?.getFormData() || true; - if (!ybsmFormValid) return null; - - // 验证步骤数据 - const stepValid = await this.$refs[`stepRef${index}`][0]?.getFormData() || true; - if (!stepValid) return null; } + let content = await this.validFormFields([...compRefs, ...refs]); + if (!content) return null; // 获取所有数据 return this.getFilledFormData(); @@ -232,23 +231,23 @@ export default { //使用的试剂、仪器 let allSjResource = []; let allYqResource = []; + const {ybsmDataList = []} = content // 收集所有样本说明项的步骤资源 - for (let index = 0; index < this.formData.ybsmDataList.length; index++) { - const stepResource = this.$refs[`stepRef${index}`][0]?.getStepResource() || { sjResource: [], yqResource: [] }; + for (let index = 0; index < ybsmDataList.length; index++) { + const stepResource = ybsmDataList[index].stepData || { sjResource: [], yqResource: [] }; allSjResource = [...allSjResource, ...(stepResource.sjResource || [])]; allYqResource = [...allYqResource, ...(stepResource.yqResource || [])]; } - for(var i=0;i { this.close(); }, 500); diff --git a/src/views/business/comps/template/formConfig/sp/SP0019.js b/src/views/business/comps/template/formConfig/sp/SP0019.js index 70f1719..79ae3c2 100644 --- a/src/views/business/comps/template/formConfig/sp/SP0019.js +++ b/src/views/business/comps/template/formConfig/sp/SP0019.js @@ -43,19 +43,19 @@ export const getBaseInfoFormConfig = (formType) => { type: 'input', disabled: true }, - methodCode: { - label: 'template.common.methodCode', - type: 'input', - fillType: formType === 'sp0020' ? 'actFill' : 'preFill', - maxlength: 50 - }, - versionNum: { - label: 'template.common.versionNumber', - type: 'inputNumber', - fillType: formType === 'sp0020' ? 'actFill' : 'preFill', - prepend: 'V', - maxlength: 50 - }, + // methodCode: { + // label: 'template.common.methodCode', + // type: 'input', + // fillType: formType === 'sp0020' ? 'actFill' : 'preFill', + // maxlength: 50 + // }, + // versionNum: { + // label: 'template.common.versionNumber', + // type: 'inputNumber', + // fillType: formType === 'sp0020' ? 'actFill' : 'preFill', + // prepend: 'V', + // maxlength: 50 + // }, clpbh: { label: '处理批编号', type: 'input', diff --git a/src/views/business/comps/template/formConfig/sp/SP0020.js b/src/views/business/comps/template/formConfig/sp/SP0020.js index 094f1e5..395ad16 100644 --- a/src/views/business/comps/template/formConfig/sp/SP0020.js +++ b/src/views/business/comps/template/formConfig/sp/SP0020.js @@ -94,7 +94,7 @@ export const getYqjgFormConfig = () => { type: 'checkboxList', config: { jg: { - type: 'checkboxTree', + type: 'radioTree', label: '结果', options: [ { label: '分析批接受', value: '分析批接受' },