Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/training/spec/mapper/TStPlanMapper.java

@@ -35,7 +35,6 @@ public interface TStPlanMapper
      * @param tStPlan 培训计划
      * @return 培训计划集合
      */
-    @DataScope(deptAlias = "d")
     public List<TStPlan> selectTStPlanList(TStPlan tStPlan);
 
     /**

master/src/main/resources/mybatis/training/spec/TStPlanMapper.xml

@@ -46,7 +46,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectTStPlanList" parameterType="TStPlan" resultMap="TStPlanResult">
@@ -61,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+
     </select>
 
     <select id="selectTStPlanById" parameterType="Long" resultMap="TStPlanResult">

ui/src/views/training/spec/plan/index.vue

@@ -215,9 +215,6 @@
         <el-form-item label="培训内容" prop="plantName">
           <el-input v-model="form.plantName" placeholder="请输入培训内容" />
         </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
-        </el-form-item>
         <el-form-item label="开始日期" prop="startDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.startDate"
@@ -256,9 +253,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-          </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ui/src/views/training/spec/successor/index.vue

@@ -93,7 +93,7 @@
       <el-table-column label="班值" align="center" prop="staff.team" :formatter="teamFormat" />
       <el-table-column label="目标岗位" align="center" prop="actualpost" :formatter="actualpostFormat" />
       <el-table-column label="导师" align="center" prop="mentorStaffName" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训状态" align="center" prop="state" :show-overflow-tooltip="true"/>
+      <el-table-column label="培训状态" align="center" prop="state" :formatter="stSuccessorStatusFormat"/>
       <el-table-column label="一季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="二季度" align="center" prop="" :show-overflow-tooltip="true"/>
       <el-table-column label="三季度" align="center" prop="" :show-overflow-tooltip="true"/>
@@ -162,7 +162,14 @@
           <el-input v-model="form.mentorStaffId" placeholder="请输入导师员工编号" />
         </el-form-item>
         <el-form-item label="培训状态" prop="state">
-          <el-input v-model="form.state" placeholder="请输入培训状态" />
+          <el-select v-model="form.state" placeholder="请选择培训状态">
+            <el-option
+              v-for="dict in stSuccessorStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
         </el-form-item>
           <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
@@ -245,6 +252,7 @@ export default {
       // 目标岗位字典
       actualpostOptions: [],
       teamOptions: [],
+      stSuccessorStatusOptions: [],
         // 用户导入参数
         upload: {
             // 是否显示弹出层（用户导入）
@@ -294,6 +302,10 @@ export default {
     this.getDicts("TEAM_DIVIDE").then(response => {
       this.teamOptions = response.data;
     });
+    this.getDicts("st_successor_status").then(response => {
+      this.stSuccessorStatusOptions = response.data;
+    });
+
   },
   methods: {
     /** 查询继任者清单列表 */
@@ -323,6 +335,9 @@ export default {
     teamFormat(row, column) {
       return this.selectDictLabel(this.teamOptions, row.staff.team);
     },
+    stSuccessorStatusFormat(row, column) {
+      return this.selectDictLabel(this.stSuccessorStatusOptions, row.state);
+    },
     // 取消按钮
     cancel() {
       this.open = false;