From a0a29f96f7120a80abe0c93dc21f4919220db0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Sun, 4 Feb 2024 14:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9F=83=E9=A9=B0=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E3=80=91=E5=A7=94=E5=A4=96=E5=87=BA=E5=BA=93=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=20+=20=E5=A7=94=E5=A4=96=E9=80=80=E5=BA=93=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=20=E6=8A=A5=E8=A1=A8=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/outsourcingOutReport.vue          | 10 ++++++----
 .../src/views/report/outsourcingReturnReport.vue       | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue
index 9eac854..03902cd 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingOutReport.vue
@@ -25,21 +25,23 @@ export default {
         { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述2', 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: '目标库位', 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:[
         {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
-        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
-        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'来源库位组',optionsProc:'LocationGroupCode',options:[]},
+        // {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
         {type:'date',prop:'beginDate',label:'起始'},
         {type:'date',prop:'endDate',label:'截止'},
       ],
       searchForm:{
         ItemCode:'',
         LocationGroupCode:"",
-        SupplierCode:'',
+        // SupplierCode:'',
         beginDate:"",
         endDate:'',
       },
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue
index 44307e7..d10e8bc 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/outsourcingReturnReport.vue
@@ -25,21 +25,23 @@ export default {
         { field: '物料名称', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述2', 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: '目标库位组', 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:[
         {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
-        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
-        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'目标库位组',optionsProc:'LocationGroupCode',options:[]},
+        // {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
         {type:'date',prop:'beginDate',label:'起始'},
         {type:'date',prop:'endDate',label:'截止'},
       ],
       searchForm:{
         ItemCode:'',
         LocationGroupCode:"",
-        SupplierCode:'',
+        // SupplierCode:'',
         beginDate:"",
         endDate:'',
       },