fix:[模板管理]优化

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

@@ -101,35 +101,12 @@ export default {
 		//获取填写完成的表单数据
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]);
-			//生成resource
-			let tmpResource = []
-			if (this.fillType === "actFill") {
-				//配置的试剂
-				tmpResource.push({
-					mc: content.targetName,
-					bh: content.targetCode + content.targetCodeSn,
-					ph: '',
-					ndz: content.targetActConcentration + content.targetActConcentrationUnit,
-					nd: content.targetActConcentration,
-					nddw: content.targetActConcentrationUnit,
-					ly: 'ELN配制',
-					sxrq: content.expireDate,
-					kc: content.targetActVolume,
-					kcdw: content.targetActVolumeUnit,
-					syl: null,
-					type: null,
-					elnType: this.product,
-					syldw: content.targetActVolumeUnit,
-					yxzq: content.effectivePeriod,
-					yxzqdw: content.effectivePeriodUnit,
-				})
-			}
-			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
-			this.yqResourceTmp = stepResource.yqResource||[]
 			return content;
 		},
+		getResource() {
+			let content = this.getFilledFormData();
+			return this.resourceTmp;
+		},
 		//保存
 		async onSave() {
 			let content =await this.$refs.fjRef.getFormData();

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -333,7 +337,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode+ fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -376,7 +380,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -384,7 +387,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -405,7 +408,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode+ item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -351,10 +351,10 @@ export default {
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "tableRef", "stepRef",
 			 "rongyeTableRef", "rongyeStepFormPackageRef", "remarkRef"]);
-
-			if(!content) {
-				return false;
-			}
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -410,7 +410,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode+ fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -524,7 +524,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -573,7 +573,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = this.getFilledFormData();
@@ -595,7 +595,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode+ item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode+ fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -277,6 +277,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -330,7 +334,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -373,7 +377,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -381,7 +384,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -402,7 +405,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,7 +279,11 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
-			//生成resource
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+				//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
 				let tableList = content.stepTableFormData
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -279,6 +279,10 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
@@ -332,7 +336,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode + fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -375,7 +379,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -383,7 +386,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -404,7 +407,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode + item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})

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

@@ -280,7 +280,11 @@ export default {
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef","tableRef" ,"stepRef", "remarkRef"]);
-			//生成resource
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+            //生成resource
 			let tmpResource = []
 			if(this.fillType === "actFill"){
 				let tableList = content.stepTableFormData
@@ -333,7 +337,7 @@ export default {
 								let fzItem = item.fzsj.fzList[j]
 								tmpResource.push({
 									mc: null,
-									bh: item.fzsj.mybh+fzItem.preCode,
+									bh: item.fzsj.mybh+fzItem.preCode+ fzItem.subCode,
 									ph: null,
 									ndz: item.hhwznd + content.headerSelectFields.hhwzndUnit,
 									nd: item.hhwznd,
@@ -376,7 +380,6 @@ export default {
 					}
 				}
 			}
-			debugger
 			if(tmpResource.length>0){
 				tmpResource = uniqeResourceOne(tmpResource)
 			}
@@ -384,7 +387,7 @@ export default {
 			const stepResource = this.$refs.stepRef.getStepResource()
 			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			this.yqResourceTmp = stepResource.yqResource||[]
-			return content;
+			return this.resourceTmp;
 		},
 		async onSave() {
 			const formData = await this.getFilledFormData();
@@ -405,7 +408,7 @@ export default {
 				for(let i=0;i<val.fzsj.fzList.length;i++){
 					let item = val.fzsj.fzList[i]
 					list.push({
-						bh:val.fzsj.mybh+item.preCode,
+						bh:val.fzsj.mybh+item.preCode+ item.subCode,
 						kc:item.num,
 						kcdw:val.fzsj.dw,
 					})