From 4729094c321a81ae37b6e8999b126259b86733a2 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, 30 May 2024 17:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9CselectExcess=E2=80=9D=E5=A4=A7?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8B=E6=8B=89=E6=9F=A5=E8=AF=A2=E6=96=B9?=
=?UTF-8?q?=E5=BC=8F=E5=B0=81=E8=A3=85=E5=BC=80=E5=8F=91=EF=BC=8C=E5=A4=84?=
=?UTF-8?q?=E7=90=86=E5=A4=A7=E6=95=B0=E6=8D=AE=E5=8D=A1=E9=A1=BF=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/reportPageHeader/index.vue | 112 ++++++++++++++----
fe/UI.DY.AgGridReport/src/router/index.js | 4 +-
.../src/views/report/InventoryAgingDetail.vue | 2 +-
.../report/InventoryAgingsectionSummary.vue | 2 +-
.../src/views/report/InventoryBalanceERP.vue | 2 +-
.../views/report/InventoryBalanceEnRoute.vue | 2 +-
.../views/report/InventoryBalanceLocation.vue | 2 +-
.../views/report/InventoryJournalLocation.vue | 20 +++-
.../views/report/ProductDeliveryNoPrice.vue | 2 +-
.../views/report/ProductDeliverySummary.vue | 2 +-
.../views/report/ProductReceiptSummary.vue | 2 +-
.../views/report/ProductionIssueSummary.vue | 2 +-
.../views/report/ProductionReturnSummary.vue | 2 +-
.../views/report/PurchaseReturnSummary.vue | 2 +-
.../src/views/report/ScrapDetail.vue | 2 +-
.../src/views/report/SupplierDeliver.vue | 2 +-
.../views/report/UnplannedIssueSummary.vue | 2 +-
.../views/report/UnplannedReceiptSummary.vue | 2 +-
.../src/views/report/orderSummary.vue | 2 +-
.../src/views/report/planNoteSummary.vue | 2 +-
20 files changed, 124 insertions(+), 46 deletions(-)
diff --git a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
index 1a291ab2f..61c3ba122 100644
--- a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
@@ -27,15 +27,35 @@
:placeholder="'请输入'+item.label"
:clearable="!item.noClear"
>
-
+
+
+
{selectTypeVisibleChange(isShow,item)}'
>
diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js
index 9c93e7731..6946b08e6 100644
--- a/fe/UI.DY.AgGridReport/src/router/index.js
+++ b/fe/UI.DY.AgGridReport/src/router/index.js
@@ -128,7 +128,7 @@ const routes = [
name: 'InventoryJournalERP',
component: InventoryJournalERP,
meta:{
- title:"库存流水账汇总(储位)11111",
+ title:"库存流水账汇总(储位)",
}
},
{
@@ -136,7 +136,7 @@ const routes = [
name: 'InventoryJournalLocation',
component: InventoryJournalLocation,
meta:{
- title:"库存流水账汇总(库位)11111",
+ title:"库存流水账汇总(库位)",
}
},
{
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue
index 472aada55..a84b1fdb5 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingDetail.vue
@@ -36,7 +36,7 @@ export default {
{ field: '入库时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
],
searchConfig:[
- {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+ {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
{type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
{type:'select',prop:'Status',label:'状态',optionsProc:'InventoryBalanceStatus',options:[]},
],
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue
index 0b55797d0..18d7a32ca 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue
@@ -38,7 +38,7 @@ export default {
{ field: '合计数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
],
searchConfig:[
- {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+ {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
{type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
{type:'date',prop:'beginDate',label:'起始'},
{type:'date',prop:'endDate',label:'截止'},
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
index 625f004a4..241448389 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue
@@ -30,7 +30,7 @@ export default {
{ field: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
],
searchConfig:[
- {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+ {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
{type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
],
searchForm:{
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue
index 24d0934a9..a2ec770a9 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue
@@ -30,7 +30,7 @@ export default {
{ field: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
],
searchConfig:[
- {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+ {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
{type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
],
searchForm:{
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue
index 8c0747ca8..0c763d2ab 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue
@@ -30,7 +30,7 @@ export default {
{ field: '余额汇总', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
],
searchConfig:[
- {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+ {type:'selectExcess',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
{type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
],
searchForm:{
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue
index c614152d2..0ef23e7ce 100644
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryJournalLocation.vue
@@ -3,6 +3,7 @@
:columnList="columnDefs"
:searchConfig="searchConfig"
:searchForm="searchForm"
+ :searchRules="searchRules"
:BottomFixedItem="BottomFixedItem"
:reportName="'库存流水账汇总(库位)'"
:procName="'Proc_库存流水帐汇总库位'"
@@ -12,6 +13,7 @@