LY 专项培训 年度培训

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -319,7 +319,7 @@ public class TApproveDangerController extends BaseController
                     devTask.setApproveSpecModify(approve);
                 }else if (pi.getProcessDefinitionName().equals("专项培训计划审核")) {
                     TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
-                    logger.info("设备修改/删除审核" +JSON.toJSONString(approve));
+                    logger.info("专项培训计划审核" +JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
                 }

ui/src/views/approve/pending/index.vue

@@ -1,5 +1,15 @@
 <template >
   <div class="app-container">
+    <!-- 顶部工具栏 -->
+    <el-row :gutter="10">
+      <div class="top-right-btn">
+        <el-row>
+          <el-tooltip  effect="dark" :content="$t('tagsView.refresh')" placement="top">
+            <el-button size="mini" circle icon="el-icon-refresh" @click="getList()" />
+          </el-tooltip>
+        </el-row>
+      </div>
+    </el-row>
     <el-table v-loading="loading" :data="approvedangerList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('流程')+' '+ $t('ID')" align="center" prop="processId" :show-overflow-tooltip="true"/>

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

@@ -536,7 +536,17 @@
             updatePlan(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
-              // this.getList();
+              getStapproveInfo(this.dataForm.id).then(response => {
+                this.taskForm.businessKey = response.data.id
+                this.dataForm.creattime = response.data.creattime
+                this.planList = response.data.planList
+                this.yearplanList = [response.data.yearplan]
+                this.setrowspans() // 设置合并
+                this.getChartTitle() // 渲染的信息
+                this.$nextTick(() => {
+                  this.$refs.planTable.doLayout(); // 解决表格错位
+                });
+              });
             });
           }
         }

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

@@ -1427,7 +1427,7 @@ export default {
 }
 .barchart .progressUpon{
   background: rgb(38, 84, 124);
-  height: 1em;
+  height: 1.5em;
   /* width: calc(100% + 2px); // +2是因为边框线为2px*/
   z-index: 2;
   position: absolute;
@@ -1436,7 +1436,7 @@ export default {
 }
 .barchart .progressDownon{
   background: rgb(255,209,102);
-  height: 1em;
+  height: 1.5em;
   /* width: calc(100% + 2px); // +2是因为边框线为2px*/
   z-index: 2;
   position: absolute;

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

@@ -176,7 +176,7 @@
           </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" :loading="submitLoading"  @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -229,6 +229,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      submitLoading: false,
       staffResumeVisible: false,
       // 选中数组
       ids: [],
@@ -397,21 +398,25 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.submitLoading = true
           if (this.form.id != null) {
             updateSuccessor(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.submitLoading = false
               this.getList();
             });
           } else {
             addSuccessor(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
+              this.submitLoading = false
               this.getList();
             });
           }
         }
       });
+      //
     },
     /** 删除按钮操作 */
     handleDelete(row) {