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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

236
openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPartDeptDevice/index.vue
View File

@@ -1,6 +1,10 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
=======
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules">
>>>>>>> v1.3
<el-form-item label="项目名称" prop="name">
<el-input
v-model="queryParams.name"
@@ -10,7 +14,11 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="仓库类型" prop="purposeTypeEnum">
=======
<el-form-item label="仓库" prop="purposeTypeEnum">
>>>>>>> v1.3
<el-select
v-model="queryParams.purposeTypeEnum"
placeholder="请选择"
@@ -18,6 +26,10 @@
filterable
style="width: 200px"
@change="handleChangePurposeTypeEnum"
<<<<<<< HEAD
=======
@keyup.enter="handleQuery"
>>>>>>> v1.3
>
<el-option
v-for="item in warehous_type"
@@ -27,13 +39,20 @@
/>
</el-select>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="盘点仓库" prop="purposeLocationId">
<el-select
v-model="queryParams.purposeLocationId"
=======
<el-form-item label="盘点仓库" prop="sourceLocationId">
<el-select
v-model="queryParams.sourceLocationId"
>>>>>>> v1.3
placeholder="请选择"
clearable
filterable
style="width: 200px"
<<<<<<< HEAD
@change="handleCabinetChange(receiptHeaderForm.purposeLocationId)"
>
<el-option
@@ -41,6 +60,13 @@
{ id: 1, name: '仓库1' },
{ id: 2, name: '仓库2' },
]"
=======
:disabled="!queryParams.purposeTypeEnum"
@keyup.enter="handleQuery"
>
<el-option
v-for="item in purposeTypeListOptions"
>>>>>>> v1.3
:key="item.id"
:label="item.name"
:value="item.id"
@@ -55,6 +81,7 @@
filterable
style="width: 200px"
>
<<<<<<< HEAD
<el-option
v-for="item in [
{ id: 1, name: '货位1' },
@@ -66,17 +93,53 @@
/>
</el-select>
</el-form-item>
=======
<el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="请求日期" prop="applyTime">
<el-date-picker
v-model="queryParams.applyTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
format="YYYY-MM-DD"
></el-date-picker>
</el-form-item>
>>>>>>> v1.3
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<<<<<<< HEAD
=======
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
size="small"
@click="handleSave()"
:disabled="multiple"
>批量保存</el-button
>
</el-col>
</el-row>
>>>>>>> v1.3
<el-table
v-loading="loading"
:data="dataList"
@selection-change="handleSelectionChange"
height="calc(100vh - 250px)"
>
<<<<<<< HEAD
=======
<el-table-column type="selection" width="55" align="center" fixed></el-table-column>
>>>>>>> v1.3
<el-table-column
label="项目"
align="center"
@@ -86,6 +149,7 @@
fixed
></el-table-column>
<el-table-column label="规格" align="center" prop="totalVolume" />
<<<<<<< HEAD
<el-table-column label="厂家/产地" align="center" prop="manufacturer" show-overflow-tooltip />
<el-table-column label="产品批号" align="center" prop="lotNumber" />
<el-table-column label="单价" align="center" key="unit" prop="unitPrice" />
@@ -94,6 +158,37 @@
<el-table-column label="盈亏数量" align="center" prop="itemQuantity">
<template #default="scope">
<el-input v-model="scope.row.itemQuantity" :input-style="{ textAlign: 'center' }" type="number" />
=======
<el-table-column label="厂家/产地" align="center" prop="manufacturerText" show-overflow-tooltip />
<el-table-column label="产品批号" align="center" prop="lotNumber" />
<el-table-column label="单价(元)" align="center" key="unit" prop="unitPrice" />
<el-table-column label="发放数量" align="center" prop="dispenseQuantity">
<template #default="scope">
{{ formatQuantityWithUnit(scope.row.dispenseQuantity, scope.row.minUnitCode_dictText) }}
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="quantity">
<template #default="scope">
{{ formatQuantityWithUnit(scope.row.quantity, scope.row.minUnitCode_dictText) }}
</template>
</el-table-column>
<el-table-column label="实盘数量" align="center" prop="stockTakeQuantity">
<template #default="scope">
<el-input-number
v-model="scope.row.stockTakeQuantity"
:precision="0"
:min="0"
:input-style="{ textAlign: 'center' }"
:controls="false"
style="width: 100%"
@keyup.enter="handleSave(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="盈亏数量" align="center" prop="profitLoss">
<template #default="scope">
{{ calcProfitLoss(scope.row) }}
>>>>>>> v1.3
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitCode_dictText" />
@@ -102,8 +197,14 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
<<<<<<< HEAD
size="mini"
type="text"
=======
size="small"
type="primary"
link
>>>>>>> v1.3
icon="Check"
@click="handleSave(scope.row)"
v-hasPermi="['chkstock:partDeptDevice:edit']"
@@ -115,6 +216,7 @@
</div>
</template>
<script setup>
<<<<<<< HEAD
import { ref, reactive, toRaw, computed, watch, onMounted } from 'vue';
const { proxy } = getCurrentInstance();
import { getStockTakeList } from './components/api.js';
@@ -134,12 +236,49 @@ const getList = () => {
loading.value = false;
dataList.value = res.data;
total.value = res.data.length;
=======
import { ref, reactive, getCurrentInstance, onMounted } from 'vue';
import {
getStockTakeList,
getPharmacyList,
getDispensaryList,
saveOrgDeviceSummary,
} from './components/api.js';
const { proxy } = getCurrentInstance();
const { warehous_type } = proxy.useDict('warehous_type');
const dataList = ref([]);
const queryParams = reactive({
name: undefined,
purposeTypeEnum: undefined,
sourceLocationId: undefined,
applyTime: [],
applyTimeSTime: undefined,
applyTimeETime: undefined,
});
const loading = ref(false);
const rules = ref({});
// 获取列表
const getList = () => {
loading.value = true;
const params = {
...queryParams,
pageNo: queryParams.pageNo || 1,
pageSize: queryParams.pageSize || 10,
applyTime: undefined,
applyTimeSTime: queryParams.applyTime[0] ? `${queryParams.applyTime[0]} 00:00:00` : undefined,
applyTimeETime: queryParams.applyTime[1] ? `${queryParams.applyTime[1]} 23:59:59` : undefined,
};
getStockTakeList(params).then((res) => {
loading.value = false;
dataList.value = res.data;
>>>>>>> v1.3
});
};
// 搜索
const handleQuery = () => {
getList();
};
<<<<<<< HEAD
// 重置
const resetQuery = () => {
queryParams.value = {};
@@ -158,6 +297,77 @@ const handleSave = (row) => {
proxy.$modal.msgWarning('盈亏数量不能为空');
return;
}
=======
// 重置
const resetQuery = () => {
Object.assign(queryParams, {
name: undefined,
purposeTypeEnum: undefined,
sourceLocationId: undefined,
applyTime: [],
});
handleQuery();
};
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
// 多选
const handleSelectionChange = (selection) => {
ids.value = selection.map((item) => item);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
const toNumber = (value) => {
if (value === '' || value === null || value === undefined) return null;
const num = Number(value);
return Number.isNaN(num) ? null : num;
};
const formatQuantityWithUnit = (quantity, unitText) => {
const num = toNumber(quantity);
if (num === null) return '';
return unitText ? `${num} ${unitText}` : `${num}`;
};
const calcProfitLoss = (row) => {
const stockTakeQuantity = toNumber(row.stockTakeQuantity);
const dispenseQuantity = toNumber(row.dispenseQuantity);
if (stockTakeQuantity === null || dispenseQuantity === null) return '';
const profitLoss = stockTakeQuantity - dispenseQuantity;
return `${profitLoss} ${row.minUnitCode_dictText ?? ''}`;
};
const buildSummaryPayload = (rows) =>
rows.map((item) => ({
id: item.id,
stockTakeQuantity: Number(item.stockTakeQuantity),
useUnitCode: item.minUnitCode,
...item,
}));
// 保存（单条/批量）
const handleSave = (row) => {
const targetRows = row ? [row] : ids.value;
if (!targetRows.length) {
proxy.$modal.msgWarning('请选择需要保存的数据');
return;
}
const invalidRow = targetRows.find(
(item) =>
item.stockTakeQuantity === '' ||
item.stockTakeQuantity === null ||
item.stockTakeQuantity === undefined
);
if (invalidRow) {
proxy.$modal.msgWarning('实盘数量不能为空');
return;
}
const payload = buildSummaryPayload(targetRows);
>>>>>>> v1.3
proxy.$modal
.confirm('确定保存吗？', '保存', {
confirmButtonText: '保存',
@@ -165,6 +375,7 @@ const handleSave = (row) => {
type: 'warning',
})
.then(() => {
<<<<<<< HEAD
proxy.$modal.msgSuccess('保存成功');
getList();
})
@@ -172,6 +383,31 @@ const handleSave = (row) => {
};
const handleChangePurposeTypeEnum = (val) => {};
const handleCabinetChange = (val) => {};
=======
saveOrgDeviceSummary(payload).then(() => {
proxy.$modal.msgSuccess('保存成功');
getList();
});
})
.catch(() => {});
};
const purposeTypeListOptions = ref([]);
// 仓库类型切换
const handleChangePurposeTypeEnum = (val) => {
// 药房
if (val == '16') {
getPharmacyList().then((res) => {
purposeTypeListOptions.value = res.data;
});
} else if (val == '11') {
getDispensaryList().then((res) => {
purposeTypeListOptions.value = res.data;
});
}
getList();
};
>>>>>>> v1.3
onMounted(() => {
getList();
});