【报表】报表制作

PC/UI.WinIn.FasterZ.AgGridReport/src/api/api.js

@@ -17,7 +17,12 @@ export function getLocationErpCodeList() {
     return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_LocationErpCode',{})
 }
 
-// 获取 库位组
+// 获取 库位 LocationCode
+export function getLocationCodeList() {
+    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_LocationCode',{})
+}
+
+// 获取 库位组 LocationGroupCode
 export function getLocationGroupCodeList() {
     return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_LocationGroupCode',{})
 }
@@ -32,10 +37,27 @@ export function getTransTypeList() {
     return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_TransType',{})
 }
 
-// 获取 供应商
+// 获取 供应商 SupplierCode
 export function getSupplierCodeList() {
     return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_SupplierCode',{})
 }
 
+// 获取 客户代码 CustomerCode
+export function getCustomerCodeList() {
+    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_CustomCode',{})
+}
 
+// 获取 入库类别 UnplannedReceiptType
+export function getUnplannedReceiptTypeList() {
+    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_UnplannedReceiptType',{})
+}
 
+// 获取 出库类别 UnplannedIssueType
+export function getUnplannedIssueTypeList() {
+    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_UnplannedIssueType',{})
+}
+
+// 获取 报废工单 ScrapNumber
+export function getScrapNumberList() {
+    return axiosUtil.ajax_post(procApi+'Proc_Zheng_InputWhere_ScrapNumber',{})
+}

PC/UI.WinIn.FasterZ.AgGridReport/src/components/reportPageHeader/index.vue

