浏览代码

LY 周会 修改

ly 1 年之前
父节点
当前提交
a1422f855b

+ 19 - 0
master/src/main/java/com/ruoyi/framework/task/meeting/WeekMeetingTask.java

@@ -0,0 +1,19 @@
+package com.ruoyi.framework.task.meeting;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时任务调度测试
+ *
+ * @author ruoyi
+ */
+@Component("weekMeetingTask")
+public class WeekMeetingTask extends BaseController
+{
+    public void TestTask()
+    {
+
+
+    }
+}

+ 0 - 1
master/src/main/java/com/ruoyi/project/plant/controller/weekMeeting/TMtKeymaintenanceController.java

@@ -223,7 +223,6 @@ public class TMtKeymaintenanceController extends BaseController
     /**
     /**
      * 删除下周关键维修工作
      * 删除下周关键维修工作
      */
      */
-    @PreAuthorize("@ss.hasPermi('plant:meeting:remove')")
     @Log(title = "下周关键维修工作", businessType = BusinessType.DELETE)
     @Log(title = "下周关键维修工作", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     public AjaxResult remove(@PathVariable Long[] ids)

+ 1 - 1
ui/src/views/components/meeting/keymaintenance.vue

@@ -121,7 +121,7 @@
             type="text"
             type="text"
             icon="el-icon-delete"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:remove']) "
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
 
 
           >{{ $t('删除') }}</el-button>
           >{{ $t('删除') }}</el-button>
         </template>
         </template>