From ed867825c785ab6c2f2b2410a0d18686999ae840 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 27 Dec 2021 16:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E6=8A=A5=E5=91=8A=E5=8F=82?=
 =?UTF-8?q?=E8=80=83=E7=AD=94=E6=A1=88=E5=AD=97=E4=BD=93=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/show/index.vue |  9 +++++++-
 src/pages/system/list/staff.vue      | 32 +++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 40368ae..dbf1af7 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -420,7 +420,14 @@ export default {
         }
     }
 }
-
+/deep/ pre, code, kbd, samp{
+    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+}
+/deep/ pre{
+    white-space: pre-wrap;
+}
 /deep/ .cell {
     font-size: 12px;
 }
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index f95cec4..59c35ee 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -68,15 +68,18 @@
                 <el-form-item prop="workNumber" label="工号">
                     <el-input v-model.trim="teacherForm.workNumber" placeholder="请输入职工工号"></el-input>
                 </el-form-item>
-                <template v-for="item in teacherForm.roleAndDeptList">
-                    <el-form-item :label="`${item.roleName}所属部门`">
-                        <el-cascader
-                            v-model="item.cascaderValue"
-                            :options="majorList"
-                            style="width: 100%"
-                        ></el-cascader>
-                    </el-form-item>
-                </template>
+                <el-form-item v-for="item in teacherForm.roleAndDeptList" :label="`${item.roleName}所属部门`" :rules="{
+      required: true, message: '请选择', trigger: 'change'
+    }">
+                    <el-cascader
+                        v-model="item.cascaderValue"
+                        :options="majorList"
+                        style="width: 100%"
+                    ></el-cascader>
+                </el-form-item>
+<!--                <template v-for="item in teacherForm.roleAndDeptList">-->
+<!--                    -->
+<!--                </template>-->
 
                 <el-form-item prop="phone" label="手机号">
                     <el-input v-model.trim="teacherForm.phone" placeholder="请输入手机号" maxlength="11" @blur="phoneChange"></el-input>
@@ -471,10 +474,15 @@ export default {
             }
         },
         roleRemove(value) { // 处理移除角色
-            let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleName === value);
-            if (index !== -1) {
-                this.teacherForm.roleAndDeptList.splice(index, 1);
+            let list = [];
+            for(var i=0;i<this.teacherForm.roleAndDeptList.length;i++){
+                if (this.teacherForm.roleAndDeptList[i].roleId == value){
+
+                }else{
+                    list.push(this.teacherForm.roleAndDeptList[i])
+                }
             }
+            this.teacherForm.roleAndDeptList = list
         },
         async saveSure(teacherForm) {
             this.$refs[teacherForm].validate((valid) => {