Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/api/business/gsp/gsp.js

@@ -209,4 +209,13 @@ export function jy(data) {
     method: 'post',
     data: data
   })
+}
+
+//导出
+export function exportDetail(query) {
+  return request({
+    url: '/system/business/gsp/exportDetail',
+    method: 'get',
+    params: query
+  })
 }

src/lang/en/template/sp.js

@@ -15,10 +15,35 @@ export default {
     title: '生物样品标曲工作液制备表',
 
   },
-  // 生物样品内标工作液制备表
-  sp004:{
+ // 生物样品内标工作液制备表
+  sp00456:{
     title: '生物样品内标工作液制备表',
-
+    mbrybh:'Target Solution ID',
+    qsrybh:'Source Solution ID',
+    ysqsrytj:'Expected Volume of Source Solution',
+    sjqsrytj:'Actual Source Solution Volume',
+    ysxsytj:'Expected Volume of Diluent',
+    sjxsytj:'Actual Volume of Diluent',
+    ysmbrynd:'Expected Concentration of Target Solution',
+    sjmbrynd:'Actual Concentration of Target Solution',
+    ysmbrytj:'Expected Volume of Target Solution',
+    sjmbrytj:'Actual Volume of Target Solution',
+    mbryyxzq:'Validity Period of Target Solution',
+    mbrysxr:'Expiration Date of Target Solution',
+    ysysrybh:'预设原始溶液编号',
+    sjysrybh:'实际原始溶液编号',
+    ysysrynd:'预设原始溶液浓度',
+    sjysrynd:'实际原始溶液浓度',
+    ysysrytj:'预设原始溶液体积',
+    sjysrytj:'实际原始溶液体积',
+    yjxsytj:'Expected Volume of Diluent',
+    sjxsytj:'Actual Volume of Diluent',
+    qsyry:'Source Solution',
+    ysqsyrynd:'Expected Concentration of Source Solution',
+    sjqsyrynd:'Actual Concentration of Source Solution',
+    xsy:'Diluent',
+    rqcz: 'Container Material',
+    cctj:'Storage Condition',
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {

src/lang/zh/template/sp.js

@@ -16,9 +16,34 @@ export default {
 
   },
   // 生物样品内标工作液制备表
-  sp004:{
+  sp00456:{
     title: '生物样品内标工作液制备表',
-
+    mbrybh:'目标溶液编号',
+    qsrybh:'起始溶液编号',
+    ysqsrytj:'预设起始溶液体积',
+    sjqsrytj:'实际起始溶液体积',
+    ysxsytj:'预设稀释液体积',
+    sjxsytj:'实际稀释液体积',
+    ysmbrynd:'预设目标溶液浓度',
+    sjmbrynd:'实际目标溶液浓度',
+    ysmbrytj:'预设目标溶液体积',
+    sjmbrytj:'实际目标溶液体积',
+    mbryyxzq:'目标溶液有效周期',
+    mbrysxr:'目标溶液失效日',
+    ysysrybh:'预设原始溶液编号',
+    sjysrybh:'实际原始溶液编号',
+    ysysrynd:'预设原始溶液浓度',
+    sjysrynd:'实际原始溶液浓度',
+    ysysrytj:'预设原始溶液体积',
+    sjysrytj:'实际原始溶液体积',
+    yjxsytj:'预计稀释液体积',
+    sjxsytj:'实际稀释液体积',
+    qsyry:'起始源溶液',
+    ysqsyrynd:'预设起始源溶液浓度',
+    sjqsyrynd:'实际起始源溶液浓度',
+    xsy:'稀释液',
+    rqcz: '容器材质',
+    cctj:'存储条件',
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {

src/views/business/archive/gsp/comps/ffjlList.vue

@@ -70,7 +70,7 @@
               {{ scope.row.rkl }} {{ scope.row.rkldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gsp.dasqr')" align="center" prop="dasqrMc" width="150px"
+          <el-table-column :label="$t('page.business.resource.gsp.sqr')" align="center" prop="gdsqrMc" width="150px"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gsp.jlzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">

src/views/business/archive/gsp/comps/gspList.vue

@@ -23,18 +23,18 @@
           <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'" prop="jyzt">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
-              <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
-              <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
           <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'" prop="zjzt">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.resource.zjzt.dgd')" :value="7" />
-              <el-option :label="$t('page.business.resource.zjzt.gd')" :value="9" />
-              <el-option :label="$t('page.business.resource.zjzt.djd')" :value="11" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
             </el-select>
           </el-form-item>
 
@@ -60,7 +60,7 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" width="150px" />
-          <el-table-column :label="$t('page.business.resource.gsp.sqr')" align="center" prop="dasqrMc" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.sqr')" align="center" prop="gdsqrMc" width="150px" />
           <el-table-column :label="$t('page.business.resource.gsp.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>

src/views/business/comps/select/BusinessSelect.vue

@@ -8,7 +8,7 @@
 <!-- 处置方式：business_czfs -->
 <template>
   <div>
-    <el-select  style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
+    <el-select  :style="showMax?'width:100%':''" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
       <el-option v-for="item in list"  :key="item.dictCode" :label="item.dictLabel" :value="item.dictLabel" />
     </el-select>
   </div>
@@ -44,6 +44,10 @@ export default {
     placeholder: {
       type: String,
       default: ''
+    },
+    showMax: {
+      type: Boolean,
+      default: true
     }
   },
   watch: {

src/views/business/comps/select/SelectDeptUserDialog.vue

@@ -2,7 +2,7 @@
 
 <template>
   <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('form.selectMember')" :visible.sync="open" width="800px" append-to-body>
-    <el-row>
+    <el-row style="height: 500px;overflow-y: scroll;">
       <el-col :span="12" class="select-user-left">
         <el-input
           :placeholder="$t('form.placeholderInput')"

src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue

@@ -2,7 +2,7 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.templateMc ||
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
 				"生物样品标曲工作液制备表" }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
@@ -15,14 +15,16 @@
 					<LineLabel label="操作步骤" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage @clickable="handleClickable" ref="stepFormPackageRef"
-							@resetRecord="resetRecord"
-							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
+							@resetRecord="resetRecord" :formConfig="stepFormConfig" @blur="onHandleBlur"
+							:formData="formData" />
 						<CustomTable fieldItemLabel="操作步骤" @blur="onHandleTableBlur" :showAddRow="false"
 							:showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
 							:formData="formData">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete" @printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType" :row="row"
-									:rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow"></TableOpertaion>
+								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
+									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
+									:row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
+								</TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -417,25 +419,25 @@ export default {
 	mounted() {
 	},
 	methods: {
-		resetRecord(){
+		resetRecord() {
 			this.$refs.stepTableRef.resetRecord();
 		},
-		startConfig(val){
+		startConfig(val) {
 			const { rowData } = val;
 			let postData = {
-				bh:rowData.targetSolutionCode+rowData.subTargetSolutionCode,
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
 			}
 			this.startConfigRequest(postData);
 		},
-		configComplete(val){
-			const { rowData,headerSelectFields } = val;
+		configComplete(val) {
+			const { rowData, headerSelectFields } = val;
 			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const {total,unit} = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
+			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
 			let postData = {
-				mc:null,
-				bh:rowData.targetSolutionCode+rowData.subTargetSolutionCode,
-				nd:rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw:headerSelectFields.actSolutionConcentrationUnit,
+				mc: null,
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
+				nddw: headerSelectFields.actSolutionConcentrationUnit,
 				kc: total,
 				kcdw: unit,
 			}
@@ -444,27 +446,27 @@ export default {
 		//打印标签回调
 		printTag(data) {
 			const printConfig = this.getBasePrintConfig(data);
-			EventBus.$emit('showTagPrintDialog', {printConfig})
+			EventBus.$emit('showTagPrintDialog', { printConfig })
 		},
 		//分装回调
 		subPackageSubmit(data) {
-			const { fzsj, rowData,headerSelectFields } = data;
-			const {fzList = [],dw="",mybh} = fzsj;
-			if(fzList && fzList.length>0){
-				const list = fzList.map((item)=>{
-					return{
-						bh:mybh+item.subCode,
-						kc:item.num,
-						kcdw:dw,
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + item.subCode,
+						kc: item.num,
+						kcdw: dw,
 					}
 				})
 				let postData = {
-					studyId:this.formData.studyId,
-					studyFormId:this.formData.id,
-					bh:mybh,
-					nd:rowData.actSolutionConcentration || 0,
-					nddw:headerSelectFields.actSolutionConcentrationUnit,
-					list:list
+					studyId: this.formData.studyId,
+					studyFormId: this.formData.id,
+					bh: mybh,
+					nd: rowData.actSolutionConcentration || 0,
+					nddw: headerSelectFields.actSolutionConcentrationUnit,
+					list: list
 				}
 				this.subPackageRequest(postData);
 			}
@@ -511,15 +513,15 @@ export default {
 		//选择试剂提交事件
 		onSelectReagentSubmit(code, row) {
 			if (this.currentSubKey === "subStartSolution") {//起始源溶液点击事件
-				this.$refs.stepFormPackageRef.updateFormData("targetAcSolution", row.nd,["targetAcSolution"]);
+				this.$refs.stepFormPackageRef.updateFormData("targetAcSolution", row.nd, ["targetAcSolution"]);
 				this.updateStepTableData(row);
 			}
-			this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code,[this.currentSubKey]);
+			this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code, [this.currentSubKey]);
 			this.$refs.selectReagentDialogRef.onCancel()
 		},
 		//更新table数据
 		updateStepTableData(row) {
-			const {stepTableFormData = []} = this.$refs.stepTableRef.getFilledFormData();
+			const { stepTableFormData = [] } = this.$refs.stepTableRef.getFilledFormData();
 
 			// 创建新的表格数据副本
 			const newStepTableData = JSON.parse(JSON.stringify(stepTableFormData));
@@ -535,7 +537,7 @@ export default {
 					// 第三条的起始溶液编号是第二条数据里面的targetSolutionCode字段，以此类推
 					newStepTableData[i].startSolutionCode = newStepTableData[i - 1].targetSolutionCode;
 				}
-				const {actVol,actNd} = this.updateSjmbrynd(item, row.nd);
+				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
 				item.actSolutionVolume = actVol;
 				item.actSolutionConcentration = actNd;
 			}
@@ -544,11 +546,60 @@ export default {
 			this.$refs.stepTableRef.updateDataSource(newStepTableData);
 		},
 		async getFormData() {
-			return await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			//生成resource
+			let tmpResource = []
+			let tableList = content.stepTableFormData
+			if (tableList && tableList.length > 0) {
+				for (let i = 0; i < tableList.length; i++) {
+					let item = tableList[i]
+					//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+			        const { total, unit } = addTj([item.actStartSolutionVolume, item.actDiluentVolumeUnit], [content.headerSelectFields.actStartSolutionVolumeUnit, content.headerSelectFields.actDiluentVolumeUnit])
+					tmpResource.push({
+						mc: null,
+						bh: item.targetSolutionCode + item.subTargetSolutionCode,
+						ph: null,
+						nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
+						source: 'ELN配制',
+						sxrq: content.expireDate,
+						ndz: item.actSolutionConcentration,
+						nddw: content.headerSelectFields.actSolutionConcentrationUnit,
+						kc: total,
+						kcdw: unit,
+						syl: null,
+						syldw: unit,
+						yxzq: content.effectivePeriod,
+						yxzqdw: content.effectivePeriodUnit,
+					})
+					if (item.fzsj && item.fzsj.fzList && item.fzsj.fzList) {
+						for (let j = 0; j < item.fzsj.fzList.length; j++) {
+							tmpResource.push({
+								mc: null,
+								bh: item.fzsj.mybh +'-'+item.fzsj.fzList[j].subCode,
+								ph: null,
+								nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
+								source: 'ELN配制',
+								sxrq: content.expireDate,
+								ndz: item.actSolutionConcentration,
+								nddw: content.headerSelectFields.actSolutionConcentrationUnit,
+								kc: item.fzsj.fzList[j].num,
+								kcdw: item.fzsj.dw,
+								syl: null,
+								syldw: item.fzsj.dw,
+								yxzq: content.effectivePeriod,
+								yxzqdw: content.effectivePeriodUnit,
+							})
+						}
+					}
+				}
+			}
+			this.resourceTmp = tmpResource
+
+			return content;
 		},
 		async onSave() {
 			// const formData = await this.getFormData();
-			const formData = await this.validFormFields(["baseInfoRef","stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
+			const formData = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
 
 			console.log(formData, "formData")
 		}

src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue

@@ -306,7 +306,7 @@ export default {
 				yxzqdw:content.effectivePeriodUnit,
 			})
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			
 			return content;
 		},

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue

@@ -16,20 +16,20 @@
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
-						
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -49,7 +49,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -116,7 +117,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -140,7 +141,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -242,7 +243,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +341,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -378,6 +382,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -395,6 +400,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -405,13 +413,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -420,7 +432,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue

@@ -2,7 +2,7 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.templateMc ||
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
 				$t('template.sp.sp009.title') }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
@@ -78,6 +78,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: "SWYPFXRYPZB",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@@ -147,7 +148,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -380,7 +381,6 @@ export default {
 						resourceList: null,
 					}
 					setTimeout(() => {
-						debugger
 						EventBus.$emit('onModifyRecord', params,)
 					}, 10);
 				}
@@ -428,6 +428,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,
@@ -437,10 +440,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,
 					})
@@ -452,26 +455,27 @@ export default {
 				for(let i=0;i<tableList.length;i++){
 					//配置的试剂
 					let item = tableList[i]
+					const { total, unit } = addTj([item.sjryxql, item.sjgzyxql,item.sjxsyxql], [content.headerSelectFields_1.sjryxqlUnit, content.headerSelectFields_1.sjgzyxqlUnit,content.headerSelectFields_1.sjxsyxqlUnit])
 					tmpResource.push({
 						mc: null,
 						bh: item.bh+item.bhCode,
 						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+						nd: item.hhwznd + content.headerSelectFields_1.hhwzndUnit,
 						source: 'ELN配制',
 						sxrq: null,
 						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: item.sjryxql+item.sjgzyxql + item.sjxsyxql,//todo 单位不一致-计算
-						kcdw: content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+						nddw: content.headerSelectFields_1.hhwzndUnit,
+						kc: total,
+						kcdw: unit,
 						syl: null,
-						syldw:content.headerSelectFields.sjryxqlUnit || content.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算,
+						syldw:unit,
 						yxzq:null,
 						yxzqdw:null,
 					})
 				}
 			}
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -502,6 +506,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -519,6 +524,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -529,13 +537,25 @@ export default {
 		},
 		configComplete(val){
 			console.log("完成配置数据："+JSON.stringify(val))
+			let amount = {
+				total:0,
+				unit:''
+			}
+			if(val.rowData.sjgzyxql===undefined && val.headerSelectFields.sjgzyxqlUnit === undefined){
+				amount = addTj([val.rowData.sjjzxql, val.rowData.sjryxql], [val.headerSelectFields.sjjzxqlUnit, val.headerSelectFields.sjryxqlUnit])
+			}else{
+				amount = addTj([val.rowData.sjryxql, val.rowData.sjgzyxql,val.rowData.sjxsyxql], [val.headerSelectFields.sjryxqlUnit, val.headerSelectFields.sjgzyxqlUnit,val.headerSelectFields.sjxsyxqlUnit])
+			}
 			let postData = {
 				mc:null,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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: amount.total,
+				kcdw: amount.unit
 			}
 			console.log("完成配置提交数据："+JSON.stringify(postData))
 			sj_configurationCompleted(postData).then(() => {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -313,7 +314,7 @@ export default {
 							bhCode: result.data[i],
 						})
 					}
-					
+
 					const params = {
 						type: "fieldChanged",
 						newRecord: null,
@@ -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,19 +353,19 @@ 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,
 					})
 				}
 			}
-			
-			
+
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -391,6 +395,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -408,6 +413,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -418,13 +426,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -433,7 +445,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -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",
@@ -118,7 +119,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -142,7 +143,7 @@ export default {
 						},
 						versionNum: {
 							label: 'template.common.versionNumber',
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
@@ -244,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -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,18 +353,18 @@ 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,
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -390,6 +394,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -407,6 +412,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -417,13 +425,17 @@ 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,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				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(() => {
@@ -432,7 +444,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue

@@ -19,19 +19,19 @@
 						<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps" ref="stepFormPackageRef" :formConfig="stepFormConfig"
 							:formData="formData" @clickable="handleJzClickable" />
 
-						<CustomTable 
-							@blur="onHandleTableBlur" 
-							:ref="`tableRef`" 
-							:columns="tableStepColumns" 
+						<CustomTable
+							@blur="onHandleTableBlur"
+							:ref="`tableRef`"
+							:columns="tableStepColumns"
 							:formData="formData"
 							:prefixKey = "`table`"
 							@clickable="handleClickable"
 							fieldItemLabel = "template.common.operationSteps"
 						>
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion 
-									:fillType="fillType" 
-									:row="row" 
+								<TableOpertaion
+									:fillType="fillType"
+									:row="row"
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
@@ -51,7 +51,7 @@
 		</div>
 		<!-- <button @click = "onSave">保存</button> -->
 
-		<SelectReagentDialog 
+		<SelectReagentDialog
 		@submit="onSelectReagentSubmit"
 		ref="selectReagentDialogRef" >
 		</SelectReagentDialog>
@@ -118,7 +118,7 @@ export default {
 				}
 			]
 		},
-		
+
 		baseInfoFormConfig() {
 			return [
 				{
@@ -245,7 +245,7 @@ export default {
 				{ label: 'template.common.reagentCode', prop: "bh" },//编号
 				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
 				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
+				{ label: 'template.common.source', prop: "source" },//来源
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
@@ -359,9 +359,9 @@ export default {
 					})
 				}
 			}
-			
+
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {
@@ -391,6 +391,7 @@ export default {
 				let postData = {
 					studyId:this.formData.studyId,
 					studyFormId:this.formData.id,
+					deptId: this.formData.studySubjectId,
 					bh:val.fzsj.mybh,
 					nd:val.rowData.hhwznd,
 					nddw:val.headerSelectFields.hhwzndUnit,
@@ -408,6 +409,9 @@ export default {
 			console.log("开始配置数据："+JSON.stringify(val))
 			let postData = {
 				bh:val.rowData.bh+val.rowData.bhCode,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 			}
 			console.log("开始配置提交数据："+JSON.stringify(postData))
 			sj_startConfiguration(postData).then(() => {
@@ -420,6 +424,9 @@ export default {
 			console.log("完成配置数据："+JSON.stringify(val))
 			let postData = {
 				mc:null,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
+				deptId: this.formData.studySubjectId,
 				bh:val.rowData.bh+val.rowData.bhCode,
 				nd:val.rowData.hhwznd,
 				nddw:val.headerSelectFields.hhwzndUnit,
@@ -433,7 +440,7 @@ export default {
 			.finally(() => {
 			})
 		},
-		
+
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue

@@ -303,7 +303,7 @@ export default {
 				yxzqdw:content.effectivePeriodUnit,
 			})
 			//使用的试剂
-			this.resource=tmpResource
+			this.resourceTmp=tmpResource
 			
 			return content;
 		},

src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue

@@ -2,17 +2,17 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ getTemplateName() }}<img
-					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc || getTemplateName()
+			}}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
-					<BaseInfoFormPackage label="试验基本信息" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqsColumns" :dataSource="resource" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef" :formConfig="storageFormConfig"
 						:formData="formData" />
-					<TableList label="试验试剂信息" :columns="sysjColumns" :dataSource="resource" />
-					<TableList label="仪器使用信息" :columns="yqsColumns" :dataSource="resource" />
-					<BaseInfoFormPackage label="存储条件" ref="storageConditionRef" :formConfig="storageFormConfig"
-						:formData="formData" />
-					<LineLabel label="操作步骤" />
+					<LineLabel label="template.common.operationSteps" />
 					<div v-if="fillType === 'preFill'" class="mt-20">
 						<el-button type="primary" @click="handleAddParalle">新增平行配制</el-button>
 						<el-button type="primary" @click="handleAddLadder">新增阶梯配制</el-button>
@@ -86,7 +86,7 @@
 								:prefixKey="'paralle' + paralleIndex"></Step>
 						</div>
 					</div>
-					<BaseInfoFormPackage label="备注" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
 			</div>
@@ -378,7 +378,7 @@ export default {
 
 		// 表格失去焦点事件
 		onHandleTableBlur(type, configIndex, e) {
-			const { colKey = "", item,rowIndex } = e;
+			const { colKey = "", item, rowIndex } = e;
 			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
 				if (type === "ladder") {
 					const volume = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetStartSolution") || 0;
@@ -395,17 +395,21 @@ export default {
 				if (type === "ladder") {
 					const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
-						const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
-						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
-						actSolutionConcentration: actNd,});
+						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+							actSolutionVolume: actVol,
+							actSolutionConcentration: actNd,
+						});
 					}
 				} else if (type === "paralle") {
 					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
 						this.updateSjmbrynd(item, targetAcSolution);
-						const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
-						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
-						targetAcSolution: actNd,});
+						const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
+							actSolutionVolume: actVol,
+							targetAcSolution: actNd,
+						});
 					}
 				}
 
@@ -564,7 +568,106 @@ export default {
 			if (!validFlag) {
 				return false;
 			}
-			return this.getFilledFormData();
+			let content = this.getFilledFormData();
+			//生成resource
+			let tmpResource = []
+			//平行配置
+			if (content.ladderConfigs && content.ladderConfigs.length > 0) {
+				for (let i = 0; i < content.ladderConfigs.length; i++) {
+					let ladderConfigs = content.ladderConfigs[i]
+					let stepTableFormData = ladderConfigs.stepTableFormData
+					for (let j = 0; j < stepTableFormData.length; j++) {
+						//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+						const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
+						tmpResource.push({
+							mc: null,
+							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+							ph: null,
+							nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+							source: 'ELN配制',
+							sxrq: ladderConfigs.expireDate,
+							ndz: stepTableFormData[j].actSolutionConcentration,
+							nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw: unit,
+							yxzq: ladderConfigs.effectivePeriod,
+							yxzqdw: ladderConfigs.effectivePeriodUnit,
+						})
+						let fzsj = stepTableFormData[j].fzsj
+						if (fzsj && fzsj.fzList) {
+							for (let k = 0; k < fzsj.fzList.length; k++) {
+								tmpResource.push({
+									mc: null,
+									bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+									ph: null,
+									nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+									source: 'ELN配制',
+									sxrq: ladderConfigs.expireDate,
+									ndz: stepTableFormData[j].actSolutionConcentration,
+									nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+									kc: fzsj.fzList[k].num,
+									kcdw: fzsj.dw,
+									syl: null,
+									syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+									yxzq: ladderConfigs.effectivePeriod,
+									yxzqdw: ladderConfigs.effectivePeriodUnit,
+								})
+							}
+						}
+					}
+				}
+			}
+			//阶梯配置
+			if (content.paralleConfigs && content.paralleConfigs.length > 0) {
+				for (let i = 0; i < content.paralleConfigs.length; i++) {
+					let paralleConfigs = content.paralleConfigs[i]
+					let stepTableFormData = paralleConfigs.stepTableFormData
+					for (let j = 0; j < stepTableFormData.length; j++) {
+						const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
+						tmpResource.push({
+							mc: null,
+							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+							ph: null,
+							nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+							source: 'ELN配制',
+							sxrq: stepTableFormData[j].targetSolutionExpirationDate,
+							ndz: stepTableFormData[j].actSolutionConcentration,
+							nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw: unit,
+							yxzq: stepTableFormData[j].targetSolutionCycle,
+							yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
+						})
+						let fzsj = stepTableFormData[j].fzsj
+						if (fzsj && fzsj.fzList) {
+							for (let k = 0; k < fzsj.fzList.length; k++) {
+								tmpResource.push({
+									mc: null,
+									bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+									ph: null,
+									nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+									source: 'ELN配制',
+									sxrq: paralleConfigs.expireDate,
+									ndz: stepTableFormData[j].actSolutionConcentration,
+									nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+									kc: fzsj.fzList[k].num,
+									kcdw: fzsj.dw,
+									syl: null,
+									syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+									yxzq: paralleConfigs.effectivePeriod,
+									yxzqdw: paralleConfigs.effectivePeriodUnit,
+								})
+							}
+						}
+					}
+				}
+			}
+			this.resourceTmp = tmpResource
+			return content;
 		},
 		async onSave() {
 			const formData = await this.getFormData();

src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js

@@ -21,8 +21,8 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodyFillType: 'preFill',
       width: 280,
       myCodeFields: ['bh', 'bhOther', 'bhCode'],
-      maxVolumeField: 'sjryxql', //分装的最大量字段
-      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+      maxVolumeField: 'sjryxql,sjjzxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit,sjjzxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',
@@ -123,8 +123,8 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodyFillType: 'preFill',
       width: 280,
       myCodeFields: ['bh', 'bhCode'],
-      maxVolumeField: 'sjryxql', //分装的最大量字段
-      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
+      maxVolumeField: 'sjryxql,sjgzyxql,sjxsyxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit,sjgzyxqlUnit,sjxsyxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',

src/views/business/comps/template/formConfig/paralleAndLadderConfig.js

@@ -2,7 +2,7 @@
 export const getLadderColumnsConfig = ($this) => {
   return [
     {
-      label: '目标溶液编号',
+      label: 'template.sp.sp00456.mbrybh',
       prop: 'targetSolutionCode',
       bodyType: 'input',
       bodySubType: 'span',
@@ -14,7 +14,7 @@ export const getLadderColumnsConfig = ($this) => {
       maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
     },
     {
-      label: '起始溶液编号',
+      label: 'template.sp.sp00456.qsrybh',
       prop: 'startSolutionCode',
       width: 280,
       bodyType: 'input',
@@ -22,7 +22,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '预设起始溶液体积',
+      label: 'template.sp.sp00456.ysqsrytj',
       prop: 'targetStartSolutionVolume',
       width: 280,
       headerSelectKey: 'targetStartSolutionVolumeUnit',
@@ -40,7 +40,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodySubPlaceholder: '请输入保留小数位数'
     },
     {
-      label: '实际起始溶液体积',
+      label: 'template.sp.sp00456.sjqsrytj',
       prop: 'actStartSolutionVolume',
       width: 280,
       headerSelectKey: 'actStartSolutionVolumeUnit',
@@ -53,7 +53,7 @@ export const getLadderColumnsConfig = ($this) => {
       compareTo: 'targetStartSolutionVolume' //比较哪个字段
     },
     {
-      label: '预设稀释液体积',
+      label: 'template.sp.sp00456.ysxsytj',
       prop: 'targetDiluentVolume',
       width: 280,
       headerSelectKey: 'targetDiluentVolumeUnit',
@@ -72,7 +72,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodySubPlaceholder: '请输入保留小数位数'
     },
     {
-      label: '实际稀释液体积',
+      label: 'template.sp.sp00456.sjxsytj',
       prop: 'actDiluentVolume',
       width: 280,
       headerSelectKey: 'actDiluentVolumeUnit',
@@ -85,7 +85,7 @@ export const getLadderColumnsConfig = ($this) => {
       compareTo: 'targetDiluentVolume', //比较哪个字段
     },
     {
-      label: '预设目标溶液浓度',
+      label: 'template.sp.sp00456.ysmbrynd',
       prop: 'targetSolutionConcentration',
       width: 280,
       headerSelectKey: 'targetSolutionConcentrationUnit',
@@ -96,7 +96,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '实际目标溶液浓度',
+      label: 'template.sp.sp00456.sjmbrynd',
       prop: 'actSolutionConcentration',
       width: 280,
       headerSelectKey: 'actSolutionConcentrationUnit',
@@ -116,7 +116,7 @@ export const getLadderColumnsConfig = ($this) => {
       compareTo: 'targetSolutionConcentration', //比较哪个字段
     },
     {
-      label: '预设目标溶液体积',
+      label: 'template.sp.sp00456.ysmbrytj',
       prop: 'targetSolutionVolume',
       width: 280,
       headerSelectKey: 'targetSolutionVolumeUnit',
@@ -127,7 +127,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '实际目标溶液体积',
+      label: 'template.sp.sp00456.sjmbrytj',
       prop: 'actSolutionVolume',
       width: 280,
       headerSelectKey: 'actSolutionVolumeUnit',
@@ -159,7 +159,7 @@ export const getParallelColumnsConfig = ($this) => {
   }
   return [
     {
-      label: '目标溶液编号',
+      label: 'template.sp.sp00456.mbrybh',
       prop: 'targetSolutionCode',
       bodyType: 'select',
       bodyOptions: $this.getDictOptions(o[sn]),
@@ -172,7 +172,7 @@ export const getParallelColumnsConfig = ($this) => {
       width: 280
     },
     {
-      label: '预设目标溶液浓度',
+      label: 'template.sp.sp00456.ysmbrynd',
       prop: 'targetSolutionConcentration',
       width: 280,
       headerSelectKey: 'targetSolutionConcentrationUnit',
@@ -183,7 +183,7 @@ export const getParallelColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '实际目标溶液浓度',
+      label: 'template.sp.sp00456.sjmbrynd',
       prop: 'actSolutionConcentration',
       width: 280,
       headerSelectKey: 'actSolutionConcentrationUnit',
@@ -202,7 +202,7 @@ export const getParallelColumnsConfig = ($this) => {
       compareTo: 'targetSolutionConcentration', //比较哪个字段
     },
     {
-      label: '预设目标溶液体积',
+      label: 'template.sp.sp00456.ysmbrytj',
       prop: 'targetSolutionVolume',
       width: 280,
       headerSelectKey: 'targetSolutionVolumeUnit',
@@ -213,7 +213,7 @@ export const getParallelColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '实际目标溶液体积',
+      label: 'template.sp.sp00456.sjmbrytj',
       prop: 'actSolutionVolume',
       width: 280,
       headerSelectKey: 'actSolutionVolumeUnit',
@@ -232,7 +232,7 @@ export const getParallelColumnsConfig = ($this) => {
       compareTo: 'targetSolutionVolume', //比较哪个字段
     },
     {
-      label: '目标溶液有效周期',
+      label: 'template.sp.sp00456.mbryyxzq',
       prop: 'targetSolutionCycle',
       width: 280,
       fillType: 'preFill',
@@ -246,20 +246,20 @@ export const getParallelColumnsConfig = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: '目标溶液失效日',
+      label: 'template.sp.sp00456.mbrysxr',
       prop: 'targetSolutionExpirationDate',
       width: 180,
       bodyType: 'span'
     },
     {
-      label: '预设原始溶液编号',
+      label: 'template.sp.sp00456.ysysrybh',
       prop: 'startSolutionCode',
       width: 280,
       bodyType: 'input',
       bodyFillType: 'preFill'
     },
     {
-      label: '实际原始溶液编号',
+      label: 'template.sp.sp00456.sjysrybh',
       prop: 'actStartSolutionCode',
       width: 280,
       bodyType: 'clickable',
@@ -267,7 +267,7 @@ export const getParallelColumnsConfig = ($this) => {
       compareTo: 'startSolutionCode', //比较哪个字段
     },
     {
-      label: '预设原始溶液浓度',
+      label: 'template.sp.sp00456.ysysrynd',
       prop: 'targetStartSolutionConcentration',
       width: 280,
       bodyType: 'inputNumber',
@@ -280,7 +280,7 @@ export const getParallelColumnsConfig = ($this) => {
       showBodySub: true
     },
     {
-      label: '实际原始溶液浓度',
+      label: 'template.sp.sp00456.sjysrynd',
       prop: 'targetAcSolution',
       width: 280,
       bodyType: 'inputNumber',
@@ -289,7 +289,7 @@ export const getParallelColumnsConfig = ($this) => {
       compareTo: 'targetStartSolutionConcentration', //比较哪个字段
     },
     {
-      label: '预设原始溶液体积',
+      label: 'template.sp.sp00456.ysysrytj',
       prop: 'targetStartSolutionVolume',
       headerSelectKey: 'targetStartSolutionVolumeUnit',
       fillType: 'preFill',
@@ -310,7 +310,7 @@ export const getParallelColumnsConfig = ($this) => {
     },
 
     {
-      label: '实际原始溶液体积',
+      label: 'template.sp.sp00456.sjysrytj',
       prop: 'actStartSolutionVolume',
       headerSelectKey: 'actStartSolutionVolumeUnit',
       fillType: 'preFill',
@@ -324,7 +324,7 @@ export const getParallelColumnsConfig = ($this) => {
     },
 
     {
-      label: '预计稀释液体积',
+      label: 'template.sp.sp00456.yjxsytj',
       prop: 'targetDiluentVolume',
       headerSelectKey: 'preDiluentVolumeUnit',
       fillType: 'preFill',
@@ -342,7 +342,7 @@ export const getParallelColumnsConfig = ($this) => {
       showBodySub: $this.fillType === 'preFill'
     },
     {
-      label: '实际稀释液体积',
+      label: 'template.sp.sp00456.sjxsytj',
       prop: 'actDiluentVolume',
       headerSelectKey: 'actDiluentVolumeUnit',
       fillType: 'preFill',
@@ -363,7 +363,7 @@ export const getLadderFormConfig = ($this) => {
       type: 'step',
       config: {
         startSolution: {
-          label: '起始源溶液',
+          label: 'template.sp.sp00456.qsyry',
           type: 'input',
           fillType: 'preFill',
           subType: 'clickable',
@@ -372,7 +372,7 @@ export const getLadderFormConfig = ($this) => {
           maxlength: 20
         },
         targetStartSolution: {
-          label: '预设起始源溶液浓度',
+          label: 'template.sp.sp00456.ysqsyrynd',
           type: 'inputNumber',
           subType: 'select',
           fillType: 'preFill',
@@ -381,7 +381,7 @@ export const getLadderFormConfig = ($this) => {
           maxlength: 10
         },
         targetAcSolution: {
-          label: '实际起始源溶液浓度',
+          label: 'template.sp.sp00456.sjqsyrynd',
           type: 'input',
           fillType: 'actFill',
           disabled: true,
@@ -389,7 +389,7 @@ export const getLadderFormConfig = ($this) => {
           compareTo: 'targetStartSolution', //比较哪个字段
         },
         solution: {
-          label: '稀释液',
+          label: 'template.sp.sp00456.xsy',
           type: 'input',
           fillType: 'preFill',
           subType: 'clickable',
@@ -398,7 +398,7 @@ export const getLadderFormConfig = ($this) => {
           maxlength: 20
         },
         stepStorageCondition: {
-          label: '存储条件',
+          label: 'template.sp.sp00456.cctj',
           type: 'select',
           fillType: 'preFill',
           options: $this.getDictOptions('business_cctj'),
@@ -406,7 +406,7 @@ export const getLadderFormConfig = ($this) => {
         },
 
         effectivePeriod: {
-          label: '目标溶液有效周期',
+          label: 'template.sp.sp00456.mbryyxzq',
           type: 'input',
           subType: 'select',
           subKey: 'effectivePeriodUnit',
@@ -414,7 +414,7 @@ export const getLadderFormConfig = ($this) => {
           subOptions: $this.getDictOptions('business_yxqdw')
         },
         expireDate: {
-          label: '目标溶液失效日',
+          label: 'template.sp.sp00456.mbrysxr',
           type: 'input'
         }
       }
@@ -429,23 +429,23 @@ export const getBaseInfoFormConfig = ($this) => {
       type: 'cardItem',
       config: {
         studyMc: {
-          label: '试验名称',
+          label: 'template.common.testName',
           type: 'input',
           disabled: true
         },
         studySn: {
-          label: '试验编号',
+          label: 'template.common.testNumber',
           type: 'input',
           disabled: true
         },
         methodCode: {
-          label: '方法编号',
+          label: 'template.common.methodCode',
           type: 'input',
           fillType: 'preFill',
           maxlength: 50
         },
         versionNum: {
-          label: '版本号',
+          label: 'template.common.versionNumber',
           type: 'inputNumber',
           fillType: 'actFill',
           prepend: 'V',
@@ -455,10 +455,10 @@ export const getBaseInfoFormConfig = ($this) => {
     },
     {
       type: 'conditionItem',
-      label: '试验配制条件',
+      label: 'template.common.testConfigurationConditions',
       config: {
         pre: {
-          label: '预填',
+          label: 'template.common.preFill',
           type: 'select',
           multiple: true,
           fillType: 'preFill',
@@ -466,7 +466,7 @@ export const getBaseInfoFormConfig = ($this) => {
           otherCode: 'preOther'
         },
         act: {
-          label: '实际',
+          label: 'template.common.actualFill',
           type: 'select',
           fillType: 'actFill',
           otherCode: 'actOther',
@@ -477,10 +477,10 @@ export const getBaseInfoFormConfig = ($this) => {
     },
     {
       type: 'conditionItem',
-      label: '容器材质',
+      label: 'template.sp.sp00456.rqcz',
       config: {
         containerMaterial: {
-          label: '容器材质',
+          label: 'template.sp.sp00456.rqcz',
           type: 'select',
           options: $this.getDictOptions('business_rqcz'),
           fillType: 'actFill',
@@ -491,14 +491,14 @@ export const getBaseInfoFormConfig = ($this) => {
     },
     {
       type: 'cellItem',
-      label: '处理时间',
+      label: 'template.common.configurationTime',
       config: {
         startDate: {
-          label: '开始时间',
+          label: 'template.common.startTime',
           type: 'input'
         },
         endDate: {
-          label: '结束时间',
+          label: 'template.common.endTime',
           type: 'input'
         }
       }
@@ -533,7 +533,7 @@ export const getStorageConditionFormConfig = ($this) => {
       type: 'conditionItem',
       config: {
         storageCondition: {
-          label: '存储条件',
+          label: 'template.sp.sp00456.cctj',
           type: 'select',
           fillType: 'preFill',
           options: $this.getDictOptions('business_cctj'),

src/views/business/comps/template/mixins/templateMixin.js

@@ -38,6 +38,7 @@ export default {
 			handler(v) {
 				if (v) {
 					const {
+						studySubjectId,
 						studyId,
 						studyMc,
 						studySn,
@@ -56,6 +57,7 @@ export default {
 					if (v.bdnr) {
 						this.formData = {
 							...JSON.parse(v.bdnr),
+							studySubjectId,
 							studyId,
 							studyMc,
 							studySn,
@@ -69,6 +71,7 @@ export default {
 						}
 					} else {
 						this.formData = {
+							studySubjectId,
 							studyId,
 							studyMc,
 							studySn,
@@ -109,6 +112,7 @@ export default {
 			formData: {},
 			templateDetail: {},
 			resource: [], //试验试剂信息
+			resourceTmp:[],//试验试剂信息提交用
 			sysjColumns: [
 				{ label: '试剂名称', prop: 'reagentName' },
 				{ label: '编号', prop: 'reagentCode' },
@@ -184,7 +188,7 @@ export default {
 			return null
 		},
 		getResource() {
-			return this.resource
+			return this.resourceTmp
 		},
 		//根据ref数组获取直接formData
 		getFilledFormDataByRefs(refArr = []) {

src/views/business/resource/gsp/comps/gsp/Xq.vue

@@ -129,7 +129,7 @@
 </template>
 
 <script>
-import { info, tzList, jcgjList } from "@/api/business/gsp/gsp"
+import { info, tzList, jcgjList, exportDetail } from "@/api/business/gsp/gsp"
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import html2canvas from 'html2canvas';
 import jsPDF from 'jspdf'
@@ -162,6 +162,13 @@ export default {
   },
   methods: {
     exportPDF() {
+      this.$modal.loading()
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0] }).then(response => {
+        window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
       // const canvas = await html2canvas(element, {
       //   scale: 2, // 提高清晰度
       //   useCORS: true, // 允许跨域图片

src/views/business/resource/gsp/comps/gspList.vue

@@ -23,21 +23,21 @@
           <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'" prop="jyzt">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
-              <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
-              <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
           <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'" prop="zjzt">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.resource.zjzt.rk')" :value="1" />
-              <el-option :label="$t('page.business.resource.zjzt.yff')" :value="3" />
-              <el-option :label="$t('page.business.resource.zjzt.ysd')" :value="5" />
-              <el-option :label="$t('page.business.resource.zjzt.dgd')" :value="7" />
-              <el-option :label="$t('page.business.resource.zjzt.gd')" :value="9" />
-              <el-option :label="$t('page.business.resource.zjzt.djd')" :value="11" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->

src/views/business/study/comp/suject.vue

@@ -23,7 +23,7 @@
     </div>
 
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="800px" append-to-body>
-      <el-table v-loading="infoDialog.loading" :data="infoDialog.list">
+      <el-table v-loading="infoDialog.loading" :data="infoDialog.list" height="500px">
         <el-table-column label="" type="index" width="50">
           <template slot-scope="scope">
             <el-checkbox v-model="scope.row.select"></el-checkbox>

src/views/business/study/comp/tbbd/Bj.vue

@@ -84,7 +84,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.tjjl')" :visible.sync="openApprove" width="1200px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px" v-if="openApprove">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password > </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row v-if="form.sftb == 1">
           <el-col :psna="24">
             <el-form-item>
@@ -166,16 +166,18 @@
           <el-col :psna="24">
             <el-form-item>
               <div>{{ $t('page.business.study.studyFormFill.yltj') }}</div>
-              <div v-for="(item, index) in resource" :key="'r' + index">
-                {{ item.bh }}
-                <el-input type="text" v-model="item.syl" maxlength="50" style="width: 250px;">
-                  <template slot="append">
-                    <div style="width: 70px;">
-                      <BusinessSelect v-model="item.syldw" dictType="business_tjdw">
-                      </BusinessSelect>
-                    </div>
-                  </template>
-                </el-input>
+              <div style=" display: flex;  flex-wrap: wrap;  gap: 16px;">
+                <div v-for="(item, index) in resource" :key="'r' + index" style=" flex: 0 0 calc(33.333% - 11px);">
+                  {{ item.bh }}
+                  <el-input type="text" v-model="item.syl" maxlength="50" style="width:150px;">
+                    <template slot="append">
+                      <div style="width: 20px;">
+                        <BusinessSelect v-model="item.syldw" :showMax="false" dictType="business_tjdw">
+                        </BusinessSelect>
+                      </div>
+                    </template>
+                  </el-input>
+                </div>
               </div>
             </el-form-item>
           </el-col>
@@ -208,7 +210,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input  type="password" show-password  v-model="formApprove.qmrmm" maxlength="20"
+              <el-input type="password" show-password v-model="formApprove.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -223,7 +225,7 @@
     <el-dialog :title="$t('page.business.study.studyFormFill.bcjl')" :visible.sync="openSave" width="600px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSave" :model="formSave" :rules="rulesSave" label-width="120px" v-if="openSave">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password > </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -252,7 +254,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input  type="password" show-password  v-model="formSave.qmrmm" maxlength="20"
+              <el-input type="password" show-password v-model="formSave.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>

src/views/business/study/comp/tbbd/Qrfz.vue

@@ -88,7 +88,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyymc: $t('page.business.study.studyFormFill.fztgjj'),
+        qmyymc: this.$t('page.business.study.studyFormFill.fztgjj'),
         qmyy: null,
         remark: null,
         qmrmm: null

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-          target: `http://39.99.251.173:8080`,
+        target: `http://localhost:8080`,
+          // target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''