版本更新

This commit is contained in:
Zhang.WH
2025-09-03 15:54:41 +08:00
parent 0b93d16b64
commit 8f82322d10
3290 changed files with 154339 additions and 23829 deletions

View File

@@ -0,0 +1,153 @@
import request from '@/utils/request'
// 查询调拨管理列表
export function getTransferProductList(query) {
return request({
url:'/inventory-manage/transfer/product-transfer-page',
method: 'get',
params: query
})
}
// 调拨详情
export function getTransferProductDetail(busNo) {
return request({
url: '/inventory-manage/transfer/product-transfer-detail',
method: 'get',
params: busNo // 确保参数正确传递
})
}
// 添加/编辑调拨单据
export function addTransferProduct(data) {
return request({
url: '/inventory-manage/transfer/product-transfer',
// product-transfer-edit',
method: 'put',
data: data
})
}
// 添加/编辑批量调拨单据
export function addTransferProductBatch(data) {
return request({
url: '/inventory-manage/transfer/product-transfer-batch',
// product-transfer-edit',
method: 'put',
data: data
})
}
// 批量调拨详情
export function getTransferProductDetails(params) {
return request({
url: '/inventory-manage/transfer/product-transfer-batch',
method: 'get',
params: params // 确保参数正确传递
})
}
// 查询单据初始化数据
export function getInit() {
return request({
url: '/inventory-manage/transfer/init',
method: 'get'
})
}
export function getBusNoInit() { //单据号
return request({
url: '/inventory-manage/transfer/bus-no-init',
method: 'get'
})
}
// 删除单据
export function delTransferProduct(param) {
return request({
url: '/inventory-manage/transfer/product-transfer-del?supplyRequestIds=' + param,
method: 'delete',
})
}
// 提交审批
export function submitApproval(busNo) {
return request({
url: '/inventory-manage/transfer/submit-approval',
// product-transfer-approved
method: 'put',
data: busNo
})
}
// 撤回审批
export function withdrawApproval(busNo) {
return request({
url: '/inventory-manage/transfer/withdraw-approval',
method: 'put',
data: busNo
})
}
// 获取药品目录
export function getMedicineList(queryParams) {
return request({
url: '/app-common/inventory-item',
method: 'get',
params: queryParams
})
}
// 获取药品目录
export function getCount(queryParams) {
return request({
url: '/app-common/inventory-item-info',
method: 'get',
params: queryParams
})
}
// 获取药房列表
export function getPharmacyList() {
return request({
url: '/app-common/inventory-pharmacy-list',
// '/app-common/pharmacy-list',
method: 'get',
})
}
// 获取药库列表
export function getDispensaryList() {
return request({
url:'/app-common/inventory-cabinet-list',
// '/app-common/cabinet-list',
method: 'get',
})
}
// 获取仓库药房列表
export function getpharmacyCabinetList() {
return request({
url: '/app-common/pharmacy-cabinet-list',
method: 'get',
})
}
/**
* 审批驳回
*/
export function reject(busNo) {
return request({
url: '/inventory-manage/receipt/reject?busNo=' + busNo,
method: 'put',
})
}
/**
* 商品调拨审批通过
*/
export function productTransferApproved(busNo) {
return request({
url: '/inventory-manage/receipt/product-transfer-approved?busNo=' + busNo,
method: 'put',
})
}

View File

