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 | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/basicData/parameterMaintenance/index.vue b/src/views/basicData/parameterMaintenance/index.vue
index bd73467..7f9bfb0 100644
--- a/src/views/basicData/parameterMaintenance/index.vue
+++ b/src/views/basicData/parameterMaintenance/index.vue
@@ -50,7 +50,7 @@
prop="paramCode">
<el-input v-model="formData.paramCode"
disabled
- placeholder="淇濆瓨鍚庤嚜鍔ㄧ敓鎴�" />
+ placeholder="鑷姩鐢熸垚" />
</el-form-item>
<el-form-item label="鍙傛暟鍚嶇О"
prop="paramName">
@@ -82,14 +82,6 @@
value="2" />
</el-select>
</el-form-item> -->
- <el-form-item label="鍒涘缓鏃堕棿"
- prop="createTime">
- <el-date-picker v-model="formData.createTime"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- style="width: 100%" />
- </el-form-item>
<el-form-item label="鍗曚綅"
prop="unit">
<el-input v-model="formData.unit"
@@ -231,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([
{
@@ -301,6 +294,10 @@
{
label: "鍒涘缓鏃堕棿",
prop: "createTime",
+ formatData: val => {
+ if (!val) return "";
+ return parseTime(val, "{y}-{m}-{d} {h}:{i}:{s}");
+ },
},
{
label: "鎿嶄綔",
@@ -349,7 +346,6 @@
remark: "",
isRequired: 0,
paramFormat: "",
- createTime: "",
});
const rules = reactive({
paramName: [{ required: true, message: "璇疯緭鍏ュ弬鏁板悕绉�", trigger: "blur" }],
@@ -528,7 +524,6 @@
formData.unit = "";
formData.remark = "";
formData.isRequired = 0;
- formData.createTime = new Date().toISOString().split("T")[0];
dialogVisible.value = true;
};
--
Gitblit v1.9.3