From 98b97797af9fecd5c753c36ae321b9be42cdd82b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Dec 2024 17:26:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?12/9=20=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/DialogCheckCode.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue index 0206e822..2aaf5978 100644 --- a/src/views/collect/DialogCheckCode.vue +++ b/src/views/collect/DialogCheckCode.vue @@ -26,6 +26,7 @@ size="mini" icon="el-icon-plus" style="margin-left: 15px" + @click.native.stop="enterKey($event)" >添加 @@ -77,7 +78,7 @@ 单据 {{ orderData.billNo }}-追溯码详情 - + From c422463523d9ff9ec306a14a971b7be5beeeeb74 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 10 Dec 2024 18:29:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?12/10=20=E5=8D=95=E6=8D=AE=E5=AE=A1?= =?UTF-8?q?=E6=A0=B82.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/IoCollectCodeSelect.js | 9 - src/api/collect/splitCreateOrder.js | 9 + src/views/collect/CollectOrderTabs.vue | 17 +- .../collect/IocCollectOrderCheckCode.vue | 616 ++++++++++++++++++ 4 files changed, 641 insertions(+), 10 deletions(-) create mode 100644 src/views/collect/IocCollectOrderCheckCode.vue diff --git a/src/api/collect/IoCollectCodeSelect.js b/src/api/collect/IoCollectCodeSelect.js index e6bb66da..391d5de3 100644 --- a/src/api/collect/IoCollectCodeSelect.js +++ b/src/api/collect/IoCollectCodeSelect.js @@ -19,15 +19,6 @@ export function getCodeEndList(query) { - -export function checkCode(query) { - return axios({ - url: "/udiwms/basic/collect/ioCollectCode/checkCode", - method: "post", - data: query - }); -} - // export function IoCollectCodePageList(query) { // return axios({ // url: "/udiwms/basic/collect/ioCollectCodeBackup/list", diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js index c425e628..5b4175ae 100644 --- a/src/api/collect/splitCreateOrder.js +++ b/src/api/collect/splitCreateOrder.js @@ -73,3 +73,12 @@ export function updateOrder(query) { +export function checkCollectOrderManCode(query) { + return axios({ + url: "/udiwms/basic/collect/IoCollectOrderCodeMan/checkCode", + method: "post", + data: query + }); +} + + diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index fb74bdd5..6558a6c7 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -66,6 +66,11 @@ 取药确认 + + + 单据审核 + + 待处理单 @@ -272,6 +277,7 @@ import ioSplitFifoCode from '@/views/collect/ioSplitFifoCode.vue' import CollectOrderUpload from '@/views/collect/CollectOrderUpload.vue' import IoDestroyOrder from '@/views/collect/IoDestroyOrder.vue' import IoSplitFifoRemind from '@/views/collect/IoSplitFifoRemind.vue' +import IocCollectOrderCheckCode from '@/views/collect/IocCollectOrderCheckCode.vue' import {listPage, switchWorkplaceStatus} from "@/api/basic/workPlace/sysWorkplaceManage"; import { filterListByWorkplace, @@ -289,7 +295,8 @@ export default { CollectOrderAllot, CollectOrderEnd, CollectOrderUpload, - IoDestroyOrder + IoDestroyOrder, + IocCollectOrderCheckCode }, name: 'CollectOrderTabs', data() { @@ -414,6 +421,14 @@ export default { component: ConfirmDrugDealOrder, // 假设你需要传递的参数 componentProps: {} + }, + { + number: 10, + title: '单据审核', + name: 'IocCollectOrderCheckCode', + component: IocCollectOrderCheckCode, + // 假设你需要传递的参数 + componentProps: {} }], editableTabs: [{ number: 0, diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue new file mode 100644 index 00000000..bc62cda4 --- /dev/null +++ b/src/views/collect/IocCollectOrderCheckCode.vue @@ -0,0 +1,616 @@ + + + + +