@@ -0,0 +1,170 @@
<template>
<div>
<el-table
ref="medicineRef"
height="400"
:data="medicineList"
@cell-click="clickRow"
>
<el-table-column
label="项目名称"
align="center"
prop="name"
width="200"
:show-overflow-tooltip="true"
/>
<el-table-column
label="项目类型"
align="center"
prop="itemType_enumText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="包装单位"
align="center"
prop="unitCode_dictText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="最小单位"
align="center"
prop="minUnitCode_dictText"
:show-overflow-tooltip="true"
/>
<el-table-column label="规格"
align="center"
prop="volume"
:show-overflow-tooltip="true"
/>
<el-table-column
label="产品批号"
align="center"
prop="lotNumber"
/>
<el-table-column
label="包装单位"
align="center"
prop="unitCode_dictText"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
<el-table-column label="单次剂量" align="center" prop="dose" />
<el-table-column
label="剂量单位"
align="center"
prop="doseUnitCode_dictText"
/> -->
<el-table-column label="生产厂家" align="center" prop="manufacturer" />
<el-table-column
label="编码"
align="center"
prop="ybNo"
/>
</el-table>
</div>
</template>
<script setup>
import { getMedicineList } from "./transferManagement";
import { watch } from "vue";
import { throttle } from "lodash-es";
const router = useRouter();
const route = useRoute();
const props = defineProps({
searchKey: {
type: String,
default: "",
},
itemType: {
type: String,
default: "",
},
sourceLocationId:{
type: String,
default: "",
},
purposeLocationId:{
type: String,
default: "",
},
sourceLocationId1:{
type: String,
default: "",
},
purposeLocationId1:{
type: String,
default: "",
},
});
const emit = defineEmits(["selectRow"]);
const queryParams = ref({
// pageNum: 1,
// pageSize: 50,
itemType: props.itemType,
// itemType1: props.itemType1,
orgLocationId:props.sourceLocationId,
// objLocationId:props.purposeLocationId,
orgLocationId1:props.sourceLocationId1,
objLocationId1:props.purposeLocationId1,
purchaseFlag:0
});
const medicineList = ref([]);
// 节流函数
const throttledGetList = throttle(
() => {
getList();
},
300,
{ leading: true, trailing: true }
);
watch(
() => props,
(newValue) => {
console.log(newValue,"newValue")
queryParams.value.searchKey = newValue.searchKey;
queryParams.value.itemType = newValue.itemType;
// queryParams.value.itemType1 = newValue.itemType1;
queryParams.value.orgLocationId=newValue.sourceLocationId;
// queryParams.value.objLocationId=newValue.purposeLocationId;
queryParams.value.orgLocationId1=newValue.sourceLocationId1;
// queryParams.value.objLocationId1=newValue.purposeLocationId1;
queryParams.value.purchaseFlag = 0
throttledGetList();
},
{ immdiate: true, deep: true }
);
getList();
function getList() {
console.log(queryParams.value,"queryParams.value1")
if(route.query.supplyBusNo){ // 编辑
queryParams.value.itemType = queryParams.value.itemType;
queryParams.value.orgLocationId = queryParams.value.orgLocationId1
// queryParams.value.objLocationId = queryParams.value.objLocationId1
console.log(queryParams.value,"queryParams.value1111111")
}
// delete queryParams.value.itemType
delete queryParams.value.orgLocationId1
delete queryParams.value.objLocationId1
console.log(queryParams.value,"queryParams.value")
getMedicineList(queryParams.value).then((res) => {
medicineList.value = res.data;
console.log(medicineList.value,"medicineList.value ")
});
}
function clickRow(row) {
console.log(row,"row--------------------")
emit("selectRow", row);
}
</script>
<style scoped>
:deep( .hover_row){
width: 100vw!important;
}
</style>

View File

