Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

20240912_adapter_z
wangwei 11 months ago
commit befef4a762

@ -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) {
return axios({
url: "/udiwms/sysWorkplace/label/print",

@ -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
});
}

@ -210,18 +210,18 @@
></pagination>
</el-card>
<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="原始处方明细">-->
<!-- <prescribeOriginPanel-->
<!-- v-if="panelALive"-->
<!-- :prescribeData="curRow"-->
<!-- ></prescribeOriginPanel>-->
<!-- </el-tab-pane>-->
</el-tabs>
@ -253,6 +253,8 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr
import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import prescribeOriginDiPanel from "./PannelOrderBiz";
import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default {
name: "prescribePanel",
@ -311,6 +313,10 @@ export default {
multiplePreSelection: [],
curRow: null,
panelALive: false,
options: {
findWorkPlace: [],
},
}
},
@ -370,7 +376,7 @@ export default {
getList() {
this.loading = true;
prescribePage(this.filterQuery).then(res => {
orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@ -410,8 +416,8 @@ export default {
},
deleteOrders(data) {
this.loading = true;
this.deleteData.code = data;
deleteDataByCode(this.deleteData)
this.deleteData.billNo = data;
deleteByOrder(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
@ -436,6 +442,24 @@ export default {
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() {
getHead("prescribeAllot", "1").then((re) => {

@ -1,21 +1,26 @@
<template>
<div>
<el-tabs type="border-card" style="margin: 15px ;">
<el-tab-pane label="处理中处方">
<allotPanel
style="margin: -10px"
:panelType="1"
></allotPanel>
</el-tab-pane>
<el-tab-pane label="异常处方">
<allotPanel
style="margin: -10px"
:panelType="2"
></allotPanel>
</el-tab-pane>
</el-tabs>
<allotPanel
:panelType="1"
></allotPanel>
<!-- <el-tabs type="border-card" style="margin: 15px ;">-->
<!-- <el-tab-pane label="处理中处方">-->
<!-- <allotPanel-->
<!-- style="margin: -10px"-->
<!-- :panelType="1"-->
<!-- ></allotPanel>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="异常处方">-->
<!-- <allotPanel-->
<!-- style="margin: -10px"-->
<!-- :panelType="2"-->
<!-- ></allotPanel>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div>
</template>

@ -1,19 +1,24 @@
<template>
<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="扫码查询">
<codePanel style="margin: -15px"
></codePanel>
</el-tab-pane>
<prescribePanel
</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>

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

@ -38,11 +38,12 @@
更多功能<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单
</el-dropdown-item>
<el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-button-group>
@ -95,6 +96,7 @@
<el-tab-pane label="手动扫码">
<PannelOrderBiz
v-if="panelALive"
:dealStatus="2"
:prescribeData="curRow"
></PannelOrderBiz>
@ -126,7 +128,7 @@
</el-tabs>
<el-dialog
title="选择处方"
title="选入业务单据"
:visible.sync="selectPrescriptionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -150,7 +152,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date";
import {materialPrescribePage} from "@/api/inout/splitCode";
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 PannelOrderBiz from "./PannelOrderBiz";
@ -206,7 +208,7 @@ export default {
methods: {
handleClick(blankName) {
// let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
let url = window.location.origin+`#/`+ blankName+`?workplaceId=`+ this.workplaceId
let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
// this.$router.push( workplaceId)
window.open(url, '_blank');
},

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

@ -209,38 +209,32 @@
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<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="自动赋码明细">
<el-tab-pane label="扫码明细">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="拆零赋码明细">
<el-tab-pane label="拆零明细">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplit="1"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整取赋码明细">
<el-tab-pane label="整取明细">
<prescribeCodePanel
v-if="panelALive"
:prescribeData="curRow"
:fifoSplit="2"
></prescribeCodePanel>
</el-tab-pane>
<el-tab-pane label="整单详情">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
></prescribeOriginPanel>
</el-tab-pane>
</el-tabs>
</div>
@ -251,10 +245,9 @@ import addOrder from "@/views/inout/DialogCreateOrder";
import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date";
import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel";
import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel";
import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default {
name: "prescribeAllotIngPanel",
@ -312,7 +305,7 @@ export default {
},
components: {
addOrder, errOrder, prescribeOriginPanel, prescribeOriginDiPanel, prescribeCodePanel
addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
},
methods: {
@ -369,7 +362,7 @@ export default {
getList() {
this.loading = true;
prescribePage(this.filterQuery).then(res => {
orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@ -410,8 +403,8 @@ export default {
},
deleteOrders(data) {
this.loading = true;
this.deleteData.code = data;
deleteDataByCode(this.deleteData)
this.deleteData.billNo = data;
deleteByOrder(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();

@ -220,7 +220,7 @@
></pagination>
</el-card>
<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>
<template v-for="(item, index) in tableHeader1">

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

@ -191,7 +191,7 @@ export default {
},
///------------end
getCodeDetail(_this) {
getList(_this) {
if (this.prescribeData == null)
return
if (this.prescribeData != null) {

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

@ -214,7 +214,7 @@
></pagination>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="处方明细">
<el-tab-pane label="单据明细">
<prescribeOriginPanel
v-if="panelALive"
:prescribeData="curRow"
@ -234,6 +234,7 @@ import {convertDate} from "@/utils/date";
import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import {orderPage} from "@/api/collect/collectOrder";
export default {
name: "selectPrescribeDialog",
@ -324,7 +325,7 @@ export default {
getList() {
this.loading = true;
prescribePage(this.filterQuery).then(res => {
orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@ -359,7 +360,7 @@ export default {
},
created() {
getHead("selectTagPrescribe", "1").then((re) => {
getHead("prescribeDownload", "1").then((re) => {
//
this.tableObj = re.data;
this.tableHeader = re.data.tableList;

Loading…
Cancel
Save