LY 周会议

master/src/main/java/com/ruoyi/project/plant/controller/TMtMeetingController.java

@@ -121,7 +121,7 @@ public class TMtMeetingController extends BaseController
     /**
      * 新增装置会议
      */
-    @PreAuthorize("@ss.hasPermi('plant:meeting:add')")
+    @PreAuthorize("@ss.hasPermi('plant:meeting:edit')")
     @Log(title = "装置会议", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtMeeting tMtMeeting)

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

@@ -65,6 +65,7 @@ public class TMtActionlistController extends BaseController {
         Set<String> permissions = permissionService.getMenuPermission(s);
         if (!permissions.contains("plant:meeting:allList") && !s.isAdmin()) {
             tMtActionlist.setResponsible(s.getStaffId());
+            tMtActionlist.setCreaterCode(getUserId() + "");
         }
 
         logger.info(JSON.toJSONString(tMtActionlist));
@@ -110,6 +111,10 @@ public class TMtActionlistController extends BaseController {
                 SysUser updater = sysUserService.selectUserById(Long.parseLong(t.getUpdaterCode()));
                 t.setUpdaterCode(updater.getNickName());
             }
+            if (t.getCreaterCode() != null) {
+                SysUser creator = sysUserService.selectUserById(Long.parseLong(t.getCreaterCode()));
+                t.setCreaterCode(creator.getNickName());
+            }
         }
 
         return getDataTable(list);

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

@@ -100,6 +100,10 @@ public class TMtKeymaintenanceController extends BaseController
                 SysUser updater = sysUserService.selectUserById( Long.parseLong(t.getUpdaterCode()));
                 t.setUpdaterCode(updater.getNickName());
             }
+            if (t.getCreaterCode() != null) {
+                SysUser creator = sysUserService.selectUserById(Long.parseLong(t.getCreaterCode()));
+                t.setCreaterCode(creator.getNickName());
+            }
         }
         return getDataTable(list);
     }

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

@@ -102,6 +102,10 @@ public class TMtMessageattentionController extends BaseController {
                 SysUser updater = sysUserService.selectUserById(Long.parseLong(t.getUpdaterCode()));
                 t.setUpdaterCode(updater.getNickName());
             }
+            if (t.getCreaterCode() != null) {
+                SysUser creator = sysUserService.selectUserById(Long.parseLong(t.getCreaterCode()));
+                t.setCreaterCode(creator.getNickName());
+            }
         }
         return getDataTable(list);
     }

master/src/main/resources/mybatis/plant/TMtActionlistMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTMtActionlistList" parameterType="TMtActionlist" resultMap="TMtActionlistResult">
         <include refid="selectTMtActionlistVo"/>
         <where>
