导师带徒

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFirstplan.java

@@ -96,6 +96,16 @@ public class TTsFirstplan extends BaseEntity
 
     private String deptName;
 
+    private String staffName;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFlplan.java

@@ -108,6 +108,16 @@ public class TTsFlplan extends BaseEntity
 
     private String deptName;
 
+    private String staffName;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsFtplan.java

@@ -108,6 +108,16 @@ public class TTsFtplan extends BaseEntity
 
     private String deptName;
 
+    private String staffName;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsLjplan.java

@@ -108,6 +108,16 @@ public class TTsLjplan extends BaseEntity
 
     private String deptName;
 
+    private String staffName;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsNew.java

@@ -88,6 +88,29 @@ public class TTsNew extends BaseEntity
 
     private String planFinish;
 
+    @Excel(name = "培训员工")
+    private String staffName;
+
+    /** 导师员工编号 */
+    @Excel(name = "导师")
+    private String mentorStaffName;
+
+    public String getMentorStaffName() {
+        return mentorStaffName;
+    }
+
+    public void setMentorStaffName(String mentorStaffName) {
+        this.mentorStaffName = mentorStaffName;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getPlanFinish() {
         return planFinish;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/domain/TTsYsplan.java

@@ -108,6 +108,16 @@ public class TTsYsplan extends BaseEntity
 
     private String deptName;
 
+    private String staffName;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsNewServiceImpl.java

@@ -46,6 +46,12 @@ public class TTsNewServiceImpl implements ITTsNewService {
     @Autowired
     private TTsFtplanMapper tTsFtplanMapper;
 
+    @Autowired
+    private TTsFirstplanMapper tTsFirstplanMapper ;
+
+    @Autowired
+    private TTsFirstplanTmplMapper tTsFirstplanTmplMapper;
+
     /**
      * 查询导师带徒
      *
@@ -77,6 +83,21 @@ public class TTsNewServiceImpl implements ITTsNewService {
     @Override
     public int insertTTsNew(TTsNew tTsNew) {
         tTsNewMapper.insertTTsNew(tTsNew);
+        for (TTsFirstplanTmpl tTsFirstplanTmpl : tTsFirstplanTmplMapper.selectTTsFirstplanTmplList(new TTsFirstplanTmpl())) {
+            TTsFirstplan tTsFirstplan = new TTsFirstplan();
+            tTsFirstplan.setNewId(tTsNew.getNewId());
+            tTsFirstplan.setCourseCode(tTsFirstplanTmpl.getCourseCode());
+            tTsFirstplan.setTopic(tTsFirstplanTmpl.getTopic());
+            tTsFirstplan.setContent(tTsFirstplanTmpl.getContent());
+            tTsFirstplan.setCourseDay(tTsFirstplanTmpl.getCourseDay());
+            tTsFirstplan.setCourseHour(tTsFirstplanTmpl.getCourseHour());
+            tTsFirstplan.setCourseType(tTsFirstplanTmpl.getCourseType());
+            tTsFirstplan.setTrainer(tTsFirstplanTmpl.getTrainer());
+            tTsFirstplan.setCourseDate(tTsFirstplanTmpl.getCourseDate());
+            tTsFirstplan.setAssess(tTsFirstplanTmpl.getAssess());
+            tTsFirstplan.setPlanStatus(0L);
+            tTsFirstplanMapper.insertTTsFirstplan(tTsFirstplan);
+        }
         if (tTsNew.getPlanType() == 1) {
             for (TTsLjplanTmpl item : tTsLjplanTmplMapper.selectTTsLjplanTmplList(new TTsLjplanTmpl())) {
                 TTsLjplan entity = new TTsLjplan();

master/src/main/resources/mybatis/training/bccnew/TTsNewMapper.xml

@@ -22,11 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="planType"    column="plan_type"    />
         <result property="remarks"    column="remarks"    />
         <result property="deptName" column="dept_name" />
+        <result property="staffName"    column="staffName"    />
+        <result property="mentorStaffName"    column="mentorStaffName"    />
     </resultMap>
 
     <sql id="selectTTsNewVo">
-        select d.new_id, d.staff_id, d.name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.plan_status, d.plan_year, d.startdate, d.enddate, d.mentor_staff_id, d.plan_type, d.remarks ,s.dept_name from t_ts_new d
+        select d.new_id, d.staff_id, d.name,u.name as staffName,u2.name as mentorStaffName, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.plan_status, d.plan_year, d.startdate, d.enddate, d.mentor_staff_id, d.plan_type, d.remarks ,s.dept_name from t_ts_new d
       left join sys_dept s on s.dept_id = d.dept_id
+      left join t_staffmgr u on d.staff_id = u.staffid and u.del_flag = 0
+      left join t_staffmgr u2 on d.mentor_staff_id = u2.staffid and u2.del_flag = 0
     </sql>
 
     <select id="selectTTsNewList" parameterType="TTsNew" resultMap="TTsNewResult">
@@ -50,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by createdate desc
     </select>
 
     <select id="selectTTsNewById" parameterType="Long" resultMap="TTsNewResult">

ui/src/views/training/bccnew/firstPlanTmpl/index.vue

@@ -258,7 +258,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />

ui/src/views/bccnew/firstplan/index.vue → ui/src/views/training/bccnew/firstplan/index.vue

@@ -169,60 +169,27 @@
           @click="handleDelete"
           v-hasPermi="['bccnew:firstplan:remove']"
         >删除</el-button>
-      </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['bccnew:firstplan:edit']"
-            >导入</el-button>
-        </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['bccnew:firstplan:export']"
-        >导出</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="firstplanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
-      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训类型" align="center" prop="courseType" :show-overflow-tooltip="true"/>
-      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训类型" align="center" prop="courseType" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -252,11 +219,8 @@
     />
 
     <!-- 添加或修改进组培训对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="培训员工编号" prop="newId">
-          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="课程编号" prop="courseCode">
           <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
         </el-form-item>
@@ -264,7 +228,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />
@@ -273,9 +237,8 @@
           <el-input v-model="form.courseHour" placeholder="请输入培训小时" />
         </el-form-item>
         <el-form-item label="培训类型" prop="courseType">
-          <el-select v-model="form.courseType" placeholder="请选择培训类型">
+          <el-input v-model="form.courseType" placeholder="请输入培训类型" />
             <el-option label="请选择字典生成" value="" />
-          </el-select>
         </el-form-item>
         <el-form-item label="讲师" prop="trainer">
           <el-input v-model="form.trainer" placeholder="请输入讲师" />
@@ -291,41 +254,18 @@
         <el-form-item label="考核情况" prop="assess">
           <el-input v-model="form.assess" placeholder="请输入考核情况" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
+        <el-form-item label="培训状态">
+          <el-select v-model="form.planStatus" placeholder="请选择培训状态">
+            <el-option
+              v-for="dict in planStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="培训状态">
-          <el-radio-group v-model="form.planStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
         </el-form-item>
           <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
@@ -370,16 +310,22 @@
 </template>
 
 <script>
-import { listFirstplan, getFirstplan, delFirstplan, addFirstplan, updateFirstplan, exportFirstplan, importTemplate} from "@/api/bccnew/firstplan";
+import { listFirstplan, getFirstplan, delFirstplan, addFirstplan, updateFirstplan, exportFirstplan, importTemplate} from "@/api/training/bccnew/firstplan";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
+import Editor from '@/components/Editor/index.vue';
 
 export default {
-  name: "Firstplan",
+  name: "FirstplanBccnew",
   components: { Treeselect },
+  props: {
+    newId: {
+      default:null
+    },
+    planType: {}
+  },
   // components: { Editor },
   data() {
     return {
@@ -397,6 +343,8 @@ export default {
       total: 0,
       // 进组培训表格数据
       firstplanList: [],
+      // 培训状态字典
+      planStatusOptions: [],
       // 弹出层标题
       title: "",
       // 部门树选项
@@ -423,7 +371,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        newId: null,
+        newId: this.newId,
         courseCode: null,
         topic: null,
         content: null,
@@ -461,6 +409,9 @@ export default {
       })
     this.getList();
     this.getTreeselect();
+    this.getDicts("training_newstaff_status").then(response => {
+      this.planStatusOptions = response.data;
+    });
   },
   methods: {
     /** 查询进组培训列表 */

ui/src/views/training/bccnew/flPlan/index.vue

@@ -19,42 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训主题" prop="topic">
-        <el-input
-          v-model="queryParams.topic"
-          placeholder="请输入培训主题"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训天" prop="courseDay">
-        <el-input
-          v-model="queryParams.courseDay"
-          placeholder="请输入培训天"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训小时" prop="courseHour">
-        <el-input
-          v-model="queryParams.courseHour"
-          placeholder="请输入培训小时"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详细计划" prop="detailPlan">
-        <el-input
-          v-model="queryParams.detailPlan"
-          placeholder="请输入详细计划"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="讲师" prop="trainer">
         <el-input
           v-model="queryParams.trainer"
@@ -64,75 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训日期" prop="courseDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.courseDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择培训日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="考核情况" prop="assess">
-        <el-input
-          v-model="queryParams.assess"
-          placeholder="请输入考核情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createrCode">
-        <el-input
-          v-model="queryParams.createrCode"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="修改人" prop="updaterCode">
-        <el-input
-          v-model="queryParams.updaterCode"
-          placeholder="请输入修改人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updatedate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.updatedate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择修改时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门编号" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -192,7 +87,6 @@
 
     <el-table v-loading="loading" :data="flPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
       <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
       <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
@@ -238,9 +132,6 @@
     <!-- 添加或修改分离培训模版对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="培训员工编号" prop="newId">
-          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
-        </el-form-item>
         <el-form-item label="课程编号" prop="courseCode">
           <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
         </el-form-item>
@@ -248,7 +139,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />
@@ -273,34 +164,6 @@
         <el-form-item label="考核情况" prop="assess">
           <el-input v-model="form.assess" placeholder="请输入考核情况" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

ui/src/views/training/bccnew/ftPlan/index.vue

@@ -1,36 +1,28 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="课程编号" prop="courseCode">
+      <el-form-item label="培训员工编号" prop="newId">
         <el-input
-          v-model="queryParams.courseCode"
-          placeholder="请输入课程编号"
+          v-model="queryParams.newId"
+          placeholder="请输入培训员工编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="讲师" prop="trainer">
+      <el-form-item label="课程编号" prop="courseCode">
         <el-input
-          v-model="queryParams.trainer"
-          placeholder="请输入讲师"
+          v-model="queryParams.courseCode"
+          placeholder="请输入课程编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训日期" prop="courseDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.courseDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择培训日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="考核情况" prop="assess">
+      <el-form-item label="讲师" prop="trainer">
         <el-input
-          v-model="queryParams.assess"
-          placeholder="请输入考核情况"
+          v-model="queryParams.trainer"
+          placeholder="请输入讲师"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -95,7 +87,6 @@
 
     <el-table v-loading="loading" :data="ftPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
       <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
       <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
@@ -141,9 +132,6 @@
     <!-- 添加或修改芳烃培训模版对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="培训员工编号" prop="newId">
-          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
-        </el-form-item>
         <el-form-item label="课程编号" prop="courseCode">
           <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
         </el-form-item>
@@ -151,7 +139,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />
@@ -176,34 +164,6 @@
         <el-form-item label="考核情况" prop="assess">
           <el-input v-model="form.assess" placeholder="请输入考核情况" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

ui/src/views/training/bccnew/ljPlan/index.vue

@@ -19,42 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训主题" prop="topic">
-        <el-input
-          v-model="queryParams.topic"
-          placeholder="请输入培训主题"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训天" prop="courseDay">
-        <el-input
-          v-model="queryParams.courseDay"
-          placeholder="请输入培训天"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训小时" prop="courseHour">
-        <el-input
-          v-model="queryParams.courseHour"
-          placeholder="请输入培训小时"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详细计划" prop="detailPlan">
-        <el-input
-          v-model="queryParams.detailPlan"
-          placeholder="请输入详细计划"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="讲师" prop="trainer">
         <el-input
           v-model="queryParams.trainer"
@@ -64,75 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训日期" prop="courseDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.courseDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择培训日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="考核情况" prop="assess">
-        <el-input
-          v-model="queryParams.assess"
-          placeholder="请输入考核情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createrCode">
-        <el-input
-          v-model="queryParams.createrCode"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="修改人" prop="updaterCode">
-        <el-input
-          v-model="queryParams.updaterCode"
-          placeholder="请输入修改人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updatedate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.updatedate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择修改时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门编号" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -192,8 +87,6 @@
 
     <el-table v-loading="loading" :data="ljPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
       <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
       <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
@@ -207,19 +100,6 @@
         </template>
       </el-table-column>
       <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -252,9 +132,6 @@
     <!-- 添加或修改裂解培训模版对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="培训员工编号" prop="newId">
-          <el-input v-model="form.newId" placeholder="请输入培训员工编号" />
-        </el-form-item>
         <el-form-item label="课程编号" prop="courseCode">
           <el-input v-model="form.courseCode" placeholder="请输入课程编号" />
         </el-form-item>
@@ -262,7 +139,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />
@@ -287,34 +164,6 @@
         <el-form-item label="考核情况" prop="assess">
           <el-input v-model="form.assess" placeholder="请输入考核情况" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>

ui/src/views/training/bccnew/tsnew/index.vue

@@ -453,7 +453,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/newstaff/tnNew/importData"
+        url: process.env.VUE_APP_BASE_API + "/newstaff/tsNew/importData"
       },
       // 报告附件参数
       doc: {

ui/src/views/training/bccnew/tsnew/score.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="app-container">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -7,8 +7,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['bccnew:flplandsdt:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -17,8 +17,8 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['bccnew:flplandsdt:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -27,80 +27,446 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['bccnew:flplandsdt:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table v-loading="loading" :data="dsdtList" :height="clientHeight" @selection-change="handleSelectionChange" border>
+    <el-table v-loading="loading" :data="dsdtList" :height="clientHeight" @selection-change="handleSelectionChange"
+              border>
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true" fixed="left"/>
-      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true" fixed="left"/>
-      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" fixed="left"/>
-      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true"/>
-      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true"/>
-      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训日期" align="center" prop="courseDate" width="100">
+      <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true" fixed="left"
+                       width="180"/>
+      <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true" fixed="left"
+                       width="180"/>
+      <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训天" align="center" prop="courseDay" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训小时" align="center" prop="courseHour" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="详细计划" align="center" prop="detailPlan" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="讲师" align="center" prop="trainer" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训日期" align="center" prop="courseDate" width=" 180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.courseDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true"/>
-      <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true"/>
-      <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="第一次成绩" align="center" prop="score1" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="第二次成绩" align="center" prop="score2" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="第三次成绩" align="center" prop="score3" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改转岗培训对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form-item label="培训员工编号" prop="newId">
+          <el-input v-model="form.newId" disabled/>
+        </el-form-item>
+        <el-form-item label="课程编号" prop="courseCode">
+          <el-input v-model="form.courseCode" placeholder="请输入课程编号"/>
+        </el-form-item>
+        <el-form-item label="培训主题" prop="topic">
+          <el-input v-model="form.topic" placeholder="请输入培训主题"/>
+        </el-form-item>
+        <el-form-item label="培训内容">
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
+        </el-form-item>
+        <el-form-item label="培训天" prop="courseDay">
+          <el-input v-model="form.courseDay" placeholder="请输入培训天"/>
+        </el-form-item>
+        <el-form-item label="培训小时" prop="courseHour">
+          <el-input v-model="form.courseHour" placeholder="请输入培训小时"/>
+        </el-form-item>
+        <el-form-item label="详细计划" prop="detailPlan">
+          <el-input v-model="form.detailPlan" placeholder="请输入详细计划"/>
+        </el-form-item>
+        <el-form-item label="讲师" prop="trainer">
+          <el-input v-model="form.trainer" placeholder="请输入讲师"/>
+        </el-form-item>
+        <el-form-item label="培训日期" prop="courseDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+                          v-model="form.courseDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择培训日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="考核情况" prop="assess">
+          <el-input v-model="form.assess" placeholder="请输入考核情况"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+        <el-form-item label="培训状态">
+          <el-select v-model="form.planStatus" placeholder="请选择培训状态">
+            <el-option
+              v-for="dict in planStatusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="第一次成绩" prop="score1">
+          <el-input v-model="form.score1" placeholder="请输入第一次成绩"/>
+        </el-form-item>
+        <el-form-item label="第二次成绩" prop="score2">
+          <el-input v-model="form.score2" placeholder="请输入第二次成绩"/>
+        </el-form-item>
+        <el-form-item label="第三次成绩" prop="score3">
+          <el-input v-model="form.score3" placeholder="请输入第三次成绩"/>
+        </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>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-export default {
-  props:{
-    newId:{
-
-    },
-    traniningType:{
+import {
+  addLjplandsdt,
+  delLjplandsdt,
+  getLjplandsdt,
+  listLjplandsdt,
+  updateLjplandsdt
+} from "@/api/training/bccnew/ljplandsdt";
+import {
+  addYsplandsdt,
+  delYsplandsdt,
+  getYsplandsdt,
+  listYsplandsdt,
+  updateYsplandsdt
+} from "@/api/training/bccnew/ysplandsdt";
+import {
+  addFlplandsdt,
+  delFlplandsdt,
+  getFlplandsdt,
+  listFlplandsdt,
+  updateFlplandsdt
+} from "@/api/training/bccnew/flplandsdt";
+import {
+  addFtplandsdt,
+  delFtplandsdt,
+  getFtplandsdt,
+  listFtplandsdt,
+  updateFtplandsdt
+} from "@/api/training/bccnew/ftplandsdt";
+import {treeselect} from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
 
-    }
+export default {
+  props: {
+    newId: {},
+    planType: {}
   },
+  components: {Treeselect},
   data() {
     return {
       // 选中数组
       ids: [],
+      // 总条数
+      total: 0,
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
       showSearch: false,
-      loading:true,
+      loading: true,
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      // 培训状态字典
+      planStatusOptions: [],
       clientHeight: 300,
-      dsdtList:[],
+      // 是否显示弹出层
+      open: false,
+      dsdtList: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        newId: this.newId
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {}
+    }
+  },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
     }
   },
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight -250
+      this.clientHeight = document.body.clientHeight - 250
     })
-
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("training_newstaff_status").then(response => {
+      this.planStatusOptions = response.data;
+    });
   },
-  methods:{
-    getList(){},
+  methods: {
+    getList() {
+      if (this.planType == 1) {
+        listLjplandsdt(this.queryParams).then(res => {
+          this.dsdtList = res.rows;
+          this.total = res.total;
+          this.loading = false;
+        })
+      } else if (this.planType == 2) {
+        listYsplandsdt(this.queryParams).then(res => {
+          this.dsdtList = res.rows;
+          this.total = res.total;
+          this.loading = false;
+        })
+      } else if (this.planType == 3) {
+        listFlplandsdt(this.queryParams).then(res => {
+          this.dsdtList = res.rows;
+          this.total = res.total;
+          this.loading = false;
+        })
+      } else if (this.planType == 4) {
+        listFtplandsdt(this.queryParams).then(res => {
+          this.dsdtList = res.rows;
+          this.total = res.total;
+          this.loading = false;
+        })
+      }
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        newId: this.newId,
+        courseCode: null,
+        topic: null,
+        content: null,
+        courseDay: null,
+        courseHour: null,
+        detailPlan: null,
+        trainer: null,
+        courseDate: null,
+        assess: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null,
+        planStatus: 0,
+        score1: null,
+        score2: null,
+        score3: null
+      };
+      this.resetForm("form");
+    }, /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      if (this.planType == 1) {
+        this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return delLjplandsdt(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      } else if (this.planType == 2) {
+        this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return delYsplandsdt(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      } else if (this.planType == 3) {
+        this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return delFlplandsdt(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      } else if (this.planType == 4) {
+        this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return delFtplandsdt(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+      }
+    },
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      if (this.planType == 1) {
+        getLjplandsdt(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改课程";
+        });
+      } else if (this.planType == 2) {
+        getYsplandsdt(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改课程";
+        });
+      } else if (this.planType == 3) {
+        getFlplandsdt(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改课程";
+        });
+      } else if (this.planType == 4) {
+        getFtplandsdt(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改课程";
+        });
+      }
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加课程";
+    }, /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            if (this.planType == 1) {
+              updateLjplandsdt(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 2) {
+              updateYsplandsdt(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 3) {
+              updateFlplandsdt(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 4) {
+              updateFtplandsdt(this.form).then(response => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          } else {
+            if (this.planType == 1) {
+              addLjplandsdt(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 2) {
+              addYsplandsdt(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 3) {
+              addFlplandsdt(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            } else if (this.planType == 4) {
+              addFtplandsdt(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        }
+      });
+    },
   }
 };
 

ui/src/views/training/bccnew/tsnew/trainingPlan.vue

@@ -2,19 +2,19 @@
   <div class="app-container" style="padding: 0 0 0 0">
     <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="进组前培训" name="first">
-        <list item="1" typename="firstplan" v-if="isFirst"></list>
+        <firstplan-bccnew :newId="newId"  item="1" typename="firstplan" v-if="isFirst"></firstplan-bccnew>
       </el-tab-pane>
       <el-tab-pane label="裂解" name="second" v-if="planType == 1">
-        <score :newId="newId" v-if="isSecond"/>
+        <score :newId="newId" :planType="1" v-if="isSecond"/>
       </el-tab-pane>
       <el-tab-pane label="压缩" name="third" v-if="planType == 2">
-        <score :newId="newId" v-if="isThird"/>
+        <score :newId="newId" :planType="2" v-if="isThird"/>
       </el-tab-pane>
       <el-tab-pane label="分离" name="fourth" v-if="planType == 3">
-        <score :newId="newId" v-if="isFourth"/>
+        <score :newId="newId" :planType="3" v-if="isFourth"/>
       </el-tab-pane>
       <el-tab-pane label="芳烃" name="fifth" v-if="planType == 4">
-        <score :newId="newId" v-if="isFifth"/>
+        <score :newId="newId" :planType="4" v-if="isFifth"/>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -22,15 +22,17 @@
 <script>
 import List from "@/views/training/newstaff/firstplan/index.vue";
 import Score from "@/views/training/bccnew/tsnew/score.vue";
-import {getTnNew} from "@/api/training/newstaff/tnNew";
 import {listLjplandsdt} from "@/api/training/bccnew/ljplandsdt";
 import {listYsplandsdt} from "@/api/training/bccnew/ysplandsdt";
 import {listFlplandsdt} from "@/api/training/bccnew/flplandsdt";
 import {listFtplandsdt} from "@/api/training/bccnew/ftplandsdt";
+import {getTsnew} from "@/api/training/bccnew/tsnew";
+import Firstplan from "@/views/training/newstaff/firstplan/index.vue";
+import FirstplanBccnew from "@/views/training/bccnew/firstplan/index.vue";
 
 export default {
   name: "trainingPlan",
-  components: {Score, List},
+  components: {FirstplanBccnew, Firstplan, Score, List},
   data() {
     return {
       dsdtList: [],
@@ -50,7 +52,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.newId = this.$route.params && this.$route.params.newId;
-    getTnNew(this.newId).then(response => {
+    getTsnew(this.newId).then(response => {
       this.planType = response.data.planType;
     });
   },
@@ -59,9 +61,6 @@ export default {
       console.log(tab.name)
       this.dsdtList = [];
       if (tab.name === 'first') {
-        listLjplandsdt({newId: this.newId}).then(res => {
-          this.dsdtList = res.data;
-        })
         this.isFirst = true
         this.isSecond = false
         this.isThird = false
@@ -69,9 +68,6 @@ export default {
         this.isFifth = false
         this.isSix1th = false
       } else if (tab.name === 'second') {
-        listYsplandsdt({newId: this.newId}).then(res => {
-          this.dsdtList = res.data;
-        })
         this.isFirst = false
         this.isSecond = true
         this.isThird = false
@@ -79,9 +75,6 @@ export default {
         this.isFifth = false
         this.isSixth = false
       } else if (tab.name === 'third') {
-        listFlplandsdt({newId: this.newId}).then(res => {
-          this.dsdtList = res.data;
-        })
         this.isFirst = false
         this.isSecond = false
         this.isThird = true
@@ -89,9 +82,6 @@ export default {
         this.isFifth = false
         this.isSixth = false
       } else if (tab.name === 'fourth') {
-        listFtplandsdt({newId: this.newId}).then(res => {
-          this.dsdtList = res.data;
-        })
         this.isFirst = false
         this.isSecond = false
         this.isThird = false

ui/src/views/training/bccnew/yaPlan/index.vue → ui/src/views/training/bccnew/ysPlan/index.vue

@@ -19,42 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训主题" prop="topic">
-        <el-input
-          v-model="queryParams.topic"
-          placeholder="请输入培训主题"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训天" prop="courseDay">
-        <el-input
-          v-model="queryParams.courseDay"
-          placeholder="请输入培训天"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="培训小时" prop="courseHour">
-        <el-input
-          v-model="queryParams.courseHour"
-          placeholder="请输入培训小时"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详细计划" prop="detailPlan">
-        <el-input
-          v-model="queryParams.detailPlan"
-          placeholder="请输入详细计划"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="讲师" prop="trainer">
         <el-input
           v-model="queryParams.trainer"
@@ -64,75 +28,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="培训日期" prop="courseDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.courseDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择培训日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="考核情况" prop="assess">
-        <el-input
-          v-model="queryParams.assess"
-          placeholder="请输入考核情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createrCode">
-        <el-input
-          v-model="queryParams.createrCode"
-          placeholder="请输入创建人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="修改人" prop="updaterCode">
-        <el-input
-          v-model="queryParams.updaterCode"
-          placeholder="请输入修改人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="修改时间" prop="updatedate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.updatedate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择修改时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="部门编号" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -192,8 +87,6 @@
 
     <el-table v-loading="loading" :data="yaPlanList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
-      <el-table-column label="培训员工编号" align="center" prop="newId" :show-overflow-tooltip="true"/>
       <el-table-column label="课程编号" align="center" prop="courseCode" :show-overflow-tooltip="true"/>
       <el-table-column label="培训主题" align="center" prop="topic" :show-overflow-tooltip="true"/>
       <el-table-column label="培训内容" align="center" prop="content" :show-overflow-tooltip="true"/>
@@ -207,19 +100,6 @@
         </template>
       </el-table-column>
       <el-table-column label="考核情况" align="center" prop="assess" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -262,7 +142,7 @@
           <el-input v-model="form.topic" placeholder="请输入培训主题" />
         </el-form-item>
         <el-form-item label="培训内容">
-          <editor v-model="form.content" :min-height="192"/>
+          <el-input v-model="form.content" placeholder="请输入培训内容"/>
         </el-form-item>
         <el-form-item label="培训天" prop="courseDay">
           <el-input v-model="form.courseDay" placeholder="请输入培训天" />
@@ -287,34 +167,6 @@
         <el-form-item label="考核情况" prop="assess">
           <el-input v-model="form.assess" placeholder="请输入考核情况" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门编号" />
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
@@ -361,7 +213,7 @@
 </template>
 
 <script>
-import { listYaPlan, getYaPlan, delYaPlan, addYaPlan, updateYaPlan, exportYaPlan, importTemplate} from "@/api/training/bccnew/yaPlan";
+import { listYaPlan, getYaPlan, delYaPlan, addYaPlan, updateYaPlan, exportYaPlan, importTemplate} from "@/api/training/bccnew/ysPlan";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -369,7 +221,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor/index.vue';
 
 export default {
-  name: "YaPlan",
+  name: "YsPlan",
   components: { Treeselect },
   // components: { Editor },
   data() {