zc

src/views/comprehensive/personnel/post/index.vue

@@ -101,17 +101,17 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body
                :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="职位名称" prop="postName">
+        <el-form-item label="身份名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入职位名称" maxlength="10" />
         </el-form-item>
-        <el-form-item label="职位编码" prop="postCode">
+        <el-form-item label="身份编码" prop="postCode">
           <el-input v-model="form.postCode" placeholder="请输入编码名称" maxlength="20" />
         </el-form-item>
         <!--<el-form-item label="职位顺序" prop="postSort">-->
           <!--<el-input-number v-model="form.postSort" controls-position="right" :min="0"  style="width: 380px"/>-->
         <!--</el-form-item>-->
 
-        <el-form-item label="职位状态" prop="status">
+        <el-form-item label="角色" prop="status">
           <el-select
             style="width:380px;"
             v-model="form.roleIds"
@@ -126,7 +126,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="职位状态" prop="status">
+        <el-form-item label="身份状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio
               v-for="dict in statusOptions"
@@ -198,16 +198,16 @@ export default {
       // 表单校验
       rules: {
         postName: [
-          { required: true, message: "职位名称不能为空", trigger: "blur" },
-          { required: true, message: "职位名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "身份名称不能为空", trigger: "blur" },
+          { required: true, message: "身份名称不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ],
         postCode: [
-          { required: true, message: "职位编码不能为空", trigger: "blur" },
-          { required: true, message: "职位编码不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "身份编码不能为空", trigger: "blur" },
+          { required: true, message: "身份编码不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ],
         postSort: [
-          { required: true, message: "职位顺序不能为空", trigger: "blur" },
-          { required: true, message: "职位顺序不能为空", validator: this.spaceJudgment, trigger: "blur" }
+          { required: true, message: "身份顺序不能为空", trigger: "blur" },
+          { required: true, message: "身份顺序不能为空", validator: this.spaceJudgment, trigger: "blur" }
         ]
       },
       //权限组列表

src/views/comprehensive/personnel/student/addPage.vue

@@ -83,10 +83,6 @@
           <el-select
             :disabled="editType"
             v-model="form.roleIds"
-            filterable
-            remote
-            clearable
-            reserve-keyword
             multiple
             collapse-tags
             placeholder="请选择角色">
@@ -313,6 +309,8 @@ export default {
         sex:0,
         userName:"",
         deptId:"",
+        position:"",     //身份
+        roleIds:"",     //角色
         majorId:"",
         grade:"",
         dateBirth:"",
@@ -477,6 +475,9 @@ export default {
       }else{
         this.form.roleIds = [];
       }
+      // if(this.propsData.position === '未定'){
+      //   this.form.position = null;
+      // }
       // if(this.propsData.position){
       //   this.form.position = this.propsData.position.split(',');
       //   for(let i=0;i<self.form.position.length;i++){
@@ -676,7 +677,7 @@ export default {
       this.$forceUpdate();
     },
     positionClearClick(){
-      this.$set(this.form,'roleIds',[])
+      // this.$set(this.form,'roleIds',[])
       this.positionSelectAll();
     },
     //*************************学籍状态查询

src/views/comprehensive/personnel/teacher/addPage.vue

@@ -82,10 +82,6 @@
             <el-select
               :disabled="editType"
               v-model="form.roleIds"
-              filterable
-              remote
-              clearable
-              reserve-keyword
               multiple
               collapse-tags
               placeholder="请选择角色">
@@ -239,6 +235,7 @@ export default {
         userName:"",     //工号
         deptId:"",     //所在部门
         position:"",     //身份
+        roleIds:"",     //角色
         category:"",     //职称
         phonenumber:"",     //联系方式
         cardNum:"",     //校园卡号
@@ -257,7 +254,7 @@ export default {
         userName: [{ required: true, message: "请输入工号", trigger: "blur" },
           { required: true, message: "请输入工号", validator: this.spaceJudgment, trigger: "blur" }],
         deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
-        position: [{ required: true, message: "请选择身份", trigger: "blur" }],
+        // position: [{ required: true, message: "请选择身份", trigger: "blur" }],
         name: [{ required: true, message: "请输入模板名称", trigger: "blur" },
           { required: true, message: "请输入模板名称", validator: this.spaceJudgment, trigger: "blur" }],
         deptIds: [{ required: true, message: "请选择指定部门", trigger: "blur" }],
@@ -419,6 +416,9 @@ export default {
         this.getPermitOptionList();
         this.getMenuOne();
       }
+      // if(this.propsData.position === '未定'){
+      //   this.form.position = null;
+      // }
       // if(this.propsData.position){
       //   this.form.position = this.propsData.position.split(',');
       //   for(let i=0;i<self.form.position.length;i++){
@@ -675,7 +675,7 @@ export default {
     },
     positionClearClick(){
       //清空
-      this.$set(this.form,'roleIds',[])
+      // this.$set(this.form,'roleIds',[])
     },
     //查询职称列表
     categorySelect(query){

src/views/comprehensive/personnel/teacher/indexOne.vue

@@ -925,11 +925,11 @@
       getList() {
         this.loading = true;
         listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            for(let i=0;i<response.rows.length;i++){
-              if(response.rows[i].position == "未定"){
-                response.rows[i].position = "";
-              }
-            }
+            // for(let i=0;i<response.rows.length;i++){
+            //   if(response.rows[i].position == "未定"){
+            //     response.rows[i].position = "";
+            //   }
+            // }
             this.$set(this,'userList',response.rows);
             // this.userList = response.rows;
             this.total = response.total;