feat:[模板管理][update]

src/components/Template/BaseInfoFormPackage.vue

@@ -466,22 +466,30 @@ export default {
         },
         // 获取按钮项
         getThirdButtonItem(sItem) {
-            return {
+            const o = 
+            {
                 ...sItem,
                 key: sItem.thirdKey,
-                disabled: sItem.thirdDisabled,
                 buttonName: sItem.thirdButtonName,
                 fillType: sItem.thirdFillType || sItem.fillType
             }
+            if(sItem.hasOwnProperty("thirdDisabled")){
+                o.disabled = sItem.thirdDisabled;
+            }
+            return o;
         },
         getFourthButtonItem(sItem) {
-            return {
+            const o = 
+            {
                 ...sItem,
                 key: sItem.fourthKey,
                 buttonName: sItem.fourthButtonName,
-                disabled: sItem.fourthDisabled,
                 fillType: sItem.fourthFillType || sItem.fillType
             }
+            if(sItem.hasOwnProperty("fourthDisabled")){
+                o.disabled = sItem.fourthDisabled;
+            }
+            return o;
         },
         // 处理fqyq变化
         onFqyqChange(key, e) {

src/components/Template/Step.vue

@@ -10,7 +10,7 @@
 						<HandleFormItem type="select" placeholder="请选择" class="step-type-select" :item="stepSelectConfig"
 							v-model="step.type" @change="onTypeChange(index)" />
 						<!-- 根据步骤类型显示对应的表单 -->
-						<component class="flex1" :sn="step.type" :is="getStepComponent(step.type)" :formData="step.formData"
+						<component class="flex1" :sn="step.type" :is="getStepComponent(step.type)" :formData="step.formData" :formIndex="formIndex" :formType="formType"
 							@update="onFormUpdate(index, $event)" :stepIndex = "prefixKey + index" :ref="'stepCompRef_' + index">
 						</component>
 						<div v-if="templateFillType === 'preFill'" class="step-header-item">
@@ -366,6 +366,14 @@ export default {
 		prefixKey: {
 			type: String,
 			default: ''
+		},
+		formIndex: {
+			type: Number,
+			default: ''
+		},
+		formType: {
+			type: String,
+			default: ''
 		}
 	},
 	provide() {

src/components/Template/StepComponents/JcbComp.vue

@@ -56,11 +56,11 @@ export default {
             return [
                 {
                     label: '处理批',
-                    prop: 'clp',
+                    prop: 'mc',
                     width: '200px',
                     bodyType: "jcb",
                     bodyKey: "clpClick",
-                    bodyFillType: this.type==="qb"?"preFill":"detail",
+                    bodyFillType: "preFill",
                 },
                 {
                     label: '时间',
@@ -84,7 +84,7 @@ export default {
             const { dataSource = [] } = data;
             const tableRef = this.$refs['tableRef'];
             if (tableRef) {
-                tableRef.addRow({ clp: '', time: '' ,id:getuuid(),rowIndex:dataSource.length});
+                tableRef.addRow({ mc: '', time: '' ,id:getuuid(),rowIndex:dataSource.length});
                 // 添加行后触发数据变化
                 this.onDataChange();
             }
@@ -116,9 +116,9 @@ export default {
             return validateResult;
         },
         // 点击按钮事件
-        handleClickButton(key, rowIndex) {
+        handleClickButton(key, rowIndex,colIndex,e,data) {
             if (key === 'timeClick') {
-                this.$refs['tableRef'].updateDataSourceByRowIndex(rowIndex, { time: moment().format("YYYY-MM-DD HH:mm:ss") })
+                this.$refs['tableRef'].updateDataSourceByRowIndex(rowIndex, { time: moment().format("YYYY-MM-DD HH:mm:ss") },{signData:data,updateFields:['time']})
                 this.onDataChange();
             }
         },

src/components/Template/StepComponents/stepNameConfig.js

@@ -0,0 +1,208 @@
+const result = {
+  czdd: "操作地点",
+  czhj: "操作环境",
+  xzrq: "选择容器",
+  jrry: "加入溶液",
+  tpjysd: "天平校验（双点）",
+  tpjydd: "天平校验（单点）",
+  zlfz: "质量分装",
+  qywz: "取用物质",
+  clcz: "称量（传值）",
+  clfcz: "称量（非传值）",
+  bdtj: "标定（体积）",
+  bdzl: "标定（质量）",
+  tjphcz: "调节PH（传值）",
+  tjphfcz: "调节PH（非传值）",
+  lx: "离心",
+  ym: "研磨",
+  ddhy: "颠倒混匀",
+  jrjb: "加热搅拌",
+  jb: "搅拌",
+  cs: "超声",
+  sy: "水浴",
+  zy: "正压",
+  dc: "氮吹",
+  glzd: "过滤（自动）",
+  glsd: "过滤（手动）",
+  jz: "静置",
+  jd: "解冻",
+  fy: "孵育",
+  qcyy: "取出原药",
+  frdrq: "复溶（多容器）",
+  fr: "复溶",
+  hb: "合并",
+  rs: "染色",
+  js: "计数",
+  mj: "灭菌",
+  fs: "复苏",
+  fb: "封板",
+  wxhy: "涡旋混匀",
+  zyhy: "振摇混匀",
+  hwhy: "恒温混匀",
+  kbyq: "空白（仪器）",
+  kbsjgsp: "空白（试剂/供试品）",
+  kb: "空白",
+  jr: "加热",
+  fz: "分装",
+  jrry_b: "加入溶液",
+  cl: "称量",
+  lx_b: "离心",
+  cs_b: "超声",
+  ddhy_b: "颠倒混匀",
+  wxhy_b: "涡旋混匀",
+  zyhy_b: "振摇混匀",
+  hwhy_b: "恒温混匀",
+  jb_b: "搅拌",
+  jrjb_b: "加热搅拌",
+  sy_b: "水浴",
+  zy_b: "正压",
+  dc_b: "氮吹",
+  glzd_b: "过滤（自动）",
+  glsd_b: "过滤（手动）",
+  jz_b: "静置",
+  jd_b: "解冻",
+  fy_b: "孵育",
+  fr_b: "复溶",
+  jd_swypfx: "解冻",
+  jryp: "加入样品",
+  ysfy: "衍生反应",
+  hhspe: "活化（SPE）",
+  phspe: "平衡（SPE）",
+  syspe: "上样（SPE）",
+  lxspe: "淋洗（SPE）",
+  xtspe: "洗脱（SPE）",
+  zyfc: "转移（分层）",
+  jszz: "剪碎组织",
+  cqzz: "称取组织",
+  jryjry: "加入匀浆溶液",
+  ymyj: "研磨匀浆",
+  yjyfz2: "匀浆液分装2",
+  yjyfz3: "匀浆液分装3",
+  yjbc: "匀浆保存",
+  yjyhh: "匀浆液混合",
+  fy_spyjzzb: "孵育",
+  jz_spyjzzb: "静置",
+  ddhy_qxwdx: "颠倒混匀",
+  hwph: "恒温平衡",
+  qxfz: "全血分装",
+  qxjz: "全血静置",
+  qxlx: "全血离心",
+  qxqy: "全血取样",
+  jzhlx: "静置后离心",
+  fq2: "分取2",
+  fq3: "分取3",
+  hh: "混合",
+  qx: "清洗",
+  zc: "暂存",
+  qy: "弃液",
+  sjjy: "试剂加样",
+  jryp_pcr: "加入样品",
+  bzyp: "补足样品",
+  jz_pcr: "静置",
+  nscyp: "NSC样品",
+  qrhy: "轻柔混匀",
+  pebwfz: "PE板位放置",
+  tgbwfz: "天根板位放置",
+  lsbwfz: "罗氏板位放置",
+  tqsj: "提取上机",
+  lssj: "罗氏上机",
+  yqzt: "仪器暂停",
+  ecsj: "二次上机",
+  czclcl: "磁珠残留处理",
+  ypzy: "样品转移",
+  lx_pcr: "离心",
+  hsypfz: "核酸样品分装",
+  ypbc: "样品保存",
+  jd_pcr: "解冻",
+  sjjyst: "试剂加样（手提）",
+  ddhy_pcr: "颠倒混匀",
+  wxhy_pcr: "涡旋混匀",
+  sy_pcr: "水浴",
+  sslx: "瞬时离心",
+  xfzcl: "吸附柱处理",
+  lxdy: "离心（倒液）",
+  xfzzysjg: "吸附柱转移（收集管）",
+  xfzzylxg: "吸附柱转移（离心管）",
+  xt: "洗脱",
+  ecxt: "二次洗脱",
+  ndcd: "浓度测定",
+  jrry_pcrcjg: "加入溶液",
+  jszz_pcryj: "剪碎组织",
+  cqzz_pcryj: "称取组织",
+  jryjry_pcryj: "加入匀浆溶液",
+  xs: "稀释",
+  sjjy_pcrfxyp: "试剂加样",
+  jryp_pcrfxyp: "加入样品",
+  fmlx: "封膜离心",
+  pcrsj: "PCR上机",
+  pbsz: "排版设置",
+  cbygxz: "参比荧光选择",
+  yxpcry: "运行PCR仪",
+  cdnsypfz: "cDNA样品分装",
+  bb: "包被",
+  xb: "洗板",
+  fb_jcb: "封闭",
+  jy: "加样",
+  zh: "中和",
+  jjcsj: "加检测试剂",
+  sj: "酸解",
+  sjjy_jcb: "酸解加样",
+  zhfy: "中和孵育",
+  ecsj_jcb: "二次酸解",
+  xs_jcb: "显色",
+  zz: "终止",
+  jc: "检测",
+  dbmby: "读板（酶标仪）",
+  dbhxfgxt: "读板（化学发光系统）",
+  dbdhxfgxt: "读板（电化学发光系统）",
+  dbygxt: "读板（荧光系统）",
+  dzacl: "读值（ACL）",
+  qb: "取板",
+  jzks: "静置开始",
+  fyxks: "孵育箱开始",
+  ycfyks: "摇床孵育开始",
+  ycks: "摇床开始",
+  js_jcb: "结束",
+  fm: "覆膜",
+  pg: "拍干",
+  czqx: "磁珠清洗",
+  czzx: "磁珠重悬",
+  ychy: "摇床混匀",
+  czzy: "磁珠转移",
+  sjbj: "试剂标记",
+  qxb: "取细胞",
+  qjz: "取菌株",
+  fr_xbjzpz: "复溶",
+  lxqy: "离心（弃液）",
+  cd: "吹打",
+  xbzy: "细胞转移",
+  jzzy: "菌株转移",
+  dypyy: "倒原培养液",
+  xd: "洗涤",
+  xh: "消化",
+  zzxh: "终止消化",
+  copy: "CO2培养",
+  gc: "观察",
+  cdmd: "测定密度",
+  ds: "低渗",
+  gd: "固定",
+  cdxs: "传代/稀释",
+  gc_xb: "观察",
+  xdlc: "洗涤（2次）",
+  bzpyy: "补足培养液",
+  xh_xb: "消化",
+  jrrydh: "加入溶液（多行）",
+  gd_xb: "固定",
+  rs_xb: "染色",
+  bpqr: "破片确认",
+  dp: "滴片",
+  bprs: "破片染色",
+  cx: "冲洗",
+  lg: "晾干",
+  hygh: "混匀固化",
+  hwzd: "恒温振荡",
+  jbcpyj: "加表层培养基",
+  xs_ptjhfxyp: "稀释"
+};
+
+export default result

src/components/Template/StepFormPackage.vue

@@ -53,7 +53,7 @@
                         @onSubPackageSubmit="onSubPackageSubmit(key) "
                         :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @update="(data)=>onSubPackageUpdate(data,key)" :subData = "formFields[key]" :ref="'zlSubPackageRef_'+key" />
                 </template>
-                <template v-else-if="sItem.type === 'qb' || (sItem.type === 'dcjcb' && templateFillType === 'actFill')">
+                <template v-else-if="isShowJcb(sItem,key)">
                     <JcbComp @update="(data)=>onJcbUpdate(data,key)" :type = "sItem.type" :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :item="sItem" :formData="formData[key]" />
                 </template>
             
@@ -126,6 +126,10 @@ export default {
         }
     },
     methods: {
+        isShowJcb(item,key){
+            const {stepTableFormData = []} = this.formData[key] || {};
+            return item.type === 'qb' || (item.type === 'dcjcb' && stepTableFormData.length > 0);
+        },
         // 子组件提交处理方法
         onSubPackageSubmit(key){
             this.$emit("onSubPackageSubmit", {key,formData:this.formFields});

src/components/Template/mixins/stepMixins.js

@@ -4,8 +4,11 @@ import { getLatestSn, getLatestSnArr } from '@/api/template'
 export default {
 	inject: {
 		templateFillType: { default: 'preFill' },
+		templateSn: { default: '' },
 		getStepData: { default: () => null },
-		getMybh: { default: () => null }
+		getJcbData: { default: () => null },
+		getMybh: { default: () => null },
+		getMybhByIndex: { default: (index) => null }
 	},
 	dicts: [
 		'business_tjdw',
@@ -32,6 +35,14 @@ export default {
 		stepIndex: {
 			type: String,
 			default: ''
+		},
+		formIndex: {
+			type: Number,
+			default: ''
+		},
+		formType: {
+			type: String,
+			default: ''
 		}
 	},
 	data() {
@@ -56,31 +67,33 @@ export default {
 
 	methods: {
 		//处理jcb更新
-		commonHandleJcbUpdate(){
+		commonHandleJcbUpdate() {
 			this.localFormData = this.formData;
-			console.log(this.formData,"fff")
-			if(!this.formData.jcb){
+			if (!this.formData.jcb && this.templateFillType === 'actFill') {
 				const qbData = this.getQbData();
-				console.log(qbData,"qbData")
-				this.localFormData = {...this.localFormData, jcb: qbData};
+				this.localFormData = { ...this.localFormData, jcb: qbData };
 				justUpdateFilledFormData();
 			}
 		},
 		//获取取板数据
-		getQbData(){
+		getQbData() {
 			let qbData = [];
-			if(this.templateFillType === 'actFill'){
+			if (this.templateSn === "LBA003") {//只有lba003才会有取板步骤，所以检测板数据从取板数据里面获取；
 				const stepData = this.getStepData() || [];
-				const filterData = stepData.filter((item)=>item.type === "qb");
+				const filterData = stepData.filter((item) => item.type === "qb");
 				const allQbData = [];
-				filterData.forEach((item)=>{
-					const {stepTableFormData = []} = item.formData.qb || {};
-					allQbData.push(...stepTableFormData);
+				filterData.forEach((item) => {
+					const { stepTableFormData = [] } = item.formData.qb || {};
+					const parseData = JSON.parse(JSON.stringify(stepTableFormData));
+					allQbData.push(...parseData);
 				})
-				qbData = [...new Map(allQbData.map(item => [item.clp, item])).values()]
-
+				qbData = [...new Map(allQbData.map(item => [item.mc, item])).values()]
+			} else if (this.templateSn === "LBA002") {//lba002没有取板步骤，所以检测板数据从检测板数据里面获取；
+				const {stepTableFormData=[]} = this.getJcbData() || {};
+				qbData = JSON.parse(JSON.stringify(stepTableFormData));
 			}
-			return {stepTableFormData: qbData}
+
+			return { stepTableFormData: qbData }
 		},
 		//回填编号 preField 前缀 updateField 需要更新的字段
 		async handleBackfillCode(preField, updateField) {
@@ -142,11 +155,17 @@ export default {
 			if (buttonName === '分装') {
 				const stepFormData = this.getFilledFormData()
 				const fzInfo = stepFormData.fzInfo || this.formData.fzInfo;
-				let fields = [],options = []
+				let fields = [], options = []
 				let maxVolume, maxVolumeUnit;
-				if (this.getMybh && this.getMybh()) {
-					const { mybh,mybhOptions=[], maxVolume:max, maxVolumeUnit:unit } = this.getMybh()
-					if((!mybh &&!mybhOptions.length) || !max || !unit){
+				if (this.getMybh || this.getMybhByIndex) {//某些表单的步骤需要分装表单上的数据
+					let result = {};
+					if(this.getMybh){
+						result = this.getMybh()
+					}else if(this.getMybhByIndex){
+						result = this.getMybhByIndex(this.formIndex,this.formType)
+					}
+					const { mybh, mybhOptions = [], maxVolume: max, maxVolumeUnit: unit } = result
+					if ((!mybh && !mybhOptions.length) || !max || !unit) {
 						this.$message.warning('请先填写分装数据')
 						return
 					}
@@ -171,7 +190,7 @@ export default {
 					fzType: 'step',
 					...fzInfo,
 					maxVolume,
-					mybhOptions:options,
+					mybhOptions: options,
 					maxVolumeUnit,
 					uuid: this.uuid,
 				})

src/views/business/comps/template/TemplateTable.vue

@@ -381,6 +381,7 @@ export default {
       //分发给子组件的fillType
       templateData: this.templateData,
       templateFillType: this.fillType,
+      templateSn: this.sn,
       getZdxgjl: () => this.zdxgjl,
       getSubmittedCodes: () => this.submittedCodes,
       getFhyjjl: () => this.fhyjjl,

src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue

@@ -36,6 +36,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -71,6 +72,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 配制条件
 		storageFormConfig() {

src/views/business/comps/template/comps/gsp/GSP001.vue

@@ -35,6 +35,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -70,6 +71,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 配制条件
 		storageFormConfig() {
@@ -156,7 +165,7 @@ export default {
 							label: 'template.common.actualFill',
 							type: "select",
 							fillType: "actFill",
-							otherCode: "actOther",otherCodeCompareTo: "preOther",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
 							multiple: true,
 							compareTo: "pre",
 							options: this.getDictOptions('business_pztj')
@@ -327,8 +336,8 @@ export default {
 				for (let i = 0; i < this.formData.formConfigs.length; i++) {
 					const formData = this.$refs[`formConfigStepFormPackageRef_${i}`][0].getFilledFormData();
 					const stepData = this.$refs[`formStepRef_${i}`][0].getFilledFormData();
-					if(this.formData.startDate&&formData.effectivePeriod&&formData.effectivePeriodUnit){
-					   formData.expireDate=getExpireDate(this.formData.startDate, formData.effectivePeriod, formData.effectivePeriodUnit)
+					if (this.formData.startDate && formData.effectivePeriod && formData.effectivePeriodUnit) {
+						formData.expireDate = getExpireDate(this.formData.startDate, formData.effectivePeriod, formData.effectivePeriodUnit)
 					}
 					formConfigsData.push({
 						...formData,

src/views/business/comps/template/comps/gsp/GSP003.vue

@@ -41,6 +41,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -76,6 +77,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 计算公式
 		calcFormConfig() {

src/views/business/comps/template/comps/gsp/GSP005.vue

@@ -40,13 +40,13 @@
 							</div>
 							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 								:ref="`formZlConfigFormPackageRef_${zlIndex}`" :formConfig="formZlConfig"
+								:prefixKey="'formzl_' + zlIndex"
 								@beforeReagentSubmit="(data) => onTableBeforeReagentZlSubmit(data, zlIndex, formZlConfig)"
 								@onRegentSubmit="(data) => onTableRegentZlSubmit(zlIndex, data)"
-								@clickButton="(data) => onClickButtonZl(zlIndex, data)"
-								:formData="formzlConfig" />
+								@clickButton="(data) => onClickButtonZl(zlIndex, data)" :formData="formzlConfig" />
 							<Step class="mt-0 s-container" :ref="`formZlStepRef_${zlIndex}`"
 								:formData="formzlConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
-								:prefixKey="'form_' + zlIndex"></Step>
+								:formIndex="zlIndex" formType="formZl" :prefixKey="'form_' + zlIndex"></Step>
 							<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
 								@click="zlJspz(zlIndex)">{{ $t('template.gsp.GSP005.jspz') }}</el-button>
 						</div>
@@ -69,12 +69,13 @@
 							</div>
 							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 								:ref="`formRyConfigFormPackageRef_${ryIndex}`" :formConfig="formRyConfig"
+								:prefixKey="'formry_' + ryIndex"
 								@beforeReagentSubmit="(data) => onTableBeforeReagentRySubmit(data, ryIndex, formRyConfig)"
 								@onRegentSubmit="(data) => onTableRegentRySubmit(ryIndex, data)"
 								:formData="formryConfig" />
 							<Step class="mt-0 s-container" :ref="`formRyStepRef_${ryIndex}`"
 								:formData="formryConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
-								:prefixKey="'form_' + ryIndex"></Step>
+								:formIndex="ryIndex" formType="formRy" :prefixKey="'form_' + ryIndex"></Step>
 							<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
 								@click="ryJspz(ryIndex)">{{ $t('template.gsp.GSP005.jspz') }}</el-button>
 						</div>
@@ -113,6 +114,20 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index, type) => {
+				if (type === 'formZl') {
+					const data = this.$refs[`formZlConfigFormPackageRef_${index}`][0].getFilledFormData()
+					return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+
+				} else {
+					const data = this.$refs[`formRyConfigFormPackageRef_${index}`][0].getFilledFormData()
+					return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+				}
+			}
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {
@@ -181,7 +196,7 @@ export default {
 							label: 'template.common.actualFill',
 							type: "select",
 							fillType: "actFill",
-							otherCode: "actOther",otherCodeCompareTo: "preOther",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
 							multiple: true,
 							compareTo: "pre",
 							options: this.getDictOptions('business_pztj')
@@ -352,7 +367,7 @@ export default {
 							fourthType: "button",
 							fourthKey: "sywzsjclzButtonValue",
 							fourthFillType: "actFill",
-							fourthButtonName:"获取值",
+							fourthButtonName: "获取值",
 							isClearForm: true,
 							thirdOptions: this.getDictOptions('business_zldw'),
 							maxlength: 10
@@ -631,8 +646,8 @@ export default {
 		}
 	},
 	methods: {
-		onClickButtonZl(zlIndex, data){
-		   this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzsjclzValue', 1)
+		onClickButtonZl(zlIndex, data) {
+			this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzsjclzValue', 1)
 		},
 		//溶液开始配制
 		ryKspz(zlIndex) {
@@ -701,7 +716,7 @@ export default {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) {
+			if (key === "rjbhphSub" && selectData.row.kcdw !== formFields.rjsjtjUnit) {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
@@ -724,7 +739,7 @@ export default {
 			const { selectData, callback, key, formFields } = data;
 			debugger
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) {
+			if (key === "rjbhphSub" && selectData.row.kcdw !== formFields.rjsjtjUnit) {
 				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 			//试验物质编号/批号

src/views/business/comps/template/comps/gsp/GSP010.vue

@@ -32,6 +32,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -67,6 +68,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {

src/views/business/comps/template/comps/lba/LBA002.vue

@@ -60,6 +60,11 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getJcbData:()=>this.$refs.tableRef.getFilledFormData()
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {