From 6323c07704f7ba857de823f2b2f686ee267e84ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 2 Jan 2024 16:48:11 +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=E6=B5=B7=E5=A4=96=E6=8A=A5=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/index.js                       |  9 ++++
 .../views/report/overseasInAndOutReport.vue   | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/overseasInAndOutReport.vue

diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js b/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
index 35b6b50..dd89607 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
@@ -6,6 +6,7 @@ import inventoryERPWMSReport from '../views/report/inventoryERPWMSReport.vue'
 import inventoryTransReport from '../views/report/inventoryTransReport.vue'
 import procureHasPOReport from '../views/report/procureHasPOReport.vue'
 import procureNoPOReport from '../views/report/procureNoPOReport.vue'
+import overseasInAndOutReport from '../views/report/overseasInAndOutReport.vue'
 import repairSourceReport from '../views/report/repairSourceReport.vue'
 import repairTargetReport from '../views/report/repairTargetReport.vue'
 import repairSubItemReport from '../views/report/repairSubItemReport.vue'
@@ -80,6 +81,14 @@ const routes = [
             title:"采购收货/采购退货-无PO报表",
         }
     },
+    {
+        path: '/overseasInAndOutReport',
+        name: 'overseasInAndOutReport',
+        component: overseasInAndOutReport,
+        meta:{
+            title:"海外收货/海外退货报表",
+        }
+    },
     {
         path: '/repairSourceReport',
         name: 'repairSourceReport',
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/overseasInAndOutReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/overseasInAndOutReport.vue
new file mode 100644
index 0000000..df97dac
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/overseasInAndOutReport.vue
@@ -0,0 +1,50 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'海外收货/海外退货报表'"
+    :procName="'Proc_Zheng_海外收货_海外退货_有PO'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "overseasInAndOutReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { 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: '物料描述1', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', 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 } },
+        { field: '退货数量', type:"kiloNumber", cellClass: 'rightAlign', valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        SupplierCode:'',
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['收货数量','退货数量']
+    };
+  },
+};
+</script>
\ No newline at end of file