LY 专项培训 gant

master/src/main/java/com/ruoyi/project/training/spec/controller/TStApproveController.java

@@ -156,6 +156,7 @@ public class TStApproveController extends BaseController
         //利用任务对象，获取流程实例id
         String processInstancesId = task.getProcessInstanceId();
         TStApprove tStApprove = tStApproveService.selectTStApproveById(Long.parseLong(devTask.getBusinessKey()));
+        tStApprove.setContent(devTask.getComment());
         if (devTask.getCondition().equals("1")) {
             devTask.setComment("通过" + symbol + devTask.getComment());
             TStYearplan tStYearplan = tStYearplanService.selectTStYearplanById(Long.parseLong(tStApprove.getPlanId()));
@@ -186,6 +187,7 @@ public class TStApproveController extends BaseController
                 tStPlanService.updateTStPlan(t);
             }
         }
+        tStApproveService.updateTStApprove(tStApprove);
         System.out.println(processInstancesId);
         Map<String, Object> param = new HashMap<>();
         param.put("condition", devTask.getCondition());

ui/src/views/approve/pending/specTrainingPlan-deal.vue

@@ -120,6 +120,9 @@
       <el-form-item :label="$t('申请时间')"  prop="creattime">
         <el-input v-model="dataForm.creattime" disabled></el-input>
       </el-form-item>
+      <el-form-item  :label="$t('审核意见')" prop="comment">
+        <el-input v-model="taskForm.comment" :placeholder="$t('审核意见')" maxlength="100" show-word-limit></el-input>
+      </el-form-item>
     </el-form>
     <form ref="downloadForm" :action="downloadAction" target="FORMSUBMIT">
       <input name="approveId" v-model="dataForm.id"  hidden  />
@@ -175,7 +178,9 @@
             v-model="form.classContent">
           </el-input>
         </el-form-item>
-
+        <el-form-item v-if="!this.taskForm.taskId == ''" :label="$t('审核意见')" prop="comment">
+          <el-input v-model="taskForm.comment" :placeholder="$t('审核意见')" maxlength="100" show-word-limit></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ui/src/views/training/spec/plan/index.vue

@@ -1129,7 +1129,6 @@ export default {
         var EndDate = chartTable[i].endDate;
         var mainObj = chartTable[i];
 
-
         // 计划日期
         maxDayParams === "" ? maxDayParams = EndDate : ''
         minDayParams === "" ? minDayParams = StartDate : ""
@@ -1140,7 +1139,6 @@ export default {
         // 记录时间戳
         this.planList[i].beginTimeStamp = this.getTimeStamp(StartDate)
         this.planList[i].endTimeStamp = this.getTimeStamp(EndDate)
-
       }
       this.minDay = minDayParams
       this.maxDay = maxDayParams