From 69cdef4195fa9a58432b8f0e95e805bf1163d1ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 28 Aug 2023 15:08:32 +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=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/router/index.js                     | 10 ++---
 .../InventoryBookDetail_innerPage.vue         | 37 +++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 4ce457144..cc24cbf9b 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -121,15 +121,15 @@ 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
   },
   // {
+  //   path: '/report-test',
+  //   component: () => import('@/views/activeReportManage/reportForm/InventoryBookDetail_innerPage'),
+  //   hidden: true
+  // },
+  // {
   //   path: '/',
   //   component: Layout,
   //   redirect: '/gridlayout',
diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
index 26960c827..fbcabd56d 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -44,9 +44,12 @@
       <el-form-item>
         <el-button type="primary" @click="searchHandle">查询</el-button>
       </el-form-item>
+      <!-- <el-form-item>
+        <el-button type="primary" @click="closeAll">全部收起</el-button>
+      </el-form-item> -->
     </el-form>
     <!-- table -->
-    <div class="tableContent" v-if="tableData">
+    <div class="tableContent" v-if="tableData && !loading">
       <ul class="tableHeader">
         <li>{{tableHeader.companyName}}</li>
         <li><span class="tableName">库存流水帐 (料品)</span></li>
@@ -71,10 +74,8 @@
           :prop="item.prop"
           :label="item.label"
           :width="item.width"
-        >
-          <!-- <template slot-scope="scope">
-          </template> -->
-        </el-table-column>
+          :align="(item.prop).toLowerCase().indexOf('qty') >=0 ? 'right' : 'left'"
+        ></el-table-column>
       </el-table>
     </div>
   </div>
@@ -113,7 +114,7 @@ export default {
       },
       // table标头
       tableTh:[
-        {label:'物料代码',prop:'itemCode',width:180},
+        {label:'物料代码',prop:'itemCode',width:170},
         {label:'物料名称',prop:'itemName'},
         {label:'物料描述',prop:'itemDesc1'},
         {label:'物料配置',prop:'configuration'},
@@ -122,8 +123,8 @@ export default {
         {label:'单号',prop:'number',width:170},
         {label:'创建时间',prop:'createDateTime',width:160},
         {label:'业务编号',prop:'docNumber',width:140},
-        {label:'业务主类型',prop:'enumTransType',type:'filter',option:'TransTypeBase'},
-        {label:'业务子类型',prop:'enumTransSubType',type:'filter',option:'transSubType'},
+        {label:'业务主类型',prop:'enumTransType',type:'filter',option:'TransTypeBase',width:90},
+        {label:'业务子类型',prop:'enumTransSubType',type:'filter',option:'transSubType',width:90},
         {label:'对应接口',prop:'interFaceName',width:220},
         {label:'期初库存',prop:'firstQty'},
         {label:'入库',prop:'sumInQty'},
@@ -131,16 +132,19 @@ export default {
         {label:'结存',prop:'nowQty'},
         {label:'期末库存',prop:'lastQty'},
       ],
-      totalProps:['firstQty','lastQty','nowQty','sumInQty','sumOutQty'],// 小结显示的字段
-      indexArray_item: [], //itemCode 存储所有合并的行号
-      indexArray_erp: [], //erpLocatioCode 存储所有合并的行号
-      indexArray_erp2: [], //locationCode 存储所有合并的行号
     }
   },
   mounted () {
     this.getInterfaceCalendarList()
   },
   methods:{
+    // closeAll(){
+    //   this.loading = true
+    //   this.expandRows=[]
+    //   setTimeout(()=>{
+    //     this.loading = false
+    //   },300)
+    // },
     load(tree, treeNode, resolve) {
       // 点击第一层
       if(tree.reportErpLocationSerialDtos && tree.reportErpLocationSerialDtos.length > 0){
@@ -165,7 +169,9 @@ export default {
       // 点击第三层
       if(tree.reportTransactionSerialDtos && tree.reportTransactionSerialDtos.length > 0){
         tree.reportTransactionSerialDtos.forEach((item,key)=>{
-          item.id='id4-'+Math.random().toString()+key
+          item.id='id4-'+Math.random().toString()+key;
+          item.createDateTime = this.formatTime(item.createDateTime)
+          item.interFaceName = this.getInterFaceName(item)
         })
         resolve(tree.reportTransactionSerialDtos)
       }
@@ -268,7 +274,6 @@ export default {
           _list.push(_item1)
         }
       });
-      console.log(_list)
       this.tableData = _list
     },
     // 获取表格数据
@@ -279,6 +284,7 @@ export default {
         `wms/inventory/inventory-transaction/item-serial-list?startDateTime=${this.searchForm.beginDate}&endDateTime=${this.initEndTime(this.searchForm.endDate)}&erpLocationCode=${this.searchForm.erpLocatioCode}`,
         _itemCodes
       ).then(res => {
+        console.log(res)
         this.tableData = null
         this.tableHeader.beginDate = this.searchForm.beginDate
         this.tableHeader.endDate = this.searchForm.endDate
@@ -407,7 +413,6 @@ export default {
     // background: transparent !important;
 
     .el-table__cell{
-      vertical-align: initial !important;
       padding: 5px 0 !important;
       // background: transparent !important;
     }
@@ -422,6 +427,8 @@ export default {
       color: #000 !important;
       border: none !important;
       border-bottom: #333 solid 1px !important;
+      vertical-align: initial !important;
+
       .cell{
         vertical-align: bottom !important;
       }