feat:[模板管理][烦人的提交记录]

src/components/Template/Step.vue

@@ -71,6 +71,7 @@ import Js from "./StepComponents/ry/js.vue";//溶液-计数
 import Mj from "./StepComponents/ry/mj.vue";//溶液-灭菌
 import Fs from "./StepComponents/ry/fs.vue";//溶液-复苏
 import Fb from "./StepComponents/ry/fb.vue";//溶液-封板
+import Zlfz from "./StepComponents/ry/zlfz.vue";//溶液-质量分装
 
 
 
@@ -113,6 +114,7 @@ const stepTypes = [
 	{ label: '灭菌', value: 'mj' },
 	{ label: '复苏', value: 'fs' },
 	{ label: '封板', value: 'fb' },
+	{ label: '质量分装', value: 'zlfz' },
 	
 ];
 
@@ -177,6 +179,7 @@ export default {
 		Mj,
 		Fs,
 		Fb,
+		Zlfz,
 	},
 	computed: {
 		stepComponentMap() {
@@ -220,6 +223,7 @@ export default {
 					'mj': 'Mj',
 					'fs': 'Fs',
 					'fb': 'Fb',
+					'zlfz': 'Zlfz',
 				}
 			}
 			return this.componentMap

src/components/Template/StepComponents/ZLSubPackage.vue

@@ -0,0 +1,341 @@
+<!-- 质量分装 -->
+<template>
+    <div class="zl-container">
+        <div class="dialog-content">
+            <div class="header-container">
+                <div class="header-item">
+                    <div class="header-title">母编号</div>
+                    <HandleFormItem fieldKey = "clfz_mybh" :item="inputItem" :error="formErrors.mybh"
+                        v-model="formData.mybh" />
+                </div>
+                <div class="header-item">
+                    <div class="header-title">分装数量</div>
+                    <HandleFormItem fieldKey = "clfz_fzsl"  @blur="onBlurFzsl" :item="integerInputNumberItem"
+                    type = "inputNumber"    
+                    :error="formErrors.fzsl" v-model="formData.fzsl" />
+                </div>
+                <div class="header-item">
+                    <div class="header-title">单位</div>
+                    <div class="unit-select">
+                        <HandleFormItem  :item="unitItem" type="select" :error="formErrors.dw"
+                            @blur="(e) => onCommonBlur(e, 'dw')" v-model="formData.dw" />
+                    </div>
+                </div>
+            </div>
+            <div class="content-container">
+                <div class="header-container">
+                    <div v-for="(item, index) in fzList" class="list-item" :key="index">
+                        <div class="list-label">{{ formData.mybh }}-set{{ item.subCode }}</div>
+                        <HandleFormItem :fieldKey = "'clfz_set'+index+'_prenum'"  :item="preInputNumberItem" :error="fzListErrors[index]"
+                         type="inputNumber"   @blur="onBlurFzNum(index)" v-model="item.num" />
+                        <HandleFormItem :fieldKey = "'clfz_set'+index+'_actnum'"  class="ml-5"  :item="inputNumberItem" :error="fzListErrors[index]"
+                         type="inputNumber"   @blur="onBlurFzNum(index)" v-model="item.num" />
+                         <HandleFormItem 
+                            class="ml-5"
+                            type="button" 
+                            :item="getButtonItem()"
+                            @clickButton="(e)=>onGetValue(e,item)" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import HandleFormItem from '@/components/Template/HandleFormItem.vue';
+import { compareVolume } from '@/utils/volumeTools.js';
+import { EventBus } from '@/utils/eventBus';
+import { getLatestSn } from '@/api/template';
+export default {
+    dicts: [
+        'business_tjdw',
+    ],
+    components: {
+        HandleFormItem,
+    },
+    data() {
+        return {
+            subData: {},
+            inputItem: {
+                type: "input",
+                fillType: "actFill",
+                disabled: true,
+            },
+            integerInputNumberItem: {
+                type: "inputNumber",
+                fillType: "preFill",
+                precision: 0,
+                maxlength: 3
+            },
+            inputNumberItem: {
+                type: "inputNumber",
+                fillType: "actFill",
+            },
+            preInputNumberItem: {
+                type: "inputNumber",
+                fillType: "preFill",
+            },
+            formData: {
+                mybh: "",//母液编号
+                fzsl: "",//分装数量
+                dw: "",//单位
+                mfbzl: "",//每份包装量
+            },
+            fzList: [],//分装列表
+            // 错误状态字段
+            formErrors: {
+                mybh: false,
+                fzsl: false,
+                dw: false,
+            },
+            fzListErrors: [], // 分装列表错误状态
+            uuid:"",//事件id
+        }
+    },
+    computed: {
+        unitItem() {
+            return {
+                type: "select",
+                fillType: "actFill",
+                options: this.dict.type.business_tjdw
+            }
+        }
+    },
+    methods: {
+        // 获取按钮项
+        getButtonItem() {
+            return {
+                fillType: "actFill",
+                buttonName:"获取值",
+            }
+        },
+        close() {
+            this.visible = false;
+            this.fzList = [];
+            this.formData = {};
+            this.resetErrors();
+        },
+        show(data) {
+            const cloneData = JSON.parse(JSON.stringify(data));
+            if(data && data.uuid) {//为了标识eventBus的事件id
+                this.uuid = data.uuid
+            }
+            if (data.fzList) {
+                this.fzList = JSON.parse(JSON.stringify(cloneData.fzList));
+                // 初始化分装列表错误状态
+                this.fzListErrors = new Array(this.fzList.length).fill(false);
+                delete cloneData.fzList;
+            }
+            this.formData = cloneData;
+            // 重置错误状态
+            this.resetErrors();
+            this.visible = true;
+        },
+        onSubmit() {
+            // 验证表单数据
+            if (!this.validateFormData()) {
+                this.$message.error('表单内容未填完,请填写后再提交')
+                return;
+            } else {
+                const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
+                const {maxVolume,maxVolumeUnit,dw} = this.formData;
+                
+                const totalVolume = this.fzList.reduce((acc, cur) => acc + Number(cur.num), 0);
+                const compareResult = compareVolume(totalVolume,dw,maxVolume, maxVolumeUnit);
+                console.log(compareResult,totalVolume,dw,maxVolume, maxVolumeUnit,"比较结果");
+                if(compareResult > 0||!maxVolume){//没有填写实际溶液体积的也需要提示错误信息
+                    this.$modal.confirm(errMsg, '提示', {
+                        confirmButtonText: this.$t('form.saveConfirm'),
+                        cancelButtonText: this.$t('form.cancel'),
+                        type: 'warning'
+                    }).then(() => {
+                        this.submitEmit();
+                    }).catch(() => {
+                        // 取消操作，不执行任何操作
+                    });
+                    return;
+                }
+                this.submitEmit();
+                
+            }
+
+
+        },
+        submitEmit(){
+            EventBus.$emit('dialogSubPackageSubmit', {...this.formData, fzList: this.fzList,uuid:this.uuid});
+            setTimeout(() => {
+                this.close();
+            }, 500);
+        },
+        validateFormData() {
+            let isValid = true;
+
+            // 验证母液编号
+            if (!this.formData.mybh) {
+                this.formErrors.mybh = true;
+                isValid = false;
+            }
+
+            // 验证分装数量
+            if (!this.formData.fzsl) {
+                this.formErrors.fzsl = true;
+                isValid = false;
+            }
+
+            // 验证单位
+            if (!this.formData.dw) {
+                this.formErrors.dw = true;
+                isValid = false;
+            }
+
+            // 验证分装列表中的数值
+            if (this.fzList && this.fzList.length > 0) {
+                for (let i = 0; i < this.fzList.length; i++) {
+                    if (!this.fzList[i].num) {
+                        // 确保fzListErrors数组有足够的元素
+                        if (this.fzListErrors.length <= i) {
+                            this.$set(this.fzListErrors, i, true);
+                        } else {
+                            this.fzListErrors[i] = true;
+                        }
+                        isValid = false;
+                    }
+                }
+            }
+
+            return isValid;
+        },
+        resetErrors() {
+            // 重置表单错误状态
+            Object.keys(this.formErrors).forEach(key => {
+                this.formErrors[key] = false;
+            });
+
+            // 重置分装列表错误状态
+            this.fzListErrors.forEach((_, index) => {
+                this.$set(this.fzListErrors, index, false);
+            });
+        },
+        // 分装数量失去焦点时，根据数量生成分装列表
+        async onBlurFzsl(e) {
+            console.log(e,"失去焦点时的数量")
+            // 清除当前字段的错误状态
+            if (e) {
+                this.formErrors.fzsl = false;
+            }
+            // 清空现有列表
+            this.fzList = [];
+            this.fzListErrors = [];
+            const result = await getLatestSn({
+                pre: this.formData.mybh,
+                count: e,
+                type: 2,
+            })
+            if(result.code === 200){
+                const codes = result.data;
+                // 根据输入的数量生成新列表
+                for (let i = 0; i < e; i++) {
+                    this.fzList.push({
+                        num: "",
+                        subCode: codes[i],
+                    });
+                    // 同步初始化错误状态数组
+                    this.fzListErrors.push(false);
+                }
+            }
+            
+        },
+        onAverage() {
+            const { mfbzl } = this.formData;
+            this.fzList.forEach((item, index) => {
+                item.num = mfbzl;
+                // 同时更新错误状态
+                if (this.fzListErrors[index] !== undefined) {
+                    this.$set(this.fzListErrors, index, false);
+                }
+            })
+            // 清除相关字段的错误状态
+            this.formErrors.mfbzl = false;
+        },
+        onGetValue(item) {
+         },
+        onCommonBlur(e, field) {
+            if (this.formData[field]) {
+                this.formErrors[field] = false;
+            }
+        },
+        onBlurFzNum(index) {
+            if (this.fzList[index] && this.fzList[index].num) {
+                if (this.fzListErrors[index] !== undefined) {
+                    this.$set(this.fzListErrors, index, false);
+                }
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.zl-container{
+    // width: 1100px;
+}
+.dialog-content {
+    // padding: 20px;
+}
+.ml-5{
+    margin-left: 5px;
+}
+.unit-select {
+    width: 100px;
+}
+
+.content-item {
+    display: flex;
+    align-items: center;
+}
+
+.header-container {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    grid-gap: 20px;
+    margin-top: 10px;
+}
+
+.header-item {
+    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    background: #fff;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    // padding: 20px;
+}
+
+.header-title {
+    // margin-bottom: 10px;
+    margin-right: 5px;
+}
+
+.content-container {
+    margin-top: 10px;
+    // padding: 20px;
+    // box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    // max-height: 50vh;
+    overflow: auto;
+}
+
+.ml-20 {
+    margin-left: 20px;
+}
+
+.list-item {
+    display: flex;
+    align-items: center;
+    // margin-top: 20px;
+}
+
+.list-label {
+    margin-right: 5px;
+    // width: 200px;
+}
+</style>

src/components/Template/StepComponents/ry/qywz.vue

@@ -33,7 +33,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         zl:{
-                            type:"span",
+                            type:"input",
+                            fillType:"actFill",
+                            disabled:true,
 
                         },
                         text3:{

src/components/Template/StepComponents/ry/zlfz.vue

@@ -0,0 +1,52 @@
+<!-- 质量分装 -->
+<template>
+    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_czdd" @resetRecord="resetRecord" :form-config="formConfig"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            return [
+                {
+                    config: {
+                        text1: {
+                            label: "选择",
+                            type: "text",
+                        },
+                        ddsys: {
+                            type: "input",
+                            fillType: "preFill",
+                        },
+                        yq: {
+                            type: "gsp",
+                            fillType: "actFill",
+                        },
+                        text2: {
+                            label: "进行称量分装",
+                            type: "text",
+                        },
+                    }
+                },
+                {
+                    config:{
+                        clfz:{
+                            type: "zlfz",
+                        }
+                    }
+                }
+            ]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>

src/components/Template/StepFormPackage.vue

@@ -47,6 +47,9 @@
                 <template v-else-if="sItem.type === 'span'">
                     <span>{{ formFields[key] }}</span>
                 </template>
+                <template v-else-if="sItem.type === 'zlfz'">
+                    <ZLSubPackage :subData = "formFields[key]" ref="zlSubPackageRef" />
+                </template>
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
                     <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
@@ -64,6 +67,7 @@
 <script>
 import HandleFormItem from '@/components/Template/HandleFormItem.vue'
 import formPackageMixins from '@/components/Template/mixins/formPackageMixins.js'
+import ZLSubPackage from '@/components/Template/StepComponents/ZLSubPackage.vue'
 import { isShowOther } from "@/utils/formPackageCommon.js";
 import { EventBus } from "@/utils/eventBus";
 import { getuuid } from "@/utils/index.js";
@@ -72,6 +76,7 @@ export default {
     inject: ['templateFillType','templateData'],
     components: {
         HandleFormItem,
+        ZLSubPackage
     },
     mixins: [formPackageMixins],
     props: {

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

@@ -32,8 +32,7 @@
 								@resetRecord="(e) => resetRecord('ladder', ladderIndex, e)"
 								@onSureModifyRecord="(e) => onSureModifyRecord('ladder', ladderIndex, e)"
 								:ref="`ladderStepFormPackageRef_${ladderIndex}`" :formConfig="ladderStepFormConfig"
-								 :formData="ladderConfig" fieldItemLabel="阶梯配制"
-								:prefixKey="'ladder_' + ladderIndex" />
+								:formData="ladderConfig" fieldItemLabel="阶梯配制" :prefixKey="'ladder_' + ladderIndex" />
 							<CustomTable @blur="(e) => onHandleTableBlur('ladder', ladderIndex, e)"
 								:ref="`ladderStepTableRef_${ladderIndex}`" :columns="ladderStepColumns"
 								:formData="ladderConfig" :prefixKey="'ladder_' + ladderIndex" fieldItemLabel="阶梯配制">
@@ -66,8 +65,7 @@
 							</div>
 							<BaseInfoFormPackage @clickable="(e) => handleClickable('paralle', paralleIndex, e)"
 								:ref="`paralleStepFormPackageRef_${paralleIndex}`" :formConfig="paralleStepFormConfig"
-								 :formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
-								fieldItemLabel="平行配制" />
+								:formData="paralleConfig" :prefixKey="'paralle' + paralleIndex" fieldItemLabel="平行配制" />
 							<CustomTable @blur="(e) => onHandleTableBlur('paralle', paralleIndex, e)"
 								:ref="`paralleStepTableRef_${paralleIndex}`" :columns="paralleStepColumns"
 								@clickable="(e, tableRowIndex, rowData) => handleTableClickable('paralle', paralleIndex, e, tableRowIndex, rowData)"
@@ -110,9 +108,9 @@ import templateMixin from "../../mixins/templateMixin.js";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
-import { getExpireDate,duplicateResource } from "@/utils/index.js";
+import { getExpireDate, duplicateResource } from "@/utils/index.js";
 import moment from "moment";
-import { addTj,uniqeResource } from "@/utils/calUnitTools";
+import { addTj, uniqeResource } from "@/utils/calUnitTools";
 import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
 export default {
 	name: "SP00456",
@@ -239,7 +237,7 @@ export default {
 			this.configCompleteRequest(postData);
 		},
 		getTemplateName() {
-			if (this.templateData&&this.templateData.templateMc) {
+			if (this.templateData && this.templateData.templateMc) {
 				return this.templateData.templateMc
 			}
 			const o = {
@@ -272,41 +270,46 @@ export default {
 		},
 		// 为指定的表单数据数组分配编号
 		async assignNumbersToTableData(config) {
-			const configs = this.formData[config]
-			const { startDate } = this.formData;
-			// 检查paralleConfigs中的paralleTableFormData数组
-			if (configs && configs.length > 0) {
-				for (let i = 0; i < configs.length; i++) {
-					const ref = config === "paralleConfigs" ? `paralleStepTableRef_${i}` : `ladderStepTableRef_${i}`;
-					const { stepTableFormData = [], effectivePeriod, effectivePeriodUnit, expireDate } = configs[i];
-					if (!expireDate && config === "ladderConfigs") {
-						const date = getExpireDate(startDate, effectivePeriod, effectivePeriodUnit);
-						configs[i].expireDate = date;
-					}
-					if (stepTableFormData && stepTableFormData.length > 0) {
-						const tableDataArray = stepTableFormData;
-						// 检查表单数据中是否有任何一行的subTargetSolutionCode有值
-						const hasAnyWithValue = tableDataArray.some(row =>
-							row.subTargetSolutionCode && row.subTargetSolutionCode.trim() !== '');
-						// 如果没有任何一行有值，则为所有行分配编号
-						if (!hasAnyWithValue) {
-							const codes = stepTableFormData.map((item) => ({prex:item.targetSolutionCode,type:1}));
-							const snList = await this.getLatestSnArr(codes);
-							tableDataArray.forEach((row, idx) => {
-								let expDate = {};
-								if (config === "paralleConfigs" && !row.targetSolutionExpirationDate) {
-									let date = getExpireDate(startDate, row.targetSolutionCycle, row.targetSolutionCyclePrecision);
-									expDate = {
-										targetSolutionExpirationDate: date
+			return new Promise(async (resolve, reject) => {
+				const configs = this.formData[config]
+				const { startDate } = this.formData;
+				// 检查paralleConfigs中的paralleTableFormData数组
+				if (configs && configs.length > 0) {
+					for (let i = 0; i < configs.length; i++) {
+						const ref = config === "paralleConfigs" ? `paralleStepTableRef_${i}` : `ladderStepTableRef_${i}`;
+						const { stepTableFormData = [], effectivePeriod, effectivePeriodUnit, expireDate } = configs[i];
+						if (!expireDate && config === "ladderConfigs") {
+							const date = getExpireDate(startDate, effectivePeriod, effectivePeriodUnit);
+							configs[i].expireDate = date;
+						}
+						if (stepTableFormData && stepTableFormData.length > 0) {
+							const tableDataArray = stepTableFormData;
+							// 检查表单数据中是否有任何一行的subTargetSolutionCode有值
+							const hasAnyWithValue = tableDataArray.some(row =>
+								row.subTargetSolutionCode && row.subTargetSolutionCode.trim() !== '');
+							// 如果没有任何一行有值，则为所有行分配编号
+							if (!hasAnyWithValue) {
+								const codes = stepTableFormData.map((item) => ({ prex: item.targetSolutionCode, type: 1 }));
+								const snList = await this.getLatestSnArr(codes);
+								tableDataArray.forEach((row, idx) => {
+									let expDate = {};
+									if (config === "paralleConfigs" && !row.targetSolutionExpirationDate) {
+										let date = getExpireDate(startDate, row.targetSolutionCycle, row.targetSolutionCyclePrecision);
+										expDate = {
+											targetSolutionExpirationDate: date
+										}
 									}
-								}
-								this.$refs[ref][0]?.updateDataSourceByRowIndex(idx, { subTargetSolutionCode: snList[idx], ...expDate });
-							});
-							Promise.resolve();
+									this.$refs[ref][0]?.updateDataSourceByRowIndex(idx, { subTargetSolutionCode: snList[idx], ...expDate });
+								});
+								resolve()
+							}else{
+								reject()
+							}
+
 						}
 					}
 				}
-			}
+			})
 
 		},
 
@@ -402,25 +405,25 @@ export default {
 					const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
 						const volResult = this.updateSjmbrynd(item, targetAcSolution);
-						if(!volResult){
+						if (!volResult) {
 							return
 						}
 						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
 							actSolutionVolume: volResult.actVol,
 							actSolutionConcentration: volResult.actNd,
-						},"blur");
+						}, "blur");
 					}
 				} else if (type === "paralle") {
 					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
 						const volResult = this.updateSjmbrynd(item, targetAcSolution);
-						if(!volResult){
+						if (!volResult) {
 							return
 						}
 						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex, {
 							actSolutionVolume: volResult.actVol,
 							actSolutionConcentration: volResult.actNd,
-						},"blur");
+						}, "blur");
 					}
 				}
 
@@ -468,7 +471,7 @@ export default {
 				const tableRef = this.$refs[`paralleStepTableRef_${currentRowIndex}`][0];
 				if (tableRef) {
 					const volResult = this.updateSjmbrynd(this.currentRowData, row.nd);
-					if(!volResult){
+					if (!volResult) {
 						return
 					}
 					tableRef.updateDataSourceByRowIndex(currentTableIndex, {
@@ -476,7 +479,7 @@ export default {
 						targetAcSolution: row.nd,
 						actSolutionVolume: volResult.actVol,
 						actSolutionConcentration: volResult.actNd,
-					},"clickable")
+					}, "clickable")
 				}
 			}
 			this.$refs.selectReagentDialogRef.onCancel();
@@ -497,7 +500,7 @@ export default {
 			// 遍历数据，按要求更新起始溶液编号
 			newData.forEach((item, index) => {
 				const volResult = this.updateSjmbrynd(item, row.nd);
-				if(!volResult){
+				if (!volResult) {
 					return
 				}
 				console.log(volResult.actNd, "actNd")
@@ -601,15 +604,15 @@ export default {
 								mc: null,
 								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
 								ph: null,
-								ndz:stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								ndz: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
 								nd: stepTableFormData[j].actSolutionConcentration,
 								nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
 								ly: 'ELN配制',
 								sxrq: ladderConfigs.expireDate,
 								kc: total,
 								kcdw: unit,
-					            type: null,
-					            elnType: this.product,
+								type: null,
+								elnType: this.product,
 								syl: null,
 								syldw: unit,
 								yxzq: ladderConfigs.effectivePeriod,
@@ -629,8 +632,8 @@ export default {
 										sxrq: ladderConfigs.expireDate,
 										kc: fzsj.fzList[k].num,
 										kcdw: fzsj.dw,
-					                    type: null,
-					                    elnType: this.product,
+										type: null,
+										elnType: this.product,
 										syl: null,
 										syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
 										yxzq: ladderConfigs.effectivePeriod,
@@ -659,8 +662,8 @@ export default {
 								sxrq: stepTableFormData[j].targetSolutionExpirationDate,
 								kc: total,
 								kcdw: unit,
-					            type: null,
-					            elnType: this.product,
+								type: null,
+								elnType: this.product,
 								syl: null,
 								syldw: unit,
 								yxzq: stepTableFormData[j].targetSolutionCycle,
@@ -680,8 +683,8 @@ export default {
 										sxrq: paralleConfigs.expireDate,
 										kc: fzsj.fzList[k].num,
 										kcdw: fzsj.dw,
-					                    type: null,
-					                    elnType: this.product,
+										type: null,
+										elnType: this.product,
 										syl: null,
 										syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
 										yxzq: paralleConfigs.effectivePeriod,
@@ -693,16 +696,16 @@ export default {
 					}
 				}
 			}
-            //使用的试剂、仪器
+			//使用的试剂、仪器
 			// const stepResource = this.$refs.stepRef.getStepResource()
 			// this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
 			// this.yqResourceTmp = stepResource.yqResource||[]
 
-			this.resourceTmp=tmpResource
+			this.resourceTmp = tmpResource
 			return content;
 		},
-		getStepResource(){
-			const sjResource=[],yqResource=	[];
+		getStepResource() {
+			const sjResource = [], yqResource = [];
 			if (this.formData.paralleConfigs && this.formData.paralleConfigs.length > 0) {
 				for (let i = 0; i < this.formData.paralleConfigs.length; i++) {
 					const paralleResource = this.$refs[`paralleStepRef_${i}`][0].getStepResource();
@@ -718,8 +721,8 @@ export default {
 				}
 			}
 			//去重
-			const {sj,yq} = duplicateResource(sjResource,yqResource)
-			return {sjResource:sj,yqResource:yq};
+			const { sj, yq } = duplicateResource(sjResource, yqResource)
+			return { sjResource: sj, yqResource: yq };
 		},
 		async onSave() {
 			const formData = this.getStepResource();