From 2cea35752e8b86dc1efdc5542fbb792272d1c799 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期一, 17 八月 2026 17:21:08 +0800
Subject: [PATCH] 将意博凯新修改的年月日同步到 环境工程和奇缘恒艺
---
src/views/personnelManagement/socialSecuritySet/index.vue | 2
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 2
src/views/basicData/parameterMaintenance/index.vue | 3 +
src/components/PIMTable/PIMTable.vue | 5 ++
src/views/inventoryManagement/stockManagement/Qualified.vue | 8 +++
src/views/financialManagement/receivable/salesReturn.vue | 2
src/views/collaborativeApproval/sealManagement/index.vue | 2
src/views/inventoryManagement/dispatchLog/Record.vue | 6 ++
src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js | 39 +++++++++++--------
src/views/productionManagement/productionReporting/index.vue | 1
src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue | 12 +++--
src/views/inventoryManagement/stockManagement/Record.vue | 6 ++
src/views/inventoryManagement/stockManagement/Unqualified.vue | 8 +++
src/views/collaborativeApproval/knowledgeBase/index.vue | 1
src/views/financialManagement/payable/purchaseReturn.vue | 2
src/views/inventoryManagement/receiptManagement/Record.vue | 8 ++-
src/views/safeProduction/dangerInvestigation/index.vue | 6 ++
17 files changed, 78 insertions(+), 35 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 74615af..0045336 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -112,6 +112,10 @@
{{ formatters(scope.row[item.prop], item.formatData) }}
</el-tag>
</div>
+ <!-- 鏃堕棿绫诲瀷 -->
+ <div v-else-if="item.dataType === 'date'">
+ {{ scope.row[item.prop] ? dayjs(scope.row[item.prop]).format('YYYY-MM-DD') : '' }}
+ </div>
<!-- 鎸夐挳 -->
<div v-else-if="item.dataType == 'action'"
@click.stop>
@@ -204,6 +208,7 @@
import pagination from "./Pagination.vue";
import { computed, ref, inject, getCurrentInstance } from "vue";
import { ElMessage } from "element-plus";
+ import dayjs from "dayjs";
// 鑾峰彇鍏ㄥ眬鐨� uploadHeader
const { proxy } = getCurrentInstance();
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index 38ddd4f..01b604d 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -302,6 +302,7 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
+ dataType:"date"
},
{
label: "鎿嶄綔",
@@ -374,7 +375,7 @@
const formCreateTimeDate = computed({
get: () => (formData.createTime ? String(formData.createTime).split(" ")[0] : ""),
set: (value) => {
- formData.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ formData.createTime = value ? dayjs(value).format("YYYY-MM-DD") : "";
},
});
// const productTypes = ref([]);
diff --git a/src/views/collaborativeApproval/knowledgeBase/index.vue b/src/views/collaborativeApproval/knowledgeBase/index.vue
index f50d06b..05a1d1c 100644
--- a/src/views/collaborativeApproval/knowledgeBase/index.vue
+++ b/src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -555,6 +555,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 180,
+ dataType:"date"
},
{
dataType: "action",
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index f7ba9d9..128b7ed 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -309,7 +309,7 @@
},
{ label: "鐗堟湰", prop: "version", width: 120 },
{ label: "鍙戝竷浜�", prop: "createUserName", width: 120 },
- { label: "鍙戝竷鏃堕棿", prop: "createTime", width: 180 },
+ { label: "鍙戝竷鏃堕棿", prop: "createTime", width: 180,dataType: "date" },
{
label: "鐘舵��",
prop: "status",
diff --git a/src/views/collaborativeApproval/sealManagement/index.vue b/src/views/collaborativeApproval/sealManagement/index.vue
index a06f6d5..7be9ef9 100644
--- a/src/views/collaborativeApproval/sealManagement/index.vue
+++ b/src/views/collaborativeApproval/sealManagement/index.vue
@@ -252,7 +252,7 @@
formatData: (v) => getSealTypeText(v),
formatType: () => 'info'
},
- { label: '鐢宠鏃堕棿', prop: 'createTime', width: 180 },
+ { label: '鐢宠鏃堕棿', prop: 'createTime', width: 180,dataType: "date" },
{
label: '鐘舵��',
prop: 'status',
diff --git a/src/views/financialManagement/payable/purchaseReturn.vue b/src/views/financialManagement/payable/purchaseReturn.vue
index 5c274ac..45ec41b 100644
--- a/src/views/financialManagement/payable/purchaseReturn.vue
+++ b/src/views/financialManagement/payable/purchaseReturn.vue
@@ -109,7 +109,7 @@
minWidth: "150",
formatData: (_val, row) => (String(row?.shippingType) === "2" ? row?.expressNo || "--" : "--"),
},
- { label: "閫�璐ф棩鏈�", prop: "preparedAt", minWidth: "170" },
+ { label: "閫�璐ф棩鏈�", prop: "preparedAt", minWidth: "170",dataType: "date"},
{
label: "閫�娆炬�婚",
prop: "totalAmount",
diff --git a/src/views/financialManagement/receivable/salesReturn.vue b/src/views/financialManagement/receivable/salesReturn.vue
index 85153bf..f3c98c4 100644
--- a/src/views/financialManagement/receivable/salesReturn.vue
+++ b/src/views/financialManagement/receivable/salesReturn.vue
@@ -101,7 +101,7 @@
minWidth: "150",
formatData: (_val, row) => (String(row?.shippingType) === "2" ? row?.expressNo || "--" : "--"),
},
- { label: "閫�璐ф棩鏈�", prop: "makeTime", minWidth: "170" },
+ { label: "閫�璐ф棩鏈�", prop: "makeTime", minWidth: "170",dataType: "date" },
{
label: "閫�娆炬�婚",
prop: "refundAmount",
diff --git a/src/views/inventoryManagement/dispatchLog/Record.vue b/src/views/inventoryManagement/dispatchLog/Record.vue
index 5a056d6..fe05536 100644
--- a/src/views/inventoryManagement/dispatchLog/Record.vue
+++ b/src/views/inventoryManagement/dispatchLog/Record.vue
@@ -108,7 +108,11 @@
show-overflow-tooltip />
<el-table-column label="鍑哄簱鏃ユ湡"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 0a01def..07a3029 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -107,9 +107,11 @@
prop="inboundBatches"
width="200"
show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏃堕棿"
- prop="createTime"
- show-overflow-tooltip />
+ <el-table-column label="鍏ュ簱鏃堕棿" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧澶х被"
prop="productName"
show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
index a835ef4..7d66307 100644
--- a/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
+++ b/src/views/inventoryManagement/stockManagement/BatchNoQtyDetail.vue
@@ -50,11 +50,13 @@
show-overflow-tooltip
/>
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column
- label="鏈�杩戞洿鏂版椂闂�"
- prop="updateTime"
- show-overflow-tooltip
- />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="180" align="center">
<template #default="scope">
<el-button
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 4286772..a1f96f4 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -31,7 +31,13 @@
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/inventoryManagement/stockManagement/Record.vue b/src/views/inventoryManagement/stockManagement/Record.vue
index 9ee214c..46ea8f9 100644
--- a/src/views/inventoryManagement/stockManagement/Record.vue
+++ b/src/views/inventoryManagement/stockManagement/Record.vue
@@ -107,7 +107,11 @@
show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�"
prop="updateTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right"
label="鎿嶄綔"
min-width="80"
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 55662be..6c36f26 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -26,7 +26,13 @@
<el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
<el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
- <el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
+ <el-table-column label="鏈�杩戞洿鏂版椂闂�"
+ prop="updateTime"
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
<el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
index 727f896..e92dc97 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-template/approveTemplateConstants.js
@@ -155,24 +155,31 @@
return { createdTime, updatedTime, createTime: createdTime, updateTime: updatedTime };
}
-function normalizeTimeValue(val) {
- if (val == null || val === "") return "";
- if (Array.isArray(val) && val.length >= 3) {
- const [y, m, d, h = 0, min = 0, s = 0] = val;
- return dayjs(new Date(y, m - 1, d, h, min, s)).format("YYYY-MM-DD HH:mm:ss");
- }
- if (typeof val === "number") {
- const d = val > 1e12 ? dayjs(val) : dayjs.unix(val);
- return d.isValid() ? d.format("YYYY-MM-DD HH:mm:ss") : "";
- }
- const s = String(val).trim();
- if (!s) return "";
- const parsed = dayjs(s.includes("T") ? s : s.replace(/-/g, "/"));
- return parsed.isValid() ? parsed.format("YYYY-MM-DD HH:mm:ss") : s;
+
+/**
+ * @param {any} val 鏃堕棿鍊�
+ * @param {boolean} [onlyDate=true] true:鍙勾鏈堟棩锛宖alse:骞存湀鏃ユ椂鍒嗙
+ */
+function normalizeTimeValue(val, onlyDate = true) {
+ if (val == null || val === "") return "";
+ const fmt = onlyDate ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss";
+
+ if (Array.isArray(val) && val.length >= 3) {
+ const [y, m, d, h = 0, min = 0, s = 0] = val;
+ return dayjs(new Date(y, m - 1, d, h, min, s)).format(fmt);
+ }
+ if (typeof val === "number") {
+ const d = val > 1e12 ? dayjs(val) : dayjs.unix(val);
+ return d.isValid() ? d.format(fmt) : "";
+ }
+ const s = String(val).trim();
+ if (!s) return "";
+ const parsed = dayjs(s.includes("T") ? s : s.replace(/-/g, "/"));
+ return parsed.isValid() ? parsed.format(fmt) : s;
}
-export function formatDisplayTime(val) {
- const t = normalizeTimeValue(val);
+export function formatDisplayTime(val,onlyDate) {
+ const t = normalizeTimeValue(val,onlyDate);
return t || "鈥�";
}
diff --git a/src/views/personnelManagement/socialSecuritySet/index.vue b/src/views/personnelManagement/socialSecuritySet/index.vue
index 1f3f104..8329b9c 100644
--- a/src/views/personnelManagement/socialSecuritySet/index.vue
+++ b/src/views/personnelManagement/socialSecuritySet/index.vue
@@ -65,7 +65,7 @@
{ label: "淇濋櫓绫诲瀷", prop: "insuranceTypes", width: 120 },
{ label: "浣跨敤鑼冨洿", prop: "deptNames", width: 120 },
{ label: "澶囨敞", prop: "remark", minWidth: 120 },
- { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 160 },
+ { label: "鍒涘缓鏃堕棿", prop: "createTime", width: 160,dataType: "date" },
{ label: "鍒涘缓浜�", prop: "createUserName", width: 100 },
{
dataType: "action",
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index fa4e163..28edda2 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -236,6 +236,7 @@
label: "鍒涘缓鏃堕棿",
prop: "createTime",
width: 120,
+ dataType: "date"
},
{
dataType: "action",
diff --git a/src/views/safeProduction/dangerInvestigation/index.vue b/src/views/safeProduction/dangerInvestigation/index.vue
index a278058..4caac4e 100644
--- a/src/views/safeProduction/dangerInvestigation/index.vue
+++ b/src/views/safeProduction/dangerInvestigation/index.vue
@@ -69,7 +69,11 @@
show-overflow-tooltip />
<el-table-column label="涓婃姤鏃堕棿"
prop="createTime"
- show-overflow-tooltip />
+ show-overflow-tooltip >
+ <template #default="scope">
+ {{ scope.row.createTime ? scope.row.createTime.split(' ')[0] : '-' }}
+ </template>
+ </el-table-column>
<el-table-column label="鏁存敼瀹屾垚鏈熼檺"
prop="rectifyTime"
width="120"
--
Gitblit v1.9.3