fix: [模板管理] 库存计算

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.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
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/CBYHGZYWDX.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: "CBYHGZYWDX",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/JZXY.vue

@@ -69,6 +69,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: "JZXY",
@@ -140,7 +141,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -328,6 +329,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,
@@ -337,10 +341,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,
 					})
@@ -409,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -417,8 +422,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/SWYPFXFFXYPZBB/QXWDX.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: "QXWDX",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/RXJZXY.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: "RXJZXY",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/XSKKX.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: "XSKKX",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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.sjryxqlUnit, val.headerSelectFields.sjjzxqlUnit])
 			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/SWYPFXFFXYPZBB/XZXHTYX.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: "XZXHTYX",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/ZDYBS.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: "ZDYBS",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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/SWYPFXFFXYPZBB/ZQDYJMD.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: "ZQDYJMD",
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -340,6 +341,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,
@@ -349,10 +353,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,
 					})
@@ -421,6 +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])
 			let postData = {
 				mc:null,
 				studyId:this.formData.studyId,
@@ -429,8 +434,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(() => {