From b0a231f9c5514412d131e28c78fb08b9c0951a34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 31 Mar 2023 11:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=8E=B0=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=A1=A58=E5=B0=8F=E6=97=B6=E6=97=B6=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/currenDescriptions/index.vue | 7 +++++--
 fe/PC/src/components/currenTable/index.vue        | 4 ++--
 fe/PC/src/components/umyTable/index.vue           | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/fe/PC/src/components/currenDescriptions/index.vue b/fe/PC/src/components/currenDescriptions/index.vue
index 829b3d40a..fc49a673f 100644
--- a/fe/PC/src/components/currenDescriptions/index.vue
+++ b/fe/PC/src/components/currenDescriptions/index.vue
@@ -66,7 +66,7 @@
 </template>
 <script>
 import { parseTime } from "@/utils/index"
-import { formatDateTime } from "@/utils/formatTime"
+import { formatTimeStrToStr } from "@/utils/formatTime"
 import { fileStorage } from "@/api/wms-api"
 
 let that
@@ -84,7 +84,10 @@ export default {
   },
   filters: {
     formatDate (time) {
-      return formatDateTime(time)
+      if (time == null) {
+        return '-'
+      }
+      return formatTimeStrToStr(time)
     },
     formatOnlyDate (time) {
       var date = new Date(time);
diff --git a/fe/PC/src/components/currenTable/index.vue b/fe/PC/src/components/currenTable/index.vue
index 35345717f..8c45a6396 100644
--- a/fe/PC/src/components/currenTable/index.vue
+++ b/fe/PC/src/components/currenTable/index.vue
@@ -307,7 +307,7 @@
 </template>
 <script>
 import Sortable from "sortablejs";
-import { formatDateTime } from "@/utils/formatTime";
+import { formatTimeStrToStr } from "@/utils/formatTime";
 import { getMatchRegConformValue } from "@/utils/index"
 import _ from "lodash";
 export default {
@@ -317,7 +317,7 @@ export default {
       if (time == null) {
         return '-'
       }
-      return formatDateTime(time)
+      return formatTimeStrToStr(time)
     },
   },
   props: {
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index dd2719025..a946c772a 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -320,14 +320,17 @@
   </u-table>
 </template>
 <script>
-import { formatDateTime } from "@/utils/formatTime";
+import { formatTimeStrToStr } from "@/utils/formatTime";
 import _ from "lodash";
 import { getMatchRegConformValue } from "@/utils/index"
 export default {
   name: "currenTable",
   filters: {
     formatDate(time) {
-      return formatDateTime(time)
+      if (time == null) {
+        return '-'
+      }
+      return formatTimeStrToStr(time)
     },
   },
   props: {