From f84953a816da682554a98c5ed408aeabd6d1aa22 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, 20 Mar 2024 17:30:06 +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=AD=98=E5=82=A8=E6=97=B6=E6=95=88=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/reportPageHeader/index.vue | 10 ++++
 .../src/router/index.js                       |  9 ++++
 .../src/views/report/storageAgingReport.vue   | 51 +++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/storageAgingReport.vue

diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
index 9270f0c..a1b3334 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue
@@ -247,6 +247,16 @@ export default {
                         item.opL='label'
                         item.opV="value"
                     }
+                    //存储时效控制报表-是否超过时效
+                    if(item.optionsProc == 'IsExceedThreshold'){
+                        item.options = [
+                            {label:'是',value:'是'},
+                            {label:'否',value:'否'},
+                            {label:'全部',value:'全部'},
+                        ]
+                        item.opL='label'
+                        item.opV="value"
+                    }
                 }
             })
         },
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js b/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
index 9927ee1..021868b 100644
--- a/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js
@@ -32,6 +32,7 @@ import EQLevelReport from '../views/report/EQLevelReport.vue'
 import outsourcingOutReport from '../views/report/outsourcingOutReport.vue'
 import outsourcingReturnReport from '../views/report/outsourcingReturnReport.vue'
 import stockPreparationReport from '../views/report/stockPreparationReport.vue'
+import storageAgingReport from '../views/report/storageAgingReport.vue'
 
 Vue.use(VueRouter)
 
@@ -292,6 +293,14 @@ const routes = [
             title:"备料报表",
         }
     },
+    {
+        path: '/storageAgingReport',
+        name: 'storageAgingReport',
+        component: storageAgingReport,
+        meta:{
+            title:"存储时效控制报表",
+        }
+    },
 ]
 
 const router = new VueRouter({
diff --git a/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/storageAgingReport.vue b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/storageAgingReport.vue
new file mode 100644
index 0000000..503a181
--- /dev/null
+++ b/PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/storageAgingReport.vue
@@ -0,0 +1,51 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'存储时效控制报表'"
+    :procName="'Proc_Zheng_存储时效控制'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "storageAgingReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { 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: '箱码', 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: '入库时间',  cellClass:"centerAlign", valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), 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:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
+        {type:'select',prop:'IsExceedThreshold',noClear:true,label:'是否超过时效',optionsProc:'IsExceedThreshold',options:[]},
+      ],
+      searchForm:{
+        ItemCode:"",
+        LocationCode:'',
+        IsExceedThreshold:'全部',
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
\ No newline at end of file