-            <if test="responsible != null  and responsible != ''"> and responsible like concat(concat('%', #{responsible}), '%')</if>
+            <if test="responsible != null  and responsible != ''"> and (responsible like concat(concat('%', #{responsible}), '%') or creater_code = #{createrCode} )</if>
             <if test="action != null  and action != ''"> and action = #{action}</if>
             <if test="deadline != null "> and deadline = #{deadline}</if>
             <if test="status != null  and status != ''"> and d.status = #{status}</if>

master/src/main/resources/mybatis/plant/TMtKeymaintenanceMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTMtKeymaintenanceList" parameterType="TMtKeymaintenance" resultMap="TMtKeymaintenanceResult">
         <include refid="selectTMtKeymaintenanceVo"/>
         <where>
-            <if test="responsible != null  and responsible != ''"> and responsible like concat(concat('%', #{responsible}), '%')</if>
+            <if test="responsible != null  and responsible != ''"> and (responsible like concat(concat('%', #{responsible}), '%') or creater_code = #{createrCode} )</if>
             <if test="deadline != null "> and deadline = #{deadline}</if>
             <if test="status != null  and status != ''"> and d.status = #{status}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>

master/src/main/resources/mybatis/plant/TMtMessageattentionMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTMtMessageattentionList" parameterType="TMtMessageattention" resultMap="TMtMessageattentionResult">
         <include refid="selectTMtMessageattentionVo"/>
         <where>
-            <if test="responsible != null  and responsible != ''"> and responsible like concat(concat('%', #{responsible}), '%')</if>
+            <if test="responsible != null  and responsible != ''"> and (responsible like concat(concat('%', #{responsible}), '%') or creater_code = #{createrCode} )</if>
             <if test="action != null  and action != ''"> and action like concat(concat('%', #{action}), '%')</if>
             <if test="deadline != null  and deadline != ''"> and deadline = #{deadline}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>

ui/src/store/modules/user.js

@@ -9,7 +9,8 @@ const user = {
     roles: [],
     permissions: [],
     sex: '',
-    staffId: ''
+    staffId: '',
+    nickName: ''
   },
 
   mutations: {
@@ -36,6 +37,9 @@ const user = {
     },
     SET_STAFF_ID: (state, staffId) => {
       state.staffId = staffId
+    },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
     }
   },
 
@@ -74,6 +78,7 @@ const user = {
           commit('SET_HOME', user.homeType)
           commit('SET_DEPT_ID' , user.deptId)
           commit('SET_STAFF_ID' , user.staffId)
+          commit('SET_NICKNAME' , user.nickName)
           resolve(res)
         }).catch(error => {
           reject(error)

ui/src/views/components/PlantProgList/index.vue

@@ -132,7 +132,7 @@
       <el-table-column :label="$t('回顾结果')" align="center" prop="reviewResult" width="150" :show-overflow-tooltip="true"
                        v-if="this.itemNum !== '5'"/>
       <el-table-column :label="$t('下次回顾日期')" align="center" sortable="custom" prop="nextreviewdate" width="100"
-                       v-if="this.itemNum !== '5'">
+                       >
         <template slot-scope="scope">
           <span style="vertical-align:middle">{{ parseTime(scope.row.nextreviewdate, '{y}-{m}-{d}') }}</span>
           <svg-icon v-if="scope.row.item !== 5" :icon-class="changeColorPiont(scope.row.nextreviewdate)"
@@ -280,7 +280,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate" v-if="this.itemNum !== '5'">
+            <el-form-item :label="$t('下次回顾日期')" prop="nextreviewdate" >
               <el-date-picker clearable size="small" style="width: 200px"
                               v-model="form.nextreviewdate"
                               type="date"
@@ -685,18 +685,9 @@ export default {
         filedate: [
           {required: true, message: this.$t('修订日期') + this.$t('不能为空'), trigger: "blur"}
         ],
-        nextreviewdate: [
-          {required: true, message: this.$t('下次回顾日期') + this.$t('不能为空'), trigger: "blur"}
-        ],
         classify: [
           {required: true, message: this.$t('密级分类') + this.$t('不能为空'), trigger: "change"}
         ],
-        reviewFrequency: [
-          {required: true, message: this.$t('回顾频率') + this.$t('不能为空'), trigger: "blur"}
-        ],
-        reviewResult: [
-          {required: true, message: this.$t('回顾结果') + this.$t('不能为空'), trigger: "blur"}
-        ],
         deptId: [
           {required: true, message: this.$t('归属部门') + this.$t('不能为空'), trigger: "blur"}
         ],

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

@@ -107,12 +107,14 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="录入人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <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>
+        </template>c
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding">
         <template slot-scope="scope">
@@ -121,14 +123,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
           >{{ $t('删除') }}</el-button>
         </template>
       </el-table-column>
@@ -396,9 +398,14 @@
         this.loading = false;
       });
     },
-    getStaffId(resp){
+    getStaffId(resp,name){
       if (resp) {
-        return resp.includes(this.$store.state.user.staffId)
+        if (resp.includes(this.$store.state.user.staffId)){
+          return true
+        }
+      }
+      if (name == this.$store.state.user.nickName) {
+        return true
       }
       return false
     },

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

@@ -98,6 +98,8 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="录入人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
       <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
@@ -112,14 +114,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
 
           >{{ $t('删除') }}</el-button>
         </template>
@@ -387,9 +389,14 @@
         this.loading = false;
       });
     },
-    getStaffId(resp){
+    getStaffId(resp,name){
       if (resp) {
-        return resp.includes(this.$store.state.user.staffId)
+        if (resp.includes(this.$store.state.user.staffId)){
+          return true
+        }
+      }
+      if (name == this.$store.state.user.nickName) {
+        return true
       }
       return false
     },

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

@@ -79,6 +79,7 @@
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="录入人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="更新人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
       <el-table-column label="更新日期" align="center" prop="updatedate" width="100">
@@ -93,14 +94,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:edit']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
           >{{ $t('修改') }}</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible)"
+            v-if="checkPermi(['plant:meeting:remove']) || getStaffId(scope.row.responsible,scope.row.createrCode)"
 
           >{{ $t('删除') }}</el-button>
         </template>
@@ -164,6 +165,7 @@
             :placeholder="$t('请选择') + $t('录入日期')">
           </el-date-picker>
         </el-form-item>
+
         <el-form-item :label="$t('备注')" prop="remarks">
           <el-input v-model="form.remarks" :placeholder="$t('请输入') + $t('备注')" />
         </el-form-item>
@@ -355,9 +357,14 @@
     statusFormat(row, column) {
       return this.selectDictLabel(this.statusOptions, row.status);
     },
-    getStaffId(resp){
+    getStaffId(resp,name){
       if (resp) {
-        return resp.includes(this.$store.state.user.staffId)
+        if (resp.includes(this.$store.state.user.staffId)){
+          return true
+        }
+      }
+      if (name == this.$store.state.user.nickName) {
+        return true
       }
       return false
     },

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

@@ -262,7 +262,7 @@ export default {
       getLastMeeting(param).then(response => {
         this.form = response.data;
         this.form.meetingDate = new Date() //当天日期
-        this.form.recorder = this.$store.state.user.name
+        this.form.recorder = this.$store.state.user.nickName
         this.open = true;
         this.title = this.$t('新增') + " " + this.$t('装置会议');
       });