-导师带徒bugfix

ui/src/views/shiftmgr/shiftchangemgr/roster/index.vue

@@ -33,18 +33,18 @@
           </el-form-item>
           <el-form-item label="白班" prop="dclass">
             <el-select v-model="form.dclass" clearable>
-              <el-option value="A">A</el-option>
-              <el-option value="B">B</el-option>
-              <el-option value="C">C</el-option>
-              <el-option value="D">D</el-option>
+              <el-option value="10" label="A"/>
+              <el-option value="12" label="B"/>
+              <el-option value="14" label="C"/>
+              <el-option value="16" label="D"/>
             </el-select>
           </el-form-item>
           <el-form-item label="夜班" prop="nclass">
             <el-select v-model="form.nclass" clearable>
-              <el-option value="A">A</el-option>
-              <el-option value="B">B</el-option>
-              <el-option value="C">C</el-option>
-              <el-option value="D">D</el-option>
+              <el-option value="10" label="A"/>
+              <el-option value="12" label="B"/>
+              <el-option value="14" label="C"/>
+              <el-option value="16" label="D"/>
             </el-select>
           </el-form-item>
           <el-form-item label="节假日" prop="vacation">
@@ -368,7 +368,7 @@ export default {
               end = new Date(item.shiftDate)
             }
             if (item.nclass != null) {
-              title = "晚班：" + item.nclass;
+              title = "晚班：" + this.getClassName(item.nclass);
               color = "rgb(0,0,0,1)";
               this.calendarOptions.events.push({
                 id: item.id,
@@ -381,7 +381,7 @@ export default {
               })
             }
             if (item.dclass != null) {
-              title = "早班：" + item.dclass;
+              title = "早班：" + this.getClassName(item.dclass);
               color = "rgba(0, 140, 255, 1)";
               this.calendarOptions.events.push({
                 id: item.id,
@@ -409,6 +409,18 @@ export default {
         //this.$console.log(error);
       });
     },
+    getClassName(val) {
+      switch (val) {
+        case '10':
+          return 'A';
+        case '12':
+          return 'B';
+        case '14':
+          return 'C';
+        case '16':
+          return 'D';
+      }
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {

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

@@ -60,7 +60,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['newstaff:tnNew:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -70,7 +71,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['newstaff:tnNew:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -80,7 +82,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['newstaff:tnNew:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <!--        <el-col :span="1.5">-->
       <!--            <el-button-->
@@ -98,16 +101,18 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['newstaff:tnNew:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tnNewList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="tnNewList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
       <!--      <el-table-column label="培训员工编号" align="center" prop="staffId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="新员工" align="center" prop="staffName" width="100" />
-      <el-table-column label="培训状态" align="center" prop="planStatus" width="120" :formatter="planStatusFormat" >
+      <el-table-column label="新员工" align="center" prop="staffName" width="100"/>
+      <el-table-column label="培训状态" align="center" prop="planStatus" width="120" :formatter="planStatusFormat">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.planStatus == 2" size="small" type="warning">待考试</el-tag>
           <el-tag v-if="scope.row.planStatus == 3" size="small" type="success">已完成</el-tag>
@@ -133,94 +138,102 @@
         </template>
       </el-table-column>
       <!--      <el-table-column label="导师员工编号" align="center" prop="mentorStaffId" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="导师" align="center" prop="mentorStaffName" width="100" />
+      <el-table-column label="导师" align="center" prop="mentorStaffName" width="100"/>
       <el-table-column label="岗位" align="center" prop="planType" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.planType == 1" size="small" type="success">裂解</span>
-            <span v-else-if="scope.row.planType == 2" size="small" type="success">压缩</span>
-            <span v-else-if="scope.row.planType == 3" size="small" type="success">分离</span>
-            <span v-else-if="scope.row.planType == 4" size="small" type="success">芳烃</span>
-          </template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.planType == 1" size="small" type="success">裂解</span>
+          <span v-else-if="scope.row.planType == 2" size="small" type="success">压缩</span>
+          <span v-else-if="scope.row.planType == 3" size="small" type="success">分离</span>
+          <span v-else-if="scope.row.planType == 4" size="small" type="success">芳烃</span>
+        </template>
       </el-table-column>
       <el-table-column label="三级教育记录卡" align="center" prop="three" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-three')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-three')"
+                     circle></el-button>
         </template>
       </el-table-column>
 
       <el-table-column label="上岗能力评测表" align="center" prop="firstplan-score" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-firstplan-score')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;"
+                     @click="handleDoc(scope.row , 'tsNew-firstplan-score')" circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="导师提名表" align="center" prop="agreement" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-teacher-order')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'tsNew-teacher-order')"
+                     circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="带徒协议" align="center" prop="agreement" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDownloadWord(scope.row, 'mentorAgreement')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;"
+                     @click="handleDownloadWord(scope.row, 'mentorAgreement')" circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="带徒目标" align="center" prop="target" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDownloadWord(scope.row, 'targetPlan')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;" @click="handleDownloadWord(scope.row, 'targetPlan')"
+                     circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="培训考评" align="center" prop="tnNew-score" width="80">
         <template slot-scope="scope">
-          <el-button  icon="el-icon-folder" style="color:#6e96fa;" @click="handleDownloadWord(scope.row, 'appraisalForm')" circle></el-button>
+          <el-button icon="el-icon-folder" style="color:#6e96fa;"
+                     @click="handleDownloadWord(scope.row, 'appraisalForm')" circle></el-button>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="planList(scope.row)"
-          >培训计划</el-button>
+          >培训计划
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['newstaff:tnNew:edit']"
-          >修改 </el-button>
-<!--          <el-dropdown  size="mini">-->
-<!--            <span class="el-dropdown-link">-->
-<!--              <el-button-->
-<!--                type="text"-->
-<!--                size="mini"-->
-<!--                icon="el-icon-download"-->
-<!--              >下载<i class="el-icon-arrow-down"></i></el-button>-->
-<!--            </span>-->
-<!--            <el-dropdown-menu slot="dropdown">-->
-<!--              <el-dropdown-item>-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  @click="handleDownloadWord(scope.row, 'mentorAgreement')"-->
-<!--                >师徒协议</el-button>-->
-<!--              </el-dropdown-item>-->
-<!--              <el-dropdown-item>-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  @click="handleDownloadWord(scope.row, 'targetPlan')"-->
-<!--                >导师带徒目标及计划</el-button>-->
-<!--              </el-dropdown-item>-->
-<!--              <el-dropdown-item>-->
-<!--                <el-button-->
-<!--                  size="mini"-->
-<!--                  type="text"-->
-<!--                  @click="handleDownloadWord(scope.row, 'appraisalForm')"-->
-<!--                >导师带徒考评表</el-button>-->
-<!--              </el-dropdown-item>-->
-<!--            </el-dropdown-menu>-->
-<!--          </el-dropdown>-->
+          >修改
+          </el-button>
+          <!--          <el-dropdown  size="mini">-->
+          <!--            <span class="el-dropdown-link">-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="mini"-->
+          <!--                icon="el-icon-download"-->
+          <!--              >下载<i class="el-icon-arrow-down"></i></el-button>-->
+          <!--            </span>-->
+          <!--            <el-dropdown-menu slot="dropdown">-->
+          <!--              <el-dropdown-item>-->
+          <!--                <el-button-->
+          <!--                  size="mini"-->
+          <!--                  type="text"-->
+          <!--                  @click="handleDownloadWord(scope.row, 'mentorAgreement')"-->
+          <!--                >师徒协议</el-button>-->
+          <!--              </el-dropdown-item>-->
+          <!--              <el-dropdown-item>-->
+          <!--                <el-button-->
+          <!--                  size="mini"-->
+          <!--                  type="text"-->
+          <!--                  @click="handleDownloadWord(scope.row, 'targetPlan')"-->
+          <!--                >导师带徒目标及计划</el-button>-->
+          <!--              </el-dropdown-item>-->
+          <!--              <el-dropdown-item>-->
+          <!--                <el-button-->
+          <!--                  size="mini"-->
+          <!--                  type="text"-->
+          <!--                  @click="handleDownloadWord(scope.row, 'appraisalForm')"-->
+          <!--                >导师带徒考评表</el-button>-->
+          <!--              </el-dropdown-item>-->
+          <!--            </el-dropdown-menu>-->
+          <!--          </el-dropdown>-->
         </template>
       </el-table-column>
     </el-table>
@@ -234,7 +247,7 @@
     />
 
     <!-- 添加或修改新员工培训对话框 -->
-    <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :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="staffId">
           <el-select v-model="form.staffId" filterable :placeholder="$t('请选择')+$t('培训员工')" :disabled="isEdit">
@@ -247,7 +260,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="培训状态"  prop="planStatus">
+        <el-form-item label="培训状态" prop="planStatus">
           <el-select v-model="form.planStatus" placeholder="请选择培训状态" disabled>
             <el-option
               v-for="dict in planStatusOptions"
@@ -270,23 +283,27 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="岗位" prop="planType">
-          <el-radio-group v-model="form.planType"  @change="getTrainer">
+          <el-radio-group v-model="form.planType" @change="getTrainer">
             <el-radio
               key="1"
               :label="1"
-            >裂解</el-radio>
+            >裂解
+            </el-radio>
             <el-radio
               key="2"
               :label="2"
-            >压缩</el-radio>
+            >压缩
+            </el-radio>
             <el-radio
               key="3"
               :label="3"
-            >分离</el-radio>
+            >分离
+            </el-radio>
             <el-radio
               key="4"
               :label="4"
-            >芳烃</el-radio>
+            >芳烃
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="导师员工" prop="mentorStaffId">
@@ -305,15 +322,17 @@
             <el-radio
               key="1"
               :label="1"
-            >是</el-radio>
+            >是
+            </el-radio>
             <el-radio
               key="0"
               :label="0"
-            >否</el-radio>
+            >否
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -322,7 +341,8 @@
       </div>
     </el-dialog>
     <!-- 用户导入对话框 -->
-    <el-dialog  :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
+               append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -341,7 +361,8 @@
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
           <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
         </div>
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
@@ -352,7 +373,8 @@
       </div>
     </el-dialog>
     <!-- 报告附件对话框 -->
-    <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px" append-to-body >
+    <el-dialog :close-on-click-modal="false" v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px"
+               append-to-body>
       <el-upload v-hasPermi="['training:trainingrecords:file']"
                  ref="doc"
                  :limit="50"
@@ -373,12 +395,13 @@
       <el-table :data="doc.commonfileList" border>
         <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <a  class="link-type"  @click="handleDownload(scope.row)">
+            <a class="link-type" @click="handleDownload(scope.row)">
               <span>{{ scope.row.fileName }}</span>
             </a>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+        <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true"
+                         width="80"/>
         <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
         <!--        <el-table-column :label="$t('培训日期')" align="center" prop="pDate"  width="150">-->
         <!--          <template slot-scope="scope">-->
@@ -400,29 +423,38 @@
               type="text"
               icon="el-icon-view"
               @click="handleSee(scope.row)"
-            >{{ $t('预览') }}</el-button>
-            <el-button v-hasPermi="['training:trainingrecords:file']"  type="text" size="small" v-if="scope.row.isEdit" @click="save(scope.row)">保存</el-button>
-            <el-button type="text" size="small" v-if="scope.row.isEdit" @click="cancelFile(scope.row, scope.$index)">取消</el-button>
+            >{{ $t('预览') }}
+            </el-button>
+            <el-button v-hasPermi="['training:trainingrecords:file']" type="text" size="small" v-if="scope.row.isEdit"
+                       @click="save(scope.row)">保存
+            </el-button>
+            <el-button type="text" size="small" v-if="scope.row.isEdit" @click="cancelFile(scope.row, scope.$index)">
+              取消
+            </el-button>
             <!--            <el-button v-hasPermi="['training:trainingrecords:file']" v-if="!scope.row.isEdit" @click="edit(scope.row)" icon="el-icon-edit" type="text" size="mini">编辑</el-button>-->
             <el-button
               size="mini"
               type="text"
               icon="el-icon-download"
               @click="handleDownload(scope.row)"
-            >{{ $t('下载') }}</el-button>
+            >{{ $t('下载') }}
+            </el-button>
             <el-button
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDeleteDoc(scope.row)"
               v-hasPermi="['training:trainingrecords:file']"
-            >{{ $t('删除') }}</el-button>
+            >{{ $t('删除') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+      <el-dialog :close-on-click-modal="false" v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px"
+                 append-to-body>
         <div style="margin-top: -60px;float: right;margin-right: 40px;">
-          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+          <el-button size="mini" type="text" @click="openPdf">{{ $t('新页面打开PDF') }}</el-button>
+        </div>
         <div style="margin-top: -30px">
           <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
         </div>
@@ -451,17 +483,14 @@ 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 {listStaff} from "@/api/training/newstaff/tnNew";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
-import { Loading } from 'element-ui';
-import {date} from "mockjs/src/mock/random/date";
-import {listUserNoPage} from "@/api/system/user";
+import {Loading} from 'element-ui';
 import {listStaffmgrByDeptAndTeam} from "@/api/plant/staffmgr";
 import {listTrainer} from "@/api/training/bccnew/trainer";
 
 export default {
   name: "Tsnew",
-  components: { Treeselect },
+  components: {Treeselect},
   data() {
     return {
       pickerOptions: {
@@ -481,7 +510,7 @@ export default {
             end.setTime(start.getTime() + 3600 * 1000 * 24 * 90);
             picker.$emit('pick', [start, end]);
           }
-        },{
+        }, {
           text: '最近一年',
           onClick(picker) {
             const end = new Date();
@@ -489,7 +518,7 @@ export default {
             end.setTime(start.getTime() + 3600 * 1000 * 24 * 365);
             picker.$emit('pick', [start, end]);
           }
-        }, ]
+        },]
       },
       // 遮罩层
       loading: true,
@@ -509,13 +538,13 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 培训状态字典
       planStatusOptions: [],
       // 培训类型 1-新员工 2-转岗字典
       planTypeOptions: [],
-      userOption:[],
-      trainerOption:[],
+      userOption: [],
+      trainerOption: [],
       // 是否显示弹出层
       open: false,
       // 用户导入参数
@@ -529,7 +558,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/newstaff/tsNew/importData"
       },
@@ -547,7 +576,7 @@ export default {
         // 报告附件上传位置编号
         ids: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
         commonfileList: null,
@@ -559,7 +588,7 @@ export default {
         pId: null,
         form: {}
       },
-      pdf : {
+      pdf: {
         title: '',
         pdfUrl: '',
         numPages: null,
@@ -578,22 +607,22 @@ export default {
         enddate: null,
         planType: null,
       },
-      isEdit:false,
+      isEdit: false,
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         mentorStaffId: [
-          { required: true, message: this.$t('导师') + this.$t('不能为空'), trigger: "change" }
+          {required: true, message: this.$t('导师') + this.$t('不能为空'), trigger: "change"}
         ],
         staffId: [
-          { required: true, message: this.$t('培训员工') + this.$t('不能为空'), trigger: "change" }
+          {required: true, message: this.$t('培训员工') + this.$t('不能为空'), trigger: "change"}
         ],
         trainingDate: [
-          { required: true, message: this.$t('培训时间') + this.$t('不能为空'), trigger: "blur" }
+          {required: true, message: this.$t('培训时间') + this.$t('不能为空'), trigger: "blur"}
         ],
         planType: [
-          { required: true, message: this.$t('岗位') + this.$t('不能为空'), trigger: "change" }
+          {required: true, message: this.$t('岗位') + this.$t('不能为空'), trigger: "change"}
         ],
       }
     };
@@ -606,12 +635,12 @@ export default {
   },
   created() {
     console.log(this.$route.path)
-    if (!this.$route.path.endsWith('tsnewAll')){
-      this.queryParams.isTeacher='1';
+    if (!this.$route.path.endsWith('tsnewAll')) {
+      this.queryParams.isTeacher = '1';
     }
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight -250
+      this.clientHeight = document.body.clientHeight - 250
     })
     this.getList();
     this.getTreeselect();
@@ -621,31 +650,32 @@ export default {
     this.getDicts("training_newstaff_type").then(response => {
       this.planTypeOptions = response.data;
     });
-    listStaffmgrByDeptAndTeam({unit:103}).then(response => {
+    listStaffmgrByDeptAndTeam({unit: 103}).then(response => {
       this.userOption = response.rows;
     });
   },
   methods: {
-    getTrainer(val){
-      let post="";
+    getTrainer(val) {
+      let post = "";
       switch (val) {
         case 1:
-          post='裂解';
+          post = '裂解';
           break
         case 2:
-          post='压缩';
+          post = '压缩';
           break
         case 3:
-          post='分离';
+          post = '分离';
           break
         case 4:
-          post='芳烃';
+          post = '芳烃';
           break
       }
       listTrainer({
         pageNum: 1,
         pageSize: 2000,
-        apprenticePosition:post}).then(response => {
+        apprenticePosition: post
+      }).then(response => {
         this.trainerOption = response.rows;
       });
     },
@@ -671,7 +701,7 @@ export default {
         a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
         a.click()
       } else if (type == 'appraisalForm') {
-        genAppraisalFormWord(row.newId).then(res=>{
+        genAppraisalFormWord(row.newId).then(res => {
           name = res.msg;
           url = res.msg;
           console.log(url)
@@ -689,7 +719,7 @@ export default {
       listTsnew(this.queryParams).then(response => {
         this.tnNewList = response.rows;
         for (const item of this.tnNewList) {
-          item.planFinish=parseInt(item.planFinish)
+          item.planFinish = parseInt(item.planFinish)
         }
         this.total = response.total;
         this.loading = false;
@@ -752,29 +782,31 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.newId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    planList(row){
+    planList(row) {
       const newId = row.newId
       this.$router.push("/training/bccnew/trainingPlan/" + newId);
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.isEdit=false;
+      this.isEdit = false;
       this.reset();
       this.open = true;
       this.title = "添加新员工培训";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.isEdit=true;
+      this.isEdit = true;
       this.reset();
       const newId = row.newId || this.ids
       getTsnew(newId).then(response => {
-        response.data.trainingDate=[];
-        response.data.trainingDate[0]=new Date( response.data.startdate);
-        response.data.trainingDate[1]=new Date( response.data.enddate);
+        response.data.trainingDate = [];
+        response.data.trainingDate[0] = new Date(response.data.startdate);
+        response.data.trainingDate[1] = new Date(response.data.enddate);
+        response.data.staffId = parseInt(response.data.staffId);
+        this.getTrainer(response.data.planStatus);
         this.form = response.data;
         this.open = true;
         this.title = "修改新员工培训";
@@ -785,12 +817,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          let options={
-            text:'正在添加新员工导师带徒培训'
+          let options = {
+            text: '正在添加新员工导师带徒培训'
           }
           let loadingInstance = Loading.service(options);
-          this.form.startdate=this.form.trainingDate[0];
-          this.form.enddate=this.form.trainingDate[1];
+          this.form.startdate = this.form.trainingDate[0];
+          this.form.enddate = this.form.trainingDate[1];
           if (this.form.newId != null) {
             updateTsnew(this.form).then(response => {
               this.msgSuccess("修改成功");
@@ -820,7 +852,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delTsnew(newIds);
       }).then(() => {
         this.getList();
@@ -834,7 +866,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportTsnew(queryParams);
       }).then(response => {
         this.download(response.msg);
@@ -860,7 +892,7 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
       this.getList();
     },
     // 提交上传文件
@@ -868,11 +900,11 @@ export default {
       this.$refs.upload.submit();
     },
     /** 报告附件按钮操作 */
-    handleDoc(row , fileType) {
+    handleDoc(row, fileType) {
       this.doc.pType = fileType
       this.doc.queryParams.pType = fileType
       this.doc.id = row.id;
-      this.doc.title = this.$t('附件') ;
+      this.doc.title = this.$t('附件');
       this.doc.open = true;
       this.doc.queryParams.pId = row.newId
       this.doc.pId = row.newId
@@ -881,7 +913,7 @@ export default {
         this.$refs.doc.clearFiles()
       })
     },
-    getFileList (){
+    getFileList() {
       allFileList(this.doc.queryParams).then(response => {
         response.forEach(element => {
           element["isEdit"] = false
@@ -900,7 +932,7 @@ export default {
     //附件上传成功处理
     handleFileDocSuccess(response, file, fileList) {
       this.doc.isUploading = false;
-      this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.$alert(response.msg, this.$t('导入结果'), {dangerouslyUseHTMLString: true});
       this.getFileList()
     },
     // 文件下载处理
@@ -914,14 +946,14 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
       a.click()
     },
-    openPdf(){
+    openPdf() {
       window.open(this.pdf.pdfUrl);//path是文件的全路径地址
     },
-    handleSee (row){
+    handleSee(row) {
       // window.open(process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl);//path是文件的全路径地址
-      this.pdf.open =true
+      this.pdf.open = true
       this.pdf.title = row.fileName
-      this.pdf.pdfUrl = process.env.VUE_APP_BASE_API +'/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
+      this.pdf.pdfUrl = process.env.VUE_APP_BASE_API + '/pdf/web/viewer.html?file=' + process.env.VUE_APP_BASE_API + row.fileUrl
     },
     /** 删除按钮操作 */
     handleDeleteDoc(row) {
@@ -930,7 +962,7 @@ export default {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delCommonfile(ids);
       }).then(() => {
         this.getFileList()