@@ -79,10 +79,15 @@ import exportExcel from "@/components/exportExcel/index"
 import {
     getItemCodeList,
     getLocationErpCodeList,
+    getLocationCodeList,
     getLocationGroupCodeList,
     getInventoryStatusList,
     getTransTypeList,
-    getSupplierCodeList
+    getSupplierCodeList,
+    getCustomerCodeList,
+    getUnplannedReceiptTypeList,
+    getUnplannedIssueTypeList,
+    getScrapNumberList
 } from '@/api/api'
 export default {
     name: "reportPageHeader",
@@ -137,6 +142,7 @@ export default {
     methods: {
         initSearchConfig(){
             this.searchConfig.forEach(item=>{
+                item.options = []
                 if(item.type == 'select' && item.optionsProc){
                     // 物料
                     if(item.optionsProc == 'itemCode'){
@@ -154,6 +160,14 @@ export default {
                             item.opV="ErpLocationCode"
                         })
                     }
+                    // 库位
+                    if(item.optionsProc == 'LocationCode'){
+                        getLocationCodeList().then(res=>{
+                            item.options = res
+                            item.opL="LocationCode"
+                            item.opV="LocationCode"
+                        })
+                    }
                     // 库位组
                     if(item.optionsProc == 'LocationGroupCode'){
                         getLocationGroupCodeList().then(res=>{
@@ -188,6 +202,41 @@ export default {
                             item.opV="SupplierCode"
                         })
                     }
+                    // 客户
+                    if(item.optionsProc == 'CustomerCode'){
+                        getCustomerCodeList().then(res=>{
+                            item.options = res
+                            item.opL='CustomerCode'
+                            item.opV="CustomerCode"
+                        })
+                    }
+                    // 入库类别
+                    if(item.optionsProc == 'UnplannedReceiptType'){
+                        getUnplannedReceiptTypeList().then(res=>{
+                            res.forEach(res_item=>res_item.sValue = String(res_item['value'.toUpperCase()]))
+                            item.options = res
+                            item.opL='key'.toUpperCase()
+                            item.opV="sValue"
+                        })
+                    }
+                    // 出库类别
+                    if(item.optionsProc == 'UnplannedIssueType'){
+                        getUnplannedIssueTypeList().then(res=>{
+                            res.forEach(res_item=>res_item.sValue = String(res_item['value'.toUpperCase()]))
+                            item.options = res
+                            item.opL='key'.toUpperCase()
+                            item.opV="sValue"
+                        })
+                    }
+                    // 报废工单
+                    if(item.optionsProc == 'ScrapNumber'){
+                        getScrapNumberList().then(res=>{
+                            item.options = res
+                            item.opL='Number'
+                            item.opV="Number"
+                        })
+                    }
+                    
                 }
             })
         },

PC/UI.WinIn.FasterZ.AgGridReport/src/router/index.js

@@ -1,11 +1,28 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 import Home from '../views/Home.vue'
-import inventoryAndAge from '../views/report/inventoryAndAge.vue'
-import inventoryERPWMS from '../views/report/inventoryERPWMS.vue'
-import inventoryTrans from '../views/report/inventoryTrans.vue'
+import inventoryAndAgeReport from '../views/report/inventoryAndAgeReport.vue'
+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 repairSourceReport from '../views/report/repairSourceReport.vue'
+import repairTargetReport from '../views/report/repairTargetReport.vue'
+import repairSubItemReport from '../views/report/repairSubItemReport.vue'
+import unplannedEnterReport from '../views/report/unplannedEnterReport.vue'
+import unplannedOutReport from '../views/report/unplannedOutReport.vue'
+import scrapReport from '../views/report/scrapReport.vue'
+import completionAndRecyclReport from '../views/report/completionAndRecyclReport.vue'
+import issueNoteReport from '../views/report/issueNoteReport.vue'
+import materialConsumeNoteReport from '../views/report/materialConsumeNoteReport.vue'
+import inspectNoteReport from '../views/report/inspectNoteReport.vue'
+import productionCompletionReport from '../views/report/productionCompletionReport.vue'
+import countPlanNoteReport from '../views/report/countPlanNoteReport.vue'
+import deliveryAndExternalReport from '../views/report/deliveryAndExternalReport.vue'
+import doorUnplannedOutReport from '../views/report/doorUnplannedOutReport.vue'
+import doorUnplannedEnterReport from '../views/report/doorUnplannedEnterReport.vue'
+import doorCompleteReceiptReport from '../views/report/doorCompleteReceiptReport.vue'
+
 
 Vue.use(VueRouter)
 
@@ -19,25 +36,25 @@ const routes = [
         }
     },
     {
-        path: '/inventoryAndAge',
-        name: 'inventoryAndAge',
-        component: inventoryAndAge,
+        path: '/inventoryAndAgeReport',
+        name: 'inventoryAndAgeReport',
+        component: inventoryAndAgeReport,
         meta:{
             title:"库存库龄报表",
         }
     },
     {
-        path: '/inventoryERPWMS',
-        name: 'inventoryERPWMS',
-        component: inventoryERPWMS,
+        path: '/inventoryERPWMSReport',
+        name: 'inventoryERPWMSReport',
+        component: inventoryERPWMSReport,
         meta:{
             title:"库存余额_ERP-WMS差异报表",
         }
     },
     {
-        path: '/inventoryTrans',
-        name: 'inventoryTrans',
-        component: inventoryTrans,
+        path: '/inventoryTransReport',
+        name: 'inventoryTransReport',
+        component: inventoryTransReport,
         meta:{
             title:"库存事务报表",
         }
@@ -58,6 +75,134 @@ const routes = [
             title:"采购收货/采购退货-无PO报表",
         }
     },
+    {
+        path: '/repairSourceReport',
+        name: 'repairSourceReport',
+        component: repairSourceReport,
+        meta:{
+            title:"返修加工报表-来源报表",
+        }
+    },
+    {
+        path: '/repairTargetReport',
+        name: 'repairTargetReport',
+        component: repairTargetReport,
+        meta:{
+            title:"返修加工报表-目标报表",
+        }
+    },
+    {
+        path: '/repairSubItemReport',
+        name: 'repairSubItemReport',
+        component: repairSubItemReport,
+        meta:{
+            title:"返修加工报表-子物料报表",
+        }
+    },
+    {
+        path: '/unplannedEnterReport',
+        name: 'unplannedEnterReport',
+        component: unplannedEnterReport,
+        meta:{
+            title:"计划外入库报表",
+        }
+    },
+    {
+        path: '/unplannedOutReport',
+        name: 'unplannedOutReport',
+        component: unplannedOutReport,
+        meta:{
+            title:"计划外出库报表",
+        }
+    },
+    {
+        path: '/scrapReport',
+        name: 'scrapReport',
+        component: scrapReport,
+        meta:{
+            title:"报废报表",
+        }
+    },
+    {
+        path: '/completionAndRecyclReport',
+        name: 'completionAndRecyclReport',
+        component: completionAndRecyclReport,
+        meta:{
+            title:"完工收货/成品回收报表",
+        }
+    },
+    {
+        path: '/issueNoteReport',
+        name: 'issueNoteReport',
+        component: issueNoteReport,
+        meta:{
+            title:"发料记录报表",
+        }
+    },
+    {
+        path: '/materialConsumeNoteReport',
+        name: 'materialConsumeNoteReport',
+        component: materialConsumeNoteReport,
+        meta:{
+            title:"原料消耗记录报表",
+        }
+    },
+    {
+        path: '/inspectNoteReport',
+        name: 'inspectNoteReport',
+        component: inspectNoteReport,
+        meta:{
+            title:"检验记录报表",
+        }
+    },
+    {
+        path: '/productionCompletionReport',
+        name: 'productionCompletionReport',
+        component: productionCompletionReport,
+        meta:{
+            title:"生产计划达成率报表",
+        }
+    },
+    {
+        path: '/countPlanNoteReport',
+        name: 'countPlanNoteReport',
+        component: countPlanNoteReport,
+        meta:{
+            title:"盘点差异报表",
+        }
+    },
+    {
+        path: '/deliveryAndExternalReport',
+        name: 'deliveryAndExternalReport',
+        component: deliveryAndExternalReport,
+        meta:{
+            title:"发货记录/外库成品发货报表",
+        }
+    },
+    {
+        path: '/doorUnplannedOutReport',
+        name: 'doorUnplannedOutReport',
+        component: doorUnplannedOutReport,
+        meta:{
+            title:"门板_计划外出库记录报表",
+        }
+    },
+    {
+        path: '/doorUnplannedEnterReport',
+        name: 'doorUnplannedEnterReport',
+        component: doorUnplannedEnterReport,
+        meta:{
+            title:"门板_计划外入库记录报表",
+        }
+    },
+    {
+        path: '/doorCompleteReceiptReport',
+        name: 'doorCompleteReceiptReport',
+        component: doorCompleteReceiptReport,
+        meta:{
+            title:"门板_完工收货汇总报表",
+        }
+    },
 ]
 
 const router = new VueRouter({

PC/UI.WinIn.FasterZ.AgGridReport/src/views/Home.vue

@@ -18,7 +18,6 @@ export default {
   },
   mounted(){
     this.menuList = this.$router.options.routes
-    console.log(this.menuList)
   },
   methods: {
     goPage(url){

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/completionAndRecyclReport.vue

@@ -0,0 +1,46 @@
+<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: "completionAndRecyclReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '收货数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '回收数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/countPlanNoteReport.vue

@@ -0,0 +1,54 @@
+<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: "countPlanNoteReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '库位代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位组', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '盘点数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库存数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '差异数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '状态', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", 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:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        LocationCode:"",
+        LocationGroupCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['盘点数量','库存数量','差异数量'],
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/deliveryAndExternalReport.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: "deliveryAndExternalReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '销售订单', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '客户代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '客户名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '客户物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'CustomerCode',label:'客户代码',optionsProc:'CustomerCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        CustomerCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/doorCompleteReceiptReport.vue

@@ -0,0 +1,52 @@
+<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: "doorCompleteReceiptReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '配置码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位组', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'input',prop:'L7Part',label:'配置码'},
+        // {type:'input',prop:'L7Part',label:'项目号'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        LocationGroupCode:"",
+        L7Part:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/doorUnplannedEnterReport.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: "doorUnplannedEnterReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '配置码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位组', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'input',prop:'L7Part',label:'配置码'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        LocationGroupCode:"",
+        L7Part:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/doorUnplannedOutReport.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: "doorUnplannedOutReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '配置码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位组', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'input',prop:'L7Part',label:'配置码'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        LocationGroupCode:"",
+        L7Part:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量'],
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inspectNoteReport.vue

@@ -0,0 +1,53 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :averageFixedItem="averageFixedItem"
+    :reportName="'检验记录报表'"
+    :procName="'Proc_Zheng_检验'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "inspectNoteReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '供应商代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '检验数量(收货-破坏)', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '合格数', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '不合格数', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '合格比例', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberPercentFormatter(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, 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:['检验数量(收货-破坏)','合格数','不合格数','合格比例'],
+      averageFixedItem:['合格比例']
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryAndAge.vue → PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryAndAgeReport.vue

@@ -14,7 +14,7 @@ import reportPage from "@/components/reportPage/index"
 import util from '@/utils/util'
 
 export default {
-  name: "inventoryAndAge",
+  name: "inventoryAndAgeReport",
   components: {
     reportPage
   },
@@ -37,9 +37,9 @@ export default {
         { field: '状态', flex:1, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true }},
       ],
       searchConfig:[
-        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode'},
-        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode'},
-        {type:'select',prop:'InventoryStatus',label:'状态',optionsProc:'InventoryStatus'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'select',prop:'InventoryStatus',label:'状态',optionsProc:'InventoryStatus',options:[]},
       ],
       searchForm:{
         ItemCode:'',

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryERPWMS.vue → PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryERPWMSReport.vue

@@ -14,7 +14,7 @@ import reportPage from "@/components/reportPage/index"
 import util from '@/utils/util'
 
 export default {
-  name: "inventoryERPWMS",
+  name: "inventoryERPWMSReport",
   components: {
     reportPage
   },
@@ -32,8 +32,8 @@ export default {
         { field: '单位', cellClass:"centerAlign", width:150, suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
-        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode'},
-        {type:'select',prop:'ErpLocationCode',label:'ERP库位',optionsProc:'ErpLocationCode'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'ErpLocationCode',label:'ERP库位',optionsProc:'ErpLocationCode',options:[]},
       ],
       searchForm:{
         ItemCode:'',

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryTrans.vue → PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/inventoryTransReport.vue

@@ -14,7 +14,7 @@ import reportPage from "@/components/reportPage/index"
 import util from '@/utils/util'
 
 export default {
-  name: "inventoryTrans",
+  name: "inventoryTransReport",
   components: {
     reportPage
   },
@@ -25,17 +25,17 @@ export default {
         { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
-        { headerName:'库位组代码', field: '库位组', width:200, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位组', width:200, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '数量', type:"kiloNumber", cellClass:"rightAlign", width:200, valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '单位', cellClass:"centerAlign", width:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '状态', cellClass:"centerAlign", width:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
-        { headerName:'事务分类', field: '类型', width:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '类型', width:150, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
-        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode'},
-        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode'},
-        {type:'select',prop:'InventoryStatus',label:'状态',optionsProc:'InventoryStatus'},
-        {type:'select',prop:'TransType',label:'事务分类',optionsProc:'TransType'},
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'select',prop:'InventoryStatus',label:'状态',optionsProc:'InventoryStatus',options:[]},
+        {type:'select',prop:'TransType',label:'事务分类',optionsProc:'TransType',options:[]},
         {type:'date',prop:'beginDate',label:'起始'},
         {type:'date',prop:'endDate',label:'截止'},
       ],

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/issueNoteReport.vue

@@ -0,0 +1,45 @@
+<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: "issueNoteReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/materialConsumeNoteReport.vue

@@ -0,0 +1,45 @@
+<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: "materialConsumeNoteReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureHasPOReport.vue

@@ -32,8 +32,8 @@ export default {
         { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
-        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode'},
-        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode'},
+        {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:'截止'},
       ],

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/procureNoPOReport.vue

@@ -32,8 +32,8 @@ export default {
         { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
       ],
       searchConfig:[
-        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode'},
-        {type:'select',prop:'SupplierCode',label:'供应商',optionsProc:'SupplierCode'},
+        {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:'截止'},
       ],

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/productionCompletionReport.vue

@@ -0,0 +1,53 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :averageFixedItem="averageFixedItem"
+    :reportName="'生产计划达成率报表'"
+    :procName="'Proc_Zheng_生产计划达成率'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+
+export default {
+  name: "productionCompletionReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '生产计划单', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '计划数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '生产数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '未生产数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '生产比例', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberPercentFormatter(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'input',prop:'ProductionPlanNumber',label:'生产计划单'},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        ProductionPlanNumber:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['计划数量','生产数量','未生产数量','生产比例'],
+      averageFixedItem:['生产比例']
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/repairSourceReport.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: "repairSourceReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '来源物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/repairSubItemReport.vue

@@ -0,0 +1,45 @@
+<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: "repairSubItemReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/repairTargetReport.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: "repairTargetReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '来源物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '来源物料单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '目标物料单位', width:150, cellClass:"centerAlign", 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>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/scrapReport.vue

@@ -0,0 +1,48 @@
+<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: "scrapReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '报废工单', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'WorkOrder',label:'报废工单',optionsProc:'ScrapNumber',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        WorkOrder:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量']
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/unplannedEnterReport.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: "unplannedEnterReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '库位组', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '入库类别', width:230, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'UnplannedReceiptType',label:'入库类别',optionsProc:'UnplannedReceiptType',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        UnplannedReceiptType:"",
+        LocationGroupCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量']
+    };
+  }
+};
+</script>

PC/UI.WinIn.FasterZ.AgGridReport/src/views/report/unplannedOutReport.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: "unplannedOutReport",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: '库位组', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料代码', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料名称', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述1', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述2', flex:1, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '数量', type:"kiloNumber", width:200, cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料单位', width:150, cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '出库类别', width:230, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'select',prop:'ItemCode',label:'物料',optionsProc:'itemCode',options:[]},
+        {type:'select',prop:'UnplannedIssueType',label:'出库类别',optionsProc:'UnplannedIssueType',options:[]},
+        {type:'select',prop:'LocationGroupCode',label:'库位组',optionsProc:'LocationGroupCode',options:[]},
+        {type:'date',prop:'beginDate',label:'起始'},
+        {type:'date',prop:'endDate',label:'截止'},
+      ],
+      searchForm:{
+        ItemCode:'',
+        UnplannedIssueType:"",
+        LocationGroupCode:"",
+        beginDate:"",
+        endDate:'',
+      },
+      BottomFixedItem:['数量']
+    };
+  }
+};
+</script>