From 5b49aeb0c0ba8f4b6f68515b6a6230c909f9faff 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, 21 Aug 2023 14:04:05 +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=97=B6=E9=97=B4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/version.json                              |  2 +-
 .../reportForm/InventoryBookDetail_innerPage.vue       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index abcf1a080..bfc85b2d1 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.68"
+    "version": "1.0.69"
 }
\ No newline at end of file
diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
index c97e67cc3..c41eb4583 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -51,7 +51,7 @@
         <li>{{tableHeader.companyName}}</li>
         <li><span class="tableName">库存流水帐 (料品)</span></li>
         <li class="timeLi">
-          <div class="item">交易年月: {{ getYearMonth(searchForm.beginDate) }} - {{ getYearMonth(searchForm.endDate) }}</div>
+          <div class="item">交易年月: {{ getYearMonth(tableHeader.beginDate) }} - {{ getYearMonth(tableHeader.endDate) }}</div>
           <div class="item">制表日期：{{ getNow() }}</div>
         </li>
       </ul>
@@ -143,6 +143,8 @@ export default {
       },
       // table账单表头
       tableHeader:{
+        beginDate: '',
+        endDate: '',
         companyName:localStorage.getItem('companyName')
       },
       // table标头
@@ -221,7 +223,7 @@ export default {
     },
     // 年月转义
     getYearMonth(date){
-      return date.replaceAll('-',"")
+      return date.replaceAll('-',"").slice(0,8)
     },
     // 获取当前时间
     getNow(){
@@ -297,7 +299,7 @@ export default {
       });
       return _list
     },
-    // 格式化结束时间
+    // 格式化结束时间(格式：T23:59:59)
     initEndTime(data){
       let _time = ""
       if(data.indexOf('T') >= 0){
@@ -318,6 +320,8 @@ export default {
         erpLocatioCode:this.searchForm.erpLocatioCode,
       }).then(res => {
         this.tableData = null
+        this.tableHeader.beginDate = this.searchForm.beginDate
+        this.tableHeader.endDate = this.searchForm.endDate
         this.$nextTick(() => {
           this.tableData = this.initTableData(res)
           this.getIndexArr()