From ae5cdfbb2fc7d8581b18360658f5837d690222e8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 21 六月 2026 13:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_泽淇实业' into dev_pro_河南鹤壁_泽淇实业
---
src/views/basicData/parameterMaintenance/index.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index 5681c2b..7f9bfb0 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -142,9 +142,8 @@
</el-form>
<template #footer>
<span class="dialog-footer">
+ <el-button type="primary" @click="handleSubmit">纭畾</el-button>
<el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary"
- @click="handleSubmit">纭畾</el-button>
</span>
</template>
</el-dialog>
@@ -224,6 +223,7 @@
import { deptTreeSelect } from "@/api/system/user.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import { ElMessage, ElMessageBox } from "element-plus";
+ import { parseTime } from "@/utils/ruoyi";
const tableColumn = ref([
{
@@ -294,6 +294,10 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
+ formatData: val => {
+ if (!val) return "";
+ return parseTime(val, "{y}-{m}-{d} {h}:{i}:{s}");
+ },
},
{
label: "鎿嶄綔",
--
Gitblit v1.9.3