wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/settlementDoc.vue
View File

@@ -1,12 +1,7 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryRef"
:inline="true"
label-width="90px"
>
<el-form-item label="药品名称：" prop="searchKey">
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
<el-form-item label="药品名称：" prop="searchKey">
<el-input
v-model="queryParams.searchKey"
placeholder="药品编码/药品名称/名称拼音/供应商名"
@@ -33,7 +28,7 @@
@keyup.enter="handleQuery"
/>
</el-form-item> -->
<el-form-item label="药品类别：" prop="categoryCode">
<el-select
v-model="queryParams.categoryCode"
@@ -42,14 +37,14 @@
style="width: 150px"
>
<el-option
v-for="categoryCode in item_type"
v-for="categoryCode in item_category_code"
:key="categoryCode.value"
:label="categoryCode.label"
:value="categoryCode.value"
/>
</el-select>
</el-form-item>
<el-form-item label="医保等级：" prop="chrgitmLv" >
<el-form-item label="医保等级：" prop="chrgitmLv">
<el-select
v-model="queryParams.chrgitmLv"
placeholder="请选择医保等级"
@@ -64,7 +59,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="仓库药房：" prop="locationId" >
<el-form-item label="仓库药房：" prop="locationId">
<el-select
v-model="queryParams.locationId"
placeholder="请选择仓库药房"
@@ -72,7 +67,7 @@
style="width: 150px"
>
<el-option
v-for="supplyStatus in locationIdList"
v-for="supplyStatus in locationIdList"
:key="supplyStatus.value"
:label="supplyStatus.name"
:value="supplyStatus.id"
@@ -99,25 +94,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- v-hasPermi="['system:user:import']" -->
<el-button
type="primary"
plain
icon="Search"
@click="handleQuery"
>查询</el-button
>
<el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
</el-col>
<el-col :span="1.5">
<!-- v-hasPermi="['system:user:export']" -->
<el-button
type="warning"
plain
icon="CircleClose"
@click="handleClear"
>重置</el-button
>
<el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
</el-col>
</el-row>
@@ -133,7 +114,6 @@
key="categoryCode_dictText"
prop="categoryCode_dictText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="药品编码"
@@ -262,7 +242,7 @@
prop="price"
:show-overflow-tooltip="true"
/>
<el-table-column
<el-table-column
label="本期库存数量"
align="center"
key="quantity"
@@ -298,19 +278,15 @@
</template>
<script setup name="settlementDoc">
import {
getproductReturnPage,
getInit,
getPharmacyCabinetList,
} from "./statisticalManagent";
import { getproductReturnPage, getInit, getPharmacyCabinetList } from './statisticalManagent';
const { proxy } = getCurrentInstance();
const {
item_type,
item_category_code,
inventory_range,
} = proxy.useDict(
"item_type",
"item_category_code",
"inventory_range",
);
@@ -322,7 +298,7 @@ const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const supplyTypeOptions = ref(undefined);
const supplyTypeOptions = ref(undefined);
const supplyStatusOptions = ref(undefined);
const chrgitmLv_enumTextOptions = ref([]);
const locationIdList = ref([]);
@@ -332,13 +308,13 @@ const data = reactive({
queryParams: {
pageNo: 1,
pageSize: 10,
searchKey: undefined,
remainingDays: undefined,
// hospital:undefined,
categoryCode:undefined,
chrgitmLv:undefined,
searchKey: undefined,
remainingDays: undefined,
// hospital:undefined,
categoryCode: undefined,
chrgitmLv: undefined,
warehouseScope: undefined,
locationId: undefined,
locationId: undefined,
// occurrenceTimeSTime:undefined,
// occurrenceTimeETime:undefined,
},
@@ -349,37 +325,41 @@ const { queryParams, form, rules } = toRefs(data);
function getPharmacyCabinetLists() {
getPharmacyCabinetList().then((response) => {
locationIdList.value = response.data
locationIdList.value = response.data;
});
getInit().then((response) => {
chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions
})
chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions;
});
}
/** 查询调拨管理项目列表 */
function getList() {
loading.value = true;
getproductReturnPage(queryParams.value).then((res) => {
loading.value = false;
purchaseinventoryList.value = res.data.records
if(purchaseinventoryList.value&& purchaseinventoryList.value.length>0){
purchaseinventoryList.value.map((k,index)=>{
k.inventoryStatusEnum_enumText = k.inventoryStatusEnum==2?'未停供':(k.inventoryStatusEnum==3?'已停供':'')
k.quantityUnit = k.quantity / k.partPercent
purchaseinventoryList.value = res.data.records;
if (purchaseinventoryList.value && purchaseinventoryList.value.length > 0) {
purchaseinventoryList.value.map((k, index) => {
k.inventoryStatusEnum_enumText =
k.inventoryStatusEnum == 2 ? '未停供' : k.inventoryStatusEnum == 3 ? '已停供' : '';
k.quantityUnit = k.quantity / k.partPercent;
const integerPart1 = Math.floor(k.quantityUnit); // 获取整数部分
const decimalPart1 = k.quantityUnit - integerPart1; // 获取小数部分
if(decimalPart1){
k.quantityUnit = integerPart1 + k.unitCode_dictText +
(decimalPart1*k.partPercent).toFixed(0) + k.minUnitCode_dictText
if (decimalPart1) {
k.quantityUnit =
integerPart1 +
k.unitCode_dictText +
(decimalPart1 * k.partPercent).toFixed(0) +
k.minUnitCode_dictText;
}
k.price = k.price?k.price.toFixed(2):0
k.retailPrice = k.retailPrice?k.retailPrice.toFixed(2):0
k.totalPrice = k.price * (Number(k.quantity) / k.partPercent)
k.totalPrice = k.totalPrice?k.totalPrice.toFixed(2):0
k.totalSalePrice = k.retailPrice * (Number(k.quantity) / k.partPercent)
k.totalSalePrice = k.totalSalePrice?k.totalSalePrice.toFixed(2):0
})
k.price = k.price ? k.price.toFixed(2) : 0;
k.retailPrice = k.retailPrice ? k.retailPrice.toFixed(2) : 0;
k.totalPrice = k.price * (Number(k.quantity) / k.partPercent);
k.totalPrice = k.totalPrice ? k.totalPrice.toFixed(2) : 0;
k.totalSalePrice = k.retailPrice * (Number(k.quantity) / k.partPercent);
k.totalSalePrice = k.totalSalePrice ? k.totalSalePrice.toFixed(2) : 0;
});
}
total.value = res.data.total;
});
@@ -387,14 +367,14 @@ function getList() {
/** 搜索按钮操作 */
function handleQuery() {
// queryParams.value.occurrenceTimeSTime =
// occurrenceTime.value && occurrenceTime.value.length == 2
// ? occurrenceTime.value[0] + " 00:00:00"
// : "";
// queryParams.value.occurrenceTimeETime =
// occurrenceTime.value && occurrenceTime.value.length == 2
// ? occurrenceTime.value[1] + " 23:59:59"
// : "";
// queryParams.value.occurrenceTimeSTime =
// occurrenceTime.value && occurrenceTime.value.length == 2
// ? occurrenceTime.value[0] + " 00:00:00"
// : "";
// queryParams.value.occurrenceTimeETime =
// occurrenceTime.value && occurrenceTime.value.length == 2
// ? occurrenceTime.value[1] + " 23:59:59"
// : "";
queryParams.value.pageNo = 1;
getList();
}
@@ -402,7 +382,7 @@ function handleQuery() {
/** 清空条件按钮操作 */
function handleClear() {
// 清空查询条件
proxy.resetForm("queryRef");
proxy.resetForm('queryRef');
getList();
}
@@ -414,13 +394,11 @@ function handleSelectionChange(selection) {
}
getList();
getPharmacyCabinetLists()
getPharmacyCabinetLists();
</script>
<style scoped>
.custom-tree-node {
display: flex;
align-items: center;
}
</style>
</style>