UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据备份

Browse Source
20240912_adapter_z
anthonywj 1 year ago
parent 7732f12e95
commit dec80e5657
12 changed files with 181 additions and 105 deletions
Show Stats Download Patch File Download Diff File

9
src/api/basic/sysWorkplaceManage.js
Unescape Escape View File

@ -48,6 +48,15 @@ export function createWorkplaceId(query) {
}); });
} }
export function filterWorkOptimize(query) {
return axios({
url: "/udiwms/sysWorkplace/page/filterOptimize",
method: "get",
params: query
});
}
export function printWorkLabel(query) { export function printWorkLabel(query) {
return axios({ return axios({
url: "/udiwms/sysWorkplace/label/print", url: "/udiwms/sysWorkplace/label/print",

28
src/api/collect/collectOrder.js
Unescape Escape View File

@ -0,0 +1,28 @@
import axios from "@/utils/request"
export function orderPage(query) {
return axios({
url: "/udiwms/basic/collect/order/filter",
method: "get",
params: query
});
}
export function orderDetail(query) {
return axios({
url: "/udiwms/basic/collect/order/detail",
method: "get",
params: query
});
}
export function deleteByOrder(query) {
return axios({
url: "/udiwms/basic/collect/order/deleteOrder",
method: "post",
data: query
});
}

44
src/views/collect/CollectOrderAllot.vue
Unescape Escape View File

@ -210,18 +210,18 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="处方使用耗材明细"> <el-tab-pane label="单据详情">
<prescribeOriginDiPanel <prescribeOriginDiPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeOriginDiPanel> ></prescribeOriginDiPanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="原始处方明细"> <!-- <el-tab-pane label="原始处方明细">-->
<prescribeOriginPanel <!-- <prescribeOriginPanel-->
v-if="panelALive" <!-- v-if="panelALive"-->
:prescribeData="curRow" <!-- :prescribeData="curRow"-->
></prescribeOriginPanel> <!-- ></prescribeOriginPanel>-->
</el-tab-pane> <!-- </el-tab-pane>-->
</el-tabs> </el-tabs>
@ -253,6 +253,8 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr
import bindWorkDialog from "@/views/collect/bindWorkDialog"; import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import prescribeOriginDiPanel from "./PannelOrderBiz"; import prescribeOriginDiPanel from "./PannelOrderBiz";
import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default { export default {
name: "prescribePanel", name: "prescribePanel",
@ -311,6 +313,10 @@ export default {
multiplePreSelection: [], multiplePreSelection: [],
curRow: null, curRow: null,
panelALive: false, panelALive: false,
options: {
findWorkPlace: [],
},
} }
}, },
@ -370,7 +376,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
prescribePage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
this.total = res.data.total || 0 this.total = res.data.total || 0
@ -410,8 +416,8 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.code = data; this.deleteData.billNo = data;
deleteDataByCode(this.deleteData) deleteByOrder(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
@ -436,6 +442,24 @@ export default {
this.multiplePreSelection = val; this.multiplePreSelection = val;
}, },
findWorkPlace(_this, val) {
let query = {
invCode: _this.$store.getters.locInvCode,
key: val,
page: 1,
limit: 10,
}
filterWorkOptimize(query)
.then((response) => {
_this.loading = false;
_this.options.findWorkPlace = response.data || [];
})
.catch(() => {
_this.loading = false;
_this.options.findWorkPlace = [];
});
},
}, },
created() { created() {
getHead("prescribeAllot", "1").then((re) => { getHead("prescribeAllot", "1").then((re) => {

27
src/views/collect/CollectOrderEnd.vue
Unescape Escape View File

@ -1,19 +1,24 @@
<template> <template>
<div> <div>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="已完成赋码单据">
<prescribePanel
style="margin: -15px"
></prescribePanel>
</el-tab-pane>
<el-tab-pane label="扫码查询"> <prescribePanel
<codePanel style="margin: -15px"
></codePanel>
</el-tab-pane>
</el-tabs> ></prescribePanel>
<!-- <el-tabs type="border-card" style="margin: 15px">-->
<!-- <el-tab-pane label="已完成赋码单据">-->
<!-- <prescribePanel-->
<!-- style="margin: -15px"-->
<!-- ></prescribePanel>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="扫码查询">-->
<!-- <codePanel style="margin: -15px"-->
<!-- ></codePanel>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div> </div>

57
src/views/collect/CollectOrderNew.vue
Unescape Escape View File

@ -93,10 +93,10 @@
>查询 >查询
</el-button </el-button
> >
<el-button type="primary" icon="el-icon-download" @click="downloadPrescription" <!-- <el-button type="primary" icon="el-icon-download" @click="downloadPrescription"-->
>下载单据 <!-- >下载单据-->
</el-button <!-- </el-button-->
> <!-- >-->
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -239,9 +239,12 @@ import addOrder from "@/views/inout/DialogCreateOrder";
import errOrder from "@/views/inout/IoCreateErrorOrder"; import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {detail, page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi"; import {detail} from "@/api/basic/sicker/prescribeApi";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog"; import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz"; import prescribeOriginPanel from "./PannelOrderBiz";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
export default { export default {
name: "prescribePanel", name: "prescribePanel",
@ -264,6 +267,7 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
tagStatus:1, //
billNo: null, billNo: null,
page: 1, page: 1,
limit: 10, limit: 10,
@ -273,7 +277,12 @@ export default {
list: [], list: [],
total: 0, total: 0,
downloadPrescriptionVisible: false, downloadPrescriptionVisible: false,
deleteData: {}, deleteData: {
billNo: null,
},
options: {
sysWorkspace: [],
},
preLoading: false, preLoading: false,
preDetailList: [], preDetailList: [],
@ -337,7 +346,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
prescribePage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
this.total = res.data.total || 0 this.total = res.data.total || 0
@ -362,35 +371,6 @@ export default {
_this.panelALive = true; _this.panelALive = true;
}); });
}, },
getPrescribeDetail(_this, row) {
if (row != null) {
_this.preQuery.page = 1
_this.preQuery.prescribeCode = row.code
}
_this.preLoading = true;
detail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.preDetailList = res.data.items
_this.preLoading = false
}).catch(() => {
_this.preLoading = false
_this.$message.error("数据加载失败")
})
},
preHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
preDiHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
deleteDialog(_this, row) { deleteDialog(_this, row) {
_this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
@ -406,8 +386,8 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.code = data; this.deleteData.billNo = data;
deleteDataByCode(this.deleteData) deleteByOrder(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();
@ -428,6 +408,7 @@ export default {
}); });
}, },
}, },
created() { created() {
getHead("prescribeDownload", "1").then((re) => { getHead("prescribeDownload", "1").then((re) => {

3
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -95,6 +95,7 @@
<el-tab-pane label="手动扫码"> <el-tab-pane label="手动扫码">
<PannelOrderBiz <PannelOrderBiz
v-if="panelALive" v-if="panelALive"
:dealStatus="2"
:prescribeData="curRow" :prescribeData="curRow"
></PannelOrderBiz> ></PannelOrderBiz>
@ -150,7 +151,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {materialPrescribePage} from "@/api/inout/splitCode"; import {materialPrescribePage} from "@/api/inout/splitCode";
import {detail, page as prescribePage, tagCode} from "@/api/basic/sicker/prescribeApi"; import {detail, page as prescribePage, tagCode} from "@/api/basic/sicker/prescribeApi";
import selectPrescribeDialog from "@/views/collect/prescribe/selectPrescribeDialog"; import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
import prescribeCodePanel from "./PanelOrderTagCode"; import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz"; import PannelOrderBiz from "./PannelOrderBiz";

26
src/views/collect/IoCreateOrder.vue
Unescape Escape View File

@ -7,6 +7,14 @@
label-width="110px" label-width="110px"
> >
<el-card style="margin: 5px;"> <el-card style="margin: 5px;">
<el-alert
:title="msgTip"
:closable="false"
type="warning">
</el-alert>
<el-row> <el-row>
<el-button-group <el-button-group
style="display: flex; margin: 0px 0 15px 0; float: right" style="display: flex; margin: 0px 0 15px 0; float: right"
@ -154,13 +162,13 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<div class="result-display" :class="{'result-success': isSuccess, 'result-failure': !isSuccess}"> <el-alert
<p class="result-text" :class="{'result-text-success': isSuccess, 'result-text-failure': !isSuccess}">{{ title="扫码解析结果:"
result :type="scanResultType"
}}</p> :closable="false"
</div> :description="result">
</el-row> </el-alert>
<el-row style="margin-top: 25px;margin-bottom: -15px"> <el-row style="margin-top: 25px;margin-bottom: -15px">
<div v-if="showSearch && splitBusType!=null"> <div v-if="showSearch && splitBusType!=null">
<el-divider> <el-divider>
@ -444,7 +452,9 @@ export default {
showSearch: false, showSearch: false,
scanCode: "", scanCode: "",
isSuccess: false, isSuccess: false,
result: "扫码解析结果：" result: "",
scanResultType: "success",
msgTip: "工位存量提醒：",
}; };
}, },
components: { components: {

31
src/views/collect/PanelOrderDeal.vue
Unescape Escape View File

@ -209,38 +209,32 @@
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="处方使用耗材明细"> <el-tab-pane label="扫码明细">
<prescribeOriginDiPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginDiPanel>
</el-tab-pane>
<el-tab-pane label="原始处方明细">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane>
<el-tab-pane label="自动赋码明细">
<prescribeCodePanel <prescribeCodePanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeCodePanel> ></prescribeCodePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零赋码明细"> <el-tab-pane label="拆零明细">
<prescribeCodePanel <prescribeCodePanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
:fifoSplit="1" :fifoSplit="1"
></prescribeCodePanel> ></prescribeCodePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="整取赋码明细"> <el-tab-pane label="整取明细">
<prescribeCodePanel <prescribeCodePanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
:fifoSplit="2" :fifoSplit="2"
></prescribeCodePanel> ></prescribeCodePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="整单详情">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -255,6 +249,7 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr
import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel"; import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel";
import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel"; import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel"; import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default { export default {
name: "prescribeAllotIngPanel", name: "prescribeAllotIngPanel",
@ -369,7 +364,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
prescribePage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
this.total = res.data.total || 0 this.total = res.data.total || 0
@ -410,8 +405,8 @@ export default {
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
this.deleteData.code = data; this.deleteData.billNo = data;
deleteDataByCode(this.deleteData) deleteByOrder(this.deleteData)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getList(); this.getList();

2
src/views/collect/PanelOrderEndCodeSearch.vue
Unescape Escape View File

@ -220,7 +220,7 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="处方明细"> <el-tab-pane label="单据">
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border> <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
<template v-for="(item, index) in tableHeader1"> <template v-for="(item, index) in tableHeader1">

34
src/views/collect/PanelOrderEndSearch.vue
Unescape Escape View File

@ -207,21 +207,34 @@
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="原始处方明细"> <el-tab-pane label="扫码明细">
<prescribeOriginPanel <prescribeCodePanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeOriginPanel> ></prescribeCodePanel>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零明细">
<el-tab-pane label="处方赋码明细">
<prescribeCodePanel <prescribeCodePanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
:fifoSplit="1"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整取明细">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplit="2"
></prescribeCodePanel> ></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整单详情">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -236,6 +249,7 @@ import {convertDate} from "@/utils/date";
import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi"; import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
import prescribeCodePanel from "./PanelOrderTagCode"; import prescribeCodePanel from "./PanelOrderTagCode";
import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel"; import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
import {orderPage} from "@/api/collect/collectOrder";
export default { export default {
name: "prescribePanel", name: "prescribePanel",
@ -325,7 +339,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
prescribePage(this.filterQuery).then(res => { orderPage(this.filterQuery).then(res => {
this.loading = false this.loading = false
this.list = res.data.list || [] this.list = res.data.list || []
this.total = res.data.total || 0 this.total = res.data.total || 0
@ -352,12 +366,6 @@ export default {
}, },
preHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getPrescribeDetail(this, null);
},
}, },
created() { created() {
getHead("prescribePanel", "1").then((re) => { getHead("prescribePanel", "1").then((re) => {

21
src/views/collect/PannelOrderBiz.vue
Unescape Escape View File

@ -127,6 +127,7 @@
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import {detail} from "@/api/basic/sicker/prescribeApi"; import {detail} from "@/api/basic/sicker/prescribeApi";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {orderDetail} from "@/api/collect/collectOrder";
/** /**
* 原始处方明细 * 原始处方明细
@ -145,6 +146,13 @@ export default {
default: null, default: null,
required: true required: true
}, },
dealStatus: {
type: Number,
default: 1,
required: true
},
}, },
data() { data() {
return { return {
@ -161,11 +169,13 @@ export default {
preDetailList: [], preDetailList: [],
preTotal: 0, preTotal: 0,
preQuery: { preQuery: {
prescribeCode: null, orderIdFk: null,
page: 1, page: 1,
limit: 10, limit: 10,
}, },
countVisible: false,
} }
}, },
methods: { methods: {
@ -201,10 +211,10 @@ export default {
return return
if (_this.prescribeData != null) { if (_this.prescribeData != null) {
_this.preQuery.page = 1 _this.preQuery.page = 1
_this.preQuery.prescribeCode = this.prescribeData.code _this.preQuery.orderIdFk = this.prescribeData.billNo
} }
_this.preLoading = true; _this.preLoading = true;
detail(_this.preQuery).then(res => { orderDetail(_this.preQuery).then(res => {
_this.preLoading = false _this.preLoading = false
if (res.code != 20000) { if (res.code != 20000) {
_this.$message.error(res.message) _this.$message.error(res.message)
@ -228,6 +238,11 @@ export default {
this.fromList1 = re.data.fromList; this.fromList1 = re.data.fromList;
this.getPrescribeDetail(this); this.getPrescribeDetail(this);
}); });
if (this.dealStatus == 1) {
this.countVisible = false;
} else {
this.countVisible = true;
}
} }

4
src/views/collect/selectCollectOrderDialog.vue
Unescape Escape View File

@ -214,7 +214,7 @@
></pagination> ></pagination>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="处方明细"> <el-tab-pane label="单据明细">
<prescribeOriginPanel <prescribeOriginPanel
v-if="panelALive" v-if="panelALive"
:prescribeData="curRow" :prescribeData="curRow"
@ -359,7 +359,7 @@ export default {
}, },
created() { created() {
getHead("selectTagPrescribe", "1").then((re) => { getHead("prescribeDownload", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;

Write Preview
Loading…
Cancel
Save