【前端-报表】暂存

3 months ago · 25249c2e84
14 changed files with 506 additions and 27 deletions
--- a/fe/UI.DY.AgGridReport/package-lock.json
+++ b/fe/UI.DY.AgGridReport/package-lock.json
@ -14,7 +14,7 @@
        "axios": "^0.21.1",
        "core-js": "^3.6.5",
        "echarts": "^5.4.0",
-        "element-ui": "2.15.13",
+        "element-ui": "^2.15.14",
        "file-saver": "^2.0.2",
        "js-cookie": "^3.0.1",
        "postcss-px-to-viewport": "^1.1.1",
@ -5987,9 +5987,9 @@
      "dev": true
    },
    "node_modules/element-ui": {
-      "version": "2.15.13",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz",
-      "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
      "dependencies": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
@ -21106,9 +21106,9 @@
      "dev": true
    },
    "element-ui": {
-      "version": "2.15.13",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.13.tgz",
-      "integrity": "sha512-LJoatEYX6WV74FqXBss8Xfho9fh9rjDSzrDrTyREdGb1h1R3uRvmLh5jqp2JU137aj4/BgqA3K06RQpQBX33Bg==",
+      "version": "2.15.14",
+      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.14.tgz",
+      "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==",
      "requires": {
        "async-validator": "~1.8.1",
        "babel-helper-vue-jsx-merge-props": "^2.0.0",
--- a/fe/UI.DY.AgGridReport/package.json
+++ b/fe/UI.DY.AgGridReport/package.json
@ -15,7 +15,7 @@
    "axios": "^0.21.1",
    "core-js": "^3.6.5",
    "echarts": "^5.4.0",
-    "element-ui": "2.15.13",
+    "element-ui": "^2.15.14",
    "file-saver": "^2.0.2",
    "js-cookie": "^3.0.1",
    "postcss-px-to-viewport": "^1.1.1",
--- a/fe/UI.DY.AgGridReport/public/config.js
+++ b/fe/UI.DY.AgGridReport/public/config.js
@ -1 +1,3 @@
-window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078'
+window.SITE_CONFIG['apiURL'] = 'http://dev.ccwin-in.com:60078'
+//质检报告
+window.SITE_CONFIG['inspectionURL'] = 'http://dev.ccwin-in.com:60099'
--- a/fe/UI.DY.AgGridReport/src/api/businessApi.js
+++ b/fe/UI.DY.AgGridReport/src/api/businessApi.js
@ -1,7 +1,7 @@
 import axiosUtil from '@/utils/request'
-let businessURL = window.SITE_CONFIG['businessURL']
+let inspectionURL = window.SITE_CONFIG['inspectionURL']

-// 备料看板
-export function getstockPreparationList() {
-    return axiosUtil.ajax_post(businessURL+'/api/wms/store/board/preparation-board-export')
+// 质检报表-获取报告
+export function getInspectionImg(name) {
+    return axiosUtil.ajax_get(inspectionURL+'/api/filestore/file?blobName='+name)
 }
--- a/fe/UI.DY.AgGridReport/src/router/index.js
+++ b/fe/UI.DY.AgGridReport/src/router/index.js
@ -14,6 +14,7 @@ import SupplierDeliver from '../views/report/SupplierDeliver.vue'
 import interfaceError from '../views/report/interfaceError.vue'
 import InventoryJournalERP from '../views/report/InventoryJournalERP.vue'
 import InventoryJournalLocation from '../views/report/InventoryJournalLocation.vue'
+import InventoryBalance from '../views/report/InventoryBalance.vue'
 import InventoryBalanceERP from '../views/report/InventoryBalanceERP.vue'
 import InventoryBalanceLocation from '../views/report/InventoryBalanceLocation.vue'
 import InventoryBalanceEnRoute from '../views/report/InventoryBalanceEnRoute.vue'
@ -26,6 +27,13 @@ import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue'
 import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue'
 import rawScrapList from '../views/report/rawScrapList.vue'
 import inspection from '../views/report/inspection.vue'
+import dailyReconciliation from '../views/report/dailyReconciliation.vue'
+import returnBeforeListing from '../views/report/returnBeforeListing.vue'
+import returnAfterListing from '../views/report/returnAfterListing.vue'
+import putaway from '../views/report/putaway.vue'
+import putInDetails from '../views/report/putInDetails.vue'
+import putOutDetails from '../views/report/putOutDetails.vue'
+
 // import InventoryBookDetail from '../views/report/InventoryBookDetail.vue'

 Vue.use(VueRouter)
@ -142,6 +150,14 @@ const routes = [
            title:"库存流水账汇总(库位)",
        }
    },
+    {
+        path: '/InventoryBalance',
+        name: 'InventoryBalance',
+        component: InventoryBalance,
+        meta:{
+            title:"库存余额报表",
+        }
+    },
    {
        path: '/InventoryBalanceERP',
        name: 'InventoryBalanceERP',
@ -238,6 +254,54 @@ const routes = [
            title:"质检报表",
        }
    },
+    {
+        path: '/dailyReconciliation',
+        name: 'dailyReconciliation',
+        component: dailyReconciliation,
+        meta:{
+            title:"系统库存每日对账表",
+        }
+    },
+    {
+        path: '/returnBeforeListing',
+        name: 'returnBeforeListing',
+        component: returnBeforeListing,
+        meta:{
+            title:"上架前退货报表",
+        }
+    },
+    {
+        path: '/returnAfterListing',
+        name: 'returnAfterListing',
+        component: returnAfterListing,
+        meta:{
+            title:"上架后退货报表",
+        }
+    },
+    {
+        path: '/putaway',
+        name: 'putaway',
+        component: putaway,
+        meta:{
+            title:"采购上架报表",
+        }
+    },
+    {
+        path: '/putInDetails',
+        name: 'putInDetails',
+        component: putInDetails,
+        meta:{
+            title:"入库明细报表",
+        }
+    },
+    {
+        path: '/putOutDetails',
+        name: 'putOutDetails',
+        component: putOutDetails,
+        meta:{
+            title:"出库明细报表",
+        }
+    },
    // {
    //     path: '/InventoryBookDetail',
    //     name: 'InventoryBookDetail',
--- a/fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue
@ -0,0 +1,54 @@
+<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: "InventoryBalance",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { 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: '规格颜色', headerName:"规格/颜色", 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: 'ERP储位', 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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'select',prop:'LocationCode',label:'库位',optionsProc:'LocationCode',options:[]},
+        {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+        LocationCode:'',
+        LocationErpCode:"",
+      },
+      BottomFixedItem:['余额汇总'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.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: "dailyReconciliation",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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: 'ERP储位',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'WMS数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'TYRP数量', 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:'date',prop:'starttime',label:'起始'},
+        // {type:'date',prop:'endtime',label:'截止'},
+      ],
+      searchForm:{
+        // starttime:"",
+        // endtime:'',
+      },
+      BottomFixedItem:['WMS数量','TYRP数量','差异数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/inspection.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/inspection.vue
@ -1,24 +1,34 @@
 <template>
-  <reportPage
-    :columnList="columnDefs" 
-    :searchConfig="searchConfig"
-    :searchForm="searchForm"
-    :BottomFixedItem="BottomFixedItem"
-    :averageFixedItem="averageFixedItem"
-    :reportName="'质检报表'"
-    :procName="'Proc_质检报表'"
-  ></reportPage>
+  <div>
+    <reportPage
+      :columnList="columnDefs" 
+      :searchConfig="searchConfig"
+      :searchForm="searchForm"
+      :BottomFixedItem="BottomFixedItem"
+      :averageFixedItem="averageFixedItem"
+      :reportName="'质检报表'"
+      :procName="'Proc_质检报表'"
+    ></reportPage>
+    <!-- 抽屉查看供应商报告弹窗 -->
+    <el-image-viewer 
+      v-if="isShowImg" 
+      :on-close="(()=>{isShowImg = false})" 
+      :url-list="imgListViews" />
+  </div>
 </template>
  
 <script>
 import reportPage from "@/components/reportPage/index"
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import util from '@/utils/util'
 import {inventoryTransactionSerial} from "@/api/api"
+import {getInspectionImg} from "@/api/businessApi"

 export default {
  name: "inspection",
  components: {
-    reportPage
+    reportPage,
+    ElImageViewer
  },
  data () {
    return {
@ -38,6 +48,7 @@ export default {
        { field: '不合格', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
        { field: '合格率', type:"percentNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberPercentFormatter(data.value)}), 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 } },
+        { headerName: "操作", cellClass:"centerAlign", cellRenderer: this.ActionCellRenderer } // 自定义操作列
      ],
      searchConfig:[
        {type:'input',prop:'PoNumber',label:'订单号'},
@ -54,8 +65,53 @@ export default {
        PoNumber:"",
      },
      BottomFixedItem:['合格','不合格','合格率','抽检数量'],
-      averageFixedItem:['合格率']
+      averageFixedItem:['合格率'],
+      isShowImg:false,
+      imgListViews:[]
    };
  },
+  methods:{
+    ActionCellRenderer(row) {
+      // 底部固定栏不显示按钮
+      if(row.node.id.indexOf('b') >= 0){ return '' }
+      // 没有之间报告的不显示
+      try {
+        let _json = JSON.parse(row.data['质检报告'])
+        if(_json.length > 0){
+          const eButton = document.createElement('span');
+          eButton.innerHTML = '查看报告';
+          eButton.style.color = 'blue'
+          eButton.style.fontSize = '14px'
+          eButton.style.cursor = 'pointer'
+          eButton.addEventListener('click', () => {
+            this.showImg(row)
+          });
+          return eButton;
+        }else{
+          return ''
+        }
+        
+      } catch (error) {
+        return ''
+      }
+    },
+    async showImg(row){
+      let _json = JSON.parse(row.data['质检报告'])
+      this.imgListViews = []
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+      });
+      _json.forEach(async item=>{
+        let res = await getInspectionImg(item.FileKey)
+        this.imgListViews.push('data:application/pdf;base64,' + res.bytes)
+        if(this.imgListViews.length == _json.length){
+          this.isShowImg = true
+          loading.close();
+        }
+      })
+    }
+  }
 };
 </script>
--- a/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/interfaceError.vue
@ -21,9 +21,13 @@ export default {
  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 } },
+        { field: '编号', maxWidth:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true },width:20 },
+        { field: '业务类型C', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '业务类型E', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '系统来源', maxWidth:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '类型', maxWidth:110, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '错误信息',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
      ],
      searchConfig:[
        {type:'date',prop:'beginDate',label:'起始'},
--- a/fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue
@ -0,0 +1,49 @@
+<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: "putInDetails",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '供应商简称',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位',  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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/putOutDetails.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: "putOutDetails",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP储位',  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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/putaway.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/putaway.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: "putaway",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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", 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", 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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue
@ -0,0 +1,53 @@
+<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: "returnAfterListing",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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", 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", 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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>
--- a/fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue
+++ b/fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue
@ -0,0 +1,53 @@
+<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: "returnBeforeListing",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  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", 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", 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:'Supplier',label:'供应商',optionsProc:'SupplierCode',options:[]},
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        beginDate:"",
+        endDate:'',
+        Supplier:"",
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>