From 983e3f9e407587caa9d713c0ac49dc75d11b1a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 29 May 2024 17:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/UI.DY.AgGridReport/public/config.js | 4 +- fe/UI.DY.AgGridReport/src/api/api.js | 5 + .../src/components/reportPageHeader/index.vue | 11 +- fe/UI.DY.AgGridReport/src/router/index.js | 108 ++++++++++++++++-- .../src/views/report/InventoryAgingDetail.vue | 52 +++++++++ .../report/InventoryAgingsectionSummary.vue | 56 +++++++++ .../src/views/report/InventoryBalanceERP.vue | 44 +++++++ .../views/report/InventoryBalanceEnRoute.vue | 44 +++++++ .../views/report/InventoryBalanceLocation.vue | 2 +- .../src/views/report/InventoryJournalERP.vue | 46 ++++++++ .../views/report/InventoryJournalLocation.vue | 47 ++++++++ .../views/report/ProductReceiptSummary.vue | 46 ++++++++ .../views/report/ProductionIssueSummary.vue | 48 ++++++++ .../views/report/ProductionReturnSummary.vue | 44 +++++++ .../src/views/report/planNoteSummary.vue | 52 +++++++++ 15 files changed, 595 insertions(+), 14 deletions(-) create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue create mode 100644 fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue diff --git a/fe/UI.DY.AgGridReport/public/config.js b/fe/UI.DY.AgGridReport/public/config.js index 95337cd89..98a5fcb7d 100644 --- a/fe/UI.DY.AgGridReport/public/config.js +++ b/fe/UI.DY.AgGridReport/public/config.js @@ -1,3 +1 @@ -window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078' -//特殊使用埃驰pc端访问地址（如备料报表） -window.SITE_CONFIG['businessURL'] = 'http://dev.ccwin-in.com:10099' \ No newline at end of file +window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078' \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/api/api.js b/fe/UI.DY.AgGridReport/src/api/api.js index 4d108f252..9915ec0b1 100644 --- a/fe/UI.DY.AgGridReport/src/api/api.js +++ b/fe/UI.DY.AgGridReport/src/api/api.js @@ -41,3 +41,8 @@ export function getUnplannedIssueType() { export function getUnplannedReceiptType() { return axiosUtil.ajax_post(procApi+'Proc_InputWhere_UnplannedReceipt_Type',{}) } + +// 获取 库存状态 +export function getInventoryBalanceStatus() { + return axiosUtil.ajax_post(procApi+'Proc_InputWhere_InventoryBalance_Status',{}) +} diff --git a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue index 00c684b50..c544980e2 100644 --- a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue +++ b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue @@ -84,7 +84,8 @@ import { getSupplierCode, getLocationErpCode, getUnplannedIssueType, - getUnplannedReceiptType + getUnplannedReceiptType, + getInventoryBalanceStatus } from '@/api/api' export default { name: "reportPageHeader", @@ -198,6 +199,14 @@ export default { item.opV="VALUE" }) } + // 库存状态 + if(item.optionsProc == 'InventoryBalanceStatus'){ + getInventoryBalanceStatus().then(res=>{ + item.options = res + item.opL="KEY" + item.opV="VALUE" + }) + } // //存储时效控制报表-是否超过时效 // if(item.optionsProc == 'isExceedThreshold'){ // item.options = [ diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js index 316e06b32..9c93e7731 100644 --- a/fe/UI.DY.AgGridReport/src/router/index.js +++ b/fe/UI.DY.AgGridReport/src/router/index.js @@ -3,7 +3,6 @@ import VueRouter from 'vue-router' import Home from '../views/Home.vue' import depositSummaryReport from '../views/report/depositSummaryReport.vue' import depositDetailsReport from '../views/report/depositDetailsReport.vue' -import InventoryBalanceLocation from '../views/report/InventoryBalanceLocation.vue' import ScrapDetail from '../views/report/ScrapDetail.vue' import PurchaseReturnSummary from '../views/report/PurchaseReturnSummary.vue' import ProductDeliverySummary from '../views/report/ProductDeliverySummary.vue' @@ -13,6 +12,17 @@ import UnplannedIssueSummary from '../views/report/UnplannedIssueSummary.vue' import UnplannedReceiptSummary from '../views/report/UnplannedReceiptSummary.vue' import SupplierDeliver from '../views/report/SupplierDeliver.vue' import interfaceError from '../views/report/interfaceError.vue' +import InventoryJournalERP from '../views/report/InventoryJournalERP.vue' +import InventoryJournalLocation from '../views/report/InventoryJournalLocation.vue' +import InventoryBalanceERP from '../views/report/InventoryBalanceERP.vue' +import InventoryBalanceLocation from '../views/report/InventoryBalanceLocation.vue' +import InventoryBalanceEnRoute from '../views/report/InventoryBalanceEnRoute.vue' +import InventoryAgingsectionSummary from '../views/report/InventoryAgingsectionSummary.vue' +import InventoryAgingDetail from '../views/report/InventoryAgingDetail.vue' +import planNoteSummary from '../views/report/planNoteSummary.vue' +import ProductionIssueSummary from '../views/report/ProductionIssueSummary.vue' +import ProductionReturnSummary from '../views/report/ProductionReturnSummary.vue' +import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue' Vue.use(VueRouter) @@ -25,14 +35,6 @@ const routes = [ title:"报表首页", } }, - { - path: '/InventoryBalanceLocation', - name: 'InventoryBalanceLocation', - component: InventoryBalanceLocation, - meta:{ - title:"库存余额报表（按库位）", - } - }, { path: '/ScrapDetail', name: 'ScrapDetail', @@ -121,6 +123,94 @@ const routes = [ title:"接口错误报表", } }, + { + path: '/InventoryJournalERP', + name: 'InventoryJournalERP', + component: InventoryJournalERP, + meta:{ + title:"库存流水账汇总(储位)11111", + } + }, + { + path: '/InventoryJournalLocation', + name: 'InventoryJournalLocation', + component: InventoryJournalLocation, + meta:{ + title:"库存流水账汇总(库位)11111", + } + }, + { + path: '/InventoryBalanceERP', + name: 'InventoryBalanceERP', + component: InventoryBalanceERP, + meta:{ + title:"库存余额报表（按ERP储位）", + } + }, + { + path: '/InventoryBalanceLocation', + name: 'InventoryBalanceLocation', + component: InventoryBalanceLocation, + meta:{ + title:"库存余额报表（按库位）", + } + }, + { + path: '/InventoryBalanceEnRoute', + name: 'InventoryBalanceEnRoute', + component: InventoryBalanceEnRoute, + meta:{ + title:"库存余额报表（按在途库）", + } + }, + { + path: '/InventoryAgingsectionSummary', + name: 'InventoryAgingsectionSummary', + component: InventoryAgingsectionSummary, + meta:{ + title:"库存账龄汇总报表（分段）", + } + }, + { + path: '/InventoryAgingDetail', + name: 'InventoryAgingDetail', + component: InventoryAgingDetail, + meta:{ + title:"库存账龄明细报表", + } + }, + { + path: '/planNoteSummary', + name: 'planNoteSummary', + component: planNoteSummary, + meta:{ + title:"盘点记录汇总报表", + } + }, + { + path: '/ProductionIssueSummary', + name: 'ProductionIssueSummary', + component: ProductionIssueSummary, + meta:{ + title:"生产发料汇总报表", + } + }, + { + path: '/ProductionReturnSummary', + name: 'ProductionReturnSummary', + component: ProductionReturnSummary, + meta:{ + title:"生产退料汇总报表", + } + }, + { + path: '/ProductReceiptSummary', + name: 'ProductReceiptSummary', + component: ProductReceiptSummary, + meta:{ + title:"完工收货汇总报表", + } + }, ] const router = new VueRouter({ diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue new file mode 100644 index 000000000..472aada55 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue new file mode 100644 index 000000000..0b55797d0 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue new file mode 100644 index 000000000..625f004a4 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue new file mode 100644 index 000000000..24d0934a9 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue index 387050bcf..8c0747ca8 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue @@ -25,8 +25,8 @@ export default { { field: '物品名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '物品描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '配置', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '库存状态', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '库存状态', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, ], searchConfig:[ diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue new file mode 100644 index 000000000..0f49338d9 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue new file mode 100644 index 000000000..c614152d2 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue @@ -0,0 +1,47 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue new file mode 100644 index 000000000..724c6795e --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue new file mode 100644 index 000000000..632ba1601 --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue @@ -0,0 +1,48 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue new file mode 100644 index 000000000..e1a12028b --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue new file mode 100644 index 000000000..4abeabebc --- /dev/null +++ b/fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue @@ -0,0 +1,52 @@ + + + \ No newline at end of file