From 56177e8aa9947f875ac530f78e0ebce17c696a27 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 31 Mar 2025 22:16:40 +0800 Subject: [PATCH] =?UTF-8?q?3/31=20=E6=89=8B=E5=8A=A8=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collectOrder.js | 10 + src/views/collect/CollectOrderTabs.vue | 20 + src/views/collect/IoReturnOrderBiz.vue | 329 ++++ src/views/collect/IoReturncllectOrder.vue | 1754 +++++++++++++++++++++ src/views/collect/PannelOrderBiz.vue | 10 +- 5 files changed, 2121 insertions(+), 2 deletions(-) create mode 100644 src/views/collect/IoReturnOrderBiz.vue create mode 100644 src/views/collect/IoReturncllectOrder.vue diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index 1a289cf6..eac140ca 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -326,3 +326,13 @@ export function returnOrderSubmit(query) { data: query }); } + + + +export function finishReturnOrder(query) { + return axios({ + url: "/udiwms/basic/collect/order/finishReturnOrder", + method: "post", + data: query + }); +} diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index 97fcb577..e44fc298 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -88,11 +88,19 @@ 单据上传 + + 处方退货 + + 工位上货 + + + + 拆零上货 @@ -343,6 +351,8 @@ import IoSplitFifoRemove from '@/views/collect/IoSplitFifoRemove.vue' import IoSplitCreateOrder from '@/views/collect/IoCreateOrder.vue' import IoFullCreateOrder from '@/views/collect/IoCreateOrder.vue' import IosplitFifoStock from '@/views/collect/IosplitFifoStock.vue' +import IoReturncllectOrder from '@/views/collect/IoReturncllectOrder.vue' + // 导入器械相关工位上货页面 @@ -385,6 +395,7 @@ export default { IoSplitFifoRemove, IoSplitCreateOrder, IosplitFifoStock, + IoReturncllectOrder, //器械页面 DevicesDealOrder, @@ -601,6 +612,15 @@ export default { componentProps: { } }, + { + number: 18, + title: '单据退货', + name: 'IoReturncllectOrder', + component: IoReturncllectOrder, + // 假设你需要传递的参数 + componentProps: { + } + }, //器械页面 { diff --git a/src/views/collect/IoReturnOrderBiz.vue b/src/views/collect/IoReturnOrderBiz.vue new file mode 100644 index 00000000..4fe205d2 --- /dev/null +++ b/src/views/collect/IoReturnOrderBiz.vue @@ -0,0 +1,329 @@ + + + + + + + + {{ codingStatus }} + + + + + + + {{ scope.row.cpmctymc }} + + + + + {{ scope.row.count }} + + + + + + {{ + scope.row.shouldCount === 0 + ? '无需扫码' + : `${scope.row.scanCount}/${scope.row.shouldCount}` + }} + + + + + + {{ scope.row.prepnSpec }} + + + + + {{ scope.row.spec }} + + + + + + + {{ scope.row.ybbm }} + + + + + {{ scope.row.batchNo }} + + + + > + + + + 扫码明细({{ scope.row.scanCount == null ? 0 : scope.row.scanCount }}) + + + + + + + + + + + + + + + + + + diff --git a/src/views/collect/IoReturncllectOrder.vue b/src/views/collect/IoReturncllectOrder.vue new file mode 100644 index 00000000..f1ca6455 --- /dev/null +++ b/src/views/collect/IoReturncllectOrder.vue @@ -0,0 +1,1754 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + + + + {{ item.name }} + {{ item.code }} + + + + + + + + + + + + + + + + + + + + + + 选单 + + 放弃 + + 挂起 + + 退货完成 + + + + + + + 定向查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ formData.billNo }} + + + {{ formData.shipperName }} + + + {{ formData.fromCorpName }} + + + {{ formData.billTime }} + + + + + + + + + + + + + + + + + + + + + + + + + {{ info.busName }} + + + + + + + + + + + + {{ info.remark }} + 开始作业 + + + + + + + + + + + + + + + + + + + diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index 0ff14896..bc3e3d8d 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -137,7 +137,13 @@ - {{ scope.row.scanCount }}/{{ scope.row.shouldCount }} + + {{ + scope.row.shouldCount === 0 + ? '无需扫码' + : `${scope.row.scanCount}/${scope.row.shouldCount}` + }} + @@ -380,7 +386,7 @@ export default { getCellStyle(row) { let cellStyle = { - fontSize: '32px' + fontSize: '50px' } if (row.shouldCount == 0) { cellStyle.fontSize = '30px'
{{ info.busName }}
+ {{ info.remark }}