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

src/utils/calUnitTools.js

@@ -28,6 +28,9 @@ export function addTj(valueArr, unitArr) {
 }
 
 export function addDecimals(a, b) {
+  if (Number.isNaN(a) || Number.isNaN(b)) {
+    return 0
+  }
   const strA = a.toString()
   const strB = b.toString()
 
@@ -43,6 +46,9 @@ export function addDecimals(a, b) {
 }
 
 export function multiplyDecimals(a, b) {
+  if (Number.isNaN(a) || Number.isNaN(b)) {
+    return 0
+  }
   const strA = a.toString()
   const strB = b.toString()
 

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

@@ -288,23 +288,25 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
-			//配置的试剂
-			tmpResource.push({
-				mc: content.targetName,
-				bh: content.targetCode+content.targetCodeSn,
-				ph: '',
-				nd: content.targetActConcentration + content.targetActConcentrationUnit,
-				source: 'ELN配制',
-				sxrq: content.expireDate,
-				ndz: content.targetActConcentration,
-				nddw: content.targetActConcentrationUnit,
-				kc: content.targetActVolume,
-				kcdw: content.targetActVolumeUnit,
-				syl: null,
-				syldw:content.targetActVolumeUnit,
-				yxzq:content.effectivePeriod,
-				yxzqdw:content.effectivePeriodUnit,
-			})
+			if(this.fillType === "actFill"){
+				//配置的试剂
+				tmpResource.push({
+					mc: content.targetName,
+					bh: content.targetCode+content.targetCodeSn,
+					ph: '',
+					nd: content.targetActConcentration + content.targetActConcentrationUnit,
+					source: 'ELN配制',
+					sxrq: content.expireDate,
+					ndz: content.targetActConcentration,
+					nddw: content.targetActConcentrationUnit,
+					kc: content.targetActVolume,
+					kcdw: content.targetActVolumeUnit,
+					syl: null,
+					syldw:content.targetActVolumeUnit,
+					yxzq:content.effectivePeriod,
+					yxzqdw:content.effectivePeriodUnit,
+				})
+			}
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -324,34 +324,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -423,56 +423,57 @@ export default {
 			}
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
-			}
 
-			tableList = content.stepTableFormData_1
-			if(tableList && tableList.length>0){
-				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_1.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields_1.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+				tableList = content.stepTableFormData_1
+				if(tableList && tableList.length>0){
+					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_1.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields_1.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
 			//使用的试剂

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

@@ -336,35 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -336,34 +336,34 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
+			if(this.fillType === "actFill"){
+				let tableList = content.stepTableFormData
+				if(tableList && tableList.length>0){
+					for(let i=0;i<tableList.length;i++){
+						//配置的试剂
+						let item = tableList[i]
 
-			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.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
 
-					const { total, unit } = addTj([item.sjjzxql, item.sjryxql], [content.headerSelectFields.sjjzxqlUnit, content.headerSelectFields.sjryxqlUnit])
-
-					tmpResource.push({
-						mc: null,
-						bh: item.bh+item.bhCode,
-						ph: null,
-						nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
-						source: 'ELN配制',
-						sxrq: null,
-						ndz: item.hhwznd,
-						nddw: content.headerSelectFields.hhwzndUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw:unit,
-						yxzq:null,
-						yxzqdw:null,
-					})
+						tmpResource.push({
+							mc: null,
+							bh: item.bh+item.bhCode,
+							ph: null,
+							nd: item.hhwznd + content.headerSelectFields.hhwzndUnit,
+							source: 'ELN配制',
+							sxrq: null,
+							ndz: item.hhwznd,
+							nddw: content.headerSelectFields.hhwzndUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw:unit,
+							yxzq:null,
+							yxzqdw:null,
+						})
+					}
 				}
 			}
-
 			//使用的试剂
 			this.resourceTmp=tmpResource
 			return content;

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

@@ -285,23 +285,25 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
-			//配置的试剂
-			tmpResource.push({
-				mc: content.targetName,
-				bh: content.targetCode+content.targetCodeSn,
-				ph: '',
-				nd: content.targetActConcentration + content.targetActConcentrationUnit,
-				source: 'ELN配制',
-				sxrq: content.expireDate,
-				ndz: content.targetActConcentration,
-				nddw: content.targetActConcentrationUnit,
-				kc: content.targetActVolume,
-				kcdw: content.targetActVolumeUnit,
-				syl: null,
-				syldw:content.targetActVolumeUnit,
-				yxzq:content.effectivePeriod,
-				yxzqdw:content.effectivePeriodUnit,
-			})
+			if(this.fillType === "actFill"){
+				//配置的试剂
+				tmpResource.push({
+					mc: content.targetName,
+					bh: content.targetCode+content.targetCodeSn,
+					ph: '',
+					nd: content.targetActConcentration + content.targetActConcentrationUnit,
+					source: 'ELN配制',
+					sxrq: content.expireDate,
+					ndz: content.targetActConcentration,
+					nddw: content.targetActConcentrationUnit,
+					kc: content.targetActVolume,
+					kcdw: content.targetActVolumeUnit,
+					syl: null,
+					syldw:content.targetActVolumeUnit,
+					yxzq:content.effectivePeriod,
+					yxzqdw:content.effectivePeriodUnit,
+				})
+			}
 			//使用的试剂
 			this.resourceTmp=tmpResource