From e4debe98827b39f521b8461ac184ee793a026fdd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 28 九月 2026 23:30:57 +0800
Subject: [PATCH] feat(utils): 添加日期格式化工具函数并统一应用到各个组件
---
src/views/energyManagement/energyCockpit/index.vue | 3
src/views/index.vue | 4
src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue | 3
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 11 +
src/views/inventoryManagement/stockWarning/index.vue | 6
src/views/energyManagement/meterCollection/index.vue | 4
src/views/collaborativeApproval/sealManagement/index.vue | 2
src/views/productionManagement/workOrderManagement/index.vue | 8
src/views/inventoryManagement/fuelCardManagement/index.vue | 2
src/views/basicData/customerFile/index.vue | 5
src/views/procurementManagement/procurementPlan/index.vue | 3
src/views/monitor/job/log.vue | 2
src/views/equipmentManagement/ledger/index.vue | 4
src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue | 4
src/views/procurementManagement/advancedPriceManagement/index.vue | 4
src/views/inventoryManagement/receiptManagement/Record.vue | 3
src/views/equipmentManagement/operationManagement/index.vue | 16 --
src/views/system/user/profile/index.vue | 2
src/views/inventoryManagement/issueManagement/index.vue | 2
src/views/productionManagement/safetyMonitoring/index.vue | 7
src/views/energyManagement/gasManagement/index.vue | 7
src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue | 3
src/layout/components/NotificationCenter/index.vue | 4
src/main.js | 3
src/views/inventoryManagement/transportTaskManagement/index.vue | 3
src/views/monitorManagement/videoMonitor/index.vue | 2
src/utils/index.js | 25 +++++
src/views/collaborativeApproval/officeSupplies/index.vue | 6
src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue | 2
src/views/inventoryManagement/stockReport/index.vue | 1
src/views/procurementManagement/returnManagement/index.vue | 2
src/views/procurementManagement/qualityInspection/index.vue | 2
src/views/productionManagement/workOrder/index.vue | 8
src/views/procurementManagement/purchaseOrder/index.vue | 2
src/views/salesManagement/returnOrder/components/detailDia.vue | 2
src/views/safeProduction/emergencyPlanReview/index.vue | 2
src/views/productManagement/productIdentifier/index.vue | 5
src/views/safeProduction/accidentReportingRecord/index.vue | 4
src/views/inventoryManagement/dispatchLog/Record.vue | 3
src/views/fileManagement/bookshelf/detail.vue | 2
src/views/equipmentManagement/attendanceManagement/index.vue | 2
src/views/inventoryManagement/stockManagement/Record.vue | 3
src/views/inventoryManagement/stockManagement/Unqualified.vue | 2
src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue | 6
src/views/collaborativeApproval/knowledgeBase/index.vue | 4
src/views/qualityManagement/afterSalesTraceability/index.vue | 2
src/views/reportAnalysis/reportManagement.vue | 4
src/views/safeProduction/safeQualifications/index.vue | 1
src/views/equipmentManagement/defectManagement/index.vue | 2
src/views/procurementManagement/arrivalManagement/index.vue | 2
src/views/basicData/customerFileOpenSea/index.vue | 3
src/views/inventoryManagement/stockManagement/Qualified.vue | 2
src/views/officeProcessAutomation/SysAdmin/user-manage/profile/index.vue | 2
src/components/QRCodeGenerator/index.vue | 3
src/views/procurementManagement/priceManagement/index.vue | 2
src/views/equipmentManagement/deviceInfo/index.vue | 6
src/views/collaborativeApproval/notificationManagement/index.vue | 3
src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue | 1
src/views/energyManagement/carbonManagement/index.vue | 3
src/views/officeProcessAutomation/EnterpriseNews/news-manage/components/NewsDetailPanel.vue | 2
src/views/projectManagement/Management/projectDetail.vue | 22 ++--
src/views/safeProduction/hazardousMaterialsControl/index.vue | 4
src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue | 2
src/views/safeProduction/dangerInvestigation/index.vue | 10 +
src/views/energyManagement/dynamicEnergySaving/index.vue | 9 +
65 files changed, 167 insertions(+), 118 deletions(-)
diff --git a/src/components/QRCodeGenerator/index.vue b/src/components/QRCodeGenerator/index.vue
index fd44f44..94ef3d0 100644
--- a/src/components/QRCodeGenerator/index.vue
+++ b/src/components/QRCodeGenerator/index.vue
@@ -175,6 +175,7 @@
import QRCode from "qrcode";
import { ElMessage, ElMessageBox } from "element-plus";
import { Download, CopyDocument, Printer } from "@element-plus/icons-vue";
+ import { dateOnly } from "@/utils/index";
// 瀹氫箟缁勪欢鍚嶇О
defineOptions({
@@ -247,7 +248,7 @@
});
}
- generateTime.value = new Date().toLocaleString();
+ generateTime.value = dateOnly(new Date());
ElMessage.success("鐢熸垚鎴愬姛锛�");
} catch (error) {
console.error("鐢熸垚澶辫触:", error);
diff --git a/src/layout/components/NotificationCenter/index.vue b/src/layout/components/NotificationCenter/index.vue
index 66f489a..1bf6b40 100644
--- a/src/layout/components/NotificationCenter/index.vue
+++ b/src/layout/components/NotificationCenter/index.vue
@@ -32,7 +32,7 @@
<div class="notification-content-wrapper">
<div class="notification-title">{{ item.noticeTitle }}</div>
<div class="notification-detail">{{ item.noticeContent }}</div>
- <div class="notification-time">{{ item.createTime }}</div>
+ <div class="notification-time">{{ dateOnly(item.createTime) }}</div>
</div>
<div class="notification-action">
<el-button type="primary"
@@ -64,7 +64,7 @@
<div class="notification-content-wrapper">
<div class="notification-title">{{ item.noticeTitle }}</div>
<div class="notification-detail">{{ item.noticeContent }}</div>
- <div class="notification-time">{{ item.createTime }}</div>
+ <div class="notification-time">{{ dateOnly(item.createTime) }}</div>
</div>
</div>
</div>
diff --git a/src/main.js b/src/main.js
index 025ff14..6cab362 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,6 +35,7 @@
selectDictLabel,
selectDictLabels,
} from "@/utils/ruoyi";
+import { formatDateColumn, dateOnly } from "@/utils/index";
// 鍒嗛〉缁勪欢
import Pagination from "@/components/Pagination";
@@ -70,6 +71,8 @@
app.config.globalProperties.useDict = useDict;
app.config.globalProperties.download = download;
app.config.globalProperties.parseTime = parseTime;
+app.config.globalProperties.formatDateColumn = formatDateColumn;
+app.config.globalProperties.dateOnly = dateOnly;
app.config.globalProperties.resetForm = resetForm;
app.config.globalProperties.summarizeTable = summarizeTable;
app.config.globalProperties.calculateTaxExclusiveTotalPrice =
diff --git a/src/utils/index.js b/src/utils/index.js
index 0c443c7..73f6b5f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -16,6 +16,31 @@
}
/**
+ * 浠呬繚鐣欐棩鏈熼儴鍒嗭紝鍘绘帀鏃跺垎绉掞紝杈撳嚭 YYYY-MM-DD銆�
+ * 鍏煎 Date 瀵硅薄銆�"YYYY-MM-DD HH:mm:ss"銆�"YYYY-MM-DDTHH:mm:ss" 绛夋牸寮忥紱
+ * 宸叉槸绾棩鏈熸垨闈炴棩鏈熷瓧绗︿覆鏃跺師鏍疯繑鍥炪��
+ */
+export function dateOnly(value) {
+ if (value == null || value === "") return "";
+ if (value instanceof Date) {
+ if (Number.isNaN(value.getTime())) return "";
+ const pad = (num) => String(num).padStart(2, "0");
+ return `${value.getFullYear()}-${pad(value.getMonth() + 1)}-${pad(
+ value.getDate()
+ )}`;
+ }
+ const str = String(value).trim();
+ return str.split(/[ T]/)[0] || str;
+}
+
+/**
+ * el-table-column 鏃ユ湡鍒楁牸寮忓寲锛氫粎淇濈暀鏃ユ湡閮ㄥ垎锛屽幓鎺夋椂鍒嗙銆�
+ */
+export function formatDateColumn(row, column, cellValue) {
+ return dateOnly(cellValue);
+}
+
+/**
* @param {number} time
* @param {string} option
* @returns {string}
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index e56155d..df2edd2 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -457,7 +457,7 @@
<el-col :span="12">
<div class="info-item">
<span class="info-label">缁存姢鏃堕棿锛�</span>
- <span class="info-value">{{ detailForm.maintenanceTime }}</span>
+ <span class="info-value">{{ dateOnly(detailForm.maintenanceTime) }}</span>
</div>
</el-col>
</el-row>
@@ -478,7 +478,8 @@
style="width: 100%">
<el-table-column prop="followUpTime"
label="璺熻繘鏃堕棿"
- width="160" />
+ width="160"
+ :formatter="formatDateColumn" />
<el-table-column prop="followUpMethod"
label="璺熻繘鏂瑰紡"
width="100" />
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index df2a16e..6a4f472 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -544,7 +544,8 @@
style="width: 100%">
<el-table-column prop="followUpTime"
label="璺熻繘鏃堕棿"
- width="160" />
+ width="160"
+ :formatter="formatDateColumn" />
<el-table-column prop="followUpMethod"
label="璺熻繘鏂瑰紡"
width="100" />
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index f50d06b..f02a090 100644
--- a/src/views/collaborativeApproval/knowledgeBase/index.vue
+++ b/src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -170,7 +170,7 @@
{{ currentKnowledge.creator }}
</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">
- {{ currentKnowledge.createTime }}
+ {{ dateOnly(currentKnowledge.createTime) }}
</el-descriptions-item>
</el-descriptions>
@@ -296,7 +296,7 @@
<span v-else style="color: #909399">-</span>
</template>
</el-table-column>
- <el-table-column prop="createTime" label="涓婁紶鏃堕棿" width="180" />
+ <el-table-column prop="createTime" label="涓婁紶鏃堕棿" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="150" align="center">
<template #default="{ row }">
<el-button
diff --git a/src/views/collaborativeApproval/notificationManagement/index.vue b/src/views/collaborativeApproval/notificationManagement/index.vue
index 0b25283..5542d65 100644
--- a/src/views/collaborativeApproval/notificationManagement/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/index.vue
@@ -325,6 +325,7 @@
import { staffOnJobListPage } from "@/api/personnelManagement/staffOnJob.js";
import { listNotification, addNotification, updateNotification, delNotification,addOnlineMeeting,addFileSharing } from "@/api/collaborativeApproval/notificationManagement.js";
import { id } from "element-plus/es/locales.mjs";
+import { dateOnly } from "@/utils/index";
// 琛ㄥ崟楠岃瘉瑙勫垯
const rules = {
@@ -770,7 +771,7 @@
departments: [randomDept],
expireDate: new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0], // 30澶╁悗杩囨湡
syncMethods: ["wechat", "dingtalk"],
- createTime: now.toLocaleString()
+ createTime: dateOnly(now)
};
// 娣诲姞鍒版暟鎹紑澶�
diff --git a/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue b/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue
index 227c5be..7aec30a 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue
@@ -48,7 +48,7 @@
{{ scope.row.participants }}浜�
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="180" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
<template #default="scope">
<el-button type="primary" link @click="viewDraft(scope.row)">鏌ョ湅</el-button>
diff --git a/src/views/collaborativeApproval/officeSupplies/index.vue b/src/views/collaborativeApproval/officeSupplies/index.vue
index 510a900..b064a69 100644
--- a/src/views/collaborativeApproval/officeSupplies/index.vue
+++ b/src/views/collaborativeApproval/officeSupplies/index.vue
@@ -85,10 +85,10 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="鐢宠鏃堕棿" align="center" prop="applyTime" width="180" />
+ <el-table-column label="鐢宠鏃堕棿" align="center" prop="applyTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="瀹℃壒浜�" align="center" prop="approval" width="120" />
- <el-table-column label="瀹℃壒鏃堕棿" align="center" prop="approvalTime" width="180" />
- <el-table-column label="鍙戞斁鏃堕棿" align="center" prop="issueTime" width="180" />
+ <el-table-column label="瀹℃壒鏃堕棿" align="center" prop="approvalTime" width="180" :formatter="formatDateColumn" />
+ <el-table-column label="鍙戞斁鏃堕棿" align="center" prop="issueTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
<template #default="scope">
<el-button
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index 4699820..c43fd8d 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -144,7 +144,7 @@
<el-descriptions-item label="鍒嗙被">{{ getCategoryText(currentRegulationDetail.category) }}</el-descriptions-item>
<el-descriptions-item label="鐗堟湰">{{ currentRegulationDetail.version }}</el-descriptions-item>
<el-descriptions-item label="鍙戝竷浜�">{{ currentRegulationDetail.createUserName }}</el-descriptions-item>
- <el-descriptions-item label="鍙戝竷鏃堕棿">{{ currentRegulationDetail.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戝竷鏃堕棿">{{ dateOnly(currentRegulationDetail.createTime) }}</el-descriptions-item>
</el-descriptions>
<div class="mt-20">
<h4>鍒跺害鍐呭</h4>
@@ -169,7 +169,8 @@
width="100" />
<el-table-column prop="updateTime"
label="鏇存柊鏃堕棿"
- width="180" />
+ width="180"
+ :formatter="formatDateColumn" />
<el-table-column prop="createUserName"
label="鏇存柊浜�"
width="120" />
@@ -197,10 +198,12 @@
width="150" />
<el-table-column prop="createTime"
label="闃呰鏃堕棿"
- width="180" />
+ width="180"
+ :formatter="formatDateColumn" />
<el-table-column prop="confirmTime"
label="纭鏃堕棿"
- width="180" />
+ width="180"
+ :formatter="formatDateColumn" />
<el-table-column prop="status"
label="鐘舵��"
width="100">
diff --git a/src/views/collaborativeApproval/sealManagement/index.vue b/src/views/collaborativeApproval/sealManagement/index.vue
index a06f6d5..c4862a7 100644
--- a/src/views/collaborativeApproval/sealManagement/index.vue
+++ b/src/views/collaborativeApproval/sealManagement/index.vue
@@ -118,7 +118,7 @@
<el-descriptions-item label="鐢宠浜�">{{ currentSealDetail.createUserName }}</el-descriptions-item>
<el-descriptions-item label="鎵�灞為儴闂�">{{ currentSealDetail.department }}</el-descriptions-item>
<el-descriptions-item label="鐢ㄥ嵃绫诲瀷">{{ getSealTypeText(currentSealDetail.sealType) }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿">{{ currentSealDetail.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿">{{ dateOnly(currentSealDetail.createTime) }}</el-descriptions-item>
<el-descriptions-item label="鐘舵��">
<el-tag :type="getStatusType(currentSealDetail.status)">
{{ getStatusText(currentSealDetail.status) }}
diff --git a/src/views/energyManagement/carbonManagement/index.vue b/src/views/energyManagement/carbonManagement/index.vue
index 5a4be25..a1f735b 100644
--- a/src/views/energyManagement/carbonManagement/index.vue
+++ b/src/views/energyManagement/carbonManagement/index.vue
@@ -197,6 +197,7 @@
import { ref, reactive, onMounted, onBeforeUnmount, computed } from 'vue'
import * as echarts from 'echarts'
import Echarts from '@/components/Echarts/echarts.vue'
+import { dateOnly } from '@/utils/index'
// 鍝嶅簲寮忔暟鎹�
const selectedScope = ref('all')
@@ -592,7 +593,7 @@
// 鍑嗗瀵煎嚭鏁版嵁
const exportDataSet = {
鍩烘湰淇℃伅: {
- 瀵煎嚭鏃堕棿: new Date().toLocaleString('zh-CN'),
+ 瀵煎嚭鏃堕棿: dateOnly(new Date()),
鏁版嵁灞傜骇: heatmapLevel.value === 'device' ? '璁惧绾�' : heatmapLevel.value === 'line' ? '浜х嚎绾�' : '浼佷笟绾�',
閫夋嫨鑼冨洿: selectedScope.value === 'all' ? '鍏ㄩ儴鑼冨洿' : `鑼冨洿${selectedScope.value.slice(-1)}`,
閫夋嫨鏃ユ湡: selectedDate.value ? selectedDate.value.toLocaleDateString('zh-CN') : '浠婃棩'
diff --git a/src/views/energyManagement/dynamicEnergySaving/index.vue b/src/views/energyManagement/dynamicEnergySaving/index.vue
index 8976b22..085cbac 100644
--- a/src/views/energyManagement/dynamicEnergySaving/index.vue
+++ b/src/views/energyManagement/dynamicEnergySaving/index.vue
@@ -154,7 +154,7 @@
</template>
</el-table-column>
<el-table-column prop="accuracy" label="鍑嗙‘鐜�" />
- <el-table-column prop="lastUpdate" label="鏈�鍚庢洿鏂�" />
+ <el-table-column prop="lastUpdate" label="鏈�鍚庢洿鏂�" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔">
<template #default="scope">
<el-button
@@ -192,7 +192,7 @@
<!-- 浼樺寲鍘嗗彶瀵硅瘽妗� -->
<el-dialog v-model="historyDialogVisible" title="浼樺寲鍘嗗彶璁板綍" width="80%">
<el-table :data="optimizationHistory" style="width: 100%">
- <el-table-column prop="timestamp" label="鏃堕棿" />
+ <el-table-column prop="timestamp" label="鏃堕棿" :formatter="formatDateColumn" />
<el-table-column prop="formationPressure" label="鍦板眰鍘嬪姏 (MPa)" />
<el-table-column prop="oldFrequency" label="鍘熼鐜� (Hz)" />
<el-table-column prop="newFrequency" label="鏂伴鐜� (Hz)" />
@@ -213,6 +213,7 @@
import { ref, onMounted, onUnmounted, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Monitor, Cpu, TrendCharts } from '@element-plus/icons-vue'
+import { dateOnly } from "@/utils/index"
import * as echarts from 'echarts'
// 鍝嶅簲寮忔暟鎹�
@@ -330,7 +331,7 @@
// 娣诲姞浼樺寲鍘嗗彶璁板綍
const addOptimizationHistory = () => {
- const timestamp = new Date().toLocaleString()
+ const timestamp = dateOnly(new Date())
const record = {
timestamp,
formationPressure: pumpData.value.formationPressure,
@@ -539,7 +540,7 @@
// 鐢熸垚鍒濆鍘嗗彶鏁版嵁
const generateInitialHistory = () => {
for (let i = 0; i < 20; i++) {
- const timestamp = new Date(Date.now() - i * 3600000).toLocaleString()
+ const timestamp = dateOnly(new Date(Date.now() - i * 3600000))
const record = {
timestamp,
formationPressure: parseFloat((20 + Math.random() * 10).toFixed(1)),
diff --git a/src/views/energyManagement/energyCockpit/index.vue b/src/views/energyManagement/energyCockpit/index.vue
index 9281e37..8605337 100644
--- a/src/views/energyManagement/energyCockpit/index.vue
+++ b/src/views/energyManagement/energyCockpit/index.vue
@@ -424,6 +424,7 @@
Edit,
Bell
} from '@element-plus/icons-vue'
+import { dateOnly } from "@/utils/index"
// 鍝嶅簲寮忔暟鎹�
const lastUpdateTime = ref('')
@@ -593,7 +594,7 @@
greenEnergyRatio.value = (Math.random() * 10 + 25).toFixed(1)
// 鏇存柊鏈�鍚庢洿鏂版椂闂�
- lastUpdateTime.value = new Date().toLocaleString()
+ lastUpdateTime.value = dateOnly(new Date())
// 鍚屾椂鏇存柊鎶ヨ〃鏁版嵁
generateReportData()
diff --git a/src/views/energyManagement/gasManagement/index.vue b/src/views/energyManagement/gasManagement/index.vue
index a9b9abe..f51704e 100644
--- a/src/views/energyManagement/gasManagement/index.vue
+++ b/src/views/energyManagement/gasManagement/index.vue
@@ -177,7 +177,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="鏈�鍚庢洿鏂�" prop="lastUpdate" width="160" show-overflow-tooltip />
+ <el-table-column label="鏈�鍚庢洿鏂�" prop="lastUpdate" width="160" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template #default="scope">
<el-button link size="small" @click="editDevice(scope.row)">
@@ -254,6 +254,7 @@
Money,
Plus
} from '@element-plus/icons-vue'
+import { dateOnly } from "@/utils/index"
// 鍝嶅簲寮忔暟鎹�
const lastUpdateTime = ref('')
@@ -315,11 +316,11 @@
currentTemperature: (Math.random() * 20 + 15).toFixed(1),
gasConcentration: (Math.random() * 10).toFixed(2),
status: ['running', 'stopped', 'warning', 'error'][Math.floor(Math.random() * 4)],
- lastUpdate: new Date().toLocaleString()
+ lastUpdate: dateOnly(new Date())
}))
// 鏇存柊鏈�鍚庢洿鏂版椂闂�
- lastUpdateTime.value = new Date().toLocaleString()
+ lastUpdateTime.value = dateOnly(new Date())
}
// 鑾峰彇鍘嬪姏鐘舵�佹牱寮�
diff --git a/src/views/energyManagement/meterCollection/index.vue b/src/views/energyManagement/meterCollection/index.vue
index 2dcb89f..2c7c1a3 100644
--- a/src/views/energyManagement/meterCollection/index.vue
+++ b/src/views/energyManagement/meterCollection/index.vue
@@ -79,7 +79,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="lastUpdateTime" label="鏈�鍚庢洿鏂版椂闂�" width="160" />
+ <el-table-column prop="lastUpdateTime" label="鏈�鍚庢洿鏂版椂闂�" width="160" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="180" fixed="right" align="center">
<template #default="scope">
<el-button link @click="viewDetails(scope.row)">
@@ -174,7 +174,7 @@
<el-col :span="12">
<div class="detail-item">
<label>鏈�鍚庢洿鏂版椂闂�:</label>
- <span>{{ currentMeter.lastUpdateTime }}</span>
+ <span>{{ dateOnly(currentMeter.lastUpdateTime) }}</span>
</div>
</el-col>
</el-row>
diff --git a/src/views/equipmentManagement/attendanceManagement/index.vue b/src/views/equipmentManagement/attendanceManagement/index.vue
index a346d0b..9a51779 100644
--- a/src/views/equipmentManagement/attendanceManagement/index.vue
+++ b/src/views/equipmentManagement/attendanceManagement/index.vue
@@ -102,7 +102,7 @@
<el-table-column prop="deviceName" label="璁惧鍚嶇О" width="160" show-overflow-tooltip />
<el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" width="180" show-overflow-tooltip />
<el-table-column prop="engineerName" label="缁翠慨宸ョ▼甯�" width="120" />
- <el-table-column prop="completeTime" label="缁翠慨瀹屾垚鏃堕棿" width="180" />
+ <el-table-column prop="completeTime" label="缁翠慨瀹屾垚鏃堕棿" width="180" :formatter="formatDateColumn" />
<el-table-column prop="score" label="鏄熺骇璇勫垎" width="140" align="center">
<template #default="scope">
<el-rate v-if="scope.row.score" v-model="scope.row.score" disabled />
diff --git a/src/views/equipmentManagement/defectManagement/index.vue b/src/views/equipmentManagement/defectManagement/index.vue
index 8673000..513c785 100644
--- a/src/views/equipmentManagement/defectManagement/index.vue
+++ b/src/views/equipmentManagement/defectManagement/index.vue
@@ -77,7 +77,7 @@
<el-table-column prop="deviceName" label="璁惧鍚嶇О"></el-table-column>
<el-table-column prop="defectDescription" label="缂洪櫡鎻忚堪"></el-table-column>
<el-table-column prop="status" label="鐘舵��"></el-table-column>
- <el-table-column prop="eliminateTime" label="娑堢己鏃堕棿"></el-table-column>
+ <el-table-column prop="eliminateTime" label="娑堢己鏃堕棿" :formatter="formatDateColumn"></el-table-column>
</el-table>
</el-dialog>
</div>
diff --git a/src/views/equipmentManagement/deviceInfo/index.vue b/src/views/equipmentManagement/deviceInfo/index.vue
index 8a49227..f0a55cd 100644
--- a/src/views/equipmentManagement/deviceInfo/index.vue
+++ b/src/views/equipmentManagement/deviceInfo/index.vue
@@ -35,11 +35,11 @@
<div class="maintenance-info">
<div class="maintenance-item">
<span class="label">鏈�鍚庣淮鎶わ細</span>
- <span class="value">{{ deviceInfo.updateTime }}</span>
+ <span class="value">{{ dateOnly(deviceInfo.updateTime) }}</span>
</div>
<div class="maintenance-item">
<span class="label">涓嬫缁存姢锛�</span>
- <span class="value">{{ deviceInfo.createTime }}</span>
+ <span class="value">{{ dateOnly(deviceInfo.createTime) }}</span>
</div>
<div class="maintenance-item">
<span class="label">缁存姢鐘舵�侊細</span>
@@ -55,7 +55,7 @@
<div v-if="changeRecords.length === 0" class="empty-tip">鏆傛棤鍙樻洿璁板綍</div>
<div v-else class="change-record" v-for="(item, index) in changeRecords" :key="index">
<div class="record-header">
- <span class="record-time">{{ item.createTime }}</span>
+ <span class="record-time">{{ dateOnly(item.createTime) }}</span>
<span class="record-status" :class="approvalClass(item.approvalStatus)">{{ approvalText(item.approvalStatus) }}</span>
</div>
<div class="record-line">
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index fbc9869..b8500c3 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -137,7 +137,7 @@
<el-descriptions-item label="鍚◣鎬讳环">{{ detailData.taxIncludingPriceTotal }}</el-descriptions-item>
<el-descriptions-item label="绋庣巼(%)">{{ detailData.taxRate }}</el-descriptions-item>
<el-descriptions-item label="涓嶅惈绋庢�讳环">{{ detailData.unTaxIncludingPriceTotal }}</el-descriptions-item>
- <el-descriptions-item label="褰曞叆鏃ユ湡">{{ detailData.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ dateOnly(detailData.createTime) }}</el-descriptions-item>
<el-descriptions-item label="棰勮杩愯鏃堕棿">{{ detailData.planRuntimeTime ? dayjs(detailData.planRuntimeTime).format('YYYY-MM-DD') : '' }}</el-descriptions-item>
<el-descriptions-item label="璁惧鍥剧墖" :span="2">
<div v-if="detailData.storageBlobVOs && detailData.storageBlobVOs.length > 0" style="display: flex; gap: 10px; flex-wrap: wrap;">
@@ -186,7 +186,7 @@
<!-- 鐘舵�佸彉鏇磋褰曞璇濇 -->
<el-dialog v-model="recordDialog.visible" title="璁惧鐘舵�佸彉鏇磋褰�" width="800px" draggable>
<el-table v-loading="recordDialog.loading" :data="recordDialog.list" border>
- <el-table-column label="鍙樻洿鏃堕棿" prop="createTime" width="160" />
+ <el-table-column label="鍙樻洿鏃堕棿" prop="createTime" width="160" :formatter="formatDateColumn" />
<el-table-column label="鍘熺姸鎬�" width="100">
<template #default="scope">
<el-tag :type="scope.row.originalStatus == 1 ? 'success' : 'danger'">
diff --git a/src/views/equipmentManagement/operationManagement/index.vue b/src/views/equipmentManagement/operationManagement/index.vue
index f920bd4..4f171d6 100644
--- a/src/views/equipmentManagement/operationManagement/index.vue
+++ b/src/views/equipmentManagement/operationManagement/index.vue
@@ -74,7 +74,7 @@
align="center"
>
<template #default="scope">
- {{ scope.row.planRuntimeTime || '-' }}
+ {{ dateOnly(scope.row.planRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
@@ -84,7 +84,7 @@
align="center"
>
<template #default="scope">
- {{ scope.row.startRuntimeTime || '-' }}
+ {{ dateOnly(scope.row.startRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
@@ -94,7 +94,7 @@
align="center"
>
<template #default="scope">
- {{ scope.row.endRuntimeTime || '-' }}
+ {{ dateOnly(scope.row.endRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
@@ -318,15 +318,7 @@
const changeDeviceStatus = async (device, status) => {
try {
- const currentTime = new Date().toLocaleString('zh-CN', {
- year: 'numeric',
- month: '2-digit',
- day: '2-digit',
- hour: '2-digit',
- minute: '2-digit',
- second: '2-digit',
- hour12: false
- }).replace(/\//g, '-')
+ const currentTime = dayjs().format('YYYY-MM-DD')
// 鏇存柊璁惧鐘舵�佸拰鐩稿叧鏃堕棿瀛楁
if (status === '鍚姩杩愯') {
diff --git a/src/views/fileManagement/bookshelf/detail.vue b/src/views/fileManagement/bookshelf/detail.vue
index 5d7d3ac..c88480d 100644
--- a/src/views/fileManagement/bookshelf/detail.vue
+++ b/src/views/fileManagement/bookshelf/detail.vue
@@ -16,7 +16,7 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="鍥句功缂栧彿">{{ current.docNumber }}</el-descriptions-item>
<el-descriptions-item label="鍥句功鍚嶇О">{{ current.docName }}</el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏃堕棿">{{ current.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍏ュ簱鏃堕棿">{{ dateOnly(current.createTime) }}</el-descriptions-item>
<!-- <el-descriptions-item label="褰撳墠浣嶇疆">{{ current.currentLocation }}</el-descriptions-item> -->
<el-descriptions-item label="鐘舵��">{{ current.docStatus }}</el-descriptions-item>
</el-descriptions>
diff --git a/src/views/index.vue b/src/views/index.vue
index 7a1c762..38f3b25 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -222,7 +222,7 @@
<li v-for="item in todoList" :key="item.id" class="todo-item">
<div class="todo-head">
<span class="todo-no">寰呭姙缂栧彿锛歿{ item.approveId }}</span>
- <span class="todo-time">{{ item.approveTime }}</span>
+ <span class="todo-time">{{ dateOnly(item.approveTime) }}</span>
</div>
<div class="todo-desc">閮ㄩ棬锛歿{ item.approveDeptName }}</div>
<div class="todo-desc">浜嬬敱锛歿{ item.approveReason }}</div>
@@ -342,7 +342,7 @@
<el-table-column prop="approveDeptName" label="閮ㄩ棬/妯℃澘" min-width="160" />
<el-table-column prop="approveReason" label="浜嬬敱" min-width="240" show-overflow-tooltip />
<el-table-column prop="approveUserName" label="鍙戣捣浜�" min-width="120" />
- <el-table-column prop="approveTime" label="鏃堕棿" min-width="170" />
+ <el-table-column prop="approveTime" label="鏃堕棿" min-width="170" :formatter="formatDateColumn" />
</el-table>
</div>
</el-dialog>
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 18f3325..01d130b 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -108,7 +108,8 @@
show-overflow-tooltip />
<el-table-column label="鍑哄簱鏃ユ湡"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip
+ :formatter="formatDateColumn" />
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/fuelCardManagement/index.vue b/src/views/inventoryManagement/fuelCardManagement/index.vue
index 6dd316a..f473049 100644
--- a/src/views/inventoryManagement/fuelCardManagement/index.vue
+++ b/src/views/inventoryManagement/fuelCardManagement/index.vue
@@ -118,7 +118,7 @@
</el-row>
<el-table v-loading="rechargeDrawer.loading" :data="rechargeDrawer.list" border>
<el-table-column type="index" label="搴忓彿" width="60" align="center" />
- <el-table-column prop="rechargeDate" label="鍏呭�兼椂闂�" width="160" />
+ <el-table-column prop="rechargeDate" label="鍏呭�兼椂闂�" width="160" :formatter="formatDateColumn" />
<el-table-column prop="rechargeAmount" label="鍏呭�奸噾棰�(鍏�)" width="120" align="right">
<template #default="scope">
<span style="color: #67C23A; font-weight: bold;">+{{ scope.row.rechargeAmount }}</span>
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 45bffc1..7a0a4cf 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -29,7 +29,7 @@
:summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column label="鍏ュ簱鎵规" prop="inboundBatches" width="160" show-overflow-tooltip />
<el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0a01def..c12e9bf 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -109,7 +109,8 @@
show-overflow-tooltip />
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip
+ :formatter="formatDateColumn" />
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
index a835ef4..41a321f 100644
--- a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
+++ b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
@@ -54,6 +54,7 @@
label="鏈�杩戞洿鏂版椂闂�"
prop="updateTime"
show-overflow-tooltip
+ :formatter="formatDateColumn"
/>
<el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template #default="scope">
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 4286772..6044e36 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -31,7 +31,7 @@
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index 9ee214c..3faee27 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -107,7 +107,8 @@
show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�"
prop="updateTime"
- show-overflow-tooltip />
+ show-overflow-tooltip
+ :formatter="formatDateColumn" />
<el-table-column fixed="right"
label="鎿嶄綔"
min-width="80"
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 55662be..3764be3 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -26,7 +26,7 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 26bc8a0..a033e26 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -152,6 +152,7 @@
prop="createTime"
width="200"
show-overflow-tooltip
+ :formatter="formatDateColumn"
v-if="searchForm.reportType !== 'inout'" />
<el-table-column label="鍏ュ簱鎵规"
prop="inboundBatches"
diff --git a/src/views/inventoryManagement/stockWarning/index.vue b/src/views/inventoryManagement/stockWarning/index.vue
index fd04540..f6661d0 100644
--- a/src/views/inventoryManagement/stockWarning/index.vue
+++ b/src/views/inventoryManagement/stockWarning/index.vue
@@ -96,10 +96,10 @@
</el-table-column>
<!-- 鏃堕棿鐩稿叧瀛楁 -->
- <el-table-column label="棰勮鏃堕棿" prop="warningTime" width="150" show-overflow-tooltip />
+ <el-table-column label="棰勮鏃堕棿" prop="warningTime" width="150" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column label="棰勮鎸佺画澶╂暟" prop="warningDuration" width="120" show-overflow-tooltip />
- <el-table-column label="鏈�鍚庢洿鏂版椂闂�" prop="lastUpdateTime" width="150" show-overflow-tooltip />
- <el-table-column label="棰勮鍏呰鏃堕棿" prop="expectedRefillTime" width="150" show-overflow-tooltip />
+ <el-table-column label="鏈�鍚庢洿鏂版椂闂�" prop="lastUpdateTime" width="150" show-overflow-tooltip :formatter="formatDateColumn" />
+ <el-table-column label="棰勮鍏呰鏃堕棿" prop="expectedRefillTime" width="150" show-overflow-tooltip :formatter="formatDateColumn" />
<el-table-column label="棰勮缂烘皵鏃堕棿" prop="expectedShortageTime" width="150" show-overflow-tooltip>
<template #default="scope">
<div v-if="scope.row.expectedShortageTime">
diff --git a/src/views/inventoryManagement/transportTaskManagement/index.vue b/src/views/inventoryManagement/transportTaskManagement/index.vue
index a2a172d..4a65c21 100644
--- a/src/views/inventoryManagement/transportTaskManagement/index.vue
+++ b/src/views/inventoryManagement/transportTaskManagement/index.vue
@@ -155,18 +155,21 @@
label="瑁呰揣鏃堕棿"
width="160"
show-overflow-tooltip
+ :formatter="formatDateColumn"
/>
<el-table-column
prop="deliveryTime"
label="閫佽揣鏃堕棿"
width="160"
show-overflow-tooltip
+ :formatter="formatDateColumn"
/>
<el-table-column
prop="signTime"
label="绛炬敹鏃堕棿"
width="160"
show-overflow-tooltip
+ :formatter="formatDateColumn"
/>
<el-table-column label="鐘舵��" width="110" align="center">
<template #default="scope">
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index b425e45..0d88bfc 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -142,7 +142,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="浠诲姟鍒嗙粍锛�">{{ form.jobGroup }}</el-form-item>
- <el-form-item label="鎵ц鏃堕棿锛�">{{ form.createTime }}</el-form-item>
+ <el-form-item label="鎵ц鏃堕棿锛�">{{ dateOnly(form.createTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="璋冪敤鏂规硶锛�">{{ form.invokeTarget }}</el-form-item>
diff --git a/src/views/monitorManagement/videoMonitor/index.vue b/src/views/monitorManagement/videoMonitor/index.vue
index b78c7f5..dad9254 100644
--- a/src/views/monitorManagement/videoMonitor/index.vue
+++ b/src/views/monitorManagement/videoMonitor/index.vue
@@ -126,7 +126,7 @@
>
<el-table-column type="selection" width="45" align="center" />
<el-table-column type="index" width="50" label="搴忓彿" align="center" :index="indexMethod" />
- <el-table-column prop="time" label="鎶撴媿鏃堕棿" width="155" sortable />
+ <el-table-column prop="time" label="鎶撴媿鏃堕棿" width="155" sortable :formatter="formatDateColumn" />
<el-table-column prop="personId" label="宸ュ彿" width="110" show-overflow-tooltip />
<el-table-column prop="department" label="閮ㄩ棬" width="100" show-overflow-tooltip />
<el-table-column prop="areaName" label="鍖哄煙" width="110" show-overflow-tooltip />
diff --git a/src/views/officeProcessAutomation/EnterpriseNews/news-manage/components/NewsDetailPanel.vue b/src/views/officeProcessAutomation/EnterpriseNews/news-manage/components/NewsDetailPanel.vue
index 1124472..d832445 100644
--- a/src/views/officeProcessAutomation/EnterpriseNews/news-manage/components/NewsDetailPanel.vue
+++ b/src/views/officeProcessAutomation/EnterpriseNews/news-manage/components/NewsDetailPanel.vue
@@ -22,7 +22,7 @@
<el-descriptions-item label="缂栬緫鏉冮檺">{{ publishRoleLabel(row.editorRole) }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳瑙掕壊">{{ publishRoleLabel(row.reviewerRole) }}</el-descriptions-item>
<el-descriptions-item label="鍙戝竷浜�">{{ row.publisherName || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鍙戝竷鏃堕棿">{{ row.publishTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戝竷鏃堕棿">{{ dateOnly(row.publishTime) || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="褰撳墠鐗堟湰">v{{ row.versionNo || 1 }}</el-descriptions-item>
<el-descriptions-item label="闇�闃呰纭">
{{ row.requireReadConfirm ? "鏄�" : "鍚�" }}
diff --git a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
index dcd0082..d34e8e0 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
+++ b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/components/DetailPanel.vue
@@ -6,7 +6,7 @@
<el-tag :type="statusTagType(row.approvalResult)" size="small">{{ statusLabel(row.approvalResult) }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="璐圭敤绫诲瀷">{{ expenseCategoryLabel(row.expenseCategory) }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿">{{ row.applyTime || row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿">{{ dateOnly(row.applyTime || row.createTime) || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐缂栧彿">{{ row.employeeNo || row.applicantNo || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐濮撳悕">{{ row.employeeName || row.applicantName || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鎶ラ攢鍘熷洜" :span="2">{{ row.reimburseReason || "鈥�" }}</el-descriptions-item>
@@ -19,7 +19,7 @@
<el-descriptions-item v-if="row.rejectReason" label="椹冲洖鍘熷洜" :span="2">
<span class="reject-text">{{ row.rejectReason }}</span>
</el-descriptions-item>
- <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ dateOnly(row.createTime) || "鈥�" }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">鎶ラ攢鏄庣粏</el-divider>
diff --git a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
index df8cf8e..4b917d9 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
+++ b/src/views/officeProcessAutomation/ReimburseManage/travel-reimburse/components/DetailPanel.vue
@@ -8,8 +8,8 @@
<el-descriptions-item label="鍛樺伐缂栧彿">{{ row.employeeNo || row.applicantNo || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍛樺伐濮撳悕">{{ row.employeeName || row.applicantName || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鎶ラ攢鍘熷洜" :span="2">{{ row.reimburseReason || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鍑哄樊寮�濮�">{{ row.travelStartTime || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鍑哄樊缁撴潫">{{ row.travelEndTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊寮�濮�">{{ dateOnly(row.travelStartTime) || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍑哄樊缁撴潫">{{ dateOnly(row.travelEndTime) || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍑哄樊鍦�">{{ row.departurePlace || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鐩殑鍦�">{{ row.destination || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="閰掑簵鏍囧噯">{{ row.hotelStandard != null ? `${row.hotelStandard} 鍏�/鏅歚 : "鈥�" }}</el-descriptions-item>
@@ -25,7 +25,7 @@
<el-descriptions-item v-if="row.rejectReason" label="椹冲洖鍘熷洜" :span="2">
<span class="reject-text">{{ row.rejectReason }}</span>
</el-descriptions-item>
- <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ row.createTime || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿" :span="2">{{ dateOnly(row.createTime) || "鈥�" }}</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">鎶ラ攢鏄庣粏</el-divider>
diff --git a/src/views/officeProcessAutomation/SysAdmin/user-manage/profile/index.vue b/src/views/officeProcessAutomation/SysAdmin/user-manage/profile/index.vue
index 719a028..b2f8768 100644
--- a/src/views/officeProcessAutomation/SysAdmin/user-manage/profile/index.vue
+++ b/src/views/officeProcessAutomation/SysAdmin/user-manage/profile/index.vue
@@ -35,7 +35,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />鍒涘缓鏃ユ湡
- <div class="pull-right">{{ state.user.createTime }}</div>
+ <div class="pull-right">{{ dateOnly(state.user.createTime) }}</div>
</li>
</ul>
</div>
diff --git a/src/views/procurementManagement/advancedPriceManagement/index.vue b/src/views/procurementManagement/advancedPriceManagement/index.vue
index bd2e854..3f3e159 100644
--- a/src/views/procurementManagement/advancedPriceManagement/index.vue
+++ b/src/views/procurementManagement/advancedPriceManagement/index.vue
@@ -108,8 +108,8 @@
</div>
</template>
</el-table-column>
- <el-table-column label="鐢熸晥鏃堕棿" prop="effectiveTime" width="180" />
- <el-table-column label="鏇存柊鏃堕棿" prop="updateTime" width="180" sortable />
+ <el-table-column label="鐢熸晥鏃堕棿" prop="effectiveTime" width="180" :formatter="formatDateColumn" />
+ <el-table-column label="鏇存柊鏃堕棿" prop="updateTime" width="180" sortable :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="250" align="center" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="openDialog('edit', row)">
diff --git a/src/views/procurementManagement/arrivalManagement/index.vue b/src/views/procurementManagement/arrivalManagement/index.vue
index a1b5eed..596192f 100644
--- a/src/views/procurementManagement/arrivalManagement/index.vue
+++ b/src/views/procurementManagement/arrivalManagement/index.vue
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column label="鍒拌揣鏁伴噺" prop="arrivalQuantity" width="100" />
- <el-table-column label="鍒拌揣鏃堕棿" prop="arrivalTime" width="180" />
+ <el-table-column label="鍒拌揣鏃堕棿" prop="arrivalTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="200" align="center">
<template #default="{ row }">
<el-button type="primary" link @click="openDialog('edit', row)">缂栬緫</el-button>
diff --git a/src/views/procurementManagement/priceManagement/index.vue b/src/views/procurementManagement/priceManagement/index.vue
index 54a178b..e2f608f 100644
--- a/src/views/procurementManagement/priceManagement/index.vue
+++ b/src/views/procurementManagement/priceManagement/index.vue
@@ -46,7 +46,7 @@
</span>
</template>
</el-table-column>
- <el-table-column label="鐢熸晥鏃堕棿" prop="effectiveTime" width="180" />
+ <el-table-column label="鐢熸晥鏃堕棿" prop="effectiveTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鐘舵��" prop="status" width="100">
<template #default="{ row }">
<el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
diff --git a/src/views/procurementManagement/procurementPlan/index.vue b/src/views/procurementManagement/procurementPlan/index.vue
index ba9a38c..478ec4e 100644
--- a/src/views/procurementManagement/procurementPlan/index.vue
+++ b/src/views/procurementManagement/procurementPlan/index.vue
@@ -96,7 +96,8 @@
</el-table-column>
<el-table-column prop="updateTime"
label="鏈�鍚庤绠楁椂闂�"
- width="160" />
+ width="160"
+ :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔"
width="200"
fixed="right"
diff --git a/src/views/procurementManagement/purchaseOrder/index.vue b/src/views/procurementManagement/purchaseOrder/index.vue
index 4f9812f..c3f7d56 100644
--- a/src/views/procurementManagement/purchaseOrder/index.vue
+++ b/src/views/procurementManagement/purchaseOrder/index.vue
@@ -37,7 +37,7 @@
<el-table-column label="鎬婚噾棰�" prop="totalAmount" width="120">
<template #default="{ row }">楼{{ row.totalAmount.toFixed(2) }}</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" width="180" />
+ <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="200" align="center">
<template #default="{ row }">
<el-button type="primary" size="small" @click="openDialog('edit', row)">缂栬緫</el-button>
diff --git a/src/views/procurementManagement/qualityInspection/index.vue b/src/views/procurementManagement/qualityInspection/index.vue
index aee1d99..971e657 100644
--- a/src/views/procurementManagement/qualityInspection/index.vue
+++ b/src/views/procurementManagement/qualityInspection/index.vue
@@ -38,7 +38,7 @@
</el-table-column>
<el-table-column label="鍚堟牸鏁伴噺" prop="qualifiedQuantity" width="100" />
<el-table-column label="涓嶅悎鏍兼暟閲�" prop="unqualifiedQuantity" width="100" />
- <el-table-column label="璐ㄦ鏃堕棿" prop="inspectionTime" width="180" />
+ <el-table-column label="璐ㄦ鏃堕棿" prop="inspectionTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="200" align="center">
<template #default="{ row }">
<el-button type="primary" link @click="openDialog('edit', row)">缂栬緫</el-button>
diff --git a/src/views/procurementManagement/returnManagement/index.vue b/src/views/procurementManagement/returnManagement/index.vue
index d44b588..80de45e 100644
--- a/src/views/procurementManagement/returnManagement/index.vue
+++ b/src/views/procurementManagement/returnManagement/index.vue
@@ -41,7 +41,7 @@
<el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" width="180" />
+ <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="200" align="center">
<template #default="{ row }">
<el-button type="primary" link @click="openDialog('edit', row)">缂栬緫</el-button>
diff --git a/src/views/productManagement/productIdentifier/index.vue b/src/views/productManagement/productIdentifier/index.vue
index d638e7a..713c525 100644
--- a/src/views/productManagement/productIdentifier/index.vue
+++ b/src/views/productManagement/productIdentifier/index.vue
@@ -93,7 +93,8 @@
</el-table-column>
<el-table-column prop="generateTime"
label="鐢熸垚鏃堕棿"
- width="160" />
+ width="160"
+ :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔"
fixed="right"
align="center"
@@ -744,7 +745,7 @@
...form,
id: newId,
identifierCode: identifierCode,
- generateTime: new Date().toLocaleString(),
+ generateTime: dayjs().format("YYYY-MM-DD"),
});
pagination.total++;
ElMessage.success("鏂板鎴愬姛");
diff --git a/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue b/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
index 370815e..d20532a 100644
--- a/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
+++ b/src/views/productionManagement/productionOrder/components/MaterialDetailDialog.vue
@@ -88,7 +88,8 @@
min-width="120" />
<el-table-column label="琛ユ枡鏃ユ湡"
prop="supplementTime"
- min-width="160" />
+ min-width="160"
+ :formatter="formatDateColumn" />
<el-table-column label="琛ユ枡鍘熷洜"
prop="feedingReason"
min-width="200" />
diff --git a/src/views/productionManagement/safetyMonitoring/index.vue b/src/views/productionManagement/safetyMonitoring/index.vue
index 12922e7..3c59af9 100644
--- a/src/views/productionManagement/safetyMonitoring/index.vue
+++ b/src/views/productionManagement/safetyMonitoring/index.vue
@@ -248,6 +248,7 @@
<script>
import * as echarts from 'echarts'
+import { dateOnly } from '@/utils/index'
export default {
name: 'SafetyMonitoring',
@@ -553,7 +554,7 @@
const now = new Date()
const record = {
id: `EM${Date.now()}`,
- time: now.toLocaleString('zh-CN'),
+ time: dateOnly(now),
location: sensor.name,
type: sensor.methane > 2.5 ? '鐢茬兎瓒呮爣' : '纭寲姘㈣秴鏍�',
status: 'processing',
@@ -628,13 +629,13 @@
},
{
id: 2,
- timestamp: new Date(new Date(record.time).getTime() + 3000).toLocaleString('zh-CN'),
+ timestamp: dateOnly(new Date(new Date(record.time).getTime() + 3000)),
type: 'action',
description: '鍚姩鍠锋穻绯荤粺闄嶆俯'
},
{
id: 3,
- timestamp: new Date(new Date(record.time).getTime() + 5000).toLocaleString('zh-CN'),
+ timestamp: dateOnly(new Date(new Date(record.time).getTime() + 5000)),
type: 'action',
description: '鍙戦�佺揣鎬ョ枏鏁ｅ箍鎾�'
}
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index d3b0f93..4f9719a 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -108,11 +108,11 @@
</div> -->
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.planStartTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.planStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">璁″垝缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.planEndTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.planEndTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">澶囨敞</span>
@@ -138,11 +138,11 @@
</div>
<div class="info-item">
<span class="info-label">瀹為檯寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.actualStartTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.actualStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">瀹為檯缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.actualEndTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.actualEndTime) }}</span>
</div>
</div>
</div>
diff --git a/src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue b/src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue
index 45944b5..93086a4 100644
--- a/src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue
+++ b/src/views/productionManagement/workOrderManagement/components/MaterialDialog.vue
@@ -113,7 +113,8 @@
min-width="120" />
<el-table-column label="琛ユ枡鏃ユ湡"
prop="supplementTime"
- min-width="160" />
+ min-width="160"
+ :formatter="formatDateColumn" />
</el-table>
<template #footer>
<span class="dialog-footer">
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index b721de6..96edde6 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -62,11 +62,11 @@
</div>
<div class="info-item">
<span class="info-label">璁″垝寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.planStartTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.planStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">璁″垝缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.planEndTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.planEndTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">澶囨敞</span>
@@ -91,11 +91,11 @@
</div>
<div class="info-item">
<span class="info-label">瀹為檯寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.actualStartTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.actualStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">瀹為檯缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.actualEndTime }}</span>
+ <span class="info-value">{{ dateOnly(transferCardRowData.actualEndTime) }}</span>
</div>
</div>
</div>
diff --git a/src/views/projectManagement/Management/projectDetail.vue b/src/views/projectManagement/Management/projectDetail.vue
index dee5f99..539c6e2 100644
--- a/src/views/projectManagement/Management/projectDetail.vue
+++ b/src/views/projectManagement/Management/projectDetail.vue
@@ -25,7 +25,7 @@
<el-descriptions-item label="瀹㈡埛ID">{{ info.clientId ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="鐖堕」鐩�">{{ parentProjectLabel }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰绫诲瀷">{{ projectTypeLabel }}</el-descriptions-item>
- <el-descriptions-item label="绔嬮」鏃ユ湡">{{ info.establishTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="绔嬮」鏃ユ湡">{{ formatDate(info.establishTime) }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鏉ユ簮">{{ info.source || '-' }}</el-descriptions-item>
<el-descriptions-item label="绔嬮」浜�">{{ info.managerName || '-' }}</el-descriptions-item>
<el-descriptions-item label="涓氬姟鍛�">{{ info.salesmanName || '-' }}</el-descriptions-item>
@@ -40,10 +40,10 @@
<dict-tag :options="plan_status" :value="String(info.stage ?? '')" />
</el-descriptions-item>
<el-descriptions-item label="棰勮宸ユ湡(澶�)">{{ estimatedDays }}</el-descriptions-item>
- <el-descriptions-item label="璁″垝寮�濮嬫棩鏈�">{{ info.planStartTime || '-' }}</el-descriptions-item>
- <el-descriptions-item label="璁″垝瀹屾垚鏃ユ湡">{{ info.planEndTime || '-' }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯寮�濮嬫棩鏈�">{{ info.actualStartTime || '-' }}</el-descriptions-item>
- <el-descriptions-item label="瀹為檯瀹屾垚鏃ユ湡">{{ info.actualEndTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="璁″垝寮�濮嬫棩鏈�">{{ formatDate(info.planStartTime) }}</el-descriptions-item>
+ <el-descriptions-item label="璁″垝瀹屾垚鏃ユ湡">{{ formatDate(info.planEndTime) }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯寮�濮嬫棩鏈�">{{ formatDate(info.actualStartTime) }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯瀹屾垚鏃ユ湡">{{ formatDate(info.actualEndTime) }}</el-descriptions-item>
<el-descriptions-item label="璁㈠崟鏃ユ湡">{{ info.orderDate || '-' }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰閲戦">{{ info.orderAmount ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="澶囨敞" :span="4">{{ info.remark || '-' }}</el-descriptions-item>
@@ -79,8 +79,8 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="濮撳悕" prop="userName" show-overflow-tooltip />
<el-table-column label="椤圭洰缁勮鑹�" prop="userRoleName" show-overflow-tooltip />
- <el-table-column label="杩涘叆鏃ユ湡" prop="joinTime" width="140" />
- <el-table-column label="绂诲紑鏃ユ湡" prop="departTime" width="140" />
+ <el-table-column label="杩涘叆鏃ユ湡" prop="joinTime" width="140" :formatter="formatDateColumn" />
+ <el-table-column label="绂诲紑鏃ユ湡" prop="departTime" width="140" :formatter="formatDateColumn" />
<el-table-column label="鑱旂郴鏂瑰紡" prop="contact" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
</el-table>
@@ -143,10 +143,10 @@
<el-table-column label="鎻忚堪" prop="description" min-width="220" show-overflow-tooltip />
<el-table-column label="瀹為檯璐熻矗浜�" prop="actualLeaderName" width="140" show-overflow-tooltip />
<el-table-column label="杩涘害(%)" prop="progress" width="110" />
- <el-table-column label="璁″垝寮�濮�" prop="planStartTime" width="120" />
- <el-table-column label="璁″垝缁撴潫" prop="planEndTime" width="120" />
- <el-table-column label="瀹為檯寮�濮�" prop="actualStartTime" width="120" />
- <el-table-column label="瀹為檯缁撴潫" prop="actualEndTime" width="120" />
+ <el-table-column label="璁″垝寮�濮�" prop="planStartTime" width="120" :formatter="formatDateColumn" />
+ <el-table-column label="璁″垝缁撴潫" prop="planEndTime" width="120" :formatter="formatDateColumn" />
+ <el-table-column label="瀹為檯寮�濮�" prop="actualStartTime" width="120" :formatter="formatDateColumn" />
+ <el-table-column label="瀹為檯缁撴潫" prop="actualEndTime" width="120" :formatter="formatDateColumn" />
<el-table-column label="棰勮宸ユ湡(澶�)" prop="estimatedDuration" width="130" />
<el-table-column label="闄勪欢" width="90" align="center">
<template #default="{ row }">
diff --git a/src/views/qualityManagement/afterSalesTraceability/index.vue b/src/views/qualityManagement/afterSalesTraceability/index.vue
index b41acd1..d3fa129 100644
--- a/src/views/qualityManagement/afterSalesTraceability/index.vue
+++ b/src/views/qualityManagement/afterSalesTraceability/index.vue
@@ -123,7 +123,7 @@
<el-table-column label="鑱旂郴鏂瑰紡" prop="contact" width="140" />
<el-table-column label="鍙嶉鏃堕棿" prop="feedbackTime" width="160">
<template #default="scope">
- <span>{{ scope.row.feedbackTime }}</span>
+ <span>{{ dateOnly(scope.row.feedbackTime) }}</span>
</template>
</el-table-column>
<el-table-column label="闂鎻忚堪" prop="problemDesc" show-overflow-tooltip />
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue b/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue
index a7d0174..6eb1dee 100644
--- a/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue
+++ b/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue
@@ -97,7 +97,7 @@
>
<div class="todo-title">鐢宠绫诲瀷锛歿{ item.approveTypeName }}</div>
<div class="todo-division">鐢宠閮ㄩ棬锛歿{ item.approveDeptName }}</div>
- <div class="todo-time">{{ item.approveTime }}</div>
+ <div class="todo-time">{{ dateOnly(item.approveTime) }}</div>
</div>
</div>
diff --git a/src/views/reportAnalysis/reportManagement.vue b/src/views/reportAnalysis/reportManagement.vue
index 3c87550..efd617e 100644
--- a/src/views/reportAnalysis/reportManagement.vue
+++ b/src/views/reportAnalysis/reportManagement.vue
@@ -188,8 +188,8 @@
<el-progress :percentage="scope.row.progress" :status="getProgressStatus(scope.row.progress)" />
</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="180" />
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" width="180" />
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="180" :formatter="formatDateColumn" />
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" width="180" :formatter="formatDateColumn" />
<el-table-column label="鎿嶄綔" width="150" fixed="right">
<template #default="scope">
<el-button type="text" size="small" @click="viewDetail(scope.row)">鏌ョ湅</el-button>
diff --git a/src/views/safeProduction/accidentReportingRecord/index.vue b/src/views/safeProduction/accidentReportingRecord/index.vue
index 52d82fb..7f489c1 100644
--- a/src/views/safeProduction/accidentReportingRecord/index.vue
+++ b/src/views/safeProduction/accidentReportingRecord/index.vue
@@ -224,7 +224,7 @@
<span>{{ currentKnowledge.accidentName }}</span>
</el-descriptions-item>
<el-descriptions-item label="浜嬫晠鍙戠敓鏃堕棿">
- {{ currentKnowledge.happenTime }}
+ {{ dateOnly(currentKnowledge.happenTime) }}
</el-descriptions-item>
<el-descriptions-item label="浜嬫晠鍙戠敓鍦扮偣">
{{ currentKnowledge.happenLocation }}
@@ -245,7 +245,7 @@
{{ currentKnowledge.createUserName }}
</el-descriptions-item>
<el-descriptions-item label="涓婃姤鏃堕棿">
- {{ currentKnowledge.createTime }}
+ {{ dateOnly(currentKnowledge.createTime) }}
</el-descriptions-item>
</el-descriptions>
<div class="detail-section">
diff --git a/src/views/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index a278058..e9ada57 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -69,10 +69,12 @@
show-overflow-tooltip />
<el-table-column label="涓婃姤鏃堕棿"
prop="createTime"
+ :formatter="formatDateColumn"
show-overflow-tooltip />
<el-table-column label="鏁存敼瀹屾垚鏈熼檺"
prop="rectifyTime"
width="120"
+ :formatter="formatDateColumn"
show-overflow-tooltip />
<el-table-column label="鏁存敼璐ｄ换浜�"
prop="rectifyUserName"
@@ -89,6 +91,7 @@
<el-table-column label="瀹為檯鏁存敼瀹屾垚鏃堕棿"
prop="rectifyActualTime"
width="120"
+ :formatter="formatDateColumn"
show-overflow-tooltip />
<el-table-column label="楠屾敹鎰忚"
prop="verifyRemark"
@@ -97,6 +100,7 @@
<el-table-column label="楠屾敹鏃堕棿"
prop="verifyTime"
width="120"
+ :formatter="formatDateColumn"
show-overflow-tooltip />
<el-table-column label="楠屾敹缁撴灉"
prop="verifyResult"
@@ -296,7 +300,7 @@
<span class="detail-title">{{ form.createUserName }}</span>
</el-descriptions-item>
<el-descriptions-item label="涓婃姤鏃堕棿">
- <span class="detail-title">{{ form.createTime }}</span>
+ <span class="detail-title">{{ dateOnly(form.createTime) }}</span>
</el-descriptions-item>
<el-descriptions-item label="鏁存敼璐ｄ换浜�">
<span class="detail-title">{{ form.rectifyUserName }}</span>
@@ -305,7 +309,7 @@
<span class="detail-title">{{ form.rectifyUserMobile }}</span>
</el-descriptions-item>
<el-descriptions-item label="鏁存敼瀹屾垚鏈熼檺">
- <span class="detail-title">{{ form.rectifyTime }}</span>
+ <span class="detail-title">{{ dateOnly(form.rectifyTime) }}</span>
</el-descriptions-item>
</el-descriptions>
<div class="classtitle"
@@ -320,7 +324,7 @@
<span class="detail-title">{{ form2.rectifyMeasures }}</span>
</el-descriptions-item>
<el-descriptions-item label="瀹為檯鏁存敼瀹屾垚鏃堕棿">
- <span class="detail-title">{{ form2.rectifyActualTime }}</span>
+ <span class="detail-title">{{ dateOnly(form2.rectifyActualTime) }}</span>
</el-descriptions-item>
</el-descriptions>
<div class="classtitle"
diff --git a/src/views/safeProduction/emergencyPlanReview/index.vue b/src/views/safeProduction/emergencyPlanReview/index.vue
index 1850c18..88f2ea2 100644
--- a/src/views/safeProduction/emergencyPlanReview/index.vue
+++ b/src/views/safeProduction/emergencyPlanReview/index.vue
@@ -187,7 +187,7 @@
<span>{{ currentKnowledge.planCode }}</span>
</el-descriptions-item>
<el-descriptions-item label="鍙戝竷鐢熸晥鏃堕棿">
- {{ currentKnowledge.publishTime }}
+ {{ dateOnly(currentKnowledge.publishTime) }}
</el-descriptions-item>
<el-descriptions-item label="鏍稿績璐ｄ换浜�">
{{ currentKnowledge.coreResponsorUserName }}
diff --git a/src/views/safeProduction/hazardousMaterialsControl/index.vue b/src/views/safeProduction/hazardousMaterialsControl/index.vue
index e43b4f6..a732351 100644
--- a/src/views/safeProduction/hazardousMaterialsControl/index.vue
+++ b/src/views/safeProduction/hazardousMaterialsControl/index.vue
@@ -178,7 +178,7 @@
<span>{{ form.applyPurpose }}</span>
</el-descriptions-item>
<el-descriptions-item label="棰嗙敤鏃堕棿">
- <span>{{ form.applyTime }}</span>
+ <span>{{ dateOnly(form.applyTime) }}</span>
</el-descriptions-item>
<el-descriptions-item label="棰嗙敤鏁伴噺">
<span>{{ form.applyQty }}</span>
@@ -192,7 +192,7 @@
</el-descriptions-item>
<el-descriptions-item v-if="dialogType === 'view' && form.returnTime"
label="褰掕繕鏃堕棿">
- <span>{{ form.returnTime }}</span>
+ <span>{{ dateOnly(form.returnTime) }}</span>
</el-descriptions-item>
<el-descriptions-item v-if="dialogType === 'view' && form.returnUserId"
label="褰掕繕鎯呭喌璇存槑">
diff --git a/src/views/safeProduction/safeQualifications/index.vue b/src/views/safeProduction/safeQualifications/index.vue
index 39111be..13a5b7c 100644
--- a/src/views/safeProduction/safeQualifications/index.vue
+++ b/src/views/safeProduction/safeQualifications/index.vue
@@ -97,6 +97,7 @@
<el-table-column label="鏈夋晥鏈�"
prop="effectiveTime"
width="120"
+ :formatter="formatDateColumn"
show-overflow-tooltip />
<el-table-column fixed="right"
label="鎿嶄綔"
diff --git a/src/views/salesManagement/returnOrder/components/detailDia.vue b/src/views/salesManagement/returnOrder/components/detailDia.vue
index a09149f..bf89dc0 100644
--- a/src/views/salesManagement/returnOrder/components/detailDia.vue
+++ b/src/views/salesManagement/returnOrder/components/detailDia.vue
@@ -19,7 +19,7 @@
</template>
<!-- <el-descriptions-item label="椤圭洰鍚嶇О">{{ detail.projectName }}</el-descriptions-item> -->
<el-descriptions-item label="鍒跺崟浜�">{{ detail.maker }}</el-descriptions-item>
- <el-descriptions-item label="鍒跺崟鏃堕棿">{{ detail.makeTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍒跺崟鏃堕棿">{{ dateOnly(detail.makeTime) }}</el-descriptions-item>
<el-descriptions-item label="閫�璐у師鍥�">{{ detail.returnReason }}</el-descriptions-item>
<el-descriptions-item label="閫�娆炬�婚">{{ detail.refundAmount }}</el-descriptions-item>
</el-descriptions>
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index d27c25b..fea3338 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -35,7 +35,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />鍒涘缓鏃ユ湡
- <div class="pull-right">{{ state.user.createTime }}</div>
+ <div class="pull-right">{{ dateOnly(state.user.createTime) }}</div>
</li>
</ul>
</div>
--
Gitblit v1.9.3