diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue index f0ef8ab..e04add6 100644 --- a/src/views/business/comps/template/comps/gsp/GSP005.vue +++ b/src/views/business/comps/template/comps/gsp/GSP005.vue @@ -701,7 +701,7 @@ export default { callback.prevent('浓度单位与预制不符,请重新选择或申请废止并重新预制。'); } //溶剂编号/批号 - if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) { + if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) { callback.prevent('浓度单位与预制不符,请重新选择或申请废止并重新预制。'); } }, @@ -724,13 +724,13 @@ export default { const { selectData, callback, key, formFields } = data; debugger //溶剂编号/批号 - if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) { + if (key === "rjbhphSub" && selectData.row.kcdw!==formFields.rjsjtjUnit) { + callback.prevent('库存单位与预制不符,请重新选择或申请废止并重新预制。'); + } + //试验物质编号/批号 + if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) { callback.prevent('库存单位与预制不符,请重新选择或申请废止并重新预制。'); } - // //试验物质编号/批号 - // if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) { - // callback.prevent('库存单位与预制不符,请重新选择或申请废止并重新预制。'); - // } }, onTableRegentZlSubmit(zlIndex, data) { if (data.key === 'sywzbhphSub') { @@ -892,6 +892,7 @@ export default { if (tableListZl && tableListZl.length > 0) { for (let i = 0; i < tableListZl.length; i++) { let item = tableListZl[i] + debugger tmpResource.push({ mc: item.targetName, bh: item.targetCode + item.targetCodeSn,