LY 培训

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

@@ -179,7 +179,7 @@ public class TStApproveController extends BaseController
         TStApprove tStApprove = tStApproveService.selectTStApproveById(Long.parseLong(devTask.getBusinessKey()));
         tStApprove.setContent(devTask.getComment());
         if (devTask.getCondition().equals("1")) {
-            devTask.setComment("通过" + symbol + devTask.getComment());
+            devTask.setComment("通过");
             TStYearplan tStYearplan = tStYearplanService.selectTStYearplanById(Long.parseLong(tStApprove.getPlanId()));
             tStYearplan.setApproveStatus(1l);
             tStYearplanService.updateTStYearplan(tStYearplan);
@@ -194,7 +194,7 @@ public class TStApproveController extends BaseController
             }
          }
         else if (devTask.getCondition().equals("0")) {
-            devTask.setComment("未通过" + symbol + devTask.getComment());
+            devTask.setComment("未通过");
             TStYearplan tStYearplan = tStYearplanService.selectTStYearplanById(Long.parseLong(tStApprove.getPlanId()));
             tStYearplan.setApproveStatus(2l);
             tStYearplanService.updateTStYearplan(tStYearplan);

ui/src/views/approve/approveDetail/specTrainingPlan-detaill.vue

@@ -108,7 +108,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('审批意见')">
+        <p v-html="dataForm.content" />
+      </el-form-item>
     </el-form>
     <div>
       <span>{{$t('流转详情')}}</span>
@@ -320,12 +322,13 @@
       getStapproveInfo(id).then(response => {
         this.taskForm.businessKey = response.data.id
         this.dataForm.creattime = response.data.creattime
+        this.dataForm.content = response.data.content
         this.planList = response.data.planList
         this.yearplanList = [response.data.yearplan]
         this.setrowspans() // 设置合并
         this.getChartTitle() // 渲染的信息
         this.$nextTick(() => {
-          this.$refs.planTable.doLayout(); // 解决表格错位
+          // this.$refs.planTable.doLayout(); // 解决表格错位
         });
       });
 
@@ -430,7 +433,6 @@
                 this.setrowspans() // 设置合并
                 this.getChartTitle() // 渲染的信息
                 this.$nextTick(() => {
-                  this.$refs.planTable.doLayout(); // 解决表格错位
                 });
               });
             });

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

@@ -120,8 +120,11 @@
       <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  :label="$t('审核意见')" prop="comment">-->
+<!--        <el-input v-model="taskForm.comment" :placeholder="$t('审核意见')" maxlength="100" show-word-limit></el-input>-->
+<!--      </el-form-item>-->
+      <el-form-item :label="$t('审核意见')">
+        <editor  v-model="taskForm.comment"  :min-height="192" />
       </el-form-item>
     </el-form>
     <form ref="downloadForm" :action="downloadAction" target="FORMSUBMIT">
@@ -193,10 +196,11 @@
   import {getStapproveInfo, handleApprove} from "@/api/training/spec/stapprove";
   import {getHistorylist} from "@/api/ehs/approvedanger";
   import {addPlan, getPlan, updatePlan} from "@/api/training/spec/plan";
+  import Editor from "@/components/Editor";
 
   export default {
   name: "spec-training-plan",
-  components: {},
+  components: {Editor},
   data() {
     return {
       loading: true,