From 05f94692a6b53143a044040dec6cbad592fdd176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 18 Aug 2023 17:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=81=E6=B0=B4=E5=B8=90?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=A8=A1=E4=BB=BF=E6=8A=A5=E8=A1=A8=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |   9 +-
 .../InventoryBookDetail_innerPage.vue         | 524 +++++++++---------
 2 files changed, 269 insertions(+), 264 deletions(-)

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 5c1d94f0c..bb5cbe0e9 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -585,11 +585,12 @@ export function getListPageSafety(data, url) {
 }
 
 // 库存流水帐明细 报表页面
-export function getInventoryTransactionSerials(data) {
+export function getInventoryTransactionSerials(data,params) {
   return request({
-    url: 'http://dev.ccwin-in.com:60099/api/wms/inventory/inventory-transaction/item-serial-list',
-    method: 'get',
-    params: data
+    url: baseURL + 'wms/inventory/inventory-transaction/item-serial-list',
+    method: 'post',
+    data:data,
+    params:params
   })
 }
 
diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
index 66973f43c..fcdd13f02 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -2,9 +2,6 @@
   <div class="InventoryBookDetail_innerPage" v-loading="loading">
     <!-- 搜索 -->
     <el-form :inline="true" :model="searchForm" size="small" class="searchHeader">
-      <el-form-item label="库位">
-        <el-input v-model="searchForm.locationCode" placeholder="请输入库位"></el-input>
-      </el-form-item>
       <el-form-item label="零件">
         <el-input v-model="searchForm.itemCode" placeholder="请输入零件"></el-input>
       </el-form-item>
@@ -32,84 +29,49 @@
     <div class="tableContent" v-if="tableData">
       <ul class="tableHeader">
         <li>{{tableHeader.companyName}}</li>
-        <li class="tableName">库存流水帐（料品）</li>
-        <li>
-          <div>交易年月: {{ getYearMonth(searchForm.beginDate) }} - {{ getYearMonth(searchForm.endDate) }}</div>
-          <div>制表日期：{{ getNow() }}</div>
+        <li><span class="tableName">库存流水帐 (料品)</span></li>
+        <li class="timeLi">
+          <div class="item">交易年月: {{ getYearMonth(searchForm.beginDate) }} - {{ getYearMonth(searchForm.endDate) }}</div>
+          <div class="item">制表日期：{{ getNow() }}</div>
         </li>
       </ul>
-      <!-- :span-method="verticalMergeCell" -->
       <el-table
         :data="tableData"
-        height="calc(100% - 200px)"
-        style="width: 90%;margin: 0 auto;"
+        class="tableEl"
+        height="calc(100vh - 180px)"
+        :span-method="verticalMergeCell"
+        :row-class-name="tableRowClass"
       >
+        <!-- <el-table-column type="index" label="序号"></el-table-column> -->
         <el-table-column
           v-for="(item,key) in tableTh"
           :prop="item.prop"
           :label="item.label"
-          width="180"
+          :align="item.prop.toLowerCase().indexOf('qty') >= 0 ? 'right' : 'left'"
+          :width="item.width"
         >
-          <template slot-scope="scopeA">
-            <!-- <div>
-              <span v-if="item.prop == 'itemCode'">{{ scopeA.row[item.prop] }}</span>
-              <div v-else>
-                <div v-for="level2 in scopeA.row.reportErpLocationSerialDtos">
-                  <div v-if="item.prop == 'erpLocatioCode'">{{ level2[item.prop] }}</div>
-                  <div v-else>
-                    <div v-for="level3 in level2.reportLocationSerialDtos">{{ level3[item.prop] }}</div>
-                  </div>
-                </div>
+          <template slot-scope="scope">
+            <div v-if="!scope.row.total">
+              <div v-if="item.prop == 'itemCode'">
+                {{ scope.row.level1[item.prop] }}
+                <br/>
+                <div>配置码：{{ scope.row.level1.configuration }}</div>
               </div>
+              <div v-else-if="item.prop == 'erpLocatioCode'">{{ scope.row.level2[item.prop] }}</div>
               <div v-else>
-                <div v-for="level2 in scopeA.row.reportErpLocationSerialDtos">
-                  <div v-for="level3 in level2.reportLocationSerialDtos">{{ level3[item.prop] }}</div>
+                <div v-if="scope.row.level4">
+                  <div v-if="item.prop == 'sumInQty'">{{ scope.row.level4.inQty }}</div>
+                  <div v-else-if="item.prop == 'sumOutQty'">{{ scope.row.level4.outQty }}</div>
+                  <div v-else-if="item.prop == 'createDateTime'">{{ scope.row.level4.createDateTime.slice(0,scope.row.level4.createDateTime.indexOf('T')) }}</div>
+                  <div v-else-if="item.prop == 'locationCode'">{{ scope.row.level4.locatioCode }}</div>
+                  <div v-else>{{ scope.row.level4[item.prop] }}</div>
                 </div>
+                <div v-else>{{ scope.row.level3[item.prop] }}</div>
               </div>
-            </div> -->
-            <div>
-              <span v-if="item.prop == 'itemCode'">{{ scopeA.row[item.prop] }}</span>
-              <div v-if="item.prop == 'erpLocatioCode'">
-                <el-table
-                  :show-header="false"
-                  :data="scopeA.row.reportErpLocationSerialDtos"
-                >
-                  <el-table-column
-                    prop="erpLocatioCode"
-                  >
-                    <!-- <template slot-scope="scopeB">
-                      <div v-if="item.prop == 'erpLocatioCode'">{{ scopeB.reportLocationSerialDtos.erpLocatioCode }}</div>
-                    </template> -->
-                  </el-table-column>
-                </el-table>
-              </div>
-              <div v-else>
-                <el-table
-                  :show-header="false"
-                  :data="scopeA.row.reportErpLocationSerialDtos"
-                >
-                  <el-table-column
-                    prop="erpLocatioCode"
-                  >
-                    <template slot-scope="scopeB">
-                      <el-table
-                        :show-header="false"
-                        :data="scopeB.row.reportLocationSerialDtos"
-                      >
-                        <el-table-column
-                          :prop="item.prop"
-                        >
-                        </el-table-column>
-                      </el-table>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-              <!-- <div v-else>
-                <div v-for="level2 in scope.row.reportErpLocationSerialDtos">
-                  <div v-for="level3 in level2.reportLocationSerialDtos">{{ level3[item.prop] }}</div>
-                </div>
-              </div> -->
+            </div>
+            <div v-else>
+              <span v-if="totalProps[0] == item.prop">储位小计：</span>
+              <span v-if="totalProps.indexOf(item.prop) >= 0">{{scope.row.total[item.prop]}}</span>
             </div>
           </template>
         </el-table-column>
@@ -119,187 +81,46 @@
 </template>
 <script>
 import { getInventoryTransactionSerials } from '@/api/wms-api'
+import {  formatTimeStampToNorm } from '@/utils/formatTime'
 export default {
   name:"InventoryBookDetail_innerPage",
   data(){
     return{
       loading:false,
-      tableData:[
-        {
-          "itemCode": "VW316C1A028A",
-          "itemName": "P000000000000053",
-          "itemDesc1": "后轮眉2内板注塑件右",
-          "itemDesc2": null,
-          "configuration": "",
-          "reportErpLocationSerialDtos": [
-            {
-              "erpLocatioCode": "TV",
-              "firstQty": 0,
-              "sumInQty": 0,
-              "sumOutQty": 0,
-              "nowQty": 0,
-              "lastQty": 0,
-              "reportLocationSerialDtos": [
-                  {
-                      "locationCode": "TV",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  },
-              ]
-            },
-            {
-              "erpLocatioCode": "TVB",
-              "firstQty": 0,
-              "sumInQty": 0,
-              "sumOutQty": 0,
-              "nowQty": 0,
-              "lastQty": 0,
-              "reportLocationSerialDtos": [
-                  {
-                      "locationCode": "TVB",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  },
-                  {
-                      "locationCode": "TVB_A",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  },
-                  {
-                      "locationCode": "TVB_B",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  }
-              ]
-            },
-          ]
-        },{
-          "itemCode": "222222222222222222",
-          "itemName": "P000000000000053",
-          "itemDesc1": "后轮眉2内板注塑件右",
-          "itemDesc2": null,
-          "configuration": "",
-          "reportErpLocationSerialDtos": [
-            {
-              "erpLocatioCode": "222-TV",
-              "firstQty": 0,
-              "sumInQty": 0,
-              "sumOutQty": 0,
-              "nowQty": 0,
-              "lastQty": 0,
-              "reportLocationSerialDtos": [
-                  {
-                      "locationCode": "TV",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  },
-                  {
-                      "locationCode": "TV_A",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  }
-              ]
-            },
-            {
-              "erpLocatioCode": "2222-TVB",
-              "firstQty": 0,
-              "sumInQty": 0,
-              "sumOutQty": 0,
-              "nowQty": 0,
-              "lastQty": 0,
-              "reportLocationSerialDtos": [
-                  {
-                      "locationCode": "TVB",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  },
-                  {
-                      "locationCode": "TVB_A",
-                      "firstQty": 0,
-                      "sumInQty": 0,
-                      "sumOutQty": 0,
-                      "nowQty": 0,
-                      "lastQty": 0,
-                      "reportTransactionSerialDtos": []
-                  }
-              ]
-            },
-          ]
-        }
-      ],
+      tableData:null,
       searchForm:{
-        locationCode:'',
-        itemCode:'VW316C1A028A',
+        itemCode:'VW316C1A028A,VW316C1A131AG',
         beginDate: '2023-07-01',
         endDate: '2023-08-01',
       },
       tableHeader:{
         companyName:localStorage.getItem('companyName')
       },
-      tableTh1:[
-        {label:'1-itemCode',prop:'itemCode'},
-        {label:'1-itemDesc1',prop:'itemDesc1'},
-        {label:'1-itemDesc2',prop:'itemDesc2'},
-        {label:'1-itemName',prop:'itemName'},
-      ],
-      tableTh2:[
-        {label:'2-erpLocatioCode',prop:'erpLocatioCode'},
-        {label:'2-firstQty',prop:'firstQty'},
-        {label:'2-lastQty',prop:'lastQty'},
-        {label:'2-nowQty',prop:'nowQty'},
-        {label:'2-sumInQty',prop:'sumInQty'},
-        {label:'2-sumOutQty',prop:'sumOutQty'},
-      ],
-      tableTh3:[
-        {label:'3-firstQty',prop:'firstQty'},
-        {label:'3-lastQty',prop:'lastQty'},
-        {label:'3-locationCode',prop:'locationCode'},
-        {label:'3-nowQty',prop:'nowQty'},
-        {label:'3-sumInQty',prop:'sumInQty'},
-        {label:'3-sumOutQty',prop:'sumOutQty'},
-      ],
       tableTh:[
-        {label:'产品代码',prop:'itemCode'},
-        {label:'储位',prop:'erpLocatioCode'},
+        {label:'物料代码',prop:'itemCode',width:180},
+        {label:'ERP储位',prop:'erpLocatioCode'},
+        {label:'库位代码',prop:'locationCode',width:180},
+        // {label:'inQty',prop:'inQty'},
+        // {label:'outQty',prop:'outQty'},
+        {label:'number',prop:'number'},
+        {label:'createDateTime',prop:'createDateTime'},
+        {label:'docNumber',prop:'docNumber'},
+        {label:'enumTransType',prop:'enumTransType'},
+        {label:'enumTransSubType',prop:'enumTransSubType'},
+        {label:'interFaceName',prop:'interFaceName'},
         {label:'firstQty',prop:'firstQty'},
         {label:'lastQty',prop:'lastQty'},
-        {label:'locationCode',prop:'locationCode'},
         {label:'nowQty',prop:'nowQty'},
-        {label:'sumInQty',prop:'sumInQty'},
-        {label:'sumOutQty',prop:'sumOutQty'},
-      ]
+        {label:'sumInQty/inQty',prop:'sumInQty'},
+        {label:'sumOutQty/outQty',prop:'sumOutQty'},
+      ],
+      totalProps:['firstQty','lastQty','nowQty','sumInQty','sumOutQty'],
+      indexArray_item: [], //itemCode 存储所有合并的行号
+      indexArray_erp: [], //erpLocatioCode 存储所有合并的行号
+      indexArray_erp2: [], //locationCode 存储所有合并的行号
     }
   },
-  mounted () {
-  },
+  mounted () {},
   methods:{
     // 查询事件
     searchHandle(){
@@ -307,41 +128,162 @@ export default {
     },
     // 年月转义
     getYearMonth(date){
-
+      return date.replaceAll('-',"")
     },
     // 获取当前时间
     getNow(){
-
+      return formatTimeStampToNorm(new Date(),'date')
+    },
+    initTableData(res){
+      let _list = []
+      res.forEach(item1 => {
+        item1.reportErpLocationSerialDtos.forEach(item2 => {
+          item2.reportLocationSerialDtos.forEach((item3,index3)=>{
+            // 如果有第四层
+            if(item3.reportTransactionSerialDtos && item3.reportTransactionSerialDtos.length > 0){
+              item3.reportTransactionSerialDtos.forEach((item4,index4)=>{
+                let _item = {
+                  level1:item1,
+                  level2:item2,
+                  level3:item3,
+                  level4:item4,
+                }
+                _list.push(_item)
+                if(index4 == item3.reportTransactionSerialDtos.length - 1){
+                  _list.push({
+                    level1:item1,
+                    level2:item2,
+                    level3:item3,
+                    level4:item4,
+                    total:item3
+                  })
+                }
+              })
+            }else{
+              let _item = {
+                level1:item1,
+                level2:item2,
+                level3:item3,
+              }
+              _list.push(_item)
+              if(index3 == item2.reportLocationSerialDtos.length - 1){
+                _list.push({
+                  level1:item1,
+                  level2:item2,
+                  level3:item3,
+                  total:item2
+                })
+              }
+            }
+          })
+        })
+      });
+      return _list
     },
     // 获取表格数据
     getTableData(){
       this.loading = true
-      getInventoryTransactionSerials({
-        itemCodes:this.searchForm.itemCode,
+      getInventoryTransactionSerials(
+        this.searchForm.itemCode.split(','),{
         startDateTime:this.searchForm.beginDate,
         endDateTime:this.searchForm.endDate,
       }).then(res => {
-        console.log(res)
-        this.tableData = res
+        this.tableData = this.initTableData(res)
+        this.getIndexArr()
         this.loading = false
       }).catch(err => {
         this.loading = false
       })
     },
+    tableRowClass(data){
+      if(data.row.total){
+        return "totalRow"
+      }
+    },
+    getIndexArr(){
+      // 合并 itemCode
+      let count_item = 0
+      for (let rowIndex = 0; rowIndex < this.tableData.length; ) {
+        this.indexArray_item.push(rowIndex)
+        count_item = this.getRows(rowIndex, this.tableData[rowIndex].level1.itemCode,'itemCode','level1')
+        rowIndex += count_item
+      }
+
+      // 合并 erpLocatioCode
+      let count_erp = 0
+      for (let rowIndex = 0; rowIndex < this.tableData.length; ) {
+        this.indexArray_erp.push(rowIndex)
+        count_erp = this.getRows(rowIndex, this.tableData[rowIndex].level2.erpLocatioCode,'erpLocatioCode','level2')
+        rowIndex += count_erp
+      }
+
+      // 合并 locationCode
+      let count_erp2 = 0
+      for (let rowIndex = 0; rowIndex < this.tableData.length; ) {
+        this.indexArray_erp2.push(rowIndex)
+        count_erp2 = this.getRows(rowIndex, this.tableData[rowIndex].level3.locationCode,'locationCode','level3')
+        rowIndex += count_erp2
+      }
+    },
+    getRows(rowIndex, name,prop,level) {
+      let count = 0
+      for (let i = rowIndex; i < this.tableData.length; i++) {
+        if (this.tableData[i][level][prop] == name) {
+          count++
+        } else {
+          break
+        }
+      }
+      return count
+    },
     // 合并单元格
     verticalMergeCell({ row, column, rowIndex, columnIndex }) {
-      console.log(121,row, column, rowIndex, columnIndex)
-      if (columnIndex === 0) {
-        if (rowIndex % 2 === 0) {
+      // 合并 itemCode
+      if (columnIndex == 0) {
+        let rowCount = 0
+        if (this.indexArray_item.includes(rowIndex)) {
+          rowCount = this.getRows(rowIndex, row.level1.itemCode, 'itemCode','level1')
           return {
-            rowspan: 2,
+            rowspan: rowCount,
             colspan: 1
-          };
+          }
         } else {
           return {
             rowspan: 0,
             colspan: 0
-          };
+          }
+        }
+      }
+      // 合并 erpLocatioCode
+      if (columnIndex == 1) {
+        let rowCount = 0
+        if (this.indexArray_erp.includes(rowIndex)) {
+          rowCount = this.getRows(rowIndex, this.tableData[rowIndex].level2.erpLocatioCode,'erpLocatioCode','level2')
+          return {
+            rowspan: rowCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+      // 合并 locationCode
+      if (columnIndex == 2) {
+        let rowCount = 0
+        if (this.indexArray_erp2.includes(rowIndex)) {
+          rowCount = this.getRows(rowIndex, this.tableData[rowIndex].level3.locationCode,'locationCode','level3')
+          return {
+            rowspan: rowCount,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
         }
       }
     }
@@ -350,36 +292,98 @@ export default {
 </script>
 <style lang="scss">
 .InventoryBookDetail_innerPage{
-  background: #e6e6e6;
+  background: #fff;
   height: 100%;
 
   .searchHeader{
     background: #f1f1f1;
     padding: 20px 30px 0; 
     border-bottom: 1px solid #dbdbdb;
-  }
 
-  .el-form-item{
-    margin-right: 25px !important;
-  }
-  .el-button{
-    background: #205f78 !important;
-    border-color: #ddd;
-    border-radius: 2px;
-  }
+    .el-form-item{
+      margin-right: 25px !important;
+    }
+    .el-button{
+      background: #205f78 !important;
+      border-color: #ddd;
+      border-radius: 2px;
+    }
+
+    .el-form-item__label{
+      font-weight: normal;
+    }
+
+    .el-input__inner{
+      border-radius: 0px !important;
+      background: #ddd !important;
+    }
 
-  .el-form-item__label{
-    font-weight: normal;
+    .el-input__inner:focus,
+    .el-input__inner:hover{
+      border-color: #ddd;
+    }
   }
 
-  .el-input__inner{
-    border-radius: 0px !important;
-    background: #ddd !important;
+  .tableHeader{
+    list-style: none;
+    text-align: center;
+    height: 80px;
+    overflow: hidden;
+    margin: 10px 0;
+
+    .tableName{
+      letter-spacing: 10px;
+      border-bottom: #333 solid 1px;
+      padding: 0 15px;
+      font-size: 18px;
+    }
+
+    .timeLi{
+      display: flex;
+      justify-content: center;
+
+      .item{
+        margin: 0 10px;
+      }
+    }
   }
 
-  .el-input__inner:focus,
-  .el-input__inner:hover{
-    border-color: #ddd;
+  .tableEl{
+    width: 100%;
+    margin: 0px auto;
+    // background: transparent !important;
+
+    .el-table__cell{
+      vertical-align: initial !important;
+      padding: 5px 0 !important;
+      background: transparent !important;
+    }
+    
+    tr{
+      background: transparent !important;
+      border: none !important;
+    }
+
+    th.el-table__cell{
+      padding: 0 !important;
+      color: #000 !important;
+      border: none !important;
+      border-bottom: #333 solid 1px !important;
+      .cell{
+        vertical-align: bottom !important;
+      }
+    }
+
+    td{
+      border: none !important;
+      color: #000 !important;
+    }
+
+    .totalRow{
+      td{
+        border-top: #333 solid 1px !important;
+      }
+    }
   }
 }