SAI开项申请流程：评估、执行阶段添加备注字段

master/src/main/java/com/ruoyi/project/production/domain/TSaiApply.java

@@ -140,6 +140,28 @@ public class TSaiApply extends BaseEntity
     @TableField(exist = false)
     private List<TSaiApproveFile> files;
 
+    /** 备注（评估阶段） */
+    private String remarksAssess;
+
+    /** 备注（执行阶段） */
+    private String remarksExecute;
+
+    public String getRemarksAssess() {
+        return remarksAssess;
+    }
+
+    public void setRemarksAssess(String remarksAssess) {
+        this.remarksAssess = remarksAssess;
+    }
+
+    public String getRemarksExecute() {
+        return remarksExecute;
+    }
+
+    public void setRemarksExecute(String remarksExecute) {
+        this.remarksExecute = remarksExecute;
+    }
+
     public Long getSaiLevel() {
         return saiLevel;
     }

master/src/main/resources/mybatis/production/TSaiApplyMapper.xml

@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="veItemOther"    column="ve_item_other"    />
         <result property="saiLevel"    column="sai_level"    />
         <result property="category"    column="category"    />
+        <result property="remarksAssess"    column="remarks_assess"    />
+        <result property="remarksExecute"    column="remarks_execute"    />
     </resultMap>
 
     <sql id="selectTSaiApplyVo">
@@ -47,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.applicant, d.assessor, d.executor, d.inspectors, d.applicant_dept, d.applicant_team, d.description,
         d.unsafe_status, d.unsafe_action, d.apply_date, d.task_id, d.task_name,d.remarks, d.ve_item_other,
         d.handler, d.estimate_finish_date, d.actual_finish_date, d.is_recorded, d.record_no, d.reaction, d.need_ve, d.ve_items, d.ve_result,
-        d.sai_level, d.category
+        d.sai_level, d.category, d.remarks_assess, d.remarks_execute
         from t_sai_apply d
         left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -85,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="veItemOther != null  and veItemOther != ''"> and ve_item_other = #{veItemOther}</if>
             <if test="saiLevel != null "> and sai_level = #{saiLevel}</if>
             <if test="category != null  and category != ''"> and category = #{category}</if>
+            <if test="remarksAssess != null  and remarksAssess != ''"> and remarks_assess = #{remarksAssess}</if>
+            <if test="remarksExecute != null  and remarksExecute != ''"> and remarks_execute = #{remarksExecute}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
@@ -138,6 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="veItemOther != null">ve_item_other,</if>
             <if test="saiLevel != null">sai_level,</if>
             <if test="category != null">category,</if>
+            <if test="remarksAssess != null">remarks_assess,</if>
+            <if test="remarksExecute != null">remarks_execute,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saiApplyId != null">#{saiApplyId},</if>
@@ -175,6 +181,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="veItemOther != null">#{veItemOther},</if>
             <if test="saiLevel != null">#{saiLevel},</if>
             <if test="category != null">#{category},</if>
+            <if test="remarksAssess != null">#{remarksAssess},</if>
+            <if test="remarksExecute != null">#{remarksExecute},</if>
          </trim>
     </insert>
 
@@ -222,6 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="veItemOther == null">ve_item_other = null,</if>
             <if test="saiLevel != null">sai_level = #{saiLevel},</if>
             <if test="category != null">category = #{category},</if>
+            <if test="remarksAssess != null">remarks_assess = #{remarksAssess},</if>
+            <if test="remarksExecute != null">remarks_execute = #{remarksExecute},</if>
         </trim>
         where sai_apply_id = #{saiApplyId}
     </update>

ui/src/views/approve/approveDetail/sai-apply-detail.vue

@@ -262,6 +262,11 @@
               </el-checkbox-group>
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="3">
+            <el-form-item prop="remarksAssess">
+              <el-input :disabled="assessDisabled" v-model="dataForm.remarksAssess" placeholder="请输入备注" type="textarea" :rows="3"/>
+            </el-form-item>
+          </el-descriptions-item>
         </el-descriptions>
       </div>
       <div id="execute-div" v-if="showExecute">
@@ -336,6 +341,11 @@
               </el-table-column>
             </el-table>
           </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="3">
+            <el-form-item prop="remarksExecute">
+              <el-input :disabled="executeDisabled" v-model="dataForm.remarksExecute" placeholder="请输入备注" type="textarea" :rows="3"/>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item label="驳回历史">
             <el-table :data="rejectList" border v-loading="historyLoading" style="width: 100%;">
               <el-table-column prop="result" header-align="center" align="center"
@@ -635,6 +645,8 @@ export default {
         veItems: null,
         veResult: null,
         veItemOther: null,
+        remarksAssess: null,
+        remarksExecute: null,
       },
       taskForm: {
         comment: '',