diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index f59b2e25..c28974dc 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -418,9 +418,10 @@ export default { }, methods: { - getBillNo(billNo){ + getBillNo(billNo,workPlaceCode){ let post = { billNo: billNo, + workPlaceCode: workPlaceCode, page: 1, limit: 10, } @@ -455,7 +456,8 @@ export default { this.findFromInvList(""); } if (this.formData.billNo != null){ - this.getBillNo(this.formData.billNo) + this.getBillNo(this.formData.billNo,this.formData.workplaceCode) + this.startDeal(); }else { this.findCurOrder(); } diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index 126eb7bd..549183be 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -418,9 +418,10 @@ export default { }, methods: { - getBillNo(billNo){ + getBillNo(billNo,workPlaceCode){ let post = { billNo: billNo, + workPlaceCode: workPlaceCode, page: 1, limit: 10, } @@ -455,7 +456,8 @@ export default { this.findFromInvList(""); } if (this.formData.billNo != null){ - this.getBillNo(this.formData.billNo) + this.getBillNo(this.formData.billNo,this.formData.workplaceCode) + this.startDeal(); }else { this.findCurOrder(); } diff --git a/src/views/collect/PanelOrderManuTagCode.vue b/src/views/collect/PanelOrderManuTagCode.vue index 543dffcb..4f123f34 100644 --- a/src/views/collect/PanelOrderManuTagCode.vue +++ b/src/views/collect/PanelOrderManuTagCode.vue @@ -212,8 +212,9 @@ export default { codeRemove(post).then((response) => { if (response.code === 20000) { this.$message.success("操作成功!"); - this.refreshPanel(this) - this.getList() + // this.refreshPanel(this) + this.getList(this); + this.closeScanDialog() } else { this.$message.error(response.message); } diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index 947f6736..0d4696d8 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -292,6 +292,7 @@ export default { closeScanDialog() { this.getPrescribeDetail(this); + this.refreshPanel(this) }, rowStyle({row, rowIndex}) {