fix: [模板管理] 体积计算修改

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);
 		},
 		//获取已填写的表单数据

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;
 			}
 		},

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,

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,

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,

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,

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,

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)
 			}
 		},
 		//获取目标溶液编号

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,

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,

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,

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,

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<tableList.length;i++){
 					//配置的试剂
 					let item = tableList[i]
+
+					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
+
 					tmpResource.push({
 						mc: null,
 						bh: item.bh+item.bhCode,
@@ -350,10 +354,10 @@ export default {
 						sxrq: null,
 						ndz: item.hhwznd,
 						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: item.sjjzxql+item.sjryxql,//todo 单位不一致-计算
-						kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+						kc: total,
+						kcdw: unit,
 						syl: null,
-						syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
+						syldw:unit,
 						yxzq:null,
 						yxzqdw:null,
 					})
@@ -422,6 +426,7 @@ export default {
 		},
 		configComplete(val){
 			console.log("完成配置数据："+JSON.stringify(val))
+			const { total, unit } = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -430,8 +435,8 @@ export default {
 				bh:val.rowData.bh+val.rowData.bhCode,
 				nd:val.rowData.hhwznd,
 				nddw:val.headerSelectFields.hhwzndUnit,
-				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
-				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+				kc: total,
+				kcdw: unit,
 			}
 			console.log("完成配置提交数据："+JSON.stringify(postData))
 			sj_configurationCompleted(postData).then(() => {

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;

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',