ly преди 3 години
родител
ревизия
4120161449

+ 3 - 1
master/src/main/java/com/ruoyi/project/training/spec/controller/TStApproveController.java

@@ -120,7 +120,9 @@ public class TStApproveController extends BaseController
         tStApprove.setApNo(data);
         tStApprove.setUserId(userid);
         tStApproveService.insertTStApprove(tStApprove);
-
+        TStYearplan tStYearplan = tStYearplanService.selectTStYearplanById(Long.parseLong(tStApprove.getPlanId()));
+        tStYearplan.setApproveStatus(3l);
+        tStYearplanService.updateTStYearplan(tStYearplan);
         Map<String, Object> variables = new HashMap<>();
         //开始工作流、监听
 //        variables.put("endSucessListener", new MonthEndSucessListener());

+ 1 - 0
ui/src/views/training/spec/successor/index.vue

@@ -415,6 +415,7 @@ export default {
       const id = row.id || this.ids
       getSuccessor(id).then(response => {
         this.form = response.data;
+        this.form.state = response.data.state.toString()
         this.open = true;
         this.title = "修改继任者清单";
       });

+ 1 - 1
ui/src/views/training/spec/yearplan/index.vue

@@ -130,7 +130,7 @@
             type="text"
             icon="el-icon-edit"
             @click="addApprove(scope.row)"
-            v-if="scope.row.approveStatus != 1"
+            v-if="scope.row.approveStatus != 1 && scope.row.approveStatus != 3"
             v-hasPermi="['spec:plan:list']"
           >提交申请</el-button>
           <el-button