LY 周会议 权限

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtActionlistController.java

@@ -63,7 +63,7 @@ public class TMtActionlistController extends BaseController {
         // 权限集合
         SysUser s = sysUserService.selectUserById(getUserId());
         Set<String> permissions = permissionService.getMenuPermission(s);
-        if (!permissions.contains("plant:meeting:edit") && !s.isAdmin()) {
+        if (!permissions.contains("plant:meeting:allList") && !s.isAdmin()) {
             tMtActionlist.setResponsible(s.getStaffId());
         }
 

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtKeymaintenanceController.java

@@ -61,11 +61,10 @@ public class TMtKeymaintenanceController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TMtKeymaintenance tMtKeymaintenance)
     {
-
         // 权限集合
         SysUser s = sysUserService.selectUserById(getUserId());
         Set<String> permissions = permissionService.getMenuPermission(s);
-        if (!permissions.contains("plant:meeting:edit") && !s.isAdmin()) {
+        if (!permissions.contains("plant:meeting:allList") && !s.isAdmin()) {
             tMtKeymaintenance.setResponsible(s.getStaffId());
         }
         startPage();

master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtMessageattentionController.java

@@ -66,7 +66,7 @@ public class TMtMessageattentionController extends BaseController {
         // 权限集合
         SysUser s = sysUserService.selectUserById(getUserId());
         Set<String> permissions = permissionService.getMenuPermission(s);
-        if (!permissions.contains("plant:meeting:edit") && !s.isAdmin()) {
+        if (!permissions.contains("plant:meeting:allList") && !s.isAdmin()) {
             tMtMessageattention.setResponsible(s.getStaffId());
         }
         startPage();

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

@@ -160,7 +160,7 @@ public class TTrainingMatrixController extends BaseController
             tr.setItem(tm.getItem());
             tr.setHour(tm.getHour());
             tr.setInvolvedMoc("false");
-            tr.setNotPlan("true");
+            tr.setNotPlan("false");
             Calendar cal = Calendar.getInstance();
             tr.setYear(String.valueOf(cal.get(Calendar.YEAR)));
             int doInsert = tTrainingRegularService.insertTTrainingRegular(tr);

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

@@ -261,11 +261,27 @@ public class TTrainingRegularController extends BaseController
         if (tTrainingRegular.getNotPlan().equals("true")) {
             //查找跟这条培训计划相关联的装置级培训记录  修改其培训的年份，课程名称和课程代码
             TTraining t=  tTrainingService.selectTTrainingByRegularId(tTrainingRegular.getId());
+            if(null == t) {
+                //新增培训计划定期类
+                TTraining tTraining = new TTraining();
+                tTraining.setTrainingType("10");
+                tTraining.setYear(tTrainingRegular.getYear());
+                tTraining.setCourse(tTrainingRegular.getItem());
+                tTraining.setCourseid(tTrainingRegular.getCourseCode());
+                tTraining.setDuration(tTrainingRegular.getHour());
+                tTraining.setTrainer(tTrainingRegular.getLecturer());
+                tTraining.setPosition(tTrainingRegular.getActualpostId());
+                tTraining.setIsfinish(Long.parseLong("0"));
+                tTraining.setDeptId(tTrainingRegular.getDeptId());
+                tTraining.setRegularId(tTrainingRegular.getId());
+                tTrainingService.insertTTraining(tTraining);
+                t = tTraining;
+            }
             t.setCourse(tTrainingRegular.getItem());
             t.setCourseid(tTrainingRegular.getCourseCode());
             t.setYear(tTrainingRegular.getYear());
             t.setDelFlag(tTrainingRegular.getDelFlag());
-            int result=   tTrainingService.updateTTraining(t );
+            int result=   tTrainingService.updateTTraining(t);
             TTrainingRegular oldRegular = tTrainingRegularService.selectTTrainingRegularById(tTrainingRegular.getId());
             int i = 0;
             if (oldRegular.getActualpostId() != null) {

ui/src/views/components/meeting/actionlist.vue

@@ -389,7 +389,10 @@
       });
     },
     getStaffId(resp){
-      return resp.includes(this.$store.state.user.staffId)
+      if (resp) {
+        return resp.includes(this.$store.state.user.staffId)
+      }
+      return false
     },
     //获取人员表
     getStaffmar() {

ui/src/views/components/meeting/keymaintenance.vue

@@ -59,7 +59,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-if="checkPermi(['plant:meeting:edit']) || scope.row.responsible == getStaffId()"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -69,7 +69,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-if="checkPermi(['plant:meeting:remove']) || scope.row.responsible == getStaffId()"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -119,7 +119,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible)"
 
           >{{ $t('删除') }}</el-button>
         </template>
@@ -382,7 +382,10 @@
       });
     },
     getStaffId(resp){
-      return resp.includes(this.$store.state.user.staffId)
+      if (resp) {
+        return resp.includes(this.$store.state.user.staffId)
+      }
+      return false
     },
     //获取人员表
     getStaffmar() {

ui/src/views/components/meeting/messageattention.vue

@@ -52,7 +52,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+          v-hasPermi="['plant:meeting:edit']"
         >{{ $t('修改') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -62,7 +62,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+          v-hasPermi="['plant:meeting:remove']"
         >{{ $t('删除') }}</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -347,7 +347,10 @@
       return this.selectDictLabel(this.statusOptions, row.status);
     },
     getStaffId(resp){
-      return resp.includes(this.$store.state.user.staffId)
+      if (resp) {
+        return resp.includes(this.$store.state.user.staffId)
+      }
+      return false
     },
     //获取人员表
     getStaffmar() {

ui/src/views/plant/dailyMeeting/detail.vue

@@ -354,7 +354,7 @@ export default {
       this.form.safetyTopic =  "1、现场动火安全 \n" +
         "2、环保注意事项"
       this.attendCrackerList = this.attendCrackerOptions;
-      this.optModeData = "9+0+A+B"
+      this.optModeData = "9+1+A+B"
     }
   },
   methods: {
@@ -418,6 +418,8 @@ export default {
       let arr4 = ["H109B"]
       let val1 = this.countDupVal(data,arr1)
       if (this.countDupVal(data,arr2) > 0) {
+        val1 = val1 + "+1"
+      }else {
         val1 = val1 + "+0"
       }
       if (this.countDupVal(data,arr3) > 0) {

ui/src/views/plant/weekmeeting/index.vue

@@ -22,21 +22,24 @@
       <el-tab-pane :label="$t('EHS开项追踪')" >
         <ehsopenitem />
       </el-tab-pane>
-      <el-tab-pane :label="$t('下周关键维修')" >
-        <keymaintenance />
-      </el-tab-pane>
       <el-tab-pane :label="$t('信息提醒')" >
         <messageattention />
       </el-tab-pane>
-      <el-tab-pane :label="$t('关键机组联锁旁路')" >
-        <interlock />
-      </el-tab-pane>
       <el-tab-pane :label="$t('风险提醒')" >
         <riskreminder />
       </el-tab-pane>
+
+
+      <el-tab-pane :label="$t('关键机组联锁旁路')" >
+        <interlock />
+      </el-tab-pane>
       <el-tab-pane :label="$t('OpEx项目跟踪')" >
         <opextrack />
       </el-tab-pane>
+      <el-tab-pane :label="$t('下周关键维修')" >
+        <keymaintenance />
+      </el-tab-pane>
+
       <el-tab-pane :label="$t('与会者')" >
       <person :isCc = "0"></person>
       </el-tab-pane>