李扬

master/src/main/java/com/ruoyi/project/training/controller/TTrainingController.java

@@ -88,6 +88,7 @@ public class TTrainingController extends BaseController
     {
         startPage();
         List<TTraining> list = tTrainingService.selectTTrainingList(tTraining);
+        logger.info("====1111111::::::" + list.size());
         for (TTraining t : list) {
             int mustTraining = 0;
             if (t.getDesignatedStaff() != null) {

master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-#    host: smtpout.basf-it-services.com
-#    protocol: smtp
-#    default-encoding: UTF-8
-#    password:
-#    username:
-#    port: 25
-#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-#    properties.mail.debug: true
-#    from: CPMS.byc@BASF-YPC.com.cn
-    host: smtp.exmail.qq.com
+    host: smtpout.basf-it-services.com
     protocol: smtp
     default-encoding: UTF-8
-    password: vvTAT8hciG7FLk4C
-    username: email@seashoreept.com
-    port: 587
+    password:
+    username:
+    port: 25
     properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
     properties.mail.debug: true
-    from: email@seashoreept.com
+    from: CPMS.byc@BASF-YPC.com.cn
+#    host: smtp.exmail.qq.com
+#    protocol: smtp
+#    default-encoding: UTF-8
+#    password: vvTAT8hciG7FLk4C
+#    username: email@seashoreept.com
+#    port: 587
+#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+#    properties.mail.debug: true
+#    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

master/src/main/resources/mybatis/training/TTrainingMapper.xml

@@ -194,4 +194,4 @@
     </foreach>
   </update>
 
-</mapper>
+</mapper>

ui/src/views/training/matrix/index.vue

@@ -84,21 +84,21 @@
     </el-row>
 
     <el-table ref="matrixTable" v-loading="loading" :data="matrixList" @selection-change="handleSelectionChange" :cell-class-name="tableCellClassName" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('培训级别')" align="center" prop="trainingLevel" width="150" :formatter="trainingLevelFormat" />
-      <el-table-column :label="$t('课程名称')" align="center" prop="item" width="250" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('课程代码')" align="center" prop="courseCode" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('频率')" align="center" prop="frequency" width="300" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('责任部门')" align="center" prop="responsDept" :formatter="responsDeptFormat" />
-      <el-table-column :label="$t('授课人')" align="center" prop="lecturer" width="100" :formatter="lecturerFormat"/>
-      <el-table-column :label="$t('课时')" align="center" prop="hour" width="70" :show-overflow-tooltip="true"/>
-      <el-table-column v-for="(item, index) in actualpostIdOptions" width="150" :label="item.dictLabel" :key="index" align="center">
+      <el-table-column type="selection" width="55" min-width="55" align="center" />
+      <el-table-column :label="$t('培训级别')" align="center" prop="trainingLevel" width="150" min-width="55":formatter="trainingLevelFormat" />
+      <el-table-column :label="$t('课程名称')" align="center" prop="item" width="250" min-width="55":show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('课程代码')" align="center" prop="courseCode" width="150" min-width="55":show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('频率')" align="center" prop="frequency" width="300" min-width="55":show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('责任部门')" align="center" prop="responsDept" width="120" min-width="120" :formatter="responsDeptFormat" />
+      <el-table-column :label="$t('授课人')" align="center" prop="lecturer" width="100" min-width="100" :formatter="lecturerFormat"/>
+      <el-table-column :label="$t('课时')" align="center" prop="hour" width="70" min-width="70"  :show-overflow-tooltip="true"/>
+      <el-table-column v-for="(item, index) in actualpostIdOptions" width="150" min-width="150" :label="item.dictLabel" :key="index" align="center">
         <template slot-scope="scope">
           {{scope.row.actualpost[index]}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('备注')" align="center" prop="remarks" width="300" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('备注')" align="center" prop="remarks" width="300" min-width="300" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" min-width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -355,7 +355,7 @@ export default {
     this.$nextTick(() => {
         this.clientHeight = document.body.clientHeight -250
     })
-    this.getList();
+
     this.getTreeselect();
     this.getDicts("ACTUALPOST").then(response => {
       this.actualpostIdOptions = response.data;
@@ -370,6 +370,7 @@ export default {
           _this.otherPositionOptions.push(positionValue)
         }
       })
+      this.getList();
     });
     this.getDicts("ACTUALPOST").then(response => {
       this.lecturerOptions = response.data;

ui/src/views/training/regular/index.vue

@@ -373,9 +373,7 @@
       this.$nextTick(() => {
         this.clientHeight = document.body.clientHeight -250
       })
-      this.getStaffmar();
-      this.getLecturer();
-      this.getTreeselect();
+
       this.getDicts("ACTUALPOST").then(response => {
         this.actualpostIdOptions = response.data;
       });
@@ -392,6 +390,9 @@
             _this.otherPositionOptions.push(positionValue)
           }
         })
+        this.getStaffmar();
+        this.getLecturer();
+        this.getTreeselect();
       });
     },
     methods: {