提交

1

src/constant/guide.js

@@ -19,13 +19,13 @@ export const guideList = {
   },
   cooperationOrgan: {
     name: '合作单位',
-    desc: '合作单位既合作学校，乐团需从属与具体合作单位',
+    desc: '合作单位即合作学校，乐团需从属于具体合作单位',
     path: '/sysBasics/branchManager',
     permission: '/branchManager'
   },
   school: {
     name: '教学点',
-    desc: '教学点是乐团线下课的上线地点，学员和老师需根据教学点前往制定地点上课，同时老师需在教学点定位范围内进行考勤',
+    desc: '教学点是线下课的上课地点，学员和老师需根据教学点前往指定地点上课，同时老师需在教学点定位范围内进行考勤',
     path: '/sysBasics/addressManager',
     permission: '/addressManager'
   },

src/views/categroyManager/insideSetting/staffManager.vue

@@ -389,11 +389,35 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item
-              label="员工职位"
-              prop="positionIds"
-              :label-width="formLabelWidth"
-            >
+            <el-form-item prop="positionIds" :label-width="formLabelWidth" class="hiddenStart">
+              <template slot="label">
+                <p style="position: relative">
+                  <span style="color: #f56c6c; margin-right: 4px">*</span>
+                  员工职位
+                  <el-tooltip placement="top" popper-class="mTooltip">
+                    <div slot="content">
+                      <p>分部经理：分部事务审批，为乐团主管分配日程安排</p>
+                      <p>
+                        乐团主管：具体乐团、VIP、网管课课程组负责人，管理日常教务
+                      </p>
+                      <p>维修技师：管理端APP乐器维修人员</p>
+                      <p>
+                        衔接老师：合作单位老师，可在管理端APP查看所关联乐团课程、作业
+                      </p>
+                      <p>HRBP：人力资源表可选择HR归属</p>
+                    </div>
+                    <i
+                      class="el-icon-question"
+                      style="
+                        font-size: 18px;
+                        color: #f56c6c;
+                        position: relative;
+                        top: 2px;
+                      "
+                    ></i>
+                  </el-tooltip>
+                </p>
+              </template>
               <select-all
                 v-model.trim="form.positionIds"
                 placeholder="请选择员工职位"
@@ -630,7 +654,7 @@ export default {
         create: "添加员工",
         update: "修改员工",
       },
-      formLabelWidth: "100px",
+      formLabelWidth: "120px",
       form: {
         realName: null,
         gender: null,
@@ -685,7 +709,7 @@ export default {
             trigger: "change",
           },
         ],
-             positionIds: [
+        positionIds: [
           {
             type: "array",
             required: true,
@@ -708,7 +732,7 @@ export default {
         organId: null,
         roleId: null,
       },
-      positionList:[]
+      positionList: [],
     };
   },
   mounted() {
@@ -931,11 +955,11 @@ export default {
       });
 
       // 获取员工职位
-      try{
-        const res = await getPosition()
+      try {
+        const res = await getPosition();
         this.positionList = res.data;
-      }catch(e){
-        console.log(e)
+      } catch (e) {
+        console.log(e);
       }
       this.formActionTitle = type;
       this.roleStatus = true;
@@ -998,7 +1022,9 @@ export default {
           deptId: data.deptId
             ? this.formatParentId(data.deptId, this.deptList)
             : null,
-          positionIds: data.positionIds ? data.positionIds.split(',').map(i => Number(i) ) : [],
+          positionIds: data.positionIds
+            ? data.positionIds.split(",").map((i) => Number(i))
+            : [],
           organIdLists: data.organIdList ? data.organIdList : [],
           jobNature: data.jobNature,
           entryDate: data.entryDate,
@@ -1180,4 +1206,13 @@ export default {
 .setWidth {
   display: inline-block;
 }
+
+.hiddenStart {
+  /deep/.el-form-item__label:before {
+    content: "" !important;
+    position: absolute;
+    color: transparent;
+    margin-right: 4px;
+  }
+}
 </style>