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 @@
{{tableHeader.companyName}}
库存流水帐 (料品)
- 交易年月: {{ getYearMonth(searchForm.beginDate) }} - {{ getYearMonth(searchForm.endDate) }}
+ 交易年月: {{ getYearMonth(tableHeader.beginDate) }} - {{ getYearMonth(tableHeader.endDate) }}
制表日期:{{ getNow() }}
@@ -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()