diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java index a470a972..493da6ae 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacyWarehousemanage/appservice/impl/PharmacyWarehouseStockOutOrderServiceImpl.java @@ -59,12 +59,12 @@ public class PharmacyWarehouseStockOutOrderServiceImpl implements IPharmacyWareh // 单据分类 List supplyCategoryOption = new ArrayList<>(); -// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(), -// SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo())); -// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(), -// SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo())); -// supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(), -// SupplyCategory.OTHER_OUTBOUND.getInfo())); + supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.IN_HOSPITAL_OUTBOUND.getValue(), + SupplyCategory.IN_HOSPITAL_OUTBOUND.getInfo())); + supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getValue(), + SupplyCategory.OUT_OF_HOSPITAL_OUTBOUND.getInfo())); + supplyCategoryOption.add(new PharmacyWarehouseInitDto.IntegerOption(SupplyCategory.OTHER_OUTBOUND.getValue(), + SupplyCategory.OTHER_OUTBOUND.getInfo())); purchaseOrderInitDto.setSupplyCategoryOptions(supplyCategoryOption); diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java index 1fec199b..f174abf0 100644 --- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java +++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SupplyCategory.java @@ -24,7 +24,7 @@ public enum SupplyCategory implements HisEnumInterface { /** * 非库存供应 */ - NON_STOCK(2, "2", "非库存供应"); + NON_STOCK(2, "2", "非库存供应"), // /** // * 普通 @@ -61,15 +61,15 @@ public enum SupplyCategory implements HisEnumInterface { // /** // * 院内出库 // */ - // IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"), + IN_HOSPITAL_OUTBOUND(11, "11","0.院内出库"), // /** // * 院外出库 // */ - // OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"), + OUT_OF_HOSPITAL_OUTBOUND(12, "12","1.院外出库"), // /** // * 其他出库 // */ - // OTHER_OUTBOUND(13, "13","2.其他出库"), + OTHER_OUTBOUND(13, "13","2.其他出库"); // /** // * 普通损益 // */ diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue index 23598d40..dab8e3b9 100644 --- a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue +++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/components/orderTable.vue @@ -1353,27 +1353,37 @@ const handleSave = async () => { addOrEditOrder(editData).then((res) => { if (res.code === 200) { proxy.$message.success('新增成功'); - // 调用父组件的 getList 方法 - emit('getList'); + // 调用父组件的 getList 方法,传递 true 清除临时订单 + emit('getList', true); // 清空表单 resetAllData(); // 关闭加载 loading.value = false; + } else { + proxy.$message.error(res.msg || '新增失败'); + loading.value = false; } + }).catch((error) => { + proxy.$message.error(error.message || '新增失败,请检查网络或联系管理员'); + loading.value = false; }); } else if (localIsAddOrEditOrder.value.isEditOrder) { addOrEditOrder(editData).then((res) => { if (res.code === 200) { proxy.$message.success('保存成功'); - // 调用父组件的 getList 方法 - emit('getList'); + // 调用父组件的 getList 方法,传递 true 清除临时订单 + emit('getList', true); // 清空表单 resetAllData(); } else { - proxy.$message.error('保存失败'); + proxy.$message.error(res.msg || '保存失败'); } // 关闭加载 loading.value = false; + }).catch((error) => { + proxy.$message.error(error.message || '保存失败,请检查网络或联系管理员'); + // 关闭加载 + loading.value = false; }); } }; diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue index bebc1f2f..01a80c1c 100644 --- a/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue +++ b/openhis-ui-vue3/src/views/medicineStorage/stockOutOrder/index.vue @@ -113,6 +113,14 @@
+ +
+ + + 新增单据 + +
+ - -
- - 新增单据 - + +
+
@@ -205,7 +211,7 @@