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

250
openhis-ui-vue3/src/views/medicationmanagement/billapproval/index.vue
View File

@@ -59,63 +59,57 @@
>
重置
</el-button>
<el-button
class="table-header-button"
type="primary"
@click="getList"
icon="Search"
>
<el-button class="table-header-button" type="primary" @click="getList" icon="Search">
搜索
</el-button>
</div>
<el-table
max-height="700"
:data="receiptList"
row-key="supplyBusNo"
v-loading="loading"
>
<el-table-column
label="单据号"
align="center"
prop="supplyBusNo"
width="200"
/>
<el-table-column
label="审批状态"
align="center"
prop="statusEnum_enumText"
/>
<el-table-column
label="单据类型"
align="center"
prop="typeEnum_enumText"
/>
<el-table max-height="700" :data="receiptList" row-key="supplyBusNo" v-loading="loading">
<el-table-column label="单据号" align="center" prop="supplyBusNo" width="160" />
<el-table-column label="审批状态" align="center" prop="statusEnum_enumText" />
<el-table-column label="单据类型" align="center" prop="typeEnum_enumText" />
<el-table-column label="经手人" align="center" prop="practitionerId_dictText">
<template #default="scope">
<span>{{ scope.row.practitionerId_dictText || '-' }}</span>
</template>
</el-table-column>
<el-table-column
label="供应商"
align="center"
prop="supplierId_dictText"
/>
<el-table-column
label="经手人"
align="center"
prop="practitionerId_dictText"
/>
<el-table-column
label="申请人"
align="center"
prop="applicantId_dictText"
/>
<el-table-column label="申请时间" align="center" prop="applyTime">
width="180"
:show-overflow-tooltip="true"
>
<template #default="scope">
<span>{{ scope.row.supplierId_dictText || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="目的仓库" align="center" prop="purposeLocationId_dictText">
<template #default="scope">
<span>{{ scope.row.purposeLocationId_dictText || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="总金额" align="center" prop="totalAmount">
<template #default="scope">
<span v-if="scope.row.totalAmount">{{ scope.row.totalAmount }} 元 </span>
<span v-else>{{ '-' }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applicantId_dictText">
<template #default="scope">
<span>{{ scope.row.applicantId_dictText || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" prop="applyTime" width="180">
<template #default="scope">
{{ formatDate(scope.row.applyTime) }}
</template>
</el-table-column>
<el-table-column
label="审批人"
align="center"
prop="approverId_dictText"
/>
<el-table-column label="审批时间" align="center" prop="approvalTime">
<el-table-column label="审批人" align="center" prop="approverId_dictText">
<template #default="scope">
<span>{{ scope.row.approverId_dictText || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" prop="approvalTime" width="180">
<template #default="scope">
{{ formatDate(scope.row.approvalTime) }}
</template>
@@ -130,34 +124,12 @@
<el-button
link
type="primary"
@click="handelApplys(scope.row,'apply')"
@click="handelApplys(scope.row, 'apply')"
:disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
>
审批
</el-button>
<el-button
link
type="primary"
@click="handelApplys(scope.row,'view')"
>
查看
</el-button>
<!-- <el-button
link
type="primary"
@click="handelApply(scope.row)"
:disabled="scope.row.statusEnum == 3 || scope.row.statusEnum == 4"
>
审批通过
</el-button>
<el-button
link
type="primary"
@click="handleReject(scope.row)"
:disabled="scope.row.statusEnum == 4 || scope.row.statusEnum == 3"
>
驳回
</el-button> -->
<el-button link type="primary" @click="handelApplys(scope.row, 'view')"> 查看 </el-button>
</template>
</el-table-column>
</el-table>
@@ -187,14 +159,13 @@ import {
} from "./components/api";
import { purchaseInventoryApproved as purchaseReturnApproved } from '../returnedPurchase/components/api';
import { useStore } from '@/store/store';
import { formatDate } from "@/utils/index";
import { formatDate } from '@/utils/index';
import useTagsViewStore from '@/store/modules/tagsView';
const tagsViewStore = useTagsViewStore();
const router = useRouter();
const route = useRoute();
const store = useStore();
const { proxy } = getCurrentInstance();
const emit = defineEmits(["selectAdviceBase"]);
const emit = defineEmits(['selectAdviceBase']);
const total = ref(0);
const queryParams = ref({
pageNo: 1,
@@ -208,8 +179,8 @@ const loading = ref(false);
watch(
() => route.query.type,
(newVlaue) => {
if(newVlaue){
getList()
if (newVlaue) {
getList();
}
},
{ immediate: true }
@@ -226,38 +197,43 @@ function getList() {
}
function handelApply(row) {
if(row.typeEnum ==2 || row.typeEnum ==8){ //商品调拨 8 批量
if (row.typeEnum == 2 || row.typeEnum == 8) {
//商品调拨 8 批量
productTransferApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
});
}else if(row.typeEnum ==7 ){ //领用出库审批通过
} else if (row.typeEnum == 7) {
//领用出库审批通过
requisitionIssueApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
});
}else if(row.typeEnum == 9){ //领用退库审批通过
} else if (row.typeEnum == 9) {
//领用退库审批通过
returnIssueApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
});
}else if(row.typeEnum == 4||row.typeEnum == 10){ //盘点审批 批量盘点10通过
} else if (row.typeEnum == 4 || row.typeEnum == 10) {
//盘点审批 批量盘点10通过
productStocktakingApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
});
}else if(row.typeEnum == 6){ // 报损审批通过
} else if (row.typeEnum == 6) {
// 报损审批通过
lossReportApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
})
@@ -279,70 +255,82 @@ function handelApply(row) {
}else{
purchaseInventoryApproved(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
proxy.$modal.msgSuccess('操作成功');
getList();
}
});
}
console.log(row,"typeEnum_enumText")
}
// 审批,查看
function handelApplys(row,view) {
// if(view=='apply'){ // 审批
// tagsViewStore.delView(router.currentRoute.value)
// }
if(row.typeEnum == 2){//商品调拨
function handelApplys(row, view) {
if (row.typeEnum == 2) {
//商品调拨
// 跳转到审核页面
router.replace({path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}});
// router.push({ path: '/medicationmanagement/transferManagement/transferManagent',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 8){ //8 批量
router.replace({ path: '/medicationmanagement/transferManagement/batchTransfer',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 7 ){ //领用出库审批通过
router.replace({ path: '/medicationmanagement/requisitionManagement/requisitionManagement',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 9){ //领用退库审批通过
router.replace({ path: '/medicationmanagement/requisitionManagement/returningInventory',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 4){ //盘点审批
router.replace({ path: '/medicationmanagement/chkstock/chkstockPart',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 10){ // 批量盘点
router.replace({ path: '/medicationmanagement/chkstock/chkstockBatch',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 6){ // 报损审批通过
router.replace({ path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',query:{supplyBusNo:row.supplyBusNo,view:view}})
}else if(row.typeEnum == 5){ // 采购退货通过5
// getpurchaseInventoryDetailReturn(row.supplyBusNo).then((response) => {
// let currentData = response.data;
// console.log(currentData,"退库详情")
// store.setCurrentReturnData({ editRow: row, item: currentData });
router.replace({ path: '/medicationmanagement/medicationmanagement/returnedPurchase',query:{originalSupplyBusNo:row.supplyBusNo,view:view}})
router.replace({
path: '/medicationmanagement/transferManagement/transferManagent',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 8) {
//8 批量
router.replace({
path: '/medicationmanagement/transferManagement/batchTransfer',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 7) {
//领用出库审批通过
router.replace({
path: '/medicationmanagement/requisitionManagement/requisitionManagement',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 9) {
//领用退库审批通过
router.replace({
path: '/medicationmanagement/requisitionManagement/returningInventory',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 4) {
//盘点审批
router.replace({
path: '/medicationmanagement/chkstock/chkstockPart',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 10) {
// 批量盘点
router.replace({
path: '/medicationmanagement/chkstock/chkstockBatch',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 6) {
// 报损审批通过
router.replace({
path: '/medicationmanagement/lossReportingManagement/lossReportingManagement',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
} else if (row.typeEnum == 5) {
// 采购退货通过5
router.replace({
path: '/medicationmanagement/medicationmanagement/returnedPurchase',
query: { originalSupplyBusNo: row.supplyBusNo, view: view },
});
// });
}else{ // 采购入库 1
} else {
// 采购入库 1
getpurchaseInventoryDetail(row.supplyBusNo).then((response) => {
let currentData = response.data;
store.setCurrentData({ editRow: row, item: currentData });
router.replace({ path: '/medicationmanagement/medicationmanagement/purchaseDocument',query:{supplyBusNo:row.supplyBusNo,view:view}})
router.replace({
path: '/medicationmanagement/medicationmanagement/purchaseDocument',
query: { supplyBusNo: row.supplyBusNo, view: view },
});
});
}
console.log(row,"typeEnum_enumText")
}
// 驳回
function handleReject(row) {
reject(row.supplyBusNo).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess("操作成功");
getList();
}
});
}
function handleDateQuery(value) {
if (value) {
queryParams.value.applyTimeSTime = value + " 00:00:00";
queryParams.value.applyTimeETime = value + " 23:59:59";
queryParams.value.applyTimeSTime = value + ' 00:00:00';
queryParams.value.applyTimeETime = value + ' 23:59:59';
} else {
queryParams.value.applyTimeSTime = undefined;
queryParams.value.applyTimeETime = undefined;