@@ -0,0 +1,506 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<!-- supplyBusNo searchKey-->
<el-form-item label="单据号:" prop="searchKey">
<el-input
v-model="queryParams.searchKey"
placeholder="单据号:"
clearable
style="width: 220px;"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="单据类型:" prop="typeEnum">
<el-select
v-model="queryParams.typeEnum"
placeholder=""
clearable
style="width: 150px"
>
<el-option
v-for="supplyStatus in supplyTypeOptions"
:key="supplyStatus.value"
:label="supplyStatus.label"
:value="supplyStatus.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="药品" prop="searchKey" label-width="40">
<el-input
v-model="queryParams.searchKey"
placeholder="品名/商品名/英文品名/编码/拼音"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item> -->
<el-form-item label="源仓库:" prop="sourceLocationId">
<el-select
v-model="queryParams.sourceLocationId"
placeholder=""
clearable
style="width: 150px"
>
<el-option
v-for="sourceLocationId in getpharmacyCabinetOptions"
:key="sourceLocationId.value"
:label="sourceLocationId.name"
:value="sourceLocationId.id"
/>
</el-select>
</el-form-item>
<el-form-item label="目的仓库:" prop="purposeLocationId">
<el-select
v-model="queryParams.purposeLocationId"
placeholder=""
clearable
style="width: 150px"
>
<el-option
v-for="purposeLocationId in getpharmacyCabinetOptions"
:key="purposeLocationId.value"
:label="purposeLocationId.name"
:value="purposeLocationId.id"
/>
</el-select>
</el-form-item>
<el-form-item label="审批状态:" prop="statusEnum">
<el-select
v-model="queryParams.statusEnum"
placeholder=""
clearable
style="width: 150px"
>
<el-option
v-for="supplyStatus in supplyStatusOptions"
:key="supplyStatus.value"
:label="supplyStatus.label"
:value="supplyStatus.value"
/>
</el-select>
</el-form-item>
<el-form-item label="查询时间:">
<el-date-picker
v-model="occurrenceTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 300px"
value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- 添加记录 -->
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="openAddaddTransferProductDialog"
>新增调拨单</el-button
>
<!-- v-hasPermi="['system:user:add']" -->
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="openAddaddTransferProducts"
>新增批量调拨单</el-button
>
<!-- v-hasPermi="['system:user:add']" -->
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Search"
@click="handleQuery"
>查询</el-button
>
<!-- v-hasPermi="['system:user:import']" -->
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="CircleClose"
@click="handleClear"
>重置</el-button
>
<!-- v-hasPermi="['system:user:export']" -->
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="purchaseinventoryList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<!-- <el-table-column
label="药品名称"
align="center"
key="name"
prop="name"
:show-overflow-tooltip="true"
width="110"
/> -->
<el-table-column
label="单据号"
align="center"
key="supplyBusNo"
prop="supplyBusNo"
width="200"
:show-overflow-tooltip="true"
/>
<!-- itemTable -->
<el-table-column
label="单据类型"
align="center"
key="typeEnum_enumText"
prop="typeEnum_enumText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="审批状态"
align="center"
key="statusEnum_enumText"
prop="statusEnum_enumText"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
label="状态"
align="center"
key="typeEnum_enumText"
prop="typeEnum_enumText"
/> -->
<el-table-column
label="源仓库"
align="center"
key="sourceLocationName"
prop="sourceLocationName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="目的仓库"
align="center"
key="purposeLocationName"
prop="purposeLocationName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="制单人"
align="center"
key="applicantId_dictText"
prop="applicantId_dictText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="审核人"
align="center"
key="approverId_dictText"
prop="approverId_dictText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="制单日期"
align="center"
key="createTime"
prop="createTime"
width="160"
:show-overflow-tooltip="true"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="审核日期 "
align="center"
key="approvalTime"
prop="approvalTime"
width="160"
:show-overflow-tooltip="true"
>
<template #default="scope">
<span>{{ parseTime(scope.row.approvalTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="230"
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button
link
type="primary"
icon="View"
@click="handleUpdate(scope.row,'view')"
>详情</el-button
>
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
:disabled="
scope.row.statusEnum != '1' && scope.row.statusEnum != '9' && scope.row.statusEnum != '4'
"
>编辑</el-button
>
<!-- v-hasPermi="['system:user:edit']" -->
<el-button
link
type="primary"
icon="View"
@click="handleSubmitApproval(scope.row)"
v-if="scope.row.statusEnum == '1' || scope.row.statusEnum == '9'"
>提交审批</el-button
>
<!-- v-hasPermi="['system:user:remove']" -->
<el-button
link
type="primary"
icon="View"
@click="handleWithdrawApproval(scope.row)"
v-if="scope.row.statusEnum == '2'"
>撤销审批</el-button
>
<!-- v-hasPermi="['system:user:remove']" -->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- <Dialog
ref="transferProductRef"
:supplyTypeOptions="supplyTypeOptions"
:purposeTypeListOptions="purposeTypeListOptions"
:sourceTypeListOptions="sourceTypeListOptions"
:busNoAdd="busNoAdd"
:item="currentData"
:editRow="editRow"
@refresh="getList"
/> -->
</div>
</template>
<script setup name="transferManagementList">
import {
getTransferProductList,
getInit,
submitApproval,
withdrawApproval,
delTransferProduct,
getpharmacyCabinetList
} from "../components/transferManagement";
import { useStore } from '@/store/store';
const store = useStore();
// import Dialog from "./components/Dialog";
const router = useRouter();
const { proxy } = getCurrentInstance();
const purchaseinventoryRef = ref(null); // 初始化 ref
const getpharmacyCabinetOptions = ref([])
const purchaseinventoryList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const occurrenceTime = ref([]);
const busNoAdd = ref(""); // 单据号新增
const purposeTypeListOptions = ref(undefined);
const sourceTypeListOptions = ref(undefined)
const supplyTypeOptions = ref(undefined);
const sourceLocationIdListOptions = ref(undefined); // 源仓库
const purposeLocationIdListOptions = ref(undefined); //目的仓库
const supplyStatusOptions = ref(undefined);
const editRow = ref({});
// 使用 ref 定义当前编辑的采购
const currentData = ref({});
const data = reactive({
form: {},
queryParams: {
pageNo: 1,
pageSize: 10,
searchKey: undefined,
typeEnum:undefined, // 单据类型
sourceLocationId:undefined,//源仓库
purposeLocationId:undefined,// 目的仓库
statusEnum: undefined, // 单据状态
createTimeSTime:undefined,
createTimeETime:undefined,
},
rules: {},
});
const { queryParams, form, rules } = toRefs(data);
/** 调拨管理查询下拉树结构 */
function getTransferProductTypeList() {
getInit().then((response) => {
purposeTypeListOptions.value = response.data.purposeTypeListOptions;
sourceTypeListOptions.value = response.data.sourceTypeListOptions;
supplyTypeOptions.value = response.data.supplyTypeOptions ;
supplyStatusOptions.value = response.data.supplyStatusOptions;
});
getpharmacyCabinetList().then((response) => {
getpharmacyCabinetOptions.value = response.data
})
}
/** 查询调拨管理项目列表 */
function getList() {
loading.value = true;
getTransferProductList(queryParams.value).then((res) => {
loading.value = false;
purchaseinventoryList.value = res.data.records;
total.value = res.data.total;
});
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.createTimeSTime =
occurrenceTime.value && occurrenceTime.value.length == 2
? occurrenceTime.value[0] + " 00:00:00"
: "";
queryParams.value.createTimeETime =
occurrenceTime.value && occurrenceTime.value.length == 2
? occurrenceTime.value[1] + " 23:59:59"
: "";
queryParams.value.pageNo = 1;
getList();
}
/** 清空条件按钮操作 */
function handleClear() {
// 清空查询条件
queryParams.value.createTimeSTime = ""
queryParams.value.createTimeETime = ""
occurrenceTime.value = ""
proxy.resetForm("queryRef");
getList();
}
/** 选择条数 */
function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 打开批量新增 */
function openAddaddTransferProducts(){
router.push({ path: '/medicationmanagement/transferManagement/batchTransfer'})
}
/** 打开新增 */
function openAddaddTransferProductDialog() {
// getTransferProductTypeList();
// getBusNoInitList()
// nextTick(() => {
// proxy.$refs["transferProductRef"].show();
// });
// const partItem = {partFlg: 'add',rowData: []}
// item: JSON.stringify(partItem)
// ,query:{item: JSON.stringify(partItem)}
sessionStorage.setItem('busNo',"")
store.clearCurrentDataDB()
router.push({ path: '/medicationmanagement/transferManagement/transferManagent'})
}
/** 修改按钮操作 */
function handleUpdate(row,view) {
editRow.value = row;
if(row.typeEnum==8){ // 批量调拨
if(view){
router.replace({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else{
router.push({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:editRow.value.supplyBusNo}})
}
}else{
if(view){
router.replace({path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}});
}else{
router.push({ path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:editRow.value.supplyBusNo}})
}
}
}
/** 提交审核按钮 */
function handleSubmitApproval(row) {
submitApproval(row.supplyBusNo).then((response) => {
proxy.$modal.msgSuccess("提交审批成功");
open.value = false;
getList();
});
}
/** 撤回审批按钮 */
function handleWithdrawApproval(row) {
withdrawApproval(row.supplyBusNo).then((response) => {
proxy.$modal.msgSuccess("撤销审批成功");
open.value = false;
getList();
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const delId = row.id || ids.value;
proxy.$modal
.confirm("是否确认删除以上数据?")
.then(function () {
return delTransferProduct({ ids: delId.join(",") });
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}
getTransferProductTypeList();
getList();
</script>
<style scoped>
.custom-tree-node {
display: flex;
align-items: center;
}
.title {
font-weight: bold;
font-size: large;
margin-bottom: 10px;
}
</style>