fix:[模板管理]优化

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

@@ -202,6 +202,8 @@ export default {
 					nd: rowData.actSolutionConcentration || 0,
 					nddw: headerSelectFields.actSolutionConcentrationUnit,
 					studySubjectId: this.formData.studySubjectId,
+			     	studyId:this.formData.studyId,
+				    studyFormId:this.formData.id,
 					list: list
 				}
 				this.subPackageRequest(postData);
@@ -213,6 +215,8 @@ export default {
 			let postData = {
 				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
 				studySubjectId: this.formData.studySubjectId,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
 			}
 			this.startConfigRequest(postData);
 		},
@@ -227,6 +231,8 @@ export default {
 				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
 				nddw: headerSelectFields.actSolutionConcentrationUnit,
 				studySubjectId: this.formData.studySubjectId,
+				studyId:this.formData.studyId,
+				studyFormId:this.formData.id,
 				kc: total,
 				kcdw: unit,
 			}
@@ -562,8 +568,11 @@ export default {
 				return false;
 			}
 			let content = this.getFilledFormData();
-			//生成resource
-			debugger
+			return content;
+		},
+		getResource(){
+			let content = this.getFilledFormData();
+            //生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
 				//阶梯配置
@@ -744,7 +753,7 @@ export default {
 			this.yqResourceTmp = stepResource.yqResource || []
 
 			this.resourceTmp = tmpResource
-			return content;
+			return this.resourceTmp;
 		},
 		getStepResource() {
 			const sjResource = [], yqResource = [];

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

@@ -645,32 +645,30 @@ export default {
     },
     async showYjcc() {
       let that = this
-      let content = await that.$refs.templateTable.getFormData()
-      if (content) {
-        that.resetYjcc()
-        that.formYjcc.id = that.form.id
-        that.cclistYj = []
-        that.addCcYj()
-        let resource = that.$refs.templateTable.getResource()
-        let tmp = _.filter(resource, function (o) {
-          return o.type == null || o.type == 3 || o.type == 5 || o.type == 7
+      that.resetYjcc()
+      that.formYjcc.id = that.form.id
+      that.cclistYj = []
+      that.addCcYj()
+      let resource = that.$refs.templateTable.getResource()
+      debugger
+      let tmp = _.filter(resource, function (o) {
+        return o.type == null || o.type == 3 || o.type == 5 || o.type == 7
+      })
+      if (tmp.length > 0) {
+        that.$modal.loading()
+        studyFormFill_yjccFilter({ id: this.form.id, resource: JSON.stringify(tmp) }).then(response => {
+          let tmpResource = JSON.parse(response.msg)
+          if (tmpResource.length > 0) {
+            that.resourceYj = tmpResource
+            that.openYjcc = true
+          } else {
+            that.$modal.msgError("没有可存储的药剂")
+          }
+        }).finally(() => {
+          that.$modal.closeLoading()
         })
-        if (tmp.length > 0) {
-          that.$modal.loading()
-          studyFormFill_yjccFilter({ id: this.form.id, resource: JSON.stringify(tmp) }).then(response => {
-            let tmpResource = JSON.parse(response.msg)
-            if (tmpResource.length > 0) {
-              that.resourceYj = tmpResource
-              that.openYjcc = true
-            } else {
-              that.$modal.msgError("没有可存储的药剂")
-            }
-          }).finally(() => {
-            that.$modal.closeLoading()
-          })
-        } else {
-          that.$modal.msgError("没有可存储的药剂")
-        }
+      } else {
+        that.$modal.msgError("没有可存储的药剂")
       }
     },
     resetYjcc() {
@@ -818,8 +816,8 @@ export default {
             this.$modal.msgError("请选择要处置的药剂")
           } else {
             for (var i = 0; i < that.cclistYj.length; i++) {
-              if (!that.cclistYj[i].ccwz||that.cclistYj[i].ccwz=='') {
-                this.$modal.msgError('第'+(i+1) + "个存储,存储位置不能为空")
+              if (!that.cclistYj[i].ccwz || that.cclistYj[i].ccwz == '') {
+                this.$modal.msgError('第' + (i + 1) + "个存储,存储位置不能为空")
                 return
               }
               if (!that.cclistYj[i].cctj || that.cclistYj[i].cctj == '') {