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

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

@@ -259,10 +259,8 @@ export default {
 	methods: {
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
-			//生成resource todo 已经提交，再次编辑需要合并,通过编号关联 
-			// type（1：试剂；3：供试品；5：给药制剂；7：麻精药）,syl（使用量）syldw（使用量单位）
+			//生成resource
 			let tmpResource = []
-             debugger
 			//配置的试剂
 			tmpResource.push({
 				mc: content.targetName,
@@ -270,12 +268,10 @@ export default {
 				ph: '',
 				nd: content.targetActConcentration + content.targetActConcentrationUnit,
 				source: '配置',
-				type: 1,
-
 				sxrq: content.expireDate,
 				ndz: content.targetActConcentration,
 				nddw: content.targetActConcentrationUnit,
-				kc: content.targetActVolume*content.targetActConcentration,
+				kc: content.targetActVolume,
 				kcdw: content.targetActVolumeUnit,
 				syl: null,
 				syldw:content.targetActVolumeUnit,

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

@@ -85,7 +85,7 @@
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
-        <el-row>
+        <el-row v-if="form.sftb==1">
           <el-col :psna="24">
             <el-form-item>
               <div><el-checkbox v-model="formApprove.sfcz" @change="sfczChange">{{
@@ -144,7 +144,7 @@
                           <div style="display: flex; margin-left: 10px;">
                             <div> 存储位置：</div>
                             <div>
-                              <BusinessSelect v-model="citem.ccfs" dictType="business_ccwz" style="width: 200px;">
+                              <BusinessSelect v-model="citem.ccwz" dictType="business_ccwz" style="width: 200px;">
                               </BusinessSelect>
                             </div>
                           </div>
@@ -337,7 +337,7 @@ export default {
         this.showIndex = 1
         this.$modal.loading()
         study_info({ id: studyId }).then(response => {
-          this.form = _.merge({}, this.form, { stydyId: studyId, resourceStudy: response.data.resource })
+          this.form = _.merge({}, this.form, { stydyId: studyId, resourceStudy: response.data.resource,sftb:1 })
           this.$modal.closeLoading()
         })
       }