|
|
@ -403,7 +403,7 @@ export default { |
|
|
prop: 'actStartSolutionCode', |
|
|
prop: 'actStartSolutionCode', |
|
|
width: 280, |
|
|
width: 280, |
|
|
showWidth: 180, |
|
|
showWidth: 180, |
|
|
bodyType: 'sj', |
|
|
|
|
|
|
|
|
bodyType: 'mix', |
|
|
bodyFillType: 'actFill', |
|
|
bodyFillType: 'actFill', |
|
|
compareTo: 'startSolutionCode', //比较哪个字段 |
|
|
compareTo: 'startSolutionCode', //比较哪个字段 |
|
|
}, |
|
|
}, |
|
|
@ -742,8 +742,9 @@ export default { |
|
|
}, |
|
|
}, |
|
|
// table选择试剂确定弹窗 |
|
|
// table选择试剂确定弹窗 |
|
|
onTableRegentSubmit(type, configIndex, data) { |
|
|
onTableRegentSubmit(type, configIndex, data) { |
|
|
|
|
|
debugger |
|
|
const { selectInfo, rowIndex, key, rowData } = data; |
|
|
const { selectInfo, rowIndex, key, rowData } = data; |
|
|
const { row, selectedId } = selectInfo; |
|
|
|
|
|
|
|
|
const { row, selectedId,selectType } = selectInfo; |
|
|
if (key === "actStartSolutionCode") {//实际原始溶液编号点击事件 |
|
|
if (key === "actStartSolutionCode") {//实际原始溶液编号点击事件 |
|
|
const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0]; |
|
|
const tableRef = this.$refs[`paralleStepTableRef_${configIndex}`][0]; |
|
|
//实际起始溶液体积和实际目标溶液体积 |
|
|
//实际起始溶液体积和实际目标溶液体积 |
|
|
@ -758,6 +759,7 @@ export default { |
|
|
//第一次选择溶液的时候,可能其他值没填入,就需要先把浓度和code一起更新 |
|
|
//第一次选择溶液的时候,可能其他值没填入,就需要先把浓度和code一起更新 |
|
|
tableRef.updateDataSourceByRowIndex(rowIndex, { |
|
|
tableRef.updateDataSourceByRowIndex(rowIndex, { |
|
|
actStartSolutionCode: selectedId, |
|
|
actStartSolutionCode: selectedId, |
|
|
|
|
|
actStartSolutionCodeType: selectType, //这个字段没有配置 |
|
|
targetAcSolution: row.nd, |
|
|
targetAcSolution: row.nd, |
|
|
}) |
|
|
}) |
|
|
if (!volResult) { |
|
|
if (!volResult) { |
|
|
@ -923,7 +925,7 @@ export default { |
|
|
sxrq: null, |
|
|
sxrq: null, |
|
|
kc: null, |
|
|
kc: null, |
|
|
kcdw: null, |
|
|
kcdw: null, |
|
|
type: 1, |
|
|
|
|
|
|
|
|
type: stepTableFormData[j].actStartSolutionCodeType, |
|
|
syl: stepTableFormData[j].actStartSolutionVolume, |
|
|
syl: stepTableFormData[j].actStartSolutionVolume, |
|
|
syldw: paralleConfigs.headerSelectFields.actStartSolutionVolumeUnit, |
|
|
syldw: paralleConfigs.headerSelectFields.actStartSolutionVolumeUnit, |
|
|
yxzq: null, |
|
|
yxzq: null, |
|
|
|