From ca544c5c762cbc9ba218e09f33537abbf0dee070 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 15:37:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮
---
src/views/collaborativeApproval/journal/index.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/collaborativeApproval/journal/index.vue b/src/views/collaborativeApproval/journal/index.vue
index 543d319..3363796 100644
--- a/src/views/collaborativeApproval/journal/index.vue
+++ b/src/views/collaborativeApproval/journal/index.vue
@@ -151,7 +151,7 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鎶勯�佷汉" prop="ccUserIds">
+ <el-form-item label="鎶勯�佷汉" prop="ccUserIds" required>
<el-select
v-model="form.ccUserIds"
multiple
@@ -214,7 +214,7 @@
</div>
</div>
<div class="detail-info">
- <span><el-icon><User /></el-icon> 鍒涘缓浜猴細{{ currentJournal.createUser }}</span>
+ <span><el-icon><User /></el-icon> 鍒涘缓浜猴細{{ currentJournal.createUserName }}</span>
<span><el-icon><Timer /></el-icon> 鍒涘缓鏃堕棿锛歿{ currentJournal.createTime }}</span>
</div>
<el-divider />
@@ -330,6 +330,10 @@
],
content: [
{ required: true, message: "鏃ュ織鍐呭涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ ccUserIds: [
+ { required: true, message: "璇烽�夋嫨鎶勯�佷汉", trigger: "change", type: "array" },
+ { min: 1, message: "璇疯嚦灏戦�夋嫨涓�涓妱閫佷汉", trigger: "change", type: "array" }
]
}
});
--
Gitblit v1.9.3