report-test新版暂存

fe/PC/src/router/index.js

@@ -121,6 +121,11 @@ export const constantRoutes = [
   }, 
   {
     path: '/InventoryBookDetail_innerPage',
+    component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old'),
+    hidden: true
+  },
+  {
+    path: '/report-test',
     component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage'),
     hidden: true
   },

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue

@@ -70,7 +70,10 @@
           v-for="(item,key) in tableTh"
           :prop="item.prop"
           :label="item.label"
-          :width="item.width">
+          :width="item.width"
+        >
+          <!-- <template slot-scope="scope">
+          </template> -->
         </el-table-column>
       </el-table>
     </div>
@@ -91,7 +94,7 @@ export default {
       // 查询字段
       searchForm:{
         interfaceCalendar:null,
-        erpLocatioCode:null,
+        erpLocatioCode:'',
         itemCode:null,//VW316C1A028A,UTT06PP5483
         beginDate: '',//2021-10-01
         endDate: '',//2023-11-28T23:59:59
@@ -110,7 +113,10 @@ export default {
       },
       // table标头
       tableTh:[
-        {label:'物料信息',prop:'itemCode',width:180},
+        {label:'物料代码',prop:'itemCode',width:180},
+        {label:'物料名称',prop:'itemName'},
+        {label:'物料描述',prop:'itemDesc1'},
+        {label:'物料配置',prop:'configuration'},
         {label:'ERP储位',prop:'erpLocatioCode',width:80},
         {label:'库位代码',prop:'locationCode',width:90},
         {label:'单号',prop:'number',width:170},
@@ -258,7 +264,11 @@ export default {
             }
           })
         }
+        else{
+          _list.push(_item1)
+        }
       });
+      console.log(_list)
       this.tableData = _list
     },
     // 获取表格数据

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage copy.vue → fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="InventoryBookDetail_innerPage" v-loading="loading">
+  <div class="InventoryBookDetail_innerPage_old" v-loading="loading">
     <!-- 修改前 -->
     <!-- 搜索 -->
     <el-form ref="searchForm" :inline="true" :rules="formRule" :model="searchForm" size="small" class="searchHeader">
@@ -121,7 +121,7 @@ import { getInventoryTransactionSerials,getInterfaceCalendar } from '@/api/wms-a
 import {  formatTimeStampToNorm,formatTimeStrToStr } from '@/utils/formatTime'
 
 export default {
-  name:"InventoryBookDetail_innerPage",
+  name:"InventoryBookDetail_innerPage_old",
   data(){
     return{
       loading:false,//页面加载
@@ -314,12 +314,16 @@ export default {
     getTableData(){
       this.loading = true
       let _itemCodes = this.searchForm.itemCode ? this.searchForm.itemCode.split(',') : []
+      // getInventoryTransactionSerials(
+      //   _itemCodes,{
+      //   startDateTime:this.searchForm.beginDate,
+      //   endDateTime:this.initEndTime(this.searchForm.endDate),
+      //   erpLocatioCode:this.searchForm.erpLocatioCode,
+      // }).then(res => {
       getInventoryTransactionSerials(
-        _itemCodes,{
+        `wms/inventory/inventory-transaction/item-serial-list?startDateTime=${this.searchForm.beginDate}&endDateTime=${this.initEndTime(this.searchForm.endDate)}&erpLocationCode=${this.searchForm.erpLocatioCode}`,
-        startDateTime:this.searchForm.beginDate,
+        _itemCodes
-        endDateTime:this.initEndTime(this.searchForm.endDate),
+      ).then(res => {
-        erpLocatioCode:this.searchForm.erpLocatioCode,
-      }).then(res => {
         this.tableData = null
         this.tableHeader.beginDate = this.searchForm.beginDate
         this.tableHeader.endDate = this.searchForm.endDate
@@ -487,7 +491,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.InventoryBookDetail_innerPage{
+.InventoryBookDetail_innerPage_old{
   background: #fff;
   height: 100%;