From 5006e5956e9b47550323fa4e185e044dbb7afdbd 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 13:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=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 +-
 .../InventoryBookDetail_innerPage.vue         | 55 +++++++++++--------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index 6de798932..abcf1a080 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.67"
+    "version": "1.0.68"
 }
\ 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 59d47667f..c97e67cc3 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -100,7 +100,7 @@
                 <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 == 'createDateTime'">{{ formatTime(scope.row.level4.createDateTime) }}</div>
                   <div v-else-if="item.prop == 'locationCode'">{{ scope.row.level4.locatioCode }}</div>
                   <div v-else-if="item.prop == 'interFaceName'">{{getInterFaceName(scope.row.level4)}}</div>
                   <div v-else-if="item.prop == 'enumTransType' || item.prop == 'enumTransSubType'">{{ scope.row.level4[item.prop] | trigger(item.option, "label") }}</div>
@@ -117,49 +117,52 @@
 </template>
 <script>
 import { getInventoryTransactionSerials,getInterfaceCalendar } from '@/api/wms-api'
-import {  formatTimeStampToNorm } from '@/utils/formatTime'
+import {  formatTimeStampToNorm,formatTimeStrToStr } from '@/utils/formatTime'
+
 export default {
   name:"InventoryBookDetail_innerPage",
   data(){
     return{
-      loading:false,
-      calendarLoading:false,
-      tableData:null,
-      calendarList:[],
+      loading:false,//页面加载
+      calendarLoading:false,//账期下拉加载
+      tableData:null,//table数据
+      calendarList:[],//账期下拉列表
+      // 查询字段
       searchForm:{
         interfaceCalendar:null,
         erpLocatioCode:null,
-        itemCode:null,
-        beginDate: '',
-        endDate: '',
+        itemCode:null,//VW316C1A028A,UTT06PP5483
+        beginDate: '',//2021-10-01
+        endDate: '',//2023-11-28T23:59:59
       },
+      // 查询必填项
       formRule: {
-        beginDate: [{ required: true, trigger: "blur", message: "不可为空" }],
-        endDate: [{ required: true, trigger: "blur", message: "不可为空" }],
+        beginDate: [{ required: true, trigger: ['blur','change'], message: "不可为空" }],
+        endDate: [{ required: true, trigger: ['blur','change'], message: "不可为空" }],
         // itemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
       },
+      // table账单表头
       tableHeader:{
         companyName:localStorage.getItem('companyName')
       },
+      // table标头
       tableTh:[
         {label:'物料信息',prop:'itemCode',width:180},
         {label:'ERP储位',prop:'erpLocatioCode',width:80},
         {label:'库位代码',prop:'locationCode',width:90},
-        // {label:'inQty',prop:'inQty'},
-        // {label:'outQty',prop:'outQty'},
-        {label:'单号',prop:'number'},
-        {label:'创建时间',prop:'createDateTime'},
-        {label:'业务编号',prop:'docNumber'},
+        {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:'interFaceName',width:200},
+        {label:'对应接口',prop:'interFaceName',width:220},
         {label:'期初库存',prop:'firstQty'},
         {label:'期末库存',prop:'lastQty'},
         {label:'结存',prop:'nowQty'},
         {label:'入库',prop:'sumInQty'},
         {label:'出库',prop:'sumOutQty'},
       ],
-      totalProps:['firstQty','lastQty','nowQty','sumInQty','sumOutQty'],
+      totalProps:['firstQty','lastQty','nowQty','sumInQty','sumOutQty'],// 小结显示的字段
       indexArray_item: [], //itemCode 存储所有合并的行号
       indexArray_erp: [], //erpLocatioCode 存储所有合并的行号
       indexArray_erp2: [], //locationCode 存储所有合并的行号
@@ -169,6 +172,11 @@ export default {
     this.getInterfaceCalendarList()
   },
   methods:{
+    // 格式化时间
+    formatTime(data){
+      // return data.slice(0,scope.row.level4.createDateTime.indexOf('T')
+      return formatTimeStrToStr(data)
+    },
     // 获取账期下拉
     getInterfaceCalendarList(){
       this.calendarLoading = true
@@ -309,9 +317,12 @@ export default {
         endDateTime:this.initEndTime(this.searchForm.endDate),
         erpLocatioCode:this.searchForm.erpLocatioCode,
       }).then(res => {
-        this.tableData = this.initTableData(res)
-        this.getIndexArr()
-        this.loading = false
+        this.tableData = null
+        this.$nextTick(() => {
+          this.tableData = this.initTableData(res)
+          this.getIndexArr()
+          this.loading = false
+        })
       }).catch(err => {
         this.loading = false
       })
@@ -417,7 +428,7 @@ export default {
         }
       }
     },
-    // 转义对应接口
+    // 转义【对应接口】
     getInterFaceName(item){
       let _str = ""
       if (item.enumTransType == 11) {