LY 周会议 权限

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

@@ -32,6 +32,10 @@ public class TMtRiskreminder extends BaseEntity
     @Excel(name = "风险")
     private String risk;
 
+    /** 评估 */
+    @Excel(name = "评估")
+    private String assessment;
+
     /** 录入日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "录入日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -206,6 +210,14 @@ public class TMtRiskreminder extends BaseEntity
         return isHis;
     }
 
+    public String getAssessment() {
+        return assessment;
+    }
+
+    public void setAssessment(String assessment) {
+        this.assessment = assessment;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -20,10 +20,12 @@ 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="assessment" column="assessment" />
+
     </resultMap>
 
     <sql id="selectTMtRiskreminderVo">
-        select d.id, d.plant_code, d.maincontents, d.risk, 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_riskreminder d
+        select d.id, d.plant_code,d.assessment, d.maincontents, d.risk, 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_riskreminder d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -65,6 +67,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="assessment != null">assessment,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -81,6 +84,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="assessment != null">#{assessment},</if>
+
          </trim>
     </insert>
 
@@ -100,6 +105,8 @@ 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="assessment != null">assessment = #{assessment},</if>
+
         </trim>
         where id = #{id}
     </update>

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

@@ -344,7 +344,15 @@
       form: {},
       // 表单校验
       rules: {
-
+        action: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        inputdate: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        status: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
       }
     };
   },

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

@@ -207,8 +207,11 @@
       form: {},
       // 表单校验
       rules: {
-        plantCode: [
-          { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
+        maincontents: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        inputdate: [
+          { required: true, message: '不能为空', trigger: "change" }
         ],
       }
     };

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

@@ -335,8 +335,14 @@
       form: {},
       // 表单校验
       rules: {
-        plantCode: [
-          { required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "change" }
+        action: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        inputdate: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        status: [
+          { required: true, message: '不能为空', trigger: "change" }
         ],
       }
     };

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

@@ -289,6 +289,15 @@
       form: {},
       // 表单校验
       rules: {
+        action: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        inputdate: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
+        status: [
+          { required: true, message: '不能为空', trigger: "change" }
+        ],
       }
     };
   },

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

@@ -119,13 +119,13 @@
     <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="ongoing">
-          <el-input v-model="form.ongoing" :placeholder="$t('请输入') + $t('进行中')" />
+          <el-input-number v-model="form.ongoing" @change="changeTotal" :placeholder="$t('请输入') + $t('进行中')" />
         </el-form-item>
         <el-form-item :label="$t('已完成')" prop="finished">
-          <el-input v-model="form.finished" :placeholder="$t('请输入') + $t('已完成')" />
+          <el-input-number v-model="form.finished" @change="changeTotal" :placeholder="$t('请输入') + $t('已完成')" />
         </el-form-item>
         <el-form-item :label="$t('共计')" prop="totalitem">
-          <el-input v-model="form.totalitem" :placeholder="$t('请输入') + $t('共计')" />
+          <el-input-number v-model="form.totalitem" :placeholder="$t('请输入') + $t('共计')" />
         </el-form-item>
         <el-form-item :label="$t('录入日期')" prop="inputdate">
           <el-date-picker clearable size="small" style="width: 200px"
@@ -335,6 +335,9 @@
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    changeTotal(){
+      this.form.totalitem = this.form.ongoing + this.form.finished
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

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

@@ -59,9 +59,10 @@
 
     <el-table v-loading="loading" :data="riskreminderList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :formatter="plantCodeFormat" />
       <el-table-column :label="$t('主要内容')" align="center" prop="maincontents" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('风险')" align="center" prop="risk" :show-overflow-tooltip="true"/>
+      <el-table-column label="评估" align="center" prop="assessment" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('录入日期')" align="center" prop="inputdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.inputdate, '{y}-{m}-{d}') }}</span>
@@ -105,6 +106,9 @@
         <el-form-item :label="$t('风险')" prop="risk">
           <el-input v-model="form.risk" :placeholder="$t('请输入') + $t('风险')" />
         </el-form-item>
+        <el-form-item label="评估" prop="risk">
+          <el-input v-model="form.assessment" placeholder="请输入评估" />
+        </el-form-item>
         <el-form-item :label="$t('录入日期')" prop="inputdate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.inputdate"
@@ -225,8 +229,8 @@
       form: {},
       // 表单校验
       rules: {
-        plantCode: [
-          { required: true, message: this.$t('装置')+this.$t('不能为空'), trigger: "blur" }
+        maincontents: [
+          { required: true, message: '不能为空', trigger: "blur" }
         ],
       }
     };
@@ -281,6 +285,7 @@
         plantCode: null,
         maincontents: null,
         risk: null,
+        assessment: null,
         inputdate: null,
         delFlag: null,
         createrCode: null,