+
@@ -63,7 +65,7 @@ import Step from "@/components/Template/Step";
import templateMixin from "../../mixins/templateMixin";
import CustomTable from '@/components/Template/CustomTable.vue';
import { uniqeResource } from "@/utils/calUnitTools";
-import {getuuid} from "@/utils/index";
+import {getuuid,justUpdateFilledFormData} from "@/utils/index";
import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig,getTableColumns } from "../../formConfig/sp/SP0021";
const refConfig = {
baseInfoRef: "baseInfoRef",
@@ -116,42 +118,52 @@ export default {
};
},
mounted() {
- if(this.fillType === 'preFill'){//预填的时候默认新增一个。
+ if(this.fillType === 'preFill' &&!this.formData.ybsmDataList){//预填的时候默认新增一个。
this.onAdd()
}
},
methods: {
//删除样本说明
- deleteConfig(index){
+ deleteConfig(item){
// 确保 ybsmDataList 存在
- if (!this.formData.ybsmDataList) {
- this.formData.ybsmDataList = [{}];
- return;
- }
if (this.formData.ybsmDataList.length > 1) {
- this.formData.ybsmDataList.splice(index, 1);
+ const configIndex = this.formData.ybsmDataList.findIndex(config => config.id === item.id);
+ console.log(configIndex,"configIndex")
+ if(configIndex>-1){
+ const newList = [...this.formData.ybsmDataList]
+ newList.splice(configIndex, 1);
+ this.$set(this.formData, 'ybsmDataList', newList);
+ this.$nextTick(() => {
+ //通知后端保存数据
+ justUpdateFilledFormData();
+ })
+ }
} else {
- this.$message.warning('至少需要保留一个样本说明项');
+ this.$message.warning('至少保留一个样本说明项');
}
+
},
//新增样本说明
onAdd(){
if (!this.formData.ybsmDataList) {
this.$set(this.formData, 'ybsmDataList', []);
}
- // 添加新的平行配制配置
- this.formData.ybsmDataList.push({
+ let defaultInfo = {
id: getuuid(),
- ybsmFormData: {},
stepData: [],
- });
+ }
+ if(this.fillType === "actFill"){
+ const {ybsmDataList} = this.formData
+ defaultInfo.stepData = ybsmDataList[0]?.stepData || []
+ }
+ // 添加新的平行配制配置
+ this.formData.ybsmDataList.push(defaultInfo);
},
onLoadExcelData(excelData) {
const data = excelData.splice(1);
- console.log(data,"ddd")
this.$refs.ImportExcelDialog.cancel()
setTimeout(() => {
- this.justUpdateFilledFormData();
+ justUpdateFilledFormData();
}, 100);
},
downloadExcelTemplate(arr){
@@ -171,13 +183,13 @@ export default {
const baseData = this.getFilledFormDataByRefs(compRefs);
// 处理多个样本说明项
const ybsmDataList = this.formData.ybsmDataList.map((item, index) => {
- const ybsmFormData = this.$refs[`ybsmFormPackageRef${index}`]?.getFilledFormData() || {};
- const ybsmTableData = this.$refs[`ybsmTableRef${index}`]?.getFilledFormData() || [];
- const stepData = this.$refs[`stepRef${index}`]?.getFilledFormData() || {};
+ const ybsmFormData = this.$refs[`ybsmFormPackageRef${index}`][0]?.getFilledFormData() || {};
+ const ybsmTableData = this.$refs[`ybsmTableRef${index}`][0]?.getFilledFormData() || [];
+ const stepData = this.$refs[`stepRef${index}`][0]?.getFilledFormData() || [];
return {
...ybsmFormData,
- ybsmData: ybsmTableData,
- stepData: stepData
+ ...ybsmTableData,
+ stepData: stepData.stepData || []
};
});
return {
@@ -194,11 +206,11 @@ export default {
// 验证多个样本说明项
for (let index = 0; index < this.formData.ybsmDataList.length; index++) {
// 验证样本说明表单
- const ybsmFormValid = await this.$refs[`ybsmFormPackageRef${index}`]?.validFormFields() || true;
+ const ybsmFormValid = await this.$refs[`ybsmFormPackageRef${index}`][0]?.getFormData() || true;
if (!ybsmFormValid) return null;
// 验证步骤数据
- const stepValid = await this.$refs[`stepRef${index}`]?.getFormData() || true;
+ const stepValid = await this.$refs[`stepRef${index}`][0]?.getFormData() || true;
if (!stepValid) return null;
}
@@ -235,7 +247,7 @@ export default {
let allYqResource = [];
// 收集所有样本说明项的步骤资源
for (let index = 0; index < this.formData.ybsmDataList.length; index++) {
- const stepResource = this.$refs[`stepRef${index}`]?.getStepResource() || { sjResource: [], yqResource: [] };
+ const stepResource = this.$refs[`stepRef${index}`][0]?.getStepResource() || { sjResource: [], yqResource: [] };
allSjResource = [...allSjResource, ...(stepResource.sjResource || [])];
allYqResource = [...allYqResource, ...(stepResource.yqResource || [])];
}
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
index f87ecb7..d5cdc80 100644
--- a/src/views/business/comps/template/comps/sp/SP00456.vue
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -10,7 +10,7 @@
ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-
@@ -193,6 +193,7 @@ export default {
},
data() {
const labArr = ["LBA005", "LBA007"];
+ const sn = this.sn || '';
return {
subSolutionVisible: false,
currentSubKey: "",//当前点击的子项key
@@ -204,6 +205,7 @@ export default {
targetAcSolutionFromTable: true,//是否从表格中获取实际原始溶液浓度
currentRowData: {},//当前点击的行数据
isLba: labArr.includes(this.sn),
+ isSp: sn.includes('SP'),//是否是色谱
};
},
mounted() {
@@ -349,9 +351,9 @@ export default {
getFilledFormData() {
const baseData = this.$refs.baseInfoRef.getFilledFormData();
let conditionData = {}, jcbData = [];
- if (!this.isLba) {
- conditionData = this.$refs.storageConditionRef.getFilledFormData();
- } else {
+ if (this.isSp) {
+ conditionData = this.$refs.storageConditionRef?.getFilledFormData();
+ } else if(this.isLba) {
jcbData = this.$refs.jcbRef.getFilledFormData();
}
const remarkData = this.$refs.remarkRef.getFilledFormData();
diff --git a/src/views/business/comps/template/comps/sp/comps/LadderConfig.vue b/src/views/business/comps/template/comps/sp/comps/LadderConfig.vue
index c499b5d..58495cd 100644
--- a/src/views/business/comps/template/comps/sp/comps/LadderConfig.vue
+++ b/src/views/business/comps/template/comps/sp/comps/LadderConfig.vue
@@ -1,40 +1,37 @@
-
+
+
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index d148e22..3f8fdb3 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -521,6 +521,7 @@ export const getBaseInfoFormConfig = ($this) => {
const sn = $this.sn
const labArr = ['LBA005', 'LBA007']
const isLba = labArr.includes(sn)
+ const isSp = sn.includes('SP')//是否是色谱
return [
{
type: 'cardItem',
@@ -575,9 +576,8 @@ export const getBaseInfoFormConfig = ($this) => {
}
}
},
- isLba
- ? {}
- : {
+ isSp
+ ?{
type: 'conditionItem',
label: 'template.sp.sp00456.rqcz',
config: {
@@ -590,7 +590,8 @@ export const getBaseInfoFormConfig = ($this) => {
otherCode: 'containerMaterialOther'
}
}
- },
+ }
+ :{} ,
{
type: 'cellItem',
label: isLba
diff --git a/src/views/business/comps/template/formConfig/sp/SP0019.js b/src/views/business/comps/template/formConfig/sp/SP0019.js
index f1b40ab..a3d20f2 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0019.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0019.js
@@ -22,7 +22,7 @@ export const getBaseInfoFormConfig = (formType) => {
versionNum: {
label: 'template.common.versionNumber',
type: 'inputNumber',
- fillType: 'actFill',
+ fillType: formType === 'sp0020' ? 'actFill' : 'preFill',
prepend: 'V',
maxlength: 50
},
diff --git a/src/views/business/comps/template/formConfig/sp/SP0021.js b/src/views/business/comps/template/formConfig/sp/SP0021.js
index 6e4c295..9bdcd43 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0021.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0021.js
@@ -174,7 +174,9 @@ export const getTableColumns = ($this) => {
prop: 'sjjrl',
width: 280,
bodyType: 'inputNumber',
- bodyFillType: 'actFill'
+ bodyFillType: 'actFill',
+ copyFrom: 'lljrl',
+ compareTo: 'lljrl',
}
]
}