From 64e4c3f2b42ad035a7955a73cf5e27f6fa561cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 4 Jul 2024 14:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=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/src/router/index.js | 9 +++++++++ .../src/views/report/ProductionIssueSummary.vue | 1 + .../src/views/report/ProductionReturnSummary.vue | 1 + .../src/views/report/UnplannedIssueSummary.vue | 11 ++++++----- .../src/views/report/UnplannedReceiptSummary.vue | 11 ++++++----- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js index 6946b08e6..44ad36432 100644 --- a/fe/UI.DY.AgGridReport/src/router/index.js +++ b/fe/UI.DY.AgGridReport/src/router/index.js @@ -23,6 +23,7 @@ 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' +import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue' Vue.use(VueRouter) @@ -211,6 +212,14 @@ const routes = [ title:"完工收货汇总报表", } }, + { + path: '/SupplierAndOrderSummary', + name: 'SupplierAndOrderSummary', + component: SupplierAndOrderSummary, + meta:{ + title:"供应商发货订单汇总报表", + } + }, ] const router = new VueRouter({ diff --git a/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue index 43efa3232..256fa4b0f 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue @@ -27,6 +27,7 @@ export default { { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '类型', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '发料时间', maxWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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/ProductionReturnSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue index bc4568298..1f5569a45 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue @@ -25,6 +25,7 @@ export default { { field: '料号名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '生成记录时间', maxWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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/UnplannedIssueSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue index 863d05b5d..548ed480a 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue @@ -26,15 +26,16 @@ export default { { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '正厂编码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '库位', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP储位', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '项目分类', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '项目分类', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '项目分类描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '申请人', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '申请人', maxWidth:120, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '申请部门', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '实际发货人', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '实际发货人', maxWidth:115, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '发料时间', maxWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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/UnplannedReceiptSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue index bb34aedd4..dbdaff279 100644 --- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue +++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue @@ -26,15 +26,16 @@ export default { { field: '料号描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '正厂编码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '库位', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: 'ERP储位', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '专案代码描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '项目分类', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '项目分类', maxWidth:100, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '项目分类描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '申请人', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '申请人', maxWidth:120, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, { field: '申请部门', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, - { field: '实际发货人', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '实际发货人', maxWidth:115, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } }, + { field: '发料时间', maxWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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:[