From a16c8c0fe4ac28d7271de1681ae22d049cce1c5a Mon Sep 17 00:00:00 2001 From: yangchunlong <292345300@qq.com> Date: Tue, 15 Jul 2025 10:47:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 52 ++++---- package.json | 2 +- src/api/modules/deliveryAndOutbound.ts | 1 - src/api/modules/receiptAndWarehousing.ts | 4 + src/api/modules/warehouseSaleNotice.ts | 18 +++ src/components.d.ts | 29 +++++ src/styles/element.scss | 1 + .../outboundOrderList/index.vue | 4 - .../outboundTaskList/constant/list/search.ts | 10 +- .../outboundTaskList/constant/list/table.ts | 16 ++- .../outboundTaskList/details.vue | 2 - .../outboundTaskList/index.vue | 6 +- src/views/export/list/index.vue | 3 - .../boxModificationsList/index.vue | 4 - .../constant/list/search.ts | 6 - .../inboundOutboundRollbackList/index.vue | 4 - .../movingBoxesList/index.vue | 4 - src/views/inventory/inventoryList/index.vue | 4 - .../constant/list/table.ts | 10 +- .../ofInboundInstructionsList/details.vue | 1 - .../ofInboundInstructionsList/index.vue | 3 - .../warehouseReceiptList/index.vue | 119 +++++++++++++++--- src/views/reportForm/boxStorage/index.vue | 4 - .../finishedProduct/constant/list/table.ts | 23 ++-- .../reportForm/finishedProduct/index.vue | 4 - src/views/reportForm/immediately/index.vue | 3 - src/views/reportForm/material/index.vue | 4 - src/views/setUp/boxMark/index.vue | 4 - src/views/setUp/subscription/index.vue | 4 - 29 files changed, 225 insertions(+), 124 deletions(-) create mode 100644 src/api/modules/warehouseSaleNotice.ts diff --git a/package-lock.json b/package-lock.json index 4c3cda8..672f160 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "lodash-es": "^4.17.21", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.1.3", + "pinia": "^2.2.4", "pinia-plugin-persistedstate": "^3.1.0", "print-js": "^1.6.0", "qs": "^6.11.2", @@ -3526,9 +3526,9 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.5.0", - "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz", - "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" + "version": "6.6.4", + "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==" }, "node_modules/@vue/reactivity": { "version": "3.3.4", @@ -9873,12 +9873,15 @@ } }, "node_modules/pinia": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.3.tgz", - "integrity": "sha512-XNA/z/ye4P5rU1pieVmh0g/hSuDO98/a5UC8oSP0DNdvt6YtetJNHTrXwpwsQuflkGT34qKxAEcp7lSxXNjf/A==", + "version": "2.2.4", + "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.2.4.tgz", + "integrity": "sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==", "dependencies": { - "@vue/devtools-api": "^6.5.0", - "vue-demi": ">=0.14.5" + "@vue/devtools-api": "^6.6.3", + "vue-demi": "^0.14.10" + }, + "funding": { + "url": "https://github.com/sponsors/posva" }, "peerDependencies": { "@vue/composition-api": "^1.4.0", @@ -9903,9 +9906,9 @@ } }, "node_modules/pinia/node_modules/vue-demi": { - "version": "0.14.5", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz", - "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==", + "version": "0.14.10", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", "hasInstallScript": true, "bin": { "vue-demi-fix": "bin/vue-demi-fix.js", @@ -9914,6 +9917,9 @@ "engines": { "node": ">=12" }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, "peerDependencies": { "@vue/composition-api": "^1.0.0-rc.1", "vue": "^3.0.0-0 || ^2.6.0" @@ -17213,9 +17219,9 @@ } }, "@vue/devtools-api": { - "version": "6.5.0", - "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz", - "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" + "version": "6.6.4", + "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==" }, "@vue/reactivity": { "version": "3.3.4", @@ -22253,18 +22259,18 @@ "dev": true }, "pinia": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.3.tgz", - "integrity": "sha512-XNA/z/ye4P5rU1pieVmh0g/hSuDO98/a5UC8oSP0DNdvt6YtetJNHTrXwpwsQuflkGT34qKxAEcp7lSxXNjf/A==", + "version": "2.2.4", + "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.2.4.tgz", + "integrity": "sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==", "requires": { - "@vue/devtools-api": "^6.5.0", - "vue-demi": ">=0.14.5" + "@vue/devtools-api": "^6.6.3", + "vue-demi": "^0.14.10" }, "dependencies": { "vue-demi": { - "version": "0.14.5", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz", - "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==", + "version": "0.14.10", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", "requires": {} } } diff --git a/package.json b/package.json index 1eed0ac..fbc32af 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "lodash-es": "^4.17.21", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.1.3", + "pinia": "^2.2.4", "pinia-plugin-persistedstate": "^3.1.0", "print-js": "^1.6.0", "qs": "^6.11.2", diff --git a/src/api/modules/deliveryAndOutbound.ts b/src/api/modules/deliveryAndOutbound.ts index a2b49ee..13dd4d5 100644 --- a/src/api/modules/deliveryAndOutbound.ts +++ b/src/api/modules/deliveryAndOutbound.ts @@ -19,7 +19,6 @@ export const getDetailsApi = (id: any) => { export const getTaskDetailsApi = (params: any) => { return http.post(`OutStockTask/GetInfoByNo`, params); }; - //修改出库箱信息 export const getEditBoxInfoApi = (params: Record) => { return http.post(`OutStock/EditBoxInfo`, params); diff --git a/src/api/modules/receiptAndWarehousing.ts b/src/api/modules/receiptAndWarehousing.ts index e5db958..c9c4f07 100644 --- a/src/api/modules/receiptAndWarehousing.ts +++ b/src/api/modules/receiptAndWarehousing.ts @@ -18,3 +18,7 @@ export const getDetailsApi = (id: any) => { export const getTaskDetailsApi = (id: any) => { return http.get(`InStockTask/GetInfo/${id}`); }; +//同步成功 +export const getInStockSyncSuccessApi = (params: Record) => { + return http.post>(`InStock/SyncSuccess`, params); +}; diff --git a/src/api/modules/warehouseSaleNotice.ts b/src/api/modules/warehouseSaleNotice.ts new file mode 100644 index 0000000..8a2e50c --- /dev/null +++ b/src/api/modules/warehouseSaleNotice.ts @@ -0,0 +1,18 @@ +import http from "@/api"; +//发货通知单详情 SalOutStockOrder/GetInfo +export const getNoticerDetailsApi = (id: any) => { + return http.get(`DeliveryNoticeOrder/GetInfo/${id}`); +}; +//发货通知单列表 +export const getNoticeListApi = (params: Record) => { + return http.post(`DeliveryNoticeOrder/GetList`, params); +}; +//发货通知单自定义条件 +export const getNoticeDictionaryApi = () => { + return http.get(`Dictionary/deliverynotice`); +}; +//getNoticeStatusApi +//发货通知单据类型 +export const getNoticeStatusApi = () => { + return http.get(`DeliveryNoticeOrder/GetStatus`); +}; diff --git a/src/components.d.ts b/src/components.d.ts index 3ad925b..c3899ee 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -7,6 +7,14 @@ export {} declare module 'vue' { export interface GlobalComponents { + 403: typeof import('./components/ErrorMessage/403.vue')['default'] + 404: typeof import('./components/ErrorMessage/404.vue')['default'] + 500: typeof import('./components/ErrorMessage/500.vue')['default'] + Add: typeof import('./components/DetailsBtns/components/Add.vue')['default'] + ColSetting: typeof import('./components/ProTable/components/ColSetting.vue')['default'] + Del: typeof import('./components/ListBtns/components/Del.vue')['default'] + DetailsBtns: typeof import('./components/DetailsBtns/index.vue')['default'] + DetailsSearch: typeof import('./components/DetailsSearch/index.vue')['default'] ElAside: typeof import('element-plus/es')['ElAside'] ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -39,6 +47,11 @@ declare module 'vue' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] + Export: typeof import('./components/ListBtns/components/Export.vue')['default'] + ExprotSelect: typeof import('./components/ListBtns/components/ExprotSelect.vue')['default'] + Generate: typeof import('./components/DetailsBtns/components/Generate.vue')['default'] + Grid: typeof import('./components/Grid/index.vue')['default'] + GridItem: typeof import('./components/Grid/components/GridItem.vue')['default'] IEpArrowDown: typeof import('~icons/ep/arrow-down')['default'] IEpCircleClose: typeof import('~icons/ep/circle-close')['default'] IEpFolderDelete: typeof import('~icons/ep/folder-delete')['default'] @@ -47,8 +60,24 @@ declare module 'vue' { IEpRemove: typeof import('~icons/ep/remove')['default'] IEpSearch: typeof import('~icons/ep/search')['default'] IEpSwitchButton: typeof import('~icons/ep/switch-button')['default'] + ImportExcel: typeof import('./components/ImportExcel/index.vue')['default'] + ListBtns: typeof import('./components/ListBtns/index.vue')['default'] + ListResultDig: typeof import('./components/ListResultDig/index.vue')['default'] + Loading: typeof import('./components/Loading/index.vue')['default'] + Merge: typeof import('./components/ListBtns/components/Merge.vue')['default'] + NoToVoid: typeof import('./components/ListBtns/components/noToVoid.vue')['default'] + Pagination: typeof import('./components/ProTable/components/Pagination.vue')['default'] + Print: typeof import('./components/DetailsBtns/components/Print.vue')['default'] + ProTable: typeof import('./components/ProTable/index.vue')['default'] + Refresh: typeof import('./components/ListBtns/components/Refresh.vue')['default'] + Retransmission: typeof import('./components/ListBtns/components/Retransmission.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] + Search: typeof import('./components/Search/index.vue')['default'] + Submit: typeof import('./components/DetailsBtns/components/Submit.vue')['default'] + Switch: typeof import('./components/DetailsBtns/components/Switch.vue')['default'] Synchronous: typeof import('./components/ListBtns/components/Synchronous.vue')['default'] + TableColumn: typeof import('./components/ProTable/components/TableColumn.vue')['default'] + ToVoid: typeof import('./components/ListBtns/components/ToVoid.vue')['default'] } } diff --git a/src/styles/element.scss b/src/styles/element.scss index 9a02ffb..7e0eaa8 100644 --- a/src/styles/element.scss +++ b/src/styles/element.scss @@ -90,6 +90,7 @@ flex: 1; flex-direction: column; width: 100%; + min-width: 1280px; height: 100%; // table-search 表格搜索样式 diff --git a/src/views/deliveryAndOutbound/outboundOrderList/index.vue b/src/views/deliveryAndOutbound/outboundOrderList/index.vue index 3d53553..ea4ad33 100644 --- a/src/views/deliveryAndOutbound/outboundOrderList/index.vue +++ b/src/views/deliveryAndOutbound/outboundOrderList/index.vue @@ -40,10 +40,6 @@