From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 0a1b4af..7e73462 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -121,7 +121,7 @@
</div>
<div class="el-border-left-right acceptDate" style="width: 20%;height: 80px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.acceptDate}}
+ {{ dataForm.circulatOrder.acceptDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -176,7 +176,8 @@
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.detectDate}}
+<!-- {{dataForm.circulatOrder.detectDate}}-->
+ {{ dataForm.circulatOrder.detectDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -228,7 +229,8 @@
</div>
<div class="el-border-left-right " style="width: 20%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.issueDate}}
+<!-- {{dataForm.circulatOrder.issueDate}}-->
+ {{ dataForm.circulatOrder.issueDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
--
Gitblit v1.9.1