From 9f4ea53d3131d68a891931b55cb89237846fc82c Mon Sep 17 00:00:00 2001 From: duhe Date: Mon, 24 Mar 2025 19:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AE=A1=E6=89=B9=E7=94=BB=E9=9D=A2=20=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E8=B0=83=E8=AF=95=20up=20by=20dh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseInventoryController.java | 4 +- .../dto/PurchaseInventoryDto.java | 2 +- .../views/catalog/device/components/device.js | 20 +- .../device/components/deviceDialog.vue | 159 ++++++++-- .../src/views/catalog/device/index.vue | 20 +- .../src/views/catalog/disease/index.vue | 4 +- .../components/inventoryReceiptDialog.vue | 56 +++- .../components/purchaseinventory.js | 41 +-- .../purchaseinventory/index.vue | 280 +++--------------- 9 files changed, 284 insertions(+), 302 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java index dcced6ff..dc094629 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java @@ -98,7 +98,7 @@ public class PurchaseInventoryController { * @return 操作结果 */ @PutMapping("/submit-approval") - public R submitApproval(@RequestParam String busNo) { + public R submitApproval(@RequestBody String busNo) { return purchaseInventoryAppService.submitApproval(busNo); } @@ -109,7 +109,7 @@ public class PurchaseInventoryController { * @return 操作结果 */ @PutMapping("/withdraw-approval") - public R withdrawApproval(@RequestParam String busNo) { + public R withdrawApproval(@RequestBody String busNo) { return purchaseInventoryAppService.withdrawApproval(busNo); } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java index 4e7655a3..a69a87dc 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/PurchaseInventoryDto.java @@ -71,7 +71,7 @@ public class PurchaseInventoryDto { private Long purposeLocationStoreId; /** 申请人 */ - @NotNull +// @NotNull private Long applicantId; /** 经手人 */ diff --git a/openhis-ui-vue3/src/views/catalog/device/components/device.js b/openhis-ui-vue3/src/views/catalog/device/components/device.js index 061efdbc..475a2a00 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/device.js +++ b/openhis-ui-vue3/src/views/catalog/device/components/device.js @@ -71,4 +71,22 @@ export function startDevice(ids) { method: 'put', data: ids }) -} \ No newline at end of file +} + +// 查询部门树形数据 +export function deptTreeSelect(queryParams) { + return request({ + url: '/base-data-manage/organization/organization', + method: 'get', + param: queryParams + }) +} + +// 查询地点树形数据 +export function locationTreeSelect(queryParams) { + return request({ + url: '/base-data-manage/cabinet-location/cabinet-location', + method: 'get', + param: queryParams + }) +} diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue index 65f964fc..72f004a8 100644 --- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue @@ -24,7 +24,7 @@ - + + + + + - + - + - + + + + + + + + - + + + @@ -64,7 +109,14 @@ - + + + @@ -93,7 +145,14 @@ - + + + @@ -121,19 +180,39 @@ - + + + - - + + - + + + + @@ -143,11 +222,11 @@ - + @@ -196,18 +275,25 @@ import { addDevice, getDiseaseTreatmentInit, getDeviceOne, + deptTreeSelect, + locationTreeSelect, } from "./device"; const router = useRouter(); const { proxy } = getCurrentInstance(); -const { sys_normal_disable, sys_user_sex } = proxy.useDict( - "sys_normal_disable", - "sys_user_sex" +const { device_type_code, unit_code } = proxy.useDict( + "device_type_code", + "unit_code" ); const title = ref(""); const visible = ref(false); const emits = defineEmits(["submit"]); // 声明自定义事件 +const deptOptions = ref(undefined); // 部门树选项 +const locationOptions = ref(undefined); // 地点树选项 +const deviceCategories = ref([]); // 器材分类 +const statusFlagOptions = ref([]); // 状态标记 +const supplierListOptions = ref([]); // 供应商列表 const data = reactive({ form: {}, @@ -264,6 +350,8 @@ const data = reactive({ allergenFlag: [ { required: true, message: "过敏标记不能为空", trigger: "blur" }, ], + orgId: [{ required: true, message: "提供部门不能为空", trigger: "blur" }], + locationId: [{ required: true, message: "地点不能为空", trigger: "blur" }], }, }); @@ -278,6 +366,14 @@ const props = defineProps({ type: String, required: false, }, + deviceCategories: { + type: Object, + required: false, + }, + statusFlagOptions: { + type: Object, + required: false, + }, }); // 显示弹框 @@ -287,9 +383,30 @@ function show() { // getList(); title.value = ""; title.value = props.title; - console.log(props, "22222", title.value); + deviceCategories.value = props.deviceCategories; + statusFlagOptions.value = props.statusFlagOptions; + console.log(props, "22222", title.value, props.deviceCategories); + getDeptTree(); + getLocationTree(); visible.value = true; } +/** 查询部门下拉树结构 */ +function getDeptTree() { + deptTreeSelect().then((response) => { + console.log(response, "response查询部门下拉树结构"); + deptOptions.value = response.data.records; + console.log(deptOptions.value, "部门下拉树结构"); + }); +} + +/** 查询地点下拉树结构 */ +function getLocationTree() { + locationTreeSelect().then((response) => { + console.log(response, "response查询部门下拉树结构"); + locationOptions.value = response.data.records; + console.log(locationOptions.value, "部门下拉树结构"); + }); +} // 显示弹框 function edit() { // queryParams.roleId = props.roleId; @@ -298,6 +415,10 @@ function edit() { title.value = ""; title.value = props.title; form.value = props.item; + deviceCategories.value = props.deviceCategories; + statusFlagOptions.value = props.statusFlagOptions; + getDeptTree(); + getLocationTree(); visible.value = true; } /** 重置操作表单 */ @@ -330,6 +451,8 @@ function reset() { version: undefined, // 器材版本 substanceText: undefined, // 主要成分 allergenFlag: undefined, // 过敏标记 + orgId: undefined, // 科室ID + locationId: undefined, // 地点ID }; proxy.resetForm("medicationRef"); } diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue index 7148b113..fefa434c 100644 --- a/openhis-ui-vue3/src/views/catalog/device/index.vue +++ b/openhis-ui-vue3/src/views/catalog/device/index.vue @@ -33,7 +33,7 @@ v-model="queryParams.searchKey" placeholder="品名/商品名/英文品名/编码/拼音" clearable - style="width: 240px" + style="width: 220px" @keyup.enter="handleQuery" /> @@ -231,8 +231,8 @@ @@ -254,8 +254,8 @@ @@ -270,8 +270,8 @@ @@ -383,6 +383,8 @@ ref="deviceRef" :title="title" :item="currentData" + :deviceCategories="deviceCategories" + :statusFlagOptions="statusFlagOptions" @submit="getList()" />