From 70bc20674bf49573b725a2788259dd9731a9c43a Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Thu, 14 Nov 2024 18:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/process/evection/index.vue       | 16 +++++++++++++---
 src/views/process/leaveReporting/index.vue |  4 ++--
 src/views/system/userInfo/index.vue        | 15 +++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/process/evection/index.vue b/src/views/process/evection/index.vue
index b3942c1..01f961f 100644
--- a/src/views/process/evection/index.vue
+++ b/src/views/process/evection/index.vue
@@ -249,8 +249,8 @@
 
         <el-row >
           <el-col :span="24">
-            <el-form-item label="备注：" prop="breamks">
-              <el-input type="textarea" v-model="form.breamks" maxlength="200"></el-input>
+            <el-form-item label="备注：" prop="remark">
+              <el-input type="textarea" v-model="form.remark" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -515,17 +515,27 @@ export default {
         }
       })
     },
+
+    getSelectedUserNames() {
+      const selectedUserIds = this.form.orgHeadUserIdList;
+      const selectedUsers = this.personOptions.filter(option => selectedUserIds.includes(option.userIds));
+      const selectedUserNames = selectedUsers.map(user => user.userName);
+      return selectedUserNames.join(', ');
+    },
+
     /** 提交按钮 */
     submitForm: function () {
       console.log(this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
-          console.log(this.form)
           var list = this.form.hostUserId.join(",");
           this.form.hostUserId = list;
 
           var lists = this.form.orgHeadUserIdList.join(",");
           this.form.travelers = lists;
+
+          var nameList = this.getSelectedUserNames();
+          this.form.travelersName = nameList;
           if (this.form.id != undefined) {
             this.form.examineStatus = 0
             updateEvection(this.form).then(response => {
diff --git a/src/views/process/leaveReporting/index.vue b/src/views/process/leaveReporting/index.vue
index 767c479..a4a6c0d 100644
--- a/src/views/process/leaveReporting/index.vue
+++ b/src/views/process/leaveReporting/index.vue
@@ -249,8 +249,8 @@
 
         <el-row >
           <el-col :span="24">
-            <el-form-item label="备注：" prop="breamks">
-              <el-input type="textarea" v-model="form.breamks" maxlength="200"></el-input>
+            <el-form-item label="备注：" prop="remark">
+              <el-input type="textarea" v-model="form.remark" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/system/userInfo/index.vue b/src/views/system/userInfo/index.vue
index dfdb0db..0a4fed1 100644
--- a/src/views/system/userInfo/index.vue
+++ b/src/views/system/userInfo/index.vue
@@ -133,6 +133,17 @@
 
             </el-row>
 
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="是否干部" prop="isCadre">
+                <el-select v-model="form.isCadre" placeholder="是否干部" clearable>
+                  <el-option label="是" value="0"></el-option>
+                  <el-option label="否" value="1"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -223,6 +234,10 @@
           roleIds: [
             { required: true, message: "人员角色不能为空", trigger: "blur" }
           ],
+          isCadre: [
+            { required: true, message: "是否干部不能为空", trigger: "blur" }
+          ],
+
           phone: [
             { required: true, message: "手机号码不能为空", trigger: "blur" },
             {