【nev-报表】使用AG开发暂存

11 months ago · 12e1edcc1e
17 changed files with 690 additions and 20 deletions
--- a/fe/UI.DY.AgGridReport/public/config.js
+++ b/fe/UI.DY.AgGridReport/public/config.js
@ -1,3 +1,3 @@
-window.SITE_CONFIG['apiURL'] = 'http://192.168.0.157:60029'
+window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078'
 //特殊使用埃驰pc端访问地址（如备料报表）
 window.SITE_CONFIG['businessURL'] = 'http://dev.ccwin-in.com:10099'
--- a/fe/UI.DY.AgGridReport/src/api/api.js
+++ b/fe/UI.DY.AgGridReport/src/api/api.js
@ -9,5 +9,35 @@ export function getReportPageList(procName, data) {

 // 获取 物料
 export function getItemCodeList() {
-    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_ItemCode',{})
-}
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_ItemCode',{})
+}
+
+// 获取 库位
+export function getLocationCodeList() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_LocationCode',{})
+}
+
+// 获取 发货类型
+export function getDeliverRequestType() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_DeliverRequest_Type',{})
+}
+
+// 获取 供应商
+export function getSupplierCode() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_SupplierCode',{})
+}
+
+// 获取 ERP库位
+export function getLocationErpCode() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_LocationErpCode',{})
+}
+
+// 获取 领料类别
+export function getUnplannedIssueType() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_UnplannedIssue_Type',{})
+}
+
+// 获取 退料类别
+export function getUnplannedReceiptType() {
+    return axiosUtil.ajax_post(procApi+'Proc_InputWhere_UnplannedReceipt_Type',{})
+}
--- a/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/reportPage/index.vue
@ -116,7 +116,7 @@ export default {
        },
        // 更新表格数据
        updateTableData(data){
-            this.$refs.AgTable_Ref.updateTableData(data)
+            if(this.$refs.AgTable_Ref)this.$refs.AgTable_Ref.updateTableData(data)
        },
        // 更新导出数据
        updateDownloadData(data){
--- a/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue
@ -79,6 +79,12 @@ import columnFilter from "@/components/columnFilter/index"
 import exportExcel from "@/components/exportExcel/index"
 import {
    getItemCodeList,
+    getLocationCodeList,
+    getDeliverRequestType,
+    getSupplierCode,
+    getLocationErpCode,
+    getUnplannedIssueType,
+    getUnplannedReceiptType
 } from '@/api/api'
 export default {
    name: "reportPageHeader",
@ -137,13 +143,61 @@ export default {
                item.options = []
                if(item.type == 'select' && item.optionsProc){
                    // 物料
-                    // if(item.optionsProc == 'itemCode'){
-                    //     getItemCodeList().then(res=>{
-                    //         item.options = res
-                    //         item.opL="ItemCode"
-                    //         item.opV="ItemCode"
-                    //     })
-                    // }
+                    if(item.optionsProc == 'itemCode'){
+                        getItemCodeList().then(res=>{
+                            item.options = res
+                            item.opL="ItemCode"
+                            item.opV="ItemCode"
+                        })
+                    }
+                    // 库位
+                    if(item.optionsProc == 'LocationCode'){
+                        getLocationCodeList().then(res=>{
+                            item.options = res
+                            item.opL="LocationCode"
+                            item.opV="LocationCode"
+                        })
+                    }
+                    // 发货类型
+                    if(item.optionsProc == 'DeliverRequestType'){
+                        getDeliverRequestType().then(res=>{
+                            item.options = res
+                            item.opL="KEY"
+                            item.opV="VALUE"
+                        })
+                    }
+                    // 供应商
+                    if(item.optionsProc == 'SupplierCode'){
+                        getSupplierCode().then(res=>{
+                            item.options = res
+                            item.opL="SupplierCode"
+                            item.opV="SupplierCode"
+                        })
+                    }
+                    // ERP库位
+                    if(item.optionsProc == 'LocationErpCode'){
+                        getLocationErpCode().then(res=>{
+                            item.options = res
+                            item.opL="ErpLocationCode"
+                            item.opV="ErpLocationCode"
+                        })
+                    }
+                    // 领料类别
+                    if(item.optionsProc == 'UnplannedIssueType'){
+                        getUnplannedIssueType().then(res=>{
+                            item.options = res
+                            item.opL="KEY"
+                            item.opV="VALUE"
+                        })
+                    }
+                    // 退料类别
+                    if(item.optionsProc == 'UnplannedReceiptType'){
+                        getUnplannedReceiptType().then(res=>{
+                            item.options = res
+                            item.opL="KEY"
+                            item.opV="VALUE"
+                        })
+                    }
                    // //存储时效控制报表-是否超过时效
                    // if(item.optionsProc == 'isExceedThreshold'){
                    //     item.options = [
--- a/fe/UI.DY.AgGridReport/src/router/index.js
+++ b/fe/UI.DY.AgGridReport/src/router/index.js
@ -3,6 +3,16 @@ import VueRouter from 'vue-router'
 import Home from '../views/Home.vue'
 import depositSummaryReport from '../views/report/depositSummaryReport.vue'
 import depositDetailsReport from '../views/report/depositDetailsReport.vue'
+import InventoryBalanceLocation from '../views/report/InventoryBalanceLocation.vue'
+import ScrapDetail from '../views/report/ScrapDetail.vue'
+import PurchaseReturnSummary from '../views/report/PurchaseReturnSummary.vue'
+import ProductDeliverySummary from '../views/report/ProductDeliverySummary.vue'
+import ProductDeliveryNoPrice from '../views/report/ProductDeliveryNoPrice.vue'
+import orderSummary from '../views/report/orderSummary.vue'
+import UnplannedIssueSummary from '../views/report/UnplannedIssueSummary.vue'
+import UnplannedReceiptSummary from '../views/report/UnplannedReceiptSummary.vue'
+import SupplierDeliver from '../views/report/SupplierDeliver.vue'
+import interfaceError from '../views/report/interfaceError.vue'

 Vue.use(VueRouter)

@ -15,12 +25,84 @@ const routes = [
            title:"报表首页",
        }
    },
+    {
+        path: '/InventoryBalanceLocation',
+        name: 'InventoryBalanceLocation',
+        component: InventoryBalanceLocation,
+        meta:{
+            title:"库存余额报表（按库位）",
+        }
+    },
+    {
+        path: '/ScrapDetail',
+        name: 'ScrapDetail',
+        component: ScrapDetail,
+        meta:{
+            title:"报废明细报表",
+        }
+    },
+    {
+        path: '/PurchaseReturnSummary',
+        name: 'PurchaseReturnSummary',
+        component: PurchaseReturnSummary,
+        meta:{
+            title:"采购退货汇总报表",
+        }
+    },
+    {
+        path: '/ProductDeliverySummary',
+        name: 'ProductDeliverySummary',
+        component: ProductDeliverySummary,
+        meta:{
+            title:"成品发货汇总报表",
+        }
+    },
+    {
+        path: '/ProductDeliveryNoPrice',
+        name: 'ProductDeliveryNoPrice',
+        component: ProductDeliveryNoPrice,
+        meta:{
+            title:"成品发货汇总报表（无价格）",
+        }
+    },
+    {
+        path: '/orderSummary',
+        name: 'orderSummary',
+        component: orderSummary,
+        meta:{
+            title:"订单汇总报表",
+        }
+    },
+    {
+        path: '/UnplannedIssueSummary',
+        name: 'UnplannedIssueSummary',
+        component: UnplannedIssueSummary,
+        meta:{
+            title:"非生产领料汇总报表",
+        }
+    },
+    {
+        path: '/UnplannedReceiptSummary',
+        name: 'UnplannedReceiptSummary',
+        component: UnplannedReceiptSummary,
+        meta:{
+            title:"非生产退料汇总报表",
+        }
+    },
+    {
+        path: '/SupplierDeliver',
+        name: 'SupplierDeliver',
+        component: SupplierDeliver,
+        meta:{
+            title:"供应商发货报表",
+        }
+    },
    {
        path: '/depositSummaryReport',
        name: 'depositSummaryReport',
        component: depositSummaryReport,
        meta:{
-            title:"缴库汇总报表",
+            title:"缴库汇总差异报表",
        }
    },
    {
@ -30,7 +112,15 @@ const routes = [
        meta:{
            title:"缴库明细报表",
        }
-    }
+    },
+    {
+        path: '/interfaceError',
+        name: 'interfaceError',
+        component: interfaceError,
+        meta:{
+            title:"接口错误报表",
+        }
+    },
 ]

 const router = new VueRouter({
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue
@ -0,0 +1,44 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'库存余额报表（按库位）'"
+    :procName="'Proc_库存余额报表库位'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "InventoryBalanceLocation",
+  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: '配置',  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:[]},
+      ],
+      searchForm:{
+        ItemCode:"",
+        LocationCode:'',
+      },
+      BottomFixedItem:['余额汇总'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue
@ -0,0 +1,51 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'成品发货汇总报表（无价格）'"
+    :procName="'Proc_成品发货未有销售价格表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "ProductDeliveryNoPrice",
+  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: '配置',  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: '数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'DeliverRequestType',label:'发货类型',optionsProc:'DeliverRequestType',options:[]},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        DeliverRequestType:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue
@ -0,0 +1,51 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'成品发货汇总报表'"
+    :procName="'Proc_成品发货汇总表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "ProductDeliverySummary",
+  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: '配置',  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: '数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'DeliverRequestType',label:'发货类型',optionsProc:'DeliverRequestType',options:[]},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        DeliverRequestType:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue
@ -0,0 +1,44 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'采购退货汇总报表'"
+    :procName="'Proc_采购退货汇总'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "PurchaseReturnSummary",
+  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: '配置',  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:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['退货总数'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue
@ -0,0 +1,50 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'报废明细报表'"
+    :procName="'Proc_报废明细表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "ScrapDetail",
+  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: '物品描述1',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '配置',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'WMS库位',  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: '报废原因',  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:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['报废数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue
@ -0,0 +1,48 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'供应商发货报表'"
+    :procName="'Proc_供应商发货报表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "SupplierDeliver",
+  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: '批次',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目检状态',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '创建时间',  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:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['合格'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedIssueSummary.vue
@ -0,0 +1,58 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'非生产领料汇总报表'"
+    :procName="'Proc_非生产领料汇总表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "UnplannedIssueSummary",
+  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: '库位',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位',  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: '申请人',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '申请部门',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '实际发货人',  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:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
+        {type:'select',prop:'UnplannedIssueType',label:'领料类别',optionsProc:'UnplannedIssueType',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        LocationErpCode:"",
+        UnplannedIssueType:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['汇总数'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/UnplannedReceiptSummary.vue
@ -0,0 +1,58 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'非生产退料汇总报表'"
+    :procName="'Proc_非生产退料汇总表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "UnplannedReceiptSummary",
+  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: '库位',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位',  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: '申请人',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '申请部门',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '实际发货人',  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:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
+        {type:'select',prop:'UnplannedReceiptType',label:'退料类别',optionsProc:'UnplannedReceiptType',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        LocationErpCode:"",
+        UnplannedReceiptType:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['汇总数'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue
@ -5,7 +5,7 @@
    :searchForm="searchForm"
    :BottomFixedItem="BottomFixedItem"
    :reportName="'缴库明细报表'"
-    :procName="'Bin_缴库明细对照'"
+    :procName="'Proc_缴库明细对照'"
  ></reportPage>
 </template>
  
--- a/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue
@ -4,8 +4,8 @@
    :searchConfig="searchConfig"
    :searchForm="searchForm"
    :BottomFixedItem="BottomFixedItem"
-    :reportName="'缴库汇总报表'"
-    :procName="'Bin_缴库汇总对照'"
+    :reportName="'缴库汇总差异报表'"
+    :procName="'Proc_缴库汇总差异报表'"
  ></reportPage>
 </template>
  
@ -34,12 +34,12 @@ export default {
        { field: 'mes和tyrp差', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
      ],
      searchConfig:[
-        {type:'date',prop:'starttime',label:'起始'},
-        {type:'date',prop:'endtime',label:'截止'},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
      ],
      searchForm:{
-        starttime:"",
-        endtime:'',
+        beginDate:"",
+        endDate:'',
      },
      BottomFixedItem:['mes数量','mes和wms差','tyrp数量','wms数量'],
    };
--- a/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue
@ -0,0 +1,40 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'接口错误报表'"
+    :procName="'Proc_接口错误表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "interfaceError",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'Number', maxWidth:110, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true },width:20 },
+        { field: '类型', maxWidth:150,filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ErrorMessage',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:[],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue
@ -0,0 +1,52 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'订单汇总报表'"
+    :procName="'Proc_订单汇总查询报表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "orderSummary",
+  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: '配置',  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 } },
+        { field: '未交数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'input',prop:'Number',label:'订单号'},
+        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        SupplierCode:"",
+        Number:"",
+      },
+      BottomFixedItem:['订单数量','未交数量'],
+    };
+  }
+};
+</script>