From b21afc26b596a5a7cb77b36cd96f6e0df91637eb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 26 八月 2026 14:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸
---
src/views/collaborativeApproval/rulesRegulationsManagement/index.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
index f7ba9d9..84fadf2 100644
--- a/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
+++ b/src/views/collaborativeApproval/rulesRegulationsManagement/index.vue
@@ -144,7 +144,7 @@
<el-descriptions-item label="鍒嗙被">{{ getCategoryText(currentRegulationDetail.category) }}</el-descriptions-item>
<el-descriptions-item label="鐗堟湰">{{ currentRegulationDetail.version }}</el-descriptions-item>
<el-descriptions-item label="鍙戝竷浜�">{{ currentRegulationDetail.createUserName }}</el-descriptions-item>
- <el-descriptions-item label="鍙戝竷鏃堕棿">{{ currentRegulationDetail.createTime }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戝竷鏃堕棿">{{ formatDate(currentRegulationDetail.createTime) }}</el-descriptions-item>
</el-descriptions>
<div class="mt-20">
<h4>鍒跺害鍐呭</h4>
@@ -169,7 +169,13 @@
width="100" />
<el-table-column prop="updateTime"
label="鏇存柊鏃堕棿"
- width="180" />
+ width="180" >
+ <template #default="scope">
+ <el-text>
+ {{scope.row.updateTime?dayjs(scope.row.updateTime).format("YYYY-MM-DD"):"--"}}
+ </el-text>
+ </template>
+ </el-table-column>
<el-table-column prop="createUserName"
label="鏇存柊浜�"
width="120" />
@@ -228,6 +234,7 @@
addReadingStatus,
updateReadingStatus,
} from "@/api/collaborativeApproval/sealManagement.js";
+ import dayjs from "dayjs";
const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
import {
listRuleFiles,
@@ -235,6 +242,10 @@
addRuleFile,
} from "@/api/collaborativeApproval/rulesRegulationsManagementFile.js";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
+ import { parseDate } from "@/utils/ruoyi";
+
+ // 鏃ユ湡鍥炴樉鏍煎紡鍖栵紙YYYY-MM-DD锛�
+ const formatDate = value => parseDate(value) || "-";
// 鍝嶅簲寮忔暟鎹�
const operationType = ref("add");
@@ -309,7 +320,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",
@@ -451,7 +462,7 @@
const viewVersionHistory = row => {
showVersionHistoryDialog.value = true;
const params = {
- category: row.category,
+ title: row.title,
};
listRuleManagement(page, params).then(res => {
if (res.code == 200) {
--
Gitblit v1.9.3