From 1390eec135de33236c025457d5b21008b67f33c8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 11 十月 2026 14:06:21 +0800
Subject: [PATCH] fix: 优化日期格式化显示逻辑
---
src/views/collaborativeApproval/notificationManagement/summary/index.vue | 8
src/views/personnelManagement/scheduling/index.vue | 6
src/views/financialManagement/salesRefund/components/ReceiptandRefundPopupWindow.vue | 2
src/views/inventoryManagement/stockWarning/index.vue | 6
src/views/salesManagement/paymentShipping/index.vue | 2
src/views/collaborativeApproval/sealManagement/index.vue | 2
src/views/salesManagement/salespersonManagement/index.vue | 2
src/views/equipmentManagement/gasTank/simple.vue | 2
src/views/salesManagement/invoiceLedger/index.vue | 4
src/views/monitor/job/log.vue | 2
src/views/inventoryManagement/vehicleManagement/index.vue | 9
src/views/financialManagement/salesRefund/index.vue | 2
src/layout/components/NotificationCenter/index.vue | 4
src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue | 8
src/views/tool/gen/index.vue | 6
src/views/salesManagement/orderManagement/index.vue | 2
src/utils/index.js | 23 --
src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue | 4
src/views/inventoryManagement/stockReport/index.vue | 3
src/views/reportAnalysis/dataDashboard/index0.vue | 2
src/views/collaborativeApproval/noticeManagement/index.vue | 2
src/views/procurementManagement/returnManagement/index.vue | 2
src/utils/ruoyi.js | 23 ++
src/views/salesManagement/receiptPaymentLedger/index.vue | 3
src/views/safeProduction/emergencyPlanReview/index.vue | 2
src/views/procurementManagement/paymentEntry/index.vue | 4
src/views/salesManagement/salesLedger/index.vue | 10
src/views/personnelManagement/selfService/index.vue | 10
src/views/safeProduction/accidentReportingRecord/index.vue | 4
src/views/fileManagement/bookshelf/detail.vue | 2
src/views/monitor/server/index.vue | 4
src/views/oaSystem/projectManagement/components/phaseGoalList.vue | 2
src/views/equipmentManagement/attendanceManagement/index.vue | 2
src/views/inventoryManagement/stockManagement/Unqualified.vue | 10
src/views/collaborativeApproval/knowledgeBase/index.vue | 2
src/views/reportAnalysis/reportManagement.vue | 4
src/views/collaborativeApproval/attendanceManagement/index.vue | 18 +-
src/views/chatHome/chatHomeIndex/MobileChat.vue | 4
src/views/safeProduction/safeQualifications/index.vue | 2
src/views/collaborativeApproval/reportGeneration/index.vue | 4
src/views/salesManagement/receiptPayment/index.vue | 4
src/components/PIMTable/PIMTable.vue | 12
src/views/inventoryManagement/stockManagement/Qualified.vue | 10
src/views/collaborativeApproval/customerVisit/index.vue | 4
src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue | 4
src/views/equipmentManagement/deviceInfo/index.vue | 4
src/views/personnelManagement/classsSheduling/index.vue | 2
src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue | 4
src/views/oaSystem/projectManagement/projectDetail.vue | 4
src/views/safeProduction/dangerInvestigation/index.vue | 14
src/views/energyManagement/energyCockpit/index.vue | 2
src/views/index.vue | 4
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 8
src/views/personnelManagement/attendanceCheckin/index.vue | 12
src/views/energyManagement/meterCollection/index.vue | 4
src/views/safeProduction/safetyTrainingAssessment/detail.vue | 2
src/views/collaborativeApproval/purchaseApproval/index.vue | 3
src/views/inventoryManagement/vehicleFuelManagement/index.vue | 3
src/views/basicData/customerFile/index.vue | 4
src/views/procurementManagement/procurementPlan/index.vue | 2
src/views/collaborativeApproval/planTemplate/index.vue | 6
src/views/qualityManagement/visualization/qualityDashboard.vue | 2
src/views/procurementManagement/advancedPriceManagement/index.vue | 4
src/views/inventoryManagement/receiptManagement/Record.vue | 2
src/views/equipmentManagement/upkeep/index.vue | 2
src/views/salesManagement/deliveryLedger/index.vue | 4
src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue | 8
src/views/equipmentManagement/operationManagement/index.vue | 6
src/views/salesManagement/strategyControl/index.vue | 8
src/views/system/user/profile/index.vue | 2
src/views/inventoryManagement/issueManagement/index.vue | 2
src/views/productionManagement/safetyMonitoring/index.vue | 2
src/views/safeProduction/safeWorkApproval/components/approvalDia.vue | 8
src/views/salesManagement/salesQuotation/index.vue | 8
src/views/energyManagement/gasManagement/index.vue | 2
src/views/procurementManagement/procurementLedger/index.vue | 4
src/views/collaborativeApproval/processTracking/index.vue | 4
src/main.js | 3
src/views/inventoryManagement/transportTaskManagement/index.vue | 9
src/views/monitorManagement/videoMonitor/index.vue | 12
src/views/collaborativeApproval/officeSupplies/index.vue | 12
src/views/procurementManagement/qualityInspection/index.vue | 2
src/views/productionManagement/workOrder/index.vue | 8
src/views/reportAnalysis/qualityAnalysis/components/center-center.vue | 2
src/views/procurementManagement/purchaseOrder/index.vue | 2
src/views/procurementManagement/index.vue | 4
src/views/productManagement/productIdentifier/index.vue | 2
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 8
src/views/inventoryManagement/dispatchLog/Record.vue | 3
src/views/procurementManagement/purchaseReturnOrder/index.vue | 8
src/views/qualityManagement/afterSalesTraceability/index.vue | 2
src/views/monitor/job/index.vue | 2
src/views/demo/fakePage/index.vue | 2
src/views/oaSystem/projectManagement/index.vue | 6
src/views/procurementManagement/arrivalManagement/index.vue | 2
src/views/procurementManagement/priceManagement/index.vue | 2
src/views/monitorManagement/areaControl/index.vue | 6
src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue | 2
src/views/projectManagement/Management/projectDetail.vue | 24 +-
src/views/safeProduction/hazardousMaterialsControl/index.vue | 4
src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue | 2
src/views/energyManagement/dynamicEnergySaving/index.vue | 2
102 files changed, 258 insertions(+), 266 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 8e22459..aa5a030 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -202,14 +202,11 @@
style="width: 100%"
@click="goLink(scope.row, item.linkMethod)"
>
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
+ <span>{{ formatters(scope.row[item.prop], item.formatData) }}</span>
</div>
<!-- 榛樿绾睍绀烘暟鎹� -->
<div v-else class="cell" style="width: 100%">
- <span v-if="!item.formatData">{{ scope.row[item.prop] }}</span>
- <span v-else>{{
- formatters(scope.row[item.prop], item.formatData)
- }}</span>
+ <span>{{ formatters(scope.row[item.prop], item.formatData) }}</span>
</div>
</template>
</el-table-column>
@@ -228,6 +225,7 @@
import pagination from "./Pagination.vue";
import { ref, inject, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
+import { dateOnly } from "@/utils/ruoyi";
// 鑾峰彇鍏ㄥ眬鐨� uploadHeader
const { proxy } = getCurrentInstance();
@@ -242,7 +240,9 @@
};
const formatters = (val, format) => {
- return typeof format === "function" ? format(val) : val;
+ if (typeof format === "function") return format(val);
+ // 鏈樉寮忔寚瀹氭牸寮忓寲鍑芥暟鏃讹細鏃ユ湡鏃堕棿缁熶竴鍙樉绀哄勾鏈堟棩锛堥潪鏃ユ湡鍊煎師鏍疯繑鍥烇級
+ return dateOnly(val);
};
// Props锛堜娇鐢� defineProps 鐨勯潪 TS 褰㈠紡锛�
diff --git a/src/layout/components/NotificationCenter/index.vue b/src/layout/components/NotificationCenter/index.vue
index 2517c22..2515d29 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">{{ $d(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">{{ $d(item.createTime) }}</div>
</div>
</div>
</div>
diff --git a/src/main.js b/src/main.js
index 0b3f714..5133bd4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -29,6 +29,7 @@
import { useDict } from "@/utils/dict";
import {
parseTime,
+ dateOnly,
resetForm,
addDateRange,
handleTree,
@@ -68,6 +69,8 @@
app.config.globalProperties.useDict = useDict;
app.config.globalProperties.download = download;
app.config.globalProperties.parseTime = parseTime;
+// 鍏ㄥ眬鏃ユ湡鏄剧ず锛堝彧鏄剧ず骞存湀鏃ワ級锛氭ā鏉块噷鐢� {{ $d(row.createTime) }} 鎴� :formatter="$d"
+app.config.globalProperties.$d = 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 809593f..f268ec7 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,27 +1,14 @@
-import { parseTime } from "./ruoyi";
+import { parseTime, dateOnly } from "./ruoyi";
/**
- * 琛ㄦ牸鏃堕棿鏍煎紡鍖�
+ * 琛ㄦ牸鏃堕棿鏍煎紡鍖栵紙鍙樉绀哄勾鏈堟棩锛屼笉鏄剧ず鏃跺垎绉掞級
*/
export function formatDate(cellValue) {
- if (cellValue == null || cellValue == "") return "";
- var date = new Date(cellValue);
- var year = date.getFullYear();
- var month =
- date.getMonth() + 1 < 10
- ? "0" + (date.getMonth() + 1)
- : date.getMonth() + 1;
- var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
- var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
- var minutes =
- date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
- var seconds =
- date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
- return (
- year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds
- );
+ return dateOnly(cellValue);
}
+export { dateOnly };
+
/**
* @param {number} time
* @param {string} option
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 0d72c1a..f0775bc 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -8,7 +8,8 @@
if (arguments.length === 0 || !time) {
return null
}
- const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+ // 榛樿鍙樉绀哄勾鏈堟棩锛堜笉鏄剧ず鏃跺垎绉掞級
+ const format = pattern || '{y}-{m}-{d}'
let date
if (typeof time === 'object') {
date = time
@@ -44,6 +45,26 @@
return time_str
}
+/**
+ * 鍙繚鐣欏勾鏈堟棩鐨勬棩鏈熸樉绀猴紙椤甸潰缁熶竴涓嶆樉绀烘椂鍒嗙锛�
+ * - 鏀寔 el-table-column 鐨� :formatter="(row, column, cellValue, index)" 绛惧悕
+ * - 鏀寔鐩存帴浼犲�硷細$d('2026-05-20 10:20:30') 鎴� $d(row.createTime)
+ * - 闈炴棩鏈熷�硷紙鏁板瓧/绾椂闂� '08:00:00'/绌哄��/宸叉牸寮忓寲鐨� yyyy-MM-dd锛変竴寰嬪師鏍疯繑鍥烇紝閬垮厤璇激銆岃�楁椂/澶╂暟銆嶇瓑鍒�
+ */
+export function dateOnly(a, b, c) {
+ const value = (c !== undefined && c !== null) ? c : a
+ if (value === null || value === undefined || value === '') return ''
+ // 鍙湁瀛楃涓叉墠闇�瑕佽鍓棩鏈燂紱鏁板瓧/甯冨皵/瀵硅薄/鏁扮粍鍘熸牱杩斿洖锛屼氦缁� Vue 姝ｅ父娓叉煋锛堥伩鍏嶅璞″彉鎴� [object Object]锛�
+ if (typeof value !== 'string') return value
+ const s = value
+ // 鍏跺畠鏍煎紡锛氬彧鍙栧舰濡� 2026-05-20 / 2026/5/20 寮�澶寸殑鏃ユ湡閮ㄥ垎
+ const m = s.match(/^(\d{4})[-/](\d{1,2})[-/](\d{1,2})/)
+ if (!m) return s
+ const mm = m[2].length === 1 ? '0' + m[2] : m[2]
+ const dd = m[3].length === 1 ? '0' + m[3] : m[3]
+ return `${m[1]}-${mm}-${dd}`
+}
+
// 琛ㄥ崟閲嶇疆
export function resetForm(refName) {
if (this.$refs[refName]) {
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 79b1616..70fafc2 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -453,7 +453,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">{{ $d(detailForm.maintenanceTime) }}</span>
</div>
</el-col>
</el-row>
@@ -474,7 +474,7 @@
style="width: 100%">
<el-table-column prop="followUpTime"
label="璺熻繘鏃堕棿"
- width="160" />
+ width="160" :formatter="$d" />
<el-table-column prop="followUpMethod"
label="璺熻繘鏂瑰紡"
width="100" />
diff --git a/src/views/chatHome/chatHomeIndex/MobileChat.vue b/src/views/chatHome/chatHomeIndex/MobileChat.vue
index adeb5e7..7adbad3 100644
--- a/src/views/chatHome/chatHomeIndex/MobileChat.vue
+++ b/src/views/chatHome/chatHomeIndex/MobileChat.vue
@@ -7,7 +7,7 @@
<div class="info-time">
<img :src="item.headImg" alt="" />
<span>{{ item.name }}</span>
- <span>{{ item.time }}</span>
+ <span>{{ $d(item.time) }}</span>
</div>
<div class="chat-text" v-if="item.chatType == 0">
<template v-if="isSend && index === chatList.length - 1">
@@ -30,7 +30,7 @@
<div class="chat-me" v-else>
<div class="info-time">
<span>{{ item.name }}</span>
- <span>{{ item.time }}</span>
+ <span>{{ $d(item.time) }}</span>
<img :src="item.headImg" alt="" />
</div>
<div class="chat-text" v-if="item.chatType == 0">
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 20a4ee6..ee88d3f 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -90,8 +90,8 @@
<el-descriptions-item label="鎶ヤ环鍗曞彿">{{ currentQuotation.quotationNo }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentQuotation.customer }}</el-descriptions-item>
<el-descriptions-item label="涓氬姟鍛�">{{ currentQuotation.salesperson }}</el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
- <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ $d(currentQuotation.quotationDate) }}</el-descriptions-item>
+ <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ $d(currentQuotation.validDate) }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
<el-descriptions-item label="鎶ヤ环鎬婚" :span="2">
<span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
@@ -138,8 +138,8 @@
<el-descriptions-item label="渚涘簲鍟嗗悕绉�">{{ currentPurchase.supplierName }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鍚嶇О">{{ currentPurchase.projectName }}</el-descriptions-item>
<el-descriptions-item label="閿�鍞悎鍚屽彿">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
- <el-descriptions-item label="绛捐鏃ユ湡">{{ currentPurchase.executionDate }}</el-descriptions-item>
- <el-descriptions-item label="褰曞叆鏃ユ湡">{{ currentPurchase.entryDate }}</el-descriptions-item>
+ <el-descriptions-item label="绛捐鏃ユ湡">{{ $d(currentPurchase.executionDate) }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ $d(currentPurchase.entryDate) }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentPurchase.paymentMethod }}</el-descriptions-item>
<el-descriptions-item label="鍚堝悓閲戦" :span="2">
<span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
diff --git a/src/views/collaborativeApproval/attendanceManagement/index.vue b/src/views/collaborativeApproval/attendanceManagement/index.vue
index f6a3e3c..6dabfe6 100644
--- a/src/views/collaborativeApproval/attendanceManagement/index.vue
+++ b/src/views/collaborativeApproval/attendanceManagement/index.vue
@@ -13,8 +13,8 @@
<el-tag :type="getTagType(scope.row.type)">{{ getTypeLabel(scope.row.type) }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" />
- <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" />
+ <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" :formatter="$d" />
+ <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" :formatter="$d" />
<el-table-column prop="days" label="澶╂暟" align="center" />
<el-table-column prop="status" label="鐘舵��" >
<template #default="scope">
@@ -76,8 +76,8 @@
<el-tag :type="getTagType(scope.row.type)">{{ getTypeLabel(scope.row.type) }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" />
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿" />
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" :formatter="$d" />
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿" :formatter="$d" />
<el-table-column prop="rate" label="鍊嶇巼" align="center" />
<el-table-column prop="status" label="鐘舵��" >
<template #default="scope">
@@ -103,8 +103,8 @@
<el-table :data="worktimeData" border style="width: 100%; margin-top: 20px;">
<el-table-column prop="name" label="鏃堕棿娈靛悕绉�" />
- <el-table-column prop="startTime" label="涓婄彮鏃堕棿"/>
- <el-table-column prop="endTime" label="涓嬬彮鏃堕棿" />
+ <el-table-column prop="startTime" label="涓婄彮鏃堕棿" :formatter="$d" />
+ <el-table-column prop="endTime" label="涓嬬彮鏃堕棿" :formatter="$d" />
<el-table-column prop="flexibleStart" label="寮规�т笂鐝�">
<template #default="scope">
<el-tag :type="scope.row.flexibleStart === 'true' ? 'success' : 'info'">
@@ -161,9 +161,9 @@
<el-table :data="filteredAttendanceData" border style="width: 100%;">
<el-table-column prop="employeeName" label="鍛樺伐濮撳悕" width="120" />
<el-table-column prop="department" label="閮ㄩ棬" width="120" />
- <el-table-column prop="date" label="鏃ユ湡" width="120" />
- <el-table-column prop="clockInTime" label="涓婄彮鎵撳崱" width="120" />
- <el-table-column prop="clockOutTime" label="涓嬬彮鎵撳崱" width="120" />
+ <el-table-column prop="date" label="鏃ユ湡" width="120" :formatter="$d" />
+ <el-table-column prop="clockInTime" label="涓婄彮鎵撳崱" width="120" :formatter="$d" />
+ <el-table-column prop="clockOutTime" label="涓嬬彮鎵撳崱" width="120" :formatter="$d" />
<el-table-column prop="workHours" label="宸ヤ綔鏃堕暱" width="100" align="center" />
<el-table-column prop="status" label="鐘舵��" width="100" align="center">
<template #default="scope">
diff --git a/src/views/collaborativeApproval/customerVisit/index.vue b/src/views/collaborativeApproval/customerVisit/index.vue
index 68396eb..81efb9f 100644
--- a/src/views/collaborativeApproval/customerVisit/index.vue
+++ b/src/views/collaborativeApproval/customerVisit/index.vue
@@ -40,7 +40,7 @@
<el-table-column label="鑱旂郴浜�" prop="contact" width="120" show-overflow-tooltip />
<el-table-column label="鑱旂郴鐢佃瘽" prop="contactPhone" width="140" show-overflow-tooltip />
<el-table-column label="鎷滆鐩殑" prop="purposeVisit" width="150" show-overflow-tooltip />
- <el-table-column label="鎷滆鏃堕棿" prop="purposeDate" width="180" show-overflow-tooltip />
+ <el-table-column label="鎷滆鏃堕棿" prop="purposeDate" width="180" show-overflow-tooltip :formatter="$d" />
<el-table-column label="鎷滆鍦扮偣" prop="visitAddress" min-width="200" show-overflow-tooltip />
<el-table-column label="鎷滆浜�" prop="visitingPeople" width="120" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
@@ -93,7 +93,7 @@
</div>
<div class="info-item">
<span class="info-label">鎷滆鏃堕棿</span>
- <span class="info-value">{{ detailForm.purposeDate || '-' }}</span>
+ <span class="info-value">{{ $d(detailForm.purposeDate) || '-' }}</span>
</div>
<div class="info-item">
<span class="info-label">鎷滆鍦扮偣</span>
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index bdce9bd..b737faa 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 }}
+ {{ $d(currentKnowledge.createTime) }}
</el-descriptions-item>
</el-descriptions>
diff --git a/src/views/collaborativeApproval/noticeManagement/index.vue b/src/views/collaborativeApproval/noticeManagement/index.vue
index ab39769..2adb6ea 100644
--- a/src/views/collaborativeApproval/noticeManagement/index.vue
+++ b/src/views/collaborativeApproval/noticeManagement/index.vue
@@ -60,7 +60,7 @@
</div>
<div class="card-info">
<span class="creator">{{ notice.createUserName }}</span>
- <span class="expiration" v-if="notice.expirationDate">鎴鏃ユ湡锛歿{ notice.expirationDate }}</span>
+ <span class="expiration" v-if="notice.expirationDate">鎴鏃ユ湡锛歿{ $d(notice.expirationDate) }}</span>
</div>
</div>
<div class="card-remark" v-if="notice.remark">
diff --git a/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue b/src/views/collaborativeApproval/notificationManagement/meetDraft/index.vue
index 11d1774..399d870 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="$d" />
<el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
<template #default="scope">
<el-button type="primary" link @click="viewDraft(scope.row)">鏌ョ湅</el-button>
@@ -83,7 +83,7 @@
<el-descriptions-item label="浼氳鏃堕棿" :span="2">
{{ formatDateTime(currentDraft.meetingTime) }}
</el-descriptions-item>
- <el-descriptions-item label="鍒涘缓鏃堕棿">{{ currentDraft.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍒涘缓鏃堕棿">{{ $d(currentDraft.createTime) }}</el-descriptions-item>
</el-descriptions>
<div class="content-section mt-20">
diff --git a/src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue b/src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue
index 26e2c24..aa5b876 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue
@@ -1,4 +1,4 @@
-<template>
+锘�<template>
<div>
<el-form :model="searchForm" inline>
@@ -102,9 +102,7 @@
{{ getStatusText(currentMeeting.status) }}
</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{
- currentMeeting.createTime
- }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{ $d(currentMeeting.createTime) }}</el-descriptions-item>
<el-descriptions-item style="max-height: 400px" label="浼氳璇存槑" :span="2"
label-class-name="nowrap-label">{{ currentMeeting.description }}</el-descriptions-item>
</el-descriptions>
@@ -236,7 +234,7 @@
it.location = `${room.name}(${room.location})`
let staffs = JSON.parse(it.participants)
it.staffCount = staffs.size
- it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format('HH:mm:ss')} ~ ${dayjs(it.endTime).format('HH:mm:ss')}`
+ it.meetingTime = `${it.meetingDate}`
it.participants = staffList.value.filter(staff => staffs.some(id=>id === staff.id)).map(staff => {
return {
id: staff.id,
diff --git a/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue b/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
index 9b5325f..7faf6ba 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetIndex/index.vue
@@ -50,7 +50,7 @@
>
<div v-if="cell.type === 'meeting'" class="meeting-content">
<div class="meeting-title">{{ cell.meeting.title }}</div>
- <div class="meeting-time">{{ cell.startTime }}-{{ cell.endTime }}</div>
+ <div class="meeting-time">{{ $d(cell.startTime) }}</div>
</div>
<div v-else class="free-content">
绌洪棽
@@ -73,7 +73,7 @@
<el-descriptions :column="1" border>
<el-descriptions-item label="浼氳涓婚">{{ currentMeeting.title }}</el-descriptions-item>
<el-descriptions-item label="浼氳瀹�">{{ currentMeeting.room }}</el-descriptions-item>
- <el-descriptions-item label="浼氳鏃堕棿">{{ currentMeeting.time }}</el-descriptions-item>
+ <el-descriptions-item label="浼氳鏃堕棿">{{ $d(currentMeeting.time) }}</el-descriptions-item>
<el-descriptions-item label="涓绘寔浜�">{{ currentMeeting.host }}</el-descriptions-item>
<el-descriptions-item label="鍙備細浜烘暟">{{ currentMeeting.participants }}浜�</el-descriptions-item>
<el-descriptions-item label="浼氳璇存槑">{{ currentMeeting.description }}</el-descriptions-item>
diff --git a/src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue b/src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue
index dace531..cc689b9 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue
@@ -1,4 +1,4 @@
-<template>
+锘�<template>
<div>
<el-form :model="searchForm" inline>
@@ -100,9 +100,7 @@
{{ getStatusText(currentMeeting.status) }}
</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{
- currentMeeting.createTime
- }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{ $d(currentMeeting.createTime) }}</el-descriptions-item>
<el-descriptions-item style="max-height: 400px" label="浼氳璇存槑" :span="2"
label-class-name="nowrap-label">{{ currentMeeting.description }}</el-descriptions-item>
</el-descriptions>
@@ -235,7 +233,7 @@
let staffs = JSON.parse(it.participants)
it.staffCount = staffs.size
it.status = it.publishStatus
- it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format('HH:mm:ss')} ~ ${dayjs(it.endTime).format('HH:mm:ss')}`
+ it.meetingTime = `${it.meetingDate}`
it.participants = staffList.value.filter(staff => staffs.some(id=>id === staff.id)).map(staff => {
return {
id: staff.id,
diff --git a/src/views/collaborativeApproval/notificationManagement/summary/index.vue b/src/views/collaborativeApproval/notificationManagement/summary/index.vue
index 2b26723..02a0a9d 100644
--- a/src/views/collaborativeApproval/notificationManagement/summary/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/summary/index.vue
@@ -1,4 +1,4 @@
-<template>
+锘�<template>
<div>
<el-form :model="searchForm" inline>
@@ -86,9 +86,7 @@
{{ getStatusText(currentMeeting.status) }}
</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{
- currentMeeting.createTime
- }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿" label-class-name="nowrap-label">{{ $d(currentMeeting.createTime) }}</el-descriptions-item>
<el-descriptions-item style="max-height: 400px" label="浼氳璇存槑" :span="2"
label-class-name="nowrap-label">{{ currentMeeting.description }}</el-descriptions-item>
</el-descriptions>
@@ -210,7 +208,7 @@
it.location = `${room.name}(${room.location})`
let staffs = JSON.parse(it.participants)
it.staffCount = staffs.size
- it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format('HH:mm:ss')} ~ ${dayjs(it.endTime).format('HH:mm:ss')}`
+ it.meetingTime = `${it.meetingDate}`
it.participants = staffList.value.filter(staff => staffs.some(id => id === staff.id)).map(staff => {
return {
id: staff.id,
diff --git a/src/views/collaborativeApproval/officeSupplies/index.vue b/src/views/collaborativeApproval/officeSupplies/index.vue
index a2d1c6d..88bbba2 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="$d" />
<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="$d" />
+ <el-table-column label="鍙戞斁鏃堕棿" align="center" prop="issueTime" width="180" :formatter="$d" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="200">
<template #default="scope">
<el-button
@@ -239,11 +239,11 @@
{{ getStatusText(currentDetail.status) }}
</el-tag>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠鏃堕棿">{{ currentDetail.applyTime }}</el-descriptions-item>
+ <el-descriptions-item label="鐢宠鏃堕棿">{{ $d(currentDetail.applyTime) }}</el-descriptions-item>
<el-descriptions-item label="瀹℃壒浜�">{{ currentDetail.approval || '-' }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃壒鏃堕棿">{{ currentDetail.approvalTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹℃壒鏃堕棿">{{ $d(currentDetail.approvalTime) || '-' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃壒鎰忚" :span="2">{{ currentDetail.approvalOpinions || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鍙戞斁鏃堕棿">{{ currentDetail.issueTime || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戞斁鏃堕棿">{{ $d(currentDetail.issueTime) || '-' }}</el-descriptions-item>
<el-descriptions-item label="鍙戞斁浜�">{{ currentDetail.issueUser || '-' }}</el-descriptions-item>
</el-descriptions>
</el-dialog>
diff --git a/src/views/collaborativeApproval/planTemplate/index.vue b/src/views/collaborativeApproval/planTemplate/index.vue
index fa2bfd9..3536dbe 100644
--- a/src/views/collaborativeApproval/planTemplate/index.vue
+++ b/src/views/collaborativeApproval/planTemplate/index.vue
@@ -144,7 +144,7 @@
<div class="plan-meta">
<div class="meta-item">
<el-icon><Calendar /></el-icon>
- <span>{{ plan.startDate }} - {{ plan.endDate }}</span>
+ <span>{{ $d(plan.startDate) }} - {{ $d(plan.endDate) }}</span>
</div>
<div class="meta-item">
<el-icon><User /></el-icon>
@@ -302,8 +302,8 @@
<el-descriptions-item label="璁″垝鎻忚堪">{{ currentPlanDetail.description }}</el-descriptions-item>
<el-descriptions-item label="璁″垝绾у埆">{{ getCurrentLevelText(currentPlanDetail.level) }}</el-descriptions-item>
<el-descriptions-item label="鏃堕棿鍛ㄦ湡">{{ getCurrentPeriodText(currentPlanDetail.period) }}</el-descriptions-item>
- <el-descriptions-item label="寮�濮嬫椂闂�">{{ currentPlanDetail.startDate }}</el-descriptions-item>
- <el-descriptions-item label="缁撴潫鏃堕棿">{{ currentPlanDetail.endDate }}</el-descriptions-item>
+ <el-descriptions-item label="寮�濮嬫椂闂�">{{ $d(currentPlanDetail.startDate) }}</el-descriptions-item>
+ <el-descriptions-item label="缁撴潫鏃堕棿">{{ $d(currentPlanDetail.endDate) }}</el-descriptions-item>
<el-descriptions-item label="璐熻矗浜�">{{ currentPlanDetail.assignee }}</el-descriptions-item>
<el-descriptions-item label="浼樺厛绾�">{{ getPriorityText(currentPlanDetail.priority) }}</el-descriptions-item>
<el-descriptions-item label="鏍囩">{{ currentPlanDetail.tags.join(', ') }}</el-descriptions-item>
diff --git a/src/views/collaborativeApproval/processTracking/index.vue b/src/views/collaborativeApproval/processTracking/index.vue
index 197a438..497508e 100644
--- a/src/views/collaborativeApproval/processTracking/index.vue
+++ b/src/views/collaborativeApproval/processTracking/index.vue
@@ -54,8 +54,8 @@
<el-progress :percentage="row.progress" :status="getProgressStatus(row.status)" />
</template>
</el-table-column>
- <el-table-column prop="startDate" label="寮�濮嬫椂闂�" width="120" />
- <el-table-column prop="endDate" label="缁撴潫鏃堕棿" width="120" />
+ <el-table-column prop="startDate" label="寮�濮嬫椂闂�" width="120" :formatter="$d" />
+ <el-table-column prop="endDate" label="缁撴潫鏃堕棿" width="120" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="150">
<template #default="{ row }">
<el-button type="text" @click="updateStatus(row)">鏇存柊鐘舵��</el-button>
diff --git a/src/views/collaborativeApproval/purchaseApproval/index.vue b/src/views/collaborativeApproval/purchaseApproval/index.vue
index af17bbe..e0ccfc8 100644
--- a/src/views/collaborativeApproval/purchaseApproval/index.vue
+++ b/src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -156,8 +156,7 @@
label="褰曞叆鏃ユ湡"
prop="entryDate"
width="100"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
fixed="right"
label="鎿嶄綔"
diff --git a/src/views/collaborativeApproval/reportGeneration/index.vue b/src/views/collaborativeApproval/reportGeneration/index.vue
index c160ad7..b00b1a5 100644
--- a/src/views/collaborativeApproval/reportGeneration/index.vue
+++ b/src/views/collaborativeApproval/reportGeneration/index.vue
@@ -65,8 +65,8 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="椤圭洰鍚嶇О">{{ reportData.projectInfo.name }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰缁忕悊">{{ reportData.projectInfo.manager }}</el-descriptions-item>
- <el-descriptions-item label="寮�濮嬫椂闂�">{{ reportData.projectInfo.startDate }}</el-descriptions-item>
- <el-descriptions-item label="缁撴潫鏃堕棿">{{ reportData.projectInfo.endDate }}</el-descriptions-item>
+ <el-descriptions-item label="寮�濮嬫椂闂�">{{ $d(reportData.projectInfo.startDate) }}</el-descriptions-item>
+ <el-descriptions-item label="缁撴潫鏃堕棿">{{ $d(reportData.projectInfo.endDate) }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鐘舵��">
<el-tag :type="getStatusType(reportData.projectInfo.status)">
{{ reportData.projectInfo.status }}
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index 6f55955..62b29db 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -145,7 +145,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="鍙戝竷鏃堕棿">{{ $d(currentRegulationDetail.createTime) }}</el-descriptions-item>
</el-descriptions>
<div class="mt-20">
<h4>鍒跺害鍐呭</h4>
@@ -170,7 +170,7 @@
width="100" />
<el-table-column prop="updateTime"
label="鏇存柊鏃堕棿"
- width="180" />
+ width="180" :formatter="$d" />
<el-table-column prop="createUserName"
label="鏇存柊浜�"
width="120" />
@@ -198,10 +198,10 @@
width="150" />
<el-table-column prop="createTime"
label="闃呰鏃堕棿"
- width="180" />
+ width="180" :formatter="$d" />
<el-table-column prop="confirmTime"
label="纭鏃堕棿"
- width="180" />
+ width="180" :formatter="$d" />
<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 a6232c2..c49e902 100644
--- a/src/views/collaborativeApproval/sealManagement/index.vue
+++ b/src/views/collaborativeApproval/sealManagement/index.vue
@@ -111,7 +111,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="鐢宠鏃堕棿">{{ $d(currentSealDetail.createTime) }}</el-descriptions-item>
<el-descriptions-item label="鐘舵��">
<el-tag :type="getStatusType(currentSealDetail.status)">
{{ getStatusText(currentSealDetail.status) }}
diff --git a/src/views/demo/fakePage/index.vue b/src/views/demo/fakePage/index.vue
index 42cef72..0f36197 100644
--- a/src/views/demo/fakePage/index.vue
+++ b/src/views/demo/fakePage/index.vue
@@ -36,7 +36,7 @@
<el-tag :type="scope.row.status === '鍚敤' ? 'success' : 'info'">{{ scope.row.status }}</el-tag>
</template>
</el-table-column>
- <el-table-column prop="updatedAt" label="鏇存柊鏃堕棿" min-width="160" />
+ <el-table-column prop="updatedAt" label="鏇存柊鏃堕棿" min-width="160" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="180" fixed="right">
<template #default="scope">
<el-button link type="primary" @click="openEdit(scope.row)">缂栬緫</el-button>
diff --git a/src/views/energyManagement/dynamicEnergySaving/index.vue b/src/views/energyManagement/dynamicEnergySaving/index.vue
index 8976b22..f7efbd4 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="$d" />
<el-table-column label="鎿嶄綔">
<template #default="scope">
<el-button
diff --git a/src/views/energyManagement/energyCockpit/index.vue b/src/views/energyManagement/energyCockpit/index.vue
index 9281e37..92ca2a6 100644
--- a/src/views/energyManagement/energyCockpit/index.vue
+++ b/src/views/energyManagement/energyCockpit/index.vue
@@ -202,7 +202,7 @@
<div class="abnormal-content">
<div class="abnormal-title">{{ item.title }}</div>
<div class="abnormal-desc">{{ item.description }}</div>
- <div class="abnormal-time">{{ item.time }}</div>
+ <div class="abnormal-time">{{ $d(item.time) }}</div>
</div>
<div class="abnormal-action">
<el-button link size="small" @click="handleAbnormal(item)">澶勭悊</el-button>
diff --git a/src/views/energyManagement/gasManagement/index.vue b/src/views/energyManagement/gasManagement/index.vue
index a9b9abe..78bc4eb 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="$d" />
<el-table-column label="鎿嶄綔" align="center" width="100" fixed="right">
<template #default="scope">
<el-button link size="small" @click="editDevice(scope.row)">
diff --git a/src/views/energyManagement/meterCollection/index.vue b/src/views/energyManagement/meterCollection/index.vue
index dfa5617..5d17484 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="$d" />
<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>{{ $d(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..23cbe5b 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="$d" />
<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/deviceInfo/index.vue b/src/views/equipmentManagement/deviceInfo/index.vue
index de162cc..1ff9bfe 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">{{ $d(deviceInfo.updateTime) }}</span>
</div>
<div class="maintenance-item">
<span class="label">涓嬫缁存姢锛�</span>
- <span class="value">{{ deviceInfo.createTime }}</span>
+ <span class="value">{{ $d(deviceInfo.createTime) }}</span>
</div>
<div class="maintenance-item">
<span class="label">缁存姢鐘舵�侊細</span>
diff --git a/src/views/equipmentManagement/gasTank/simple.vue b/src/views/equipmentManagement/gasTank/simple.vue
index 4cb2d76..197dc8b 100644
--- a/src/views/equipmentManagement/gasTank/simple.vue
+++ b/src/views/equipmentManagement/gasTank/simple.vue
@@ -119,7 +119,7 @@
<div class="maintenance-list">
<div class="maintenance-item" v-for="record in maintenanceRecords" :key="record.id">
<div class="record-header">
- <span class="record-date">{{ record.date }}</span>
+ <span class="record-date">{{ $d(record.date) }}</span>
<el-tag :type="record.type === 'inspection' ? 'primary' : 'success'" size="small">
{{ record.type === 'inspection' ? '妫�楠�' : '缁存姢' }}
</el-tag>
diff --git a/src/views/equipmentManagement/operationManagement/index.vue b/src/views/equipmentManagement/operationManagement/index.vue
index 008cc2c..de71c78 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 || '-' }}
+ {{ $d(scope.row.planRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
@@ -84,7 +84,7 @@
align="center"
>
<template #default="scope">
- {{ scope.row.startRuntimeTime || '-' }}
+ {{ $d(scope.row.startRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
@@ -94,7 +94,7 @@
align="center"
>
<template #default="scope">
- {{ scope.row.endRuntimeTime || '-' }}
+ {{ $d(scope.row.endRuntimeTime) || '-' }}
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue
index 543e37b..c2cb1b7 100644
--- a/src/views/equipmentManagement/upkeep/index.vue
+++ b/src/views/equipmentManagement/upkeep/index.vue
@@ -389,7 +389,7 @@
align: "center",
prop: "maintenanceActuallyTime",
formatData: (cell) =>
- cell ? dayjs(cell).format("YYYY-MM-DD HH:mm:ss") : "-",
+ cell ? dayjs(cell).format("YYYY-MM-DD") : "-",
},
{
label: "淇濆吇缁撴灉",
diff --git a/src/views/fileManagement/bookshelf/detail.vue b/src/views/fileManagement/bookshelf/detail.vue
index 5d7d3ac..8b66d6a 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="鍏ュ簱鏃堕棿">{{ $d(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/financialManagement/salesRefund/components/ReceiptandRefundPopupWindow.vue b/src/views/financialManagement/salesRefund/components/ReceiptandRefundPopupWindow.vue
index d8218c1..72d7c8d 100644
--- a/src/views/financialManagement/salesRefund/components/ReceiptandRefundPopupWindow.vue
+++ b/src/views/financialManagement/salesRefund/components/ReceiptandRefundPopupWindow.vue
@@ -116,7 +116,7 @@
</div>
</div>
<el-table :data="form.sourceList" border>
- <el-table-column label="鍗曟嵁鏃ユ湡" minWidth="160" prop="billDate" />
+ <el-table-column label="鍗曟嵁鏃ユ湡" minWidth="160" prop="billDate" :formatter="$d" />
<el-table-column label="鍗曟嵁绫诲瀷" minWidth="160" prop="billType" />
<el-table-column label="鍗曟嵁缂栧彿" minWidth="200" prop="billNo" />
<el-table-column label="鍗曟嵁閲戦" minWidth="120" prop="billAmount" />
diff --git a/src/views/financialManagement/salesRefund/index.vue b/src/views/financialManagement/salesRefund/index.vue
index ccb775f..47cc01b 100644
--- a/src/views/financialManagement/salesRefund/index.vue
+++ b/src/views/financialManagement/salesRefund/index.vue
@@ -23,7 +23,7 @@
</template>
</el-table-column>
<el-table-column label="鍒涘缓浜�" prop="createUserName" align="center" />
- <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" align="center" />
+ <el-table-column label="鍒涘缓鏃堕棿" prop="createTime" align="center" :formatter="$d" />
<el-table-column label="鎿嶄綔" align="center" width="150">
<template #default="scope">
<el-button link type="primary" @click="openDetail(scope.row)" style="color: #67C23A">璇︽儏</el-button>
diff --git a/src/views/index.vue b/src/views/index.vue
index 4ae5fe4..edbf1c3 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -11,7 +11,7 @@
<span class="welcome-user">{{ userStore.roleName || '绯荤粺绠＄悊鍛�' }}</span>
<span> 鎮ㄥソ锛佺鎮ㄥ紑蹇冩瘡涓�澶�</span>
</div>
- <div class="welcome-time">鐧诲綍浜�: {{ userStore.currentLoginTime }}</div>
+ <div class="welcome-time">鐧诲綍浜�: {{ $d(userStore.currentLoginTime) }}</div>
</div>
<!-- 鐢ㄦ埛淇℃伅鍗＄墖 -->
@@ -82,7 +82,7 @@
<div style="display: flex;justify-content: space-between;align-items: center;">
<div class="todo-title">寰呭姙缂栧彿锛歿{ item.approveId }}</div>
<div class="todo-division">閮ㄩ棬锛歿{ item.approveDeptName }}</div>
- <div class="todo-time">{{ item.approveTime }}</div>
+ <div class="todo-time">{{ $d(item.approveTime) }}</div>
</div>
<div class="todo-division">寰呭姙浜嬬敱锛歿{ item.approveReason }}</div>
</div>
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index a7a8a4b..38c18d8 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -54,8 +54,7 @@
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
label="浜у搧澶х被"
prop="productName"
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 2bba7d0..e507841 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="$d" />
<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 3f90edf..00c3c94 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -60,7 +60,7 @@
show-overflow-tooltip/>
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
- show-overflow-tooltip/>
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip/>
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index a958f42..c1a632d 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -30,12 +30,12 @@
<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 fixed="right" label="鎿嶄綔" min-width="90" align="center">
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip :formatter="$d" />
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
- <el-button link type="primary" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
- <el-button link type="primary" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
+ <el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
+ <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
+ <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 55662be..31879c3 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -26,12 +26,12 @@
<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 fixed="right" label="鎿嶄綔" min-width="90" align="center">
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip :formatter="$d" />
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
- <el-button link type="primary" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
- <el-button link type="primary" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
+ <el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
+ <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
+ <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 89773cf..1bd69e2 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -166,8 +166,7 @@
prop="createTime"
width="200"
show-overflow-tooltip
- v-if="searchForm.reportType !== 'inout'"
- />
+ v-if="searchForm.reportType !== 'inout'" :formatter="$d" />
<el-table-column
label="鍏ュ簱鎵规"
prop="inboundBatches"
diff --git a/src/views/inventoryManagement/stockWarning/index.vue b/src/views/inventoryManagement/stockWarning/index.vue
index b5216cb..4a120fc 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="$d" />
<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="$d" />
+ <el-table-column label="棰勮鍏呰鏃堕棿" prop="expectedRefillTime" width="150" show-overflow-tooltip :formatter="$d" />
<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 1feb54b..fd47fec 100644
--- a/src/views/inventoryManagement/transportTaskManagement/index.vue
+++ b/src/views/inventoryManagement/transportTaskManagement/index.vue
@@ -154,20 +154,17 @@
prop="loadTime"
label="瑁呰揣鏃堕棿"
width="160"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
prop="deliveryTime"
label="閫佽揣鏃堕棿"
width="160"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
prop="signTime"
label="绛炬敹鏃堕棿"
width="160"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="鐘舵��" width="110" align="center">
<template #default="scope">
<el-tag :type="statusTagType(scope.row.status)">
diff --git a/src/views/inventoryManagement/vehicleFuelManagement/index.vue b/src/views/inventoryManagement/vehicleFuelManagement/index.vue
index 8579cba..9ea2a74 100644
--- a/src/views/inventoryManagement/vehicleFuelManagement/index.vue
+++ b/src/views/inventoryManagement/vehicleFuelManagement/index.vue
@@ -64,8 +64,7 @@
prop="fuelDate"
label="鍔犳补鏃ユ湡"
width="120"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
prop="gunNo"
label="娌规灙鍙�"
diff --git a/src/views/inventoryManagement/vehicleManagement/index.vue b/src/views/inventoryManagement/vehicleManagement/index.vue
index 1e383c6..17fc866 100644
--- a/src/views/inventoryManagement/vehicleManagement/index.vue
+++ b/src/views/inventoryManagement/vehicleManagement/index.vue
@@ -116,8 +116,7 @@
prop="purchaseDate"
label="璐疆鏃ユ湡"
width="120"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
prop="licenseNumber"
label="琛岄┒璇佺紪鍙�"
@@ -128,14 +127,12 @@
prop="licenseIssueDate"
label="鍙戣瘉鏃ユ湡"
width="120"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column
prop="licenseExpireDate"
label="鍒版湡鏃ユ湡"
width="120"
- show-overflow-tooltip
- />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="鐘舵��" width="100" align="center">
<template #default="scope">
<el-tag :type="statusTagType(scope.row.status)">
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index ee291a4..6d44309 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -242,7 +242,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="浠诲姟鍒嗙粍锛�">{{ jobGroupFormat(form) }}</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿锛�">{{ form.createTime }}</el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿锛�">{{ $d(form.createTime) }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="cron琛ㄨ揪寮忥細">{{ form.cronExpression }}</el-form-item>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index b425e45..9e5bc2c 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="鎵ц鏃堕棿锛�">{{ $d(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/monitor/server/index.vue b/src/views/monitor/server/index.vue
index d9840ac..d5c1f2c 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -112,9 +112,9 @@
</tr>
<tr>
<td class="el-table__cell is-leaf"><div class="cell">鍚姩鏃堕棿</div></td>
- <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ $d(server.jvm.startTime) }}</div></td>
<td class="el-table__cell is-leaf"><div class="cell">杩愯鏃堕暱</div></td>
- <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</div></td>
+ <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ $d(server.jvm.runTime) }}</div></td>
</tr>
<tr>
<td colspan="1" class="el-table__cell is-leaf"><div class="cell">瀹夎璺緞</div></td>
diff --git a/src/views/monitorManagement/areaControl/index.vue b/src/views/monitorManagement/areaControl/index.vue
index 1dd5a36..0db77db 100644
--- a/src/views/monitorManagement/areaControl/index.vue
+++ b/src/views/monitorManagement/areaControl/index.vue
@@ -66,8 +66,8 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="鐩爣鍖哄煙">{{ accessResult.zone.name }}</el-descriptions-item>
- <el-descriptions-item label="鏈�杩戝煿璁�">{{ accessResult.person.training.lastDate }}</el-descriptions-item>
- <el-descriptions-item label="閫傚矖璇佹湁鏁堟湡">{{ accessResult.person.training.expireDate }}</el-descriptions-item>
+ <el-descriptions-item label="鏈�杩戝煿璁�">{{ $d(accessResult.person.training.lastDate) }}</el-descriptions-item>
+ <el-descriptions-item label="閫傚矖璇佹湁鏁堟湡">{{ $d(accessResult.person.training.expireDate) }}</el-descriptions-item>
<el-descriptions-item label="鍑嗗叆缁撴灉">
<el-tag :type="accessResult.allowed ? 'success' : 'danger'">{{ accessResult.allowed ? '鍏佽杩涘叆' : '绂佹杩涘叆' }}</el-tag>
</el-descriptions-item>
@@ -92,7 +92,7 @@
</div>
</template>
<el-timeline style="max-height: 520px; overflow: auto">
- <el-timeline-item v-for="(item, idx) in alarms" :key="idx" :type="item.level" :timestamp="item.time">
+ <el-timeline-item v-for="(item, idx) in alarms" :key="idx" :type="item.level" :timestamp="$d(item.time)">
<div class="alarm-item">
<div class="title">
{{ item.personId }} 路 {{ item.zoneName }} 路 婊炵暀 {{ item.stayMins }} 鍒嗛挓
diff --git a/src/views/monitorManagement/videoMonitor/index.vue b/src/views/monitorManagement/videoMonitor/index.vue
index b78c7f5..7012701 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="$d" />
<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 />
@@ -195,7 +195,7 @@
v-for="(alarm, idx) in displayAlarms"
:key="idx"
:type="getAlarmType(alarm.type)"
- :timestamp="alarm.time"
+ :timestamp="$d(alarm.time)"
:hollow="alarm.handled"
>
<div class="alarm-item" :class="{ handled: alarm.handled }">
@@ -231,7 +231,7 @@
v-for="(alarm, idx) in intrusionAlarms"
:key="idx"
type="danger"
- :timestamp="alarm.time"
+ :timestamp="$d(alarm.time)"
>
<div class="alarm-item">
<div class="alarm-header">
@@ -251,7 +251,7 @@
v-for="(alarm, idx) in tailgatingAlarms"
:key="idx"
type="warning"
- :timestamp="alarm.time"
+ :timestamp="$d(alarm.time)"
>
<div class="alarm-item">
<div class="alarm-header">
@@ -271,7 +271,7 @@
v-for="(alarm, idx) in multipleAlarms"
:key="idx"
type="warning"
- :timestamp="alarm.time"
+ :timestamp="$d(alarm.time)"
>
<div class="alarm-item">
<div class="alarm-header">
@@ -341,7 +341,7 @@
<el-descriptions :column="1" border size="small">
<el-descriptions-item label="鎶撴媿鏃堕棿">
<el-icon><Clock /></el-icon>
- {{ currentSnapshot.time }}
+ {{ $d(currentSnapshot.time) }}
</el-descriptions-item>
<el-descriptions-item label="宸ュ彿">
<el-icon><User /></el-icon>
diff --git a/src/views/oaSystem/projectManagement/components/phaseGoalList.vue b/src/views/oaSystem/projectManagement/components/phaseGoalList.vue
index 5054299..7800670 100644
--- a/src/views/oaSystem/projectManagement/components/phaseGoalList.vue
+++ b/src/views/oaSystem/projectManagement/components/phaseGoalList.vue
@@ -11,7 +11,7 @@
<el-table-column prop="targetValue" label="鐩爣鍊�" width="120" />
<el-table-column prop="currentValue" label="褰撳墠鍊�" width="120" />
<el-table-column prop="unit" label="鍗曚綅" width="80" />
- <el-table-column prop="targetDate" label="鐩爣鏃ユ湡" width="120" />
+ <el-table-column prop="targetDate" label="鐩爣鏃ユ湡" width="120" :formatter="$d" />
<el-table-column prop="status" label="鐘舵��" width="100">
<template #default="scope">
<el-tag :type="getStatusType(scope.row.status)">{{ getStatusText(scope.row.status) }}</el-tag>
diff --git a/src/views/oaSystem/projectManagement/index.vue b/src/views/oaSystem/projectManagement/index.vue
index 2a0ec3a..d0c2fc9 100644
--- a/src/views/oaSystem/projectManagement/index.vue
+++ b/src/views/oaSystem/projectManagement/index.vue
@@ -109,14 +109,12 @@
label="寮�濮嬫棩鏈�"
align="center"
prop="startDate"
- width="120"
- />
+ width="120" :formatter="$d" />
<el-table-column
label="缁撴潫鏃ユ湡"
align="center"
prop="endDate"
- width="120"
- />
+ width="120" :formatter="$d" />
<el-table-column
label="鐘舵��"
align="center"
diff --git a/src/views/oaSystem/projectManagement/projectDetail.vue b/src/views/oaSystem/projectManagement/projectDetail.vue
index c3b0779..69942ef 100644
--- a/src/views/oaSystem/projectManagement/projectDetail.vue
+++ b/src/views/oaSystem/projectManagement/projectDetail.vue
@@ -11,8 +11,8 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="椤圭洰鍚嶇О">{{ projectInfo.projectName }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰璐熻矗浜�">{{ projectInfo.managerName }}</el-descriptions-item>
- <el-descriptions-item label="寮�濮嬫棩鏈�">{{ projectInfo.startDate }}</el-descriptions-item>
- <el-descriptions-item label="缁撴潫鏃ユ湡">{{ projectInfo.endDate }}</el-descriptions-item>
+ <el-descriptions-item label="寮�濮嬫棩鏈�">{{ $d(projectInfo.startDate) }}</el-descriptions-item>
+ <el-descriptions-item label="缁撴潫鏃ユ湡">{{ $d(projectInfo.endDate) }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鐘舵��">
<el-tag :type="getStatusType(projectInfo.status)">{{ getStatusText(projectInfo.status) }}</el-tag>
</el-descriptions-item>
diff --git a/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue b/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
index c47dd2e..d7fd13c 100644
--- a/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
+++ b/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
@@ -84,13 +84,13 @@
<el-table-column prop="startAt"
label="涓婄彮鏃堕棿">
<template #default="scope">
- {{ scope.row.startAt }}
+ {{ $d(scope.row.startAt) }}
</template>
</el-table-column>
<el-table-column prop="endAt"
label="涓嬬彮鏃堕棿">
<template #default="scope">
- {{ scope.row.endAt }}
+ {{ $d(scope.row.endAt) }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔"
diff --git a/src/views/personnelManagement/attendanceCheckin/index.vue b/src/views/personnelManagement/attendanceCheckin/index.vue
index b7b0f92..5a241b5 100644
--- a/src/views/personnelManagement/attendanceCheckin/index.vue
+++ b/src/views/personnelManagement/attendanceCheckin/index.vue
@@ -41,10 +41,10 @@
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="涓婄彮鏃堕棿">
- {{ todayRecord?.workStartAt || '-' }}
+ {{ $d(todayRecord?.workStartAt) || '-' }}
</el-descriptions-item>
<el-descriptions-item label="涓嬬彮鏃堕棿">
- {{ todayRecord?.workEndAt || '-' }}
+ {{ $d(todayRecord?.workEndAt) || '-' }}
</el-descriptions-item>
<el-descriptions-item label="宸ユ椂(灏忔椂)">
{{ todayRecord?.workHours ?? '-' }}
@@ -119,7 +119,7 @@
align="center" />
<el-table-column prop="date"
label="鏃ユ湡"
- width="120" />
+ width="120" :formatter="$d" />
<el-table-column prop="deptName"
label="閮ㄩ棬"
width="140" />
@@ -131,10 +131,12 @@
width="120" />
<el-table-column prop="workStartAt"
label="涓婄彮鏃堕棿"
- width="140" />
+ width="140"
+ :formatter="$d" />
<el-table-column prop="workEndAt"
label="涓嬬彮鏃堕棿"
- width="140" />
+ width="140"
+ :formatter="$d" />
<el-table-column prop="workHours"
label="宸ユ椂(灏忔椂)"
align="center" />
diff --git a/src/views/personnelManagement/classsSheduling/index.vue b/src/views/personnelManagement/classsSheduling/index.vue
index 5c0169b..6dece1c 100644
--- a/src/views/personnelManagement/classsSheduling/index.vue
+++ b/src/views/personnelManagement/classsSheduling/index.vue
@@ -204,7 +204,7 @@
</div> -->
<div class="user-total">
<span class="total-label">鍚堣鍑哄嫟:</span>
- <span class="total-value">{{ item.work_time }}澶�</span>
+ <span class="total-value">{{ $d(item.work_time) }}澶�</span>
</div>
</div>
</div>
diff --git a/src/views/personnelManagement/scheduling/index.vue b/src/views/personnelManagement/scheduling/index.vue
index 19d2062..9b3d26e 100644
--- a/src/views/personnelManagement/scheduling/index.vue
+++ b/src/views/personnelManagement/scheduling/index.vue
@@ -75,9 +75,9 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="workDate" label="宸ヤ綔鏃ユ湡" width="120"/>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100"/>
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100"/>
+ <el-table-column prop="workDate" label="宸ヤ綔鏃ユ湡" width="120" :formatter="$d" />
+ <el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" :formatter="$d" />
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" :formatter="$d" />
<el-table-column prop="workHours" label="宸ヤ綔鏃堕暱" width="100">
<template #default="scope">
{{ scope.row.workHours }}灏忔椂
diff --git a/src/views/personnelManagement/selfService/index.vue b/src/views/personnelManagement/selfService/index.vue
index 647f149..cb36efd 100644
--- a/src/views/personnelManagement/selfService/index.vue
+++ b/src/views/personnelManagement/selfService/index.vue
@@ -27,7 +27,7 @@
</div>
</template>
<el-table :data="attendanceData" style="width: 100%" :loading="tableLoading">
- <el-table-column prop="date" label="鏃ユ湡" />
+ <el-table-column prop="date" label="鏃ユ湡" :formatter="$d" />
<el-table-column prop="checkIn" label="绛惧埌鏃堕棿" />
<el-table-column prop="checkOut" label="绛鹃��鏃堕棿" />
<el-table-column prop="workHours" label="宸ヤ綔鏃堕暱" width="100" />
@@ -56,7 +56,7 @@
</div>
</template>
<el-table :data="salaryData" style="width: 100%">
- <el-table-column prop="payDate" label="鏈堜唤" />
+ <el-table-column prop="payDate" label="鏈堜唤" :formatter="$d" />
<el-table-column prop="basicSalary" label="鍩烘湰宸ヨ祫" />
<el-table-column prop="bonus" label="濂栭噾" />
<el-table-column prop="deduction" label="鎵ｆ" />
@@ -81,8 +81,8 @@
</template>
<el-table :data="leaveData" style="width: 100%">
<el-table-column prop="type" label="鍋囨湡绫诲瀷" />
- <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" />
- <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" />
+ <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" :formatter="$d" />
+ <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" :formatter="$d" />
<el-table-column prop="days" label="澶╂暟" width="80" />
<el-table-column prop="reason" label="鐢宠鍘熷洜" />
<el-table-column prop="status" label="瀹℃壒鐘舵��" width="100">
@@ -114,7 +114,7 @@
<el-descriptions-item label="宸ュ彿">{{ profile.employeeId }}</el-descriptions-item>
<el-descriptions-item label="閮ㄩ棬">{{ profile.department }}</el-descriptions-item>
<el-descriptions-item label="鑱屼綅">{{ profile.position }}</el-descriptions-item>
- <el-descriptions-item label="鍏ヨ亴鏃ユ湡">{{ profile.hireDate }}</el-descriptions-item>
+ <el-descriptions-item label="鍏ヨ亴鏃ユ湡">{{ $d(profile.hireDate) }}</el-descriptions-item>
<el-descriptions-item label="鑱旂郴鐢佃瘽">{{ profile.phone }}</el-descriptions-item>
<el-descriptions-item label="閭">{{ profile.email }}</el-descriptions-item>
<el-descriptions-item label="鍦板潃">{{ profile.adress }}</el-descriptions-item>
diff --git a/src/views/procurementManagement/advancedPriceManagement/index.vue b/src/views/procurementManagement/advancedPriceManagement/index.vue
index 84bd160..08ddb8c 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="$d" />
+ <el-table-column label="鏇存柊鏃堕棿" prop="updateTime" width="180" sortable :formatter="$d" />
<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..017f9e7 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="$d" />
<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/index.vue b/src/views/procurementManagement/index.vue
index bf54384..e765907 100644
--- a/src/views/procurementManagement/index.vue
+++ b/src/views/procurementManagement/index.vue
@@ -181,7 +181,7 @@
</el-col>
<el-col :span="6">
<div class="stat-item">
- <div class="stat-number">{{ stats.avgDeliveryTime }}</div>
+ <div class="stat-number">{{ $d(stats.avgDeliveryTime) }}</div>
<div class="stat-label">骞冲潎浜や粯澶╂暟</div>
</div>
</el-col>
@@ -204,7 +204,7 @@
<el-timeline-item
v-for="(activity, index) in recentActivities"
:key="index"
- :timestamp="activity.time"
+ :timestamp="$d(activity.time)"
:type="activity.type"
>
{{ activity.content }}
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index cb93562..8b16e00 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -69,7 +69,7 @@
type="index"
width="60"
/>
- <el-table-column label="浠樻鏃ユ湡" prop="paymentDate" />
+ <el-table-column label="浠樻鏃ユ湡" prop="paymentDate" :formatter="$d" />
<el-table-column label="浠樻閲戦" prop="currentPaymentAmount">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%"
@@ -95,7 +95,7 @@
</template>
</el-table-column>
<el-table-column label="鐧昏浜�" prop="registrant" />
- <el-table-column label="鐧昏鏃ユ湡" prop="registrationtDate" />
+ <el-table-column label="鐧昏鏃ユ湡" prop="registrationtDate" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="150">
<template #default="scope">
<el-button
diff --git a/src/views/procurementManagement/priceManagement/index.vue b/src/views/procurementManagement/priceManagement/index.vue
index 76a39ed..4b47b57 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="$d" />
<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/procurementInvoiceLedger/Modal/EditModal.vue b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
index 4e461dc..75df6e2 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/Modal/EditModal.vue
@@ -21,7 +21,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍒涘缓鏃堕棿锛�">
- <el-text>{{ form.createdAt }}</el-text>
+ <el-text>{{ $d(form.createdAt) }}</el-text>
</el-form-item>
</el-col>
<el-col :span="12">
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 8a293fc..7c952ea 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -144,7 +144,7 @@
<el-table-column label="绛捐鏃ユ湡"
prop="executionDate"
width="100"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="浠樻鏂瑰紡"
width="100"
prop="paymentMethod"
@@ -161,7 +161,7 @@
<el-table-column label="褰曞叆鏃ユ湡"
prop="entryDate"
width="100"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="澶囨敞"
prop="remarks"
width="200"
diff --git a/src/views/procurementManagement/procurementPlan/index.vue b/src/views/procurementManagement/procurementPlan/index.vue
index 42a1bcf..9a4aa98 100644
--- a/src/views/procurementManagement/procurementPlan/index.vue
+++ b/src/views/procurementManagement/procurementPlan/index.vue
@@ -63,7 +63,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏈�鍚庤绠楁椂闂�" width="160" />
+ <el-table-column prop="updateTime" label="鏈�鍚庤绠楁椂闂�" width="160" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="200" fixed="right" align="center">
<template #default="{ row }">
<el-button type="primary" link @click="handleEdit(row)">缂栬緫</el-button>
diff --git a/src/views/procurementManagement/purchaseOrder/index.vue b/src/views/procurementManagement/purchaseOrder/index.vue
index 7e56cb4..f26b97f 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="$d" />
<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/purchaseReturnOrder/index.vue b/src/views/procurementManagement/purchaseReturnOrder/index.vue
index 8de2877..2e9e561 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/index.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/index.vue
@@ -182,7 +182,7 @@
prop: 'returnUserName',
width: 110,
},
-
+
{
label: '鏁村崟鎶樻墸棰�',
prop: 'totalDiscountAmount',
@@ -236,7 +236,7 @@
},
],
},
-
+
])
const data = reactive({
searchForm: {
@@ -281,8 +281,8 @@
const payload = res?.data || {}
detailData.value = payload
// 鎷兼帴杩炰釜瀵硅薄鎴愪竴涓璞★紝鏂逛究灞曠ず item 鍜� item.salesLedgerProduct 閲岀殑瀛楁
-
-
+
+
detailProducts.value =
payload.purchaseReturnOrderProductsDetailVoList.map(item => ({ ...item, ...item.salesLedgerProduct })) ||
[]
diff --git a/src/views/procurementManagement/qualityInspection/index.vue b/src/views/procurementManagement/qualityInspection/index.vue
index ab19d6f..50083fc 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="$d" />
<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..763c1d1 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="$d" />
<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 94359e4..74a913d 100644
--- a/src/views/productManagement/productIdentifier/index.vue
+++ b/src/views/productManagement/productIdentifier/index.vue
@@ -93,7 +93,7 @@
</el-table-column>
<el-table-column prop="generateTime"
label="鐢熸垚鏃堕棿"
- width="160" />
+ width="160" :formatter="$d" />
<el-table-column label="鎿嶄綔"
fixed="right"
align="center"
diff --git a/src/views/productionManagement/safetyMonitoring/index.vue b/src/views/productionManagement/safetyMonitoring/index.vue
index 12922e7..87c3788 100644
--- a/src/views/productionManagement/safetyMonitoring/index.vue
+++ b/src/views/productionManagement/safetyMonitoring/index.vue
@@ -132,7 +132,7 @@
<h4>绯荤粺鏃ュ織</h4>
<div class="log-container">
<div class="log-item" v-for="log in systemLogs" :key="log.id">
- <span class="log-time">{{ log.time }}</span>
+ <span class="log-time">{{ $d(log.time) }}</span>
<span class="log-content">{{ log.content }}</span>
</div>
</div>
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 65acc32..6a4cbb6 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">{{ $d(transferCardRowData.planStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">璁″垝缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.planEndTime }}</span>
+ <span class="info-value">{{ $d(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">{{ $d(transferCardRowData.actualStartTime) }}</span>
</div>
<div class="info-item">
<span class="info-label">瀹為檯缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.actualEndTime }}</span>
+ <span class="info-value">{{ $d(transferCardRowData.actualEndTime) }}</span>
</div>
</div>
</div>
diff --git a/src/views/projectManagement/Management/projectDetail.vue b/src/views/projectManagement/Management/projectDetail.vue
index c54a389..f2d77f7 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="绔嬮」鏃ユ湡">{{ $d(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,11 +40,11 @@
<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="璁㈠崟鏃ユ湡">{{ info.orderDate || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="璁″垝寮�濮嬫棩鏈�">{{ $d(info.planStartTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="璁″垝瀹屾垚鏃ユ湡">{{ $d(info.planEndTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯寮�濮嬫棩鏈�">{{ $d(info.actualStartTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="瀹為檯瀹屾垚鏃ユ湡">{{ $d(info.actualEndTime) || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="璁㈠崟鏃ユ湡">{{ $d(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>
</el-descriptions>
@@ -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="$d" />
+ <el-table-column label="绂诲紑鏃ユ湡" prop="departTime" width="140" :formatter="$d" />
<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="$d" />
+ <el-table-column label="璁″垝缁撴潫" prop="planEndTime" width="120" :formatter="$d" />
+ <el-table-column label="瀹為檯寮�濮�" prop="actualStartTime" width="120" :formatter="$d" />
+ <el-table-column label="瀹為檯缁撴潫" prop="actualEndTime" width="120" :formatter="$d" />
<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 8cd4856..d4f9abe 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>{{ $d(scope.row.feedbackTime) }}</span>
</template>
</el-table-column>
<el-table-column label="闂鎻忚堪" prop="problemDesc" show-overflow-tooltip />
diff --git a/src/views/qualityManagement/visualization/qualityDashboard.vue b/src/views/qualityManagement/visualization/qualityDashboard.vue
index 57462b7..519b273 100644
--- a/src/views/qualityManagement/visualization/qualityDashboard.vue
+++ b/src/views/qualityManagement/visualization/qualityDashboard.vue
@@ -19,7 +19,7 @@
</div>
<div class="right">
<el-tag :type="statusTagType(item.status)" size="small">{{ statusLabel(item.status) }}</el-tag>
- <span class="time">{{ item.time }}</span>
+ <span class="time">{{ $d(item.time) }}</span>
</div>
</div>
</div>
diff --git a/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue b/src/views/reportAnalysis/dataDashboard/components/basic/center-top.vue
index 950038e..8668480 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">{{ $d(item.approveTime) }}</div>
</div>
</div>
diff --git a/src/views/reportAnalysis/dataDashboard/index0.vue b/src/views/reportAnalysis/dataDashboard/index0.vue
index 5c318c8..6ec74cb 100644
--- a/src/views/reportAnalysis/dataDashboard/index0.vue
+++ b/src/views/reportAnalysis/dataDashboard/index0.vue
@@ -172,7 +172,7 @@
<div style="display: flex;justify-content: space-between;align-items: center;">
<div class="todo-title">寰呭姙缂栧彿锛歿{item.approveId}}</div>
<div class="todo-division">閮ㄩ棬锛歿{item.approveDeptName}}</div>
- <div class="todo-time">{{item.approveTime}}</div>
+ <div class="todo-time">{{ $d(item.approveTime) }}</div>
</div>
<div class="todo-division">寰呭姙浜嬬敱锛歿{item.approveReason}}</div>
</div>
diff --git a/src/views/reportAnalysis/qualityAnalysis/components/center-center.vue b/src/views/reportAnalysis/qualityAnalysis/components/center-center.vue
index 8d28f7a..a78d4e9 100644
--- a/src/views/reportAnalysis/qualityAnalysis/components/center-center.vue
+++ b/src/views/reportAnalysis/qualityAnalysis/components/center-center.vue
@@ -16,7 +16,7 @@
</div>
<div class="warn-text" :title="item.title">{{ item.title }}</div>
<div class="warn-action" @click.stop="openWarning(item)">鏌ョ湅</div>
- <div class="warn-date">{{ item.date }}</div>
+ <div class="warn-date">{{ $d(item.date) }}</div>
</div>
</div>
</div>
diff --git a/src/views/reportAnalysis/reportManagement.vue b/src/views/reportAnalysis/reportManagement.vue
index 3c87550..db94334 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="$d" />
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" width="180" :formatter="$d" />
<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 ff5b301..abdedad 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 }}
+ {{ $d(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 }}
+ {{ $d(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 49965e9..67733f1 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -69,11 +69,11 @@
show-overflow-tooltip />
<el-table-column label="涓婃姤鏃堕棿"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="鏁存敼瀹屾垚鏈熼檺"
prop="rectifyTime"
width="120"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="鏁存敼璐ｄ换浜�"
prop="rectifyUserName"
width="120"
@@ -89,7 +89,7 @@
<el-table-column label="瀹為檯鏁存敼瀹屾垚鏃堕棿"
prop="rectifyActualTime"
width="120"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="楠屾敹鎰忚"
prop="verifyRemark"
width="120"
@@ -97,7 +97,7 @@
<el-table-column label="楠屾敹鏃堕棿"
prop="verifyTime"
width="120"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="楠屾敹缁撴灉"
prop="verifyResult"
width="120"
@@ -296,7 +296,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">{{ $d(form.createTime) }}</span>
</el-descriptions-item>
<el-descriptions-item label="鏁存敼璐ｄ换浜�">
<span class="detail-title">{{ form.rectifyUserName }}</span>
@@ -305,7 +305,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">{{ $d(form.rectifyTime) }}</span>
</el-descriptions-item>
</el-descriptions>
<div class="classtitle"
@@ -320,7 +320,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">{{ $d(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 eb68508..d086628 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 }}
+ {{ $d(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 a53490c..6d6ff22 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>{{ $d(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>{{ $d(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 4894d80..ae519e4 100644
--- a/src/views/safeProduction/safeQualifications/index.vue
+++ b/src/views/safeProduction/safeQualifications/index.vue
@@ -97,7 +97,7 @@
<el-table-column label="鏈夋晥鏈�"
prop="effectiveTime"
width="120"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column fixed="right"
label="鎿嶄綔"
min-width="100"
diff --git a/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue b/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
index 8d40a2e..f86fc7c 100644
--- a/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
+++ b/src/views/safeProduction/safeWorkApproval/components/approvalDia.vue
@@ -98,8 +98,8 @@
<el-descriptions-item label="鎶ヤ环鍗曞彿">{{ currentQuotation.quotationNo }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentQuotation.customer }}</el-descriptions-item>
<el-descriptions-item label="涓氬姟鍛�">{{ currentQuotation.salesperson }}</el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
- <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ $d(currentQuotation.quotationDate) }}</el-descriptions-item>
+ <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ $d(currentQuotation.validDate) }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
<el-descriptions-item label="鎶ヤ环鎬婚"
:span="2">
@@ -158,8 +158,8 @@
<el-descriptions-item label="渚涘簲鍟嗗悕绉�">{{ currentPurchase.supplierName }}</el-descriptions-item>
<el-descriptions-item label="椤圭洰鍚嶇О">{{ currentPurchase.projectName }}</el-descriptions-item>
<el-descriptions-item label="閿�鍞悎鍚屽彿">{{ currentPurchase.salesContractNo }}</el-descriptions-item>
- <el-descriptions-item label="绛捐鏃ユ湡">{{ currentPurchase.executionDate }}</el-descriptions-item>
- <el-descriptions-item label="褰曞叆鏃ユ湡">{{ currentPurchase.entryDate }}</el-descriptions-item>
+ <el-descriptions-item label="绛捐鏃ユ湡">{{ $d(currentPurchase.executionDate) }}</el-descriptions-item>
+ <el-descriptions-item label="褰曞叆鏃ユ湡">{{ $d(currentPurchase.entryDate) }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentPurchase.paymentMethod }}</el-descriptions-item>
<el-descriptions-item label="鍚堝悓閲戦"
:span="2">
diff --git a/src/views/safeProduction/safetyTrainingAssessment/detail.vue b/src/views/safeProduction/safetyTrainingAssessment/detail.vue
index 9796980..f614a18 100644
--- a/src/views/safeProduction/safetyTrainingAssessment/detail.vue
+++ b/src/views/safeProduction/safetyTrainingAssessment/detail.vue
@@ -87,7 +87,7 @@
width="60" />
<el-table-column label="鍩硅鏃ユ湡"
prop="trainingDate"
- show-overflow-tooltip />
+ show-overflow-tooltip :formatter="$d" />
<el-table-column label="鍩硅鍐呭"
prop="trainingContent"
show-overflow-tooltip />
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 0eb60cc..42d0805 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -36,7 +36,7 @@
<el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" show-overflow-tooltip />
<el-table-column label="浜у搧鍚嶇О" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
- <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip />
+ <el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip :formatter="$d" />
<el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
<el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
@@ -183,7 +183,7 @@
<el-descriptions-item label="浜у搧鍚嶇О">{{ detailRow.productName || '--' }}</el-descriptions-item>
<el-descriptions-item label="瑙勬牸鍨嬪彿">{{ detailRow.specificationModel || '--' }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣绫诲瀷">{{ detailRow.type || '--' }}</el-descriptions-item>
- <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣揣鏃ユ湡">{{ $d(detailRow.shippingDate) || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
<el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
diff --git a/src/views/salesManagement/invoiceLedger/index.vue b/src/views/salesManagement/invoiceLedger/index.vue
index 3827854..8c7ff28 100644
--- a/src/views/salesManagement/invoiceLedger/index.vue
+++ b/src/views/salesManagement/invoiceLedger/index.vue
@@ -40,7 +40,7 @@
<el-table-column label="绋庣巼(%)" prop="taxRate" show-overflow-tooltip />
<el-table-column label="褰曞叆浜�" prop="invoicePerson" show-overflow-tooltip />
<el-table-column label="褰曞叆鏃ユ湡" prop="createTime" show-overflow-tooltip :formatter="formatDate" width="180" />
- <el-table-column label="寮�绁ㄦ棩鏈�" prop="invoiceDate" show-overflow-tooltip width="120" />
+ <el-table-column label="寮�绁ㄦ棩鏈�" prop="invoiceDate" show-overflow-tooltip width="120" :formatter="$d" />
<el-table-column fixed="right" label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm(scope.row)">缂栬緫</el-button>
@@ -219,7 +219,7 @@
return parseFloat(cellValue).toFixed(2);
};
const formatDate = (row, column, cellValue) => {
- return dayjs(cellValue).format("YYYY-MM-DD HH:mm:ss");
+ return cellValue ? dayjs(cellValue).format("YYYY-MM-DD") : "";
};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
diff --git a/src/views/salesManagement/orderManagement/index.vue b/src/views/salesManagement/orderManagement/index.vue
index f44c53f..3376c7f 100644
--- a/src/views/salesManagement/orderManagement/index.vue
+++ b/src/views/salesManagement/orderManagement/index.vue
@@ -53,7 +53,7 @@
<el-table-column prop="orderNo" label="璁㈠崟鍙�" width="150" />
<el-table-column prop="customer" label="瀹㈡埛鍚嶇О" />
<el-table-column prop="salesperson" label="涓氬姟鍛�" width="100" />
- <el-table-column prop="orderDate" label="涓嬪崟鏃ユ湡" width="120" />
+ <el-table-column prop="orderDate" label="涓嬪崟鏃ユ湡" width="120" :formatter="$d" />
<el-table-column prop="amount" label="璁㈠崟閲戦" width="120">
<template #default="scope">
楼{{ scope.row.amount.toFixed(2) }}
diff --git a/src/views/salesManagement/paymentShipping/index.vue b/src/views/salesManagement/paymentShipping/index.vue
index 56caf3b..e6753ad 100644
--- a/src/views/salesManagement/paymentShipping/index.vue
+++ b/src/views/salesManagement/paymentShipping/index.vue
@@ -75,7 +75,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="shippingDate" label="鍙戣揣鏃ユ湡" width="120" />
+ <el-table-column prop="shippingDate" label="鍙戣揣鏃ユ湡" width="120" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="250" fixed="right" align="center">
<template #default="scope">
<!-- <el-button link type="primary" @click="handleView(scope.row)">鏌ョ湅</el-button>-->
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index b56abd6..7bf0721 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -66,7 +66,7 @@
type="index"
width="60"
/>
- <el-table-column label="鍥炴鏃ユ湡" prop="receiptPaymentDate" width="130"/>
+ <el-table-column label="鍥炴鏃ユ湡" prop="receiptPaymentDate" width="130" :formatter="$d" />
<el-table-column label="鍥炴閲戦" prop="receiptPaymentAmount">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%"
@@ -96,7 +96,7 @@
</template>
</el-table-column>
<el-table-column label="鐧昏浜�" prop="registrant" width="90"/>
- <el-table-column label="鐧昏鏃ユ湡" prop="createTime" width="130"/>
+ <el-table-column label="鐧昏鏃ユ湡" prop="createTime" width="130" :formatter="$d" />
<el-table-column label="鎿嶄綔" width="150" align="center">
<template #default="scope">
<el-button
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index 7029cfc..f8c3f63 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -95,8 +95,7 @@
label="鍙戠敓鏃ユ湡"
prop="receiptPaymentDate"
show-overflow-tooltip
- width="110"
- />
+ width="110" :formatter="$d" />
<el-table-column
label="閿�鍞悎鍚屽彿"
prop="salesContractNo"
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ca7ab04..e12c934 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -81,7 +81,7 @@
align="center">
<template #default="scope">
<div>
- <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
+ <div v-if="scope.row.shippingDate">{{ $d(scope.row.shippingDate) }}</div>
<el-tag v-else
type="info">-</el-tag>
</div>
@@ -116,9 +116,9 @@
<el-table-column label="鍚堝悓閲戦(鍏�)" prop="contractAmount" width="220" show-overflow-tooltip
:formatter="formattedNumber" />
<el-table-column label="褰曞叆浜�" prop="entryPersonName" width="100" show-overflow-tooltip />
- <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
- <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
- <el-table-column label="浜や粯鏃ユ湡" prop="deliveryDate" width="120" show-overflow-tooltip />
+ <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip :formatter="$d" />
+ <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip :formatter="$d" />
+ <el-table-column label="浜や粯鏃ユ湡" prop="deliveryDate" width="120" show-overflow-tooltip :formatter="$d" />
<el-table-column label="澶囨敞" prop="remarks" width="200" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" width="130" align="center">
<template #default="scope">
@@ -304,7 +304,7 @@
<el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" width="180" show-overflow-tooltip />
<el-table-column prop="customer" label="瀹㈡埛鍚嶇О" min-width="220" show-overflow-tooltip />
<el-table-column prop="salesperson" label="涓氬姟鍛�" width="120" show-overflow-tooltip />
- <el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="140" />
+ <el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="140" :formatter="$d" />
<el-table-column prop="status" label="瀹℃壒鐘舵��" width="120" align="center" />
<el-table-column prop="totalAmount" label="鎶ヤ环閲戦(鍏�)" width="160" align="right">
<template #default="scope">
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index 5574bce..d1bae00 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -54,8 +54,8 @@
<el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" />
<el-table-column prop="customer" label="瀹㈡埛鍚嶇О" />
<el-table-column prop="salesperson" label="涓氬姟鍛�" width="100" />
- <el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="120" />
- <el-table-column prop="validDate" label="鏈夋晥鏈熻嚦" width="120" />
+ <el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="120" :formatter="$d" />
+ <el-table-column prop="validDate" label="鏈夋晥鏈熻嚦" width="120" :formatter="$d" />
<el-table-column prop="status" label="瀹℃壒鐘舵��" width="120" align="center">
<template #default="{ row }">
<el-tag :type="getStatusType(row.status)" disable-transitions>
@@ -320,8 +320,8 @@
<el-descriptions-item label="鎶ヤ环鍗曞彿">{{ currentQuotation.quotationNo }}</el-descriptions-item>
<el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentQuotation.customer }}</el-descriptions-item>
<el-descriptions-item label="涓氬姟鍛�">{{ currentQuotation.salesperson }}</el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
- <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ $d(currentQuotation.quotationDate) }}</el-descriptions-item>
+ <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ $d(currentQuotation.validDate) }}</el-descriptions-item>
<el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
<!-- <el-descriptions-item label="鎶ヤ环鐘舵��">-->
<!-- <el-tag :type="getStatusType(currentQuotation.status)">{{ currentQuotation.status }}</el-tag>-->
diff --git a/src/views/salesManagement/salespersonManagement/index.vue b/src/views/salesManagement/salespersonManagement/index.vue
index e0094ec..1c155fb 100644
--- a/src/views/salesManagement/salespersonManagement/index.vue
+++ b/src/views/salesManagement/salespersonManagement/index.vue
@@ -51,7 +51,7 @@
<el-table-column prop="email" label="閭" width="200" />
<el-table-column prop="department" label="閮ㄩ棬" width="100" />
<el-table-column prop="position" label="鑱屼綅" width="100" />
- <el-table-column prop="hireDate" label="鍏ヨ亴鏃ユ湡" width="120" />
+ <el-table-column prop="hireDate" label="鍏ヨ亴鏃ユ湡" width="120" :formatter="$d" />
<el-table-column prop="status" label="鐘舵��" width="80">
<template #default="scope">
<el-tag :type="getStatusType(scope.row.status)">
diff --git a/src/views/salesManagement/strategyControl/index.vue b/src/views/salesManagement/strategyControl/index.vue
index dbdae38..258ac56 100644
--- a/src/views/salesManagement/strategyControl/index.vue
+++ b/src/views/salesManagement/strategyControl/index.vue
@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column prop="validPeriod" label="鏈夋晥鏈�" width="200">
<template #default="scope">
- {{ scope.row.startDate }} 鑷� {{ scope.row.endDate }}
+ {{ $d(scope.row.startDate) }} 鑷� {{ $d(scope.row.endDate) }}
</template>
</el-table-column>
<el-table-column prop="status" label="鐘舵��" width="80">
@@ -221,7 +221,7 @@
楼{{ scope.row.contractAmount.toLocaleString() }}
</template>
</el-table-column>
- <el-table-column prop="signDate" label="绛捐鏃ユ湡" width="120"/>
+ <el-table-column prop="signDate" label="绛捐鏃ユ湡" width="120" :formatter="$d" />
<el-table-column label="鎵ц杩涘害" width="150">
<template #default="scope">
<el-progress
@@ -310,7 +310,7 @@
<!-- 鍘嗗彶浠锋牸鍒楄〃 -->
<el-table :data="priceComparisonList" border stripe v-loading="compareLoading" style="margin-top: 20px;">
- <el-table-column prop="date" label="鏃ユ湡" width="120"/>
+ <el-table-column prop="date" label="鏃ユ湡" width="120" :formatter="$d" />
<el-table-column prop="productName" label="浜у搧鍚嶇О" width="200"/>
<el-table-column prop="specification" label="瑙勬牸" width="120"/>
<el-table-column prop="customerName" label="瀹㈡埛" width="180"/>
@@ -463,7 +463,7 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="orderDate" label="璁㈠崟鏃ユ湡" width="120"/>
+ <el-table-column prop="orderDate" label="璁㈠崟鏃ユ湡" width="120" :formatter="$d" />
</el-table>
<pagination
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index d27c25b..42de0b8 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">{{ $d(state.user.createTime) }}</div>
</li>
</ul>
</div>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index aaddeb6..9ab88e6 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -146,16 +146,14 @@
prop="createTime"
width="160"
sortable="custom"
- :sort-orders="['descending', 'ascending']"
- />
+ :sort-orders="['descending', 'ascending']" :formatter="$d" />
<el-table-column
label="鏇存柊鏃堕棿"
align="center"
prop="updateTime"
width="160"
sortable="custom"
- :sort-orders="['descending', 'ascending']"
- />
+ :sort-orders="['descending', 'ascending']" :formatter="$d" />
<el-table-column
label="鎿嶄綔"
align="center"
--
Gitblit v1.9.3