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

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

@@ -282,10 +282,10 @@ export default {
 			//配置的试剂
 			tmpResource.push({
 				mc: content.targetName,
-				bh: content.targetCode,
+				bh: content.targetCode+content.targetCodeSn,
 				ph: '',
 				nd: content.targetActConcentration + content.targetActConcentrationUnit,
-				source: '配置',
+				source: 'ELN配制',
 				sxrq: content.expireDate,
 				ndz: content.targetActConcentration,
 				nddw: content.targetActConcentrationUnit,
@@ -293,6 +293,8 @@ export default {
 				kcdw: content.targetActVolumeUnit,
 				syl: null,
 				syldw:content.targetActVolumeUnit,
+				yxzq:content.effectivePeriod,
+				yxzqdw:content.effectivePeriodUnit,
 			})
 			//使用的试剂
 			this.resource=tmpResource

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

@@ -488,8 +488,12 @@ export default {
         if (valid) {
           that.$modal.loading()
           that.formApprove.resource = JSON.stringify(that.resource)
-          that.formApprove.czlist = JSON.stringify(that.czlist)
+          if(that.czlist.length>0){
+            that.formApprove.czlist = JSON.stringify(that.czlist)
+          }
+          if(that.cclist.length>0){
           that.formApprove.cclist = JSON.stringify(that.cclist)
+          }
           studyFormFill_tj(that.formApprove).then(response => {
             that.openApprove = false
             that.$modal.closeLoading()