fix(#439,#452,#464): 修复领用出库库存查询和诊疗目录零售价同步问题
#439 领用出库选择药品后总库存数量列数据未显示 #452 领用出库模块选择药品时提示仓库数量为0与实际库存不符 - CommonAppMapper.xml: selectInventoryItemInfo的WHERE条件修复 当objLocationId非空时,location_id IN应同时包含orgLocationId和objLocationId 原代码只包含orgLocationId导致obj_quantity永远为0 #464 诊疗目录新增项目时零售价未与诊疗子项合计总价自动同步 - diagnosisTreatmentDialog.vue: submitForm中增加零售价自动同步逻辑 当有子项时,form.retailPrice自动设置为totalPrice(子项合计总价) Author: xunyu
This commit is contained in:
@@ -268,7 +268,7 @@
|
|||||||
</choose>
|
</choose>
|
||||||
<choose>
|
<choose>
|
||||||
<when test="objLocationId != null and objLocationId != ''">
|
<when test="objLocationId != null and objLocationId != ''">
|
||||||
AND T1.location_id IN (#{orgLocationId})
|
AND T1.location_id IN (#{orgLocationId}, #{objLocationId})
|
||||||
</when>
|
</when>
|
||||||
<otherwise>
|
<otherwise>
|
||||||
AND T1.location_id = #{orgLocationId}
|
AND T1.location_id = #{orgLocationId}
|
||||||
|
|||||||
@@ -646,6 +646,11 @@ async function submitForm() {
|
|||||||
treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != ''
|
treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != ''
|
||||||
? JSON.stringify(treatmentItems.value)
|
? JSON.stringify(treatmentItems.value)
|
||||||
: undefined;
|
: undefined;
|
||||||
|
// Bug #464 修复:零售价自动与诊疗子项合计总价同步
|
||||||
|
// 当有子项时,零售价自动设置为子项合计总价
|
||||||
|
if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '') {
|
||||||
|
form.value.retailPrice = parseFloat(totalPrice.value) || 0;
|
||||||
|
}
|
||||||
proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => {
|
proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
// 医保编码唯一性校验
|
// 医保编码唯一性校验
|
||||||
|
|||||||
Reference in New Issue
Block a user