LY 周会议 权限 指定人

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

@@ -66,6 +66,7 @@ public class TMtActionlistController extends BaseController
         for (TMtActionlist t:list
              ) {
             if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
                 SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
                 if (user != null) {
                     t.setRespName(user.getNickName());

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

@@ -65,6 +65,7 @@ public class TMtKeymaintenanceController extends BaseController
         for (TMtKeymaintenance t:list
         ) {
             if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
                 SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
                 if (user != null) {
                     t.setRespName(user.getNickName());

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

@@ -62,6 +62,7 @@ public class TMtMessageattentionController extends BaseController
         for (TMtMessageattention t:list
         ) {
             if (StringUtils.isNotEmpty(t.getResponsible())) {
+                t.setRespName(t.getResponsible());
                 SysUser user = sysUserService.selectUserByStaffId(t.getResponsible());
                 if (user != null) {
                     t.setRespName(user.getNickName());

master/src/main/java/com/ruoyi/project/plant/domain/TMtActionlist.java

@@ -81,10 +81,21 @@ public class TMtActionlist extends BaseEntity
 
     /** 历史记录 */
     private Long isHis;
+
+    /** 指定人 */
+    private String isPerson;
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
 
+    public String getIsPerson() {
+        return isPerson;
+    }
+
+    public void setIsPerson(String isPerson) {
+        this.isPerson = isPerson;
+    }
+
     public String getRespName() {
         return respName;
     }

master/src/main/java/com/ruoyi/project/plant/domain/TMtKeymaintenance.java

@@ -81,11 +81,20 @@ public class TMtKeymaintenance extends BaseEntity
 
     /** 历史记录 */
     private Long isHis;
-
+    /** 指定人 */
+    private String isPerson;
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
 
+    public String getIsPerson() {
+        return isPerson;
+    }
+
+    public void setIsPerson(String isPerson) {
+        this.isPerson = isPerson;
+    }
+
     public String getRespName() {
         return respName;
     }

master/src/main/java/com/ruoyi/project/plant/domain/TMtMessageattention.java

@@ -81,6 +81,18 @@ public class TMtMessageattention extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    /** 指定人 */
+    private String isPerson;
+
+    public String getIsPerson() {
+        return isPerson;
+    }
+
+    public void setIsPerson(String isPerson) {
+        this.isPerson = isPerson;
+    }
+
+
     public String getRespName() {
         return respName;
     }

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

@@ -21,11 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remarks"    column="remarks"    />
         <result property="meetingId"    column="meeting_id"    />
         <result property="isHis"    column="is_his"    />
+        <result property="isPerson"    column="is_person"    />
         <result property="deptName" column="dept_name" />
     </resultMap>
 
     <sql id="selectTMtActionlistVo">
-        select d.id, d.plant_code, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_actionlist d
+        select d.id, d.plant_code,d.is_person, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_actionlist d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
+            <if test="isPerson != null">is_person,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -99,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
+            <if test="isPerson != null">#{isPerson},</if>
          </trim>
     </insert>
 
@@ -120,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
+            <if test="isPerson != null">is_person = #{isPerson},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="meetingId"    column="meeting_id"    />
         <result property="isHis"    column="is_his"    />
         <result property="deptName" column="dept_name" />
+        <result property="isPerson"    column="is_person"    />
     </resultMap>
 
     <sql id="selectTMtKeymaintenanceVo">
-        select d.id, d.plant_code, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_keymaintenance d
+        select d.id, d.plant_code, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_keymaintenance d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
+            <if test="isPerson != null">is_person,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
+            <if test="isPerson != null">#{isPerson},</if>
          </trim>
     </insert>
 
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
+            <if test="isPerson != null">is_person = #{isPerson},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="meetingId"    column="meeting_id"    />
         <result property="isHis"    column="is_his"    />
         <result property="deptName" column="dept_name" />
+        <result property="isPerson"    column="is_person"    />
     </resultMap>
 
     <sql id="selectTMtMessageattentionVo">
-        select d.id, d.plant_code, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_mt_messageattention d
+        select d.id, d.plant_code, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_mt_messageattention d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
+            <if test="isPerson != null">is_person,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -89,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
+            <if test="isPerson != null">#{isPerson},</if>
+
          </trim>
     </insert>
 
@@ -110,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
+            <if test="isPerson != null">is_person = #{isPerson},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -147,7 +147,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item :label="$t('责任人')" prop="responsible">
-          <el-select v-if="form.isPerson" style="width: 150px" v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
+          <el-select v-if="form.isPerson == '1' " style="width: 150px" v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
             <el-option
               v-for="dict in stffmgrOptions"
               :key="dict.userId"
@@ -159,7 +159,8 @@
           </el-select>
           <el-input v-else v-model="form.responsible"  style="width: 150px" :placeholder="$t('请输入') + $t('负责人姓名')" />
 
-          <el-checkbox style="margin-left: 50px" v-model="form.isPerson">指定责任人</el-checkbox>
+          <el-checkbox style="margin-left: 50px" true-label="1" false-label="2" v-model="form.isPerson">指定责任人</el-checkbox>
+
         </el-form-item>
         <el-form-item :label="$t('行动')" prop="action">
           <el-input v-model="form.action" :placeholder="$t('请输入') + $t('行动')" />
@@ -420,7 +421,8 @@
         deptId: null,
         remarks: null,
         meetingId: null,
-        isHis: null
+        isHis: null,
+        isPerson: '1',
       };
       this.resetForm("form");
     },

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

@@ -139,7 +139,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item :label="$t('责任人')" prop="responsible">
-          <el-select v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
+          <el-select v-if="form.isPerson == '1' " style="width: 150px" v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
             <el-option
               v-for="dict in stffmgrOptions"
               :key="dict.userId"
@@ -149,6 +149,10 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
             </el-option>
           </el-select>
+          <el-input v-else v-model="form.responsible"  style="width: 150px" :placeholder="$t('请输入') + $t('负责人姓名')" />
+
+          <el-checkbox style="margin-left: 50px" true-label="1" false-label="2" v-model="form.isPerson">指定责任人</el-checkbox>
+
         </el-form-item>
         <el-form-item :label="$t('行动')" prop="action">
           <el-input v-model="form.action" :placeholder="$t('请输入') + $t('行动')" />
@@ -411,7 +415,8 @@
         deptId: null,
         remarks: null,
         meetingId: null,
-        isHis: null
+        isHis: null,
+        isPerson: '1',
       };
       this.resetForm("form");
     },

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

@@ -119,7 +119,7 @@
     <el-dialog  :close-on-click-modal="false" v-dialogDrag :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="$t('责任人')" prop="responsible">
-          <el-select v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
+          <el-select v-if="form.isPerson == '1' " style="width: 150px" v-model="form.responsible" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable >
             <el-option
               v-for="dict in stffmgrOptions"
               :key="dict.userId"
@@ -129,6 +129,10 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
             </el-option>
           </el-select>
+          <el-input v-else v-model="form.responsible"  style="width: 150px" :placeholder="$t('请输入') + $t('负责人姓名')" />
+
+          <el-checkbox style="margin-left: 50px" true-label="1" false-label="2" v-model="form.isPerson">指定责任人</el-checkbox>
+
         </el-form-item>
         <el-form-item :label="$t('行动')" prop="action">
           <el-input v-model="form.action" :placeholder="$t('请输入') + $t('行动')" />
@@ -358,7 +362,9 @@
         updaterCode: null,
         updatedate: null,
         deptId: null,
-        remarks: null
+        remarks: null,
+        isHis: null,
+        isPerson: '1',
       };
       this.resetForm("form");
     },