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/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 }}-追溯码详情 - + 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 @@ + + + + +