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

src/lang/en/template/dl.js

@@ -391,7 +391,7 @@ export default {
     qxbd: '前序表单',
     pykssj: '培养开始时间',
     pyjssj: '培养结束时间',
-    jsButton: '培养结束时间',
+    jsButton: '结束',
     xbbh: '细胞编号'
   }
 }

src/views/business/comps/template/comps/dl/DL021.vue

@@ -293,6 +293,8 @@ export default {
 		},
 		getResource() {
 			let content = this.getFilledFormData();
+			let formData = this.formData;
+			debugger
 			let tmpYq = []
 			tmpYq.push({
 				mc: content.wxjmc,

src/views/business/comps/template/comps/dl/DL024.vue

@@ -160,17 +160,17 @@ export default {
               label: 'template.dl.dl024.pykssj',
               type: 'input',
               fillType: 'actFill',
-              subType: 'button',
-              subKey: 'pykssj',
-              buttonName: 'template.dl.dl024.jsButton',
+              disabled:true
             },
             pyjssj: {
               label: 'template.dl.dl024.pyjssj',
               type: 'input',
               fillType: 'actFill',
               subType: 'button',
-              subKey: 'pyjssj',
+              subKey: 'pyjssjbtn',
               buttonName: 'template.dl.dl024.jsButton',
+			  disabled: true,
+				subDisabled: this.fillType !== 'actFill'
             },
 					}
 				}
@@ -201,7 +201,7 @@ export default {
     handleClickButton(item,signData) {
 			const arrStr = item.subKey;
       const value = moment().format('YYYY/MM/DD HH:mm');
-      this.$refs.swypyjInfoRef.updateFormData(arrStr, value,{isUpdateRecord:true,signData});
+      this.$refs.swypyjInfoRef.updateFormData('pyjssj', value,{isUpdateRecord:true,signData});
 			// console.log(this.getFilledFormData())
 		},
     // 选择前置表单预留
@@ -222,11 +222,14 @@ export default {
           }
           // 从剂量组数据中提取细胞编号
           const itemData = stepTableFormData.map(item => ({
-            xbbh: item.targetSolutionCode+'-'+item.subTargetSolutionCode, // 细胞编号
+            xbbh: item.targetSolutionCode+item.subTargetSolutionCode, // 细胞编号
           }))
           // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
           this.$set(this.formData, 'stepTableFormData', itemData)
 
+		  
+		  this.$refs.swypyjInfoRef.updateFormData('pykssj', bdnr.pykssj);
+
           this.$message.success(`已从前序表单加载 ${itemData.length} 条细胞编号数据`)
         } catch (error) {
           this.$set(this.formData, 'stepTableFormData', [])