|
|
|
@ -25,12 +25,12 @@
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-alert-->
|
|
|
|
<!-- <el-alert-->
|
|
|
|
<!-- style="margin-top: 15px"-->
|
|
|
|
<!-- style="margin-top: 15px"-->
|
|
|
|
<!-- :title="msgTip"-->
|
|
|
|
<!-- :title="msgTip"-->
|
|
|
|
<!-- :closable="false"-->
|
|
|
|
<!-- :closable="false"-->
|
|
|
|
<!-- type="warning">-->
|
|
|
|
<!-- type="warning">-->
|
|
|
|
<!--</el-alert>-->
|
|
|
|
<!--</el-alert>-->
|
|
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="0" style="margin-top: 15px">
|
|
|
|
<el-row :gutter="0" style="margin-top: 15px">
|
|
|
|
<el-col :span="24" align="right">
|
|
|
|
<el-col :span="24" align="right">
|
|
|
|
@ -209,14 +209,14 @@
|
|
|
|
:prescribeData="curRow"
|
|
|
|
:prescribeData="curRow"
|
|
|
|
></prescribeOriginPanel>
|
|
|
|
></prescribeOriginPanel>
|
|
|
|
</el-tab-pane>
|
|
|
|
</el-tab-pane>
|
|
|
|
<!-- <el-tab-pane label="扫码明细">-->
|
|
|
|
<!-- <el-tab-pane label="扫码明细">-->
|
|
|
|
<!-- <PanelOrderManuTagCode-->
|
|
|
|
<!-- <PanelOrderManuTagCode-->
|
|
|
|
<!-- v-if="panelALive"-->
|
|
|
|
<!-- v-if="panelALive"-->
|
|
|
|
<!-- :fifoSplit="3"-->
|
|
|
|
<!-- :fifoSplit="3"-->
|
|
|
|
<!-- :prescribeData="curRow"-->
|
|
|
|
<!-- :prescribeData="curRow"-->
|
|
|
|
<!-- :refreshPanel="refreshCodesPanelP"-->
|
|
|
|
<!-- :refreshPanel="refreshCodesPanelP"-->
|
|
|
|
<!-- ></PanelOrderManuTagCode>-->
|
|
|
|
<!-- ></PanelOrderManuTagCode>-->
|
|
|
|
<!-- </el-tab-pane>-->
|
|
|
|
<!-- </el-tab-pane>-->
|
|
|
|
<el-tab-pane label="拆零详情">
|
|
|
|
<el-tab-pane label="拆零详情">
|
|
|
|
<prescribeCodePanel
|
|
|
|
<prescribeCodePanel
|
|
|
|
v-if="panelALive"
|
|
|
|
v-if="panelALive"
|
|
|
|
@ -279,9 +279,9 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
<div
|
|
|
|
<div
|
|
|
|
style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"
|
|
|
|
style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
|
|
|
|
@click="selectBusType(info.code)">
|
|
|
|
@click="selectBusType(info.documentTypeCode)">
|
|
|
|
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p>
|
|
|
|
<p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
|
|
|
|
<!-- 假设你的信息对象中包含一个title属性 -->
|
|
|
|
<!-- 假设你的信息对象中包含一个title属性 -->
|
|
|
|
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
|
|
|
|
<!-- <div style="width: 60px; height: 60px; display: flex; justify-content: center; align-items: center;">-->
|
|
|
|
<!-- <!– 二维码占位，这里用灰色方块代替 –>-->
|
|
|
|
<!-- <!– 二维码占位，这里用灰色方块代替 –>-->
|
|
|
|
@ -291,11 +291,11 @@
|
|
|
|
<!-- </div>-->
|
|
|
|
<!-- </div>-->
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
|
|
|
|
<div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
|
|
|
|
@click="selectBusType(info.code)">
|
|
|
|
@click="selectBusType(info.documentTypeCode)">
|
|
|
|
<!-- 假设这里有一些信息内容 -->
|
|
|
|
<!-- 假设这里有一些信息内容 -->
|
|
|
|
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p>
|
|
|
|
<p style="font-size: 14px;background-color: #e1f3fb">{{ info.documentTypeCode }}</p>
|
|
|
|
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
|
|
|
|
<el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
|
|
|
|
@click="selectBusType(info.code)">开始作业
|
|
|
|
@click="selectBusType(info.documentTypeCode)">开始作业
|
|
|
|
</el-button>
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -326,7 +326,7 @@ import {enterCodeWeb} from "@/api/inout/order";
|
|
|
|
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
|
|
|
|
import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
|
|
|
|
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
|
|
|
|
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
|
|
|
|
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
|
|
|
|
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
|
|
|
|
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
|
|
|
|
import {getCurOrder, getNextOrder,findByBill} from "@/api/collect/collectOrder";
|
|
|
|
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
|
|
|
|
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
|
|
|
|
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
|
|
|
|
|
|
|
|
@ -365,7 +365,7 @@ export default {
|
|
|
|
curWorkPlaces: [],
|
|
|
|
curWorkPlaces: [],
|
|
|
|
erpList: [],
|
|
|
|
erpList: [],
|
|
|
|
formData: {
|
|
|
|
formData: {
|
|
|
|
billNo: null,
|
|
|
|
billNo:null,
|
|
|
|
tagStatus: -1,
|
|
|
|
tagStatus: -1,
|
|
|
|
invCode: null,
|
|
|
|
invCode: null,
|
|
|
|
busType: null,
|
|
|
|
busType: null,
|
|
|
|
@ -419,15 +419,16 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
|
|
|
|
|
|
|
|
getBillNo(billNo) {
|
|
|
|
getBillNo(billNo,workPlaceCode){
|
|
|
|
let post = {
|
|
|
|
let post = {
|
|
|
|
billNo: billNo,
|
|
|
|
billNo: billNo,
|
|
|
|
page: 1,
|
|
|
|
workPlaceCode: workPlaceCode,
|
|
|
|
limit: 10,
|
|
|
|
page: 1,
|
|
|
|
}
|
|
|
|
limit: 10,
|
|
|
|
|
|
|
|
}
|
|
|
|
findByBill(post).then(res => {
|
|
|
|
findByBill(post).then(res => {
|
|
|
|
if (res.code == 20000) {
|
|
|
|
if (res.code == 20000) {
|
|
|
|
if (res.data.list.length > 0) {
|
|
|
|
if (res.data.list.length > 0){
|
|
|
|
this.formData = res.data.list[0]
|
|
|
|
this.formData = res.data.list[0]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -455,9 +456,10 @@ export default {
|
|
|
|
if (this.formDataVisible.scanType == 1) {
|
|
|
|
if (this.formDataVisible.scanType == 1) {
|
|
|
|
this.findFromInvList("");
|
|
|
|
this.findFromInvList("");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (this.formData.billNo != null) {
|
|
|
|
if (this.formData.billNo != null){
|
|
|
|
this.getBillNo(this.formData.billNo)
|
|
|
|
this.getBillNo(this.formData.billNo,this.formData.workplaceCode)
|
|
|
|
} else {
|
|
|
|
this.startDeal();
|
|
|
|
|
|
|
|
}else {
|
|
|
|
this.findCurOrder();
|
|
|
|
this.findCurOrder();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -690,39 +692,25 @@ export default {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
confirmFinishOrder() {
|
|
|
|
finishOrder() {
|
|
|
|
this.$confirm('是否确定完成此单据?', '提示', {
|
|
|
|
this.$confirm('是否确定完成此单据?', '提示', {
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
type: 'warning'
|
|
|
|
type: 'warning'
|
|
|
|
}).then(() => {
|
|
|
|
}).then(() => {
|
|
|
|
this.finishOrder()
|
|
|
|
finishOrder(this.formData).then(res => {
|
|
|
|
|
|
|
|
this.loading = false
|
|
|
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
|
|
|
this.formData = {tagStatus: -1};
|
|
|
|
|
|
|
|
this.curRow = null
|
|
|
|
|
|
|
|
this.refreshCodesPanel(this)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
|
|
|
this.loading = false
|
|
|
|
|
|
|
|
})
|
|
|
|
}).catch(() => {
|
|
|
|
}).catch(() => {
|
|
|
|
});
|
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
finishOrder() {
|
|
|
|
|
|
|
|
finishOrder(this.formData).then(res => {
|
|
|
|
|
|
|
|
this.loading = false
|
|
|
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
|
|
|
this.formData = {tagStatus: -1};
|
|
|
|
|
|
|
|
this.curRow = null
|
|
|
|
|
|
|
|
this.formData.confirmFinish = false;
|
|
|
|
|
|
|
|
this.refreshCodesPanel(this)
|
|
|
|
|
|
|
|
} else if (res.code == 502) {
|
|
|
|
|
|
|
|
this.$confirm(res.message, '提示', {
|
|
|
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
|
|
|
type: 'warning'
|
|
|
|
|
|
|
|
}).then(() => {
|
|
|
|
|
|
|
|
this.formData.confirmFinish = true;
|
|
|
|
|
|
|
|
this.finishOrder();
|
|
|
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
|
|
|
this.loading = false
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
updateOrder() {
|
|
|
|
updateOrder() {
|
|
|
|
@ -893,6 +881,8 @@ export default {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
yewj
8 months ago