From 44a33166c03a35474907aef56b03d03d235b90b7 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Wed, 28 Jan 2026 17:06:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E4=BD=93=E7=A7=AF=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/gsp/MJYLQSQD.vue | 2 +- .../comps/template/comps/sp/SWYPBQGZYZBB.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue | 2 +- .../comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue | 4 ++-- .../template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue | 2 +- .../template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue | 2 +- .../comps/template/comps/sp/SWYPFXFFXZKPZB.vue | 23 +++++++++++++--------- .../comps/template/comps/sp/SWYPNBGZYZBB.vue | 4 ++-- .../formConfig/SWYPFXFFXYPZBBTableConfig.js | 2 +- 15 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue index 23b56ca..e44a615 100644 --- a/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue +++ b/src/views/business/comps/template/comps/gsp/MJYLQSQD.vue @@ -334,7 +334,7 @@ export default { }, // 试验编号或部门名称点击事件 onClickSybh() { - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) // this.$refs.baseInfoRef.setClickable("syNo", true); }, //获取已填写的表单数据 diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index 85962a5..e2129e3 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -506,7 +506,7 @@ export default { } const { subKey = "" } = item; if (subKey === "subStartSolution" || subKey === "subSolution") {//起始源溶液点击事件 - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) this.currentSubKey = subKey; } }, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue index e3d04f5..7cd4e3f 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue index 87ec2dd..dcaf607 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue index ce391f7..420c272 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue @@ -413,7 +413,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue index ec37ecb..db29df4 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue index ee48948..8842280 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue index 5dedc47..5f1ac84 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue @@ -347,7 +347,7 @@ export default { console.log("clickable",rowIndex, col) if(col.prop === "sjry"){ //调用对应弹窗的方法-多个点击的需要判断是哪个字段点击 - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) } }, handleRongyeTableClickable(col, rowIndex) { @@ -357,7 +357,7 @@ export default { console.log("clickable",rowIndex, col) if(col.prop === "sjry"){ //调用对应弹窗的方法-多个点击的需要判断是哪个字段点击 - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) } }, //获取目标溶液编号 diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue index ee52c28..4310f91 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue @@ -426,7 +426,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue index c1c9b68..6fd2f33 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue index 2c67d6f..8e4f09a 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue index e647de5..7b62d25 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue @@ -425,7 +425,7 @@ export default { }, configComplete(val){ console.log("完成配置数据："+JSON.stringify(val)) - const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit]) + const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit]) let postData = { mc:null, studyId:this.formData.studyId, diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index 59b68c6..3fc0da2 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -71,6 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; +import { addTj } from "@/utils/calUnitTools"; export default { name: "CBYDB", @@ -142,7 +143,7 @@ export default { }, versionNum: { label: 'template.common.versionNumber', - type: "input", + type: "inputNumber", fillType: "actFill", prepend:"V", maxlength: 50 @@ -229,7 +230,7 @@ export default { ] }, tableStepColumns() { - return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_zkgzy'); + return getSWYPFXFFXYPZBBTableConfig(this,'',true); }, }, data() { @@ -275,7 +276,7 @@ export default { handleJzClickable(obj){ this.reagentType = 1//本表单特殊字段 this.currentSubKey = obj.subKey; - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) }, //选择试剂提交事件 onSelectReagentSubmit(code,row){ @@ -298,7 +299,7 @@ export default { console.log("clickable",rowIndex, col) if(col.prop === "sjry"){ //调用对应弹窗的方法-多个点击的需要判断是哪个字段点击 - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) } }, //获取目标溶液编号 @@ -341,6 +342,9 @@ export default { for(let i=0;i { diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue index cd5e1ef..4f0d488 100644 --- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue @@ -423,7 +423,7 @@ export default { this.currentRowIndex = rowIndex; this.currentTableIndex = tableRowIndex; this.currentRowData = rowData; - this.$refs.selectReagentDialogRef.show(); + this.$refs.selectReagentDialogRef.show(this.formData.id); } }, //form表单点击事件 @@ -434,7 +434,7 @@ export default { console.log(type, rowIndex, item, "handle") const { subKey = "" } = item; if (subKey === "subStartSolution" || subKey === "subSolution") {//起始源溶液点击事件 - this.$refs.selectReagentDialogRef.show() + this.$refs.selectReagentDialogRef.show(this.formData.id) this.currentSubKey = subKey; this.currentType = type; this.currentRowIndex = rowIndex; diff --git a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js index 41c453c..57d0743 100644 --- a/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js +++ b/src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js @@ -12,7 +12,7 @@ export const getSWYPFXFFXYPZBBTableConfig = ( { label: 'template.sp.sp008.bh', prop: 'bh', - bodyType: 'select', + bodyType: selectKey === '' ? 'input' : 'select', bodyOptions: $this.getDictOptions(selectKey), otherCode: 'bhOther', otherLabel: 'template.sp.sp016.bs',