【前端pc-报表】报表更改开发

fe/UI.DY.AgGridReport/src/components/reportPageHeader/index.vue

@@ -66,6 +66,7 @@
                         </el-select>
                         <!-- 日期 -->
                         <el-date-picker
+                            style="width:180px"
                             v-if="item.type == 'date'"
                             :clearable="!item.noClear"
                             v-model="searchForm[item.prop]"

fe/UI.DY.AgGridReport/src/views/report/InventoryAgingsectionSummary.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库存状态', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/InventoryBalance.vue

@@ -32,7 +32,7 @@ export default {
         { 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:'select',prop:'SupplierCode',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:[]},
@@ -43,9 +43,9 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
         LocationCode:'',
         LocationErpCode:"",
+        SupplierCode:"",
       },
       BottomFixedItem:['余额汇总'],
     };

fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceERP.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库存状态', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceEnRoute.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库存状态', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/InventoryBalanceLocation.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', 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 } },

fe/UI.DY.AgGridReport/src/views/report/InventoryJournalERP.vue

@@ -26,6 +26,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", 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 } },

fe/UI.DY.AgGridReport/src/views/report/ProductDeliveryNoPrice.vue

@@ -27,6 +27,7 @@ export default {
         { field: '客户地址',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', 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 } },

fe/UI.DY.AgGridReport/src/views/report/ProductDeliverySummary.vue

@@ -27,6 +27,7 @@ export default {
         { field: '客户地址',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', 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 } },

fe/UI.DY.AgGridReport/src/views/report/ProductReceiptSummary.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP储位',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '单位',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/ProductionIssueSummary.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '类型', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/ProductionReturnSummary.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '生成记录时间', maxWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(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 } },

fe/UI.DY.AgGridReport/src/views/report/PurchaseReturnSummary.vue

@@ -24,6 +24,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '上架前退货', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '上架后退货', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/ScrapDetail.vue

@@ -25,6 +25,7 @@ export default {
         { 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: '正厂编码',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP储位',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'WMS库位',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/SupplierDeliver.vue

@@ -26,6 +26,7 @@ export default {
         { field: '供应商描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '批次',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '创建时间',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '合格', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/dailyReconciliation.vue

@@ -29,14 +29,8 @@ export default {
         { 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:'',
-      },
+      searchConfig:[],
+      searchForm:{},
       BottomFixedItem:['WMS数量','TYRP数量','差异数量'],
     };
   }

fe/UI.DY.AgGridReport/src/views/report/depositDetailsReport.vue

@@ -22,8 +22,8 @@ export default {
     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: 'Mesout_loc',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'Mes_Barcode',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'memo',  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: 'MES数量', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/depositSummaryReport.vue

@@ -22,6 +22,7 @@ export default {
     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: 'mes最后一条时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'wms最后一条时间', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/inspection.vue

@@ -34,8 +34,9 @@ export default {
     return {
       columnDefs: [
         { field: '采购订单号', minWidth:130,filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
-        { field: '物料号', headerName:'ERP料号', cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
-        { field: '零件号', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: 'ERP料号',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '物料描述', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '供应商', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '箱码',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/orderSummary.vue

@@ -26,6 +26,7 @@ export default {
         { field: '供应商名称',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '料号描述',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '规格颜色', headerName:"规格/颜色", 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 } },

fe/UI.DY.AgGridReport/src/views/report/planNoteSummary.vue

@@ -25,6 +25,7 @@ export default {
         { field: 'ERP料号',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         // { field: '料号名称', minWidth:170, 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: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
         { field: '完成时间',minWidth:180, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },

fe/UI.DY.AgGridReport/src/views/report/putInDetails.vue

@@ -26,13 +26,16 @@ export default {
         { 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: '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:'select',prop:'SupplierCode',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:'截止'},
       ],
@@ -40,7 +43,9 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
+        LocationCode:'',
+        LocationErpCode:"",
+        SupplierCode:"",
       },
       BottomFixedItem:['数量'],
     };

fe/UI.DY.AgGridReport/src/views/report/putOutDetails.vue

@@ -25,13 +25,17 @@ export default {
         { 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: '库位',  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:'select',prop:'SupplierCode',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:'截止'},
       ],
@@ -39,7 +43,9 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
+        LocationCode:'',
+        LocationErpCode:"",
+        SupplierCode:"",
       },
       BottomFixedItem:['数量'],
     };

fe/UI.DY.AgGridReport/src/views/report/putaway.vue

@@ -34,7 +34,7 @@ export default {
         { 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:'select',prop:'supplierCode',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:'截止'},
@@ -43,7 +43,7 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
+        supplierCode:"",
       },
       BottomFixedItem:['数量'],
     };

fe/UI.DY.AgGridReport/src/views/report/returnAfterListing.vue

@@ -35,7 +35,7 @@ export default {
         { 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:'select',prop:'supplierCode',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:'截止'},
@@ -44,7 +44,7 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
+        supplierCode:"",
       },
       BottomFixedItem:['数量'],
     };

fe/UI.DY.AgGridReport/src/views/report/returnBeforeListing.vue

@@ -35,7 +35,7 @@ export default {
         { 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:'select',prop:'supplierCode',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:'截止'},
@@ -44,7 +44,7 @@ export default {
         ItemCode:"",
         beginDate:"",
         endDate:'',
-        Supplier:"",
+        supplierCode:"",
       },
       BottomFixedItem:['数量'],
     };