From 0ac2e84b9f5407b5a0f56b6e97cfe79952130ee2 Mon Sep 17 00:00:00 2001 From: duhe Date: Thu, 20 Mar 2025 10:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=8C=82=E5=8F=B7=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=85=A5=E5=BA=93=E7=94=BB=E9=9D=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20up=20by=20dh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../medicine/components/medicineDialog.vue | 16 +- .../src/views/catalog/medicine/index.vue | 13 +- .../components/outpatientregistration.js | 11 +- .../components/patientAddDialog.vue | 32 +- .../charge/outpatientregistration/index.vue | 61 +- .../components/inventoryReceiptDialog.vue | 708 ++++++++---------- .../components/purchaseinventory.js | 16 +- .../purchaseinventory/index.vue | 258 +++---- 8 files changed, 484 insertions(+), 631 deletions(-) diff --git a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue index 6234cc01..f5fbf017 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue @@ -373,10 +373,10 @@ :disabled="form.id != undefined" > @@ -471,18 +471,17 @@ - + - + @@ -720,6 +718,7 @@ function show() { // getList(); reset(); statusFlagOptions.value = props.status; + domainEnumOptions.value = props.domainEnum; // currentData.value.activeFlag == 1 // ? (currentData.value.activeFlag = true) // : (currentData.value.activeFlag = false); //是否为活性 @@ -751,6 +750,7 @@ function edit() { reset(); form.value = props.item; statusFlagOptions.value = props.status; + domainEnumOptions.value = props.domainEnum; visible.value = true; } /** 重置操作表单 */ diff --git a/openhis-ui-vue3/src/views/catalog/medicine/index.vue b/openhis-ui-vue3/src/views/catalog/medicine/index.vue index 49768ed5..60d68de3 100644 --- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue +++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue @@ -303,14 +303,22 @@ key="effectiveDate" prop="effectiveDate" :show-overflow-tooltip="true" - /> + > + + + > + + { - maritalstatusList.value = response.data; - }); - listoccupationtype().then((response) => { - occupationtypeList.value = response.data; - }); - lisadministrativegender().then((response) => { - administrativegenderList.value = response.data; - }); - listbloodtypeabo().then((response) => { - bloodtypeaboList.value = response.data; - }); - listbloodtypearh().then((response) => { - bloodtypearhList.value = response.data; - }); - listfamilyrelationshiptype().then((response) => { - familyrelationshiptypeList.value = response.data; + patientlLists().then((response) => { + console.log(response); + occupationtypeList.value = response.data.occupationType; + administrativegenderList.value = response.data.administrativeGender; + bloodtypeaboList.value = response.data.bloodTypeABO; + bloodtypearhList.value = response.data.bloodTypeRH; + familyrelationshiptypeList.value = response.data.familyRelationshipType; + maritalstatusList.value = response.data.maritalStatus; }); } diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue index 921ce142..de628fe0 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -9,7 +9,7 @@ @@ -151,7 +151,7 @@ @@ -678,10 +678,29 @@ const data = reactive({ // status: undefined, // 状态（包括 1：预置，2：启用，3：停用） }, rules: { - // name: [{ required: true, message: "名称不能为空", trigger: "blur" }], - // conditionCode: [ - // { required: true, message: "编码不能为空", trigger: "blur" }, + patientId: [{ required: true, message: "病人不能为空", trigger: "blur" }], + priorityEnum: [ + { required: true, message: "优先级不能为空", trigger: "blur" }, + ], + serviceTypeId: [ + { required: true, message: "挂号类型不能为空", trigger: "blur" }, + ], + organizationId: [ + { required: true, message: "优先级不能为空", trigger: "blur" }, + ], + locationId: [ + { required: true, message: "就诊科室不能为空", trigger: "blur" }, + ], + // practitionerId: [ + // { required: true, message: "医生不能为空", trigger: "blur" }, // ], + typeCode: [ + { required: true, message: "账户类型不能为空", trigger: "blur" }, + ], + definitionId: [ + { required: true, message: "费用定价不能为空", trigger: "blur" }, + ], + totalPrice: [{ required: true, message: "总价不能为空", trigger: "blur" }], }, }); @@ -797,13 +816,6 @@ function setInfo() { (doctor) => doctor.id === form.value.practitionerId ); form.value.doctorName = doctorData.length > 0 ? doctorData[0].name : ""; - console.log(doctorData, "datayisheng"); - const healthcareData = healthcareList.value.filter( - (healthcare) => healthcare.id === form.value.serviceTypeId - ); - form.value.locationId_dictText = - healthcareData.length > 0 ? healthcareData[0].name : ""; - form.value.price = healthcareData.length > 0 ? healthcareData[0].price : ""; } // 设定费用项管理表单 @@ -811,10 +823,9 @@ function setchargeItem() { const healthcareData = healthcareList.value.filter( (healthcare) => healthcare.id === form.value.serviceTypeId ); - form.value.definitionId = - healthcareData.length > 0 ? healthcareData[0].definitionId : ""; - form.value.totalPrice = - healthcareData.length > 0 ? healthcareData[0].price : ""; + form.value.locationId_dictText = + healthcareData.length > 0 ? healthcareData[0].name : ""; + form.value.price = healthcareData.length > 0 ? healthcareData[0].price : ""; } /** 查询患者信息 */ function getList() { @@ -944,10 +955,14 @@ function reset() { function handleAdd() { const transformedData = transformFormData(form.value); console.log(transformedData, "transformedData门诊挂号"); - addOutpatientRegistration(transformedData).then((response) => { - reset(); - proxy.$modal.msgSuccess("新增成功"); - getList(); + proxy.$refs["outpatientRegistrationRef"].validate((valid) => { + if (valid) { + addOutpatientRegistration(transformedData).then((response) => { + reset(); + proxy.$modal.msgSuccess("新增成功"); + getList(); + }); + } }); } @@ -979,7 +994,7 @@ function transformFormData(form) { patientId: form.patientId, definitionId: form.definitionId, serviceId: form.serviceTypeId, - totalPrice: form.totalPrice, // 默认值为 99.99 + totalPrice: form.price, // 默认值为 99.99 }, }; } diff --git a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue index bce286e0..e643f1dc 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/purchaseinventory/components/inventoryReceiptDialog.vue @@ -36,100 +36,85 @@ - - - - - - - - - + + + + + + + + + + + + - - -