Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮

liyong

2026-05-11 ca544c5c762cbc9ba218e09f33537abbf0dee070

Merge remote-tracking branch 'origin/dev_浪潮' into dev_浪潮

 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" }
    ]
  }
});