立项管理修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectApprovalController.java

@@ -241,6 +241,7 @@ public class ProjectApprovalController {
         ProjectApprovalLog projectApprovalLog=new ProjectApprovalLog();
         projectApprovalLog.setCreateTime(LocalDateTime.now());
         projectApprovalLog.setProjectApprovalId(projectApproval.getId());
+        projectApprovalLog.setUserName(user.getName());
         if(projectApproval.getId()==null){
             //提交
             projectApprovalLog.setType(0);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectApprovalServiceImpl.java

@@ -726,6 +726,7 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                     //新增操作记录数据
                     projectApprovalLog.setCreateTime(LocalDateTime.now());
                     projectApprovalLog.setProjectApprovalId(projectApproval.getId());
+                    projectApprovalLog.setUserName(user.getName());
                     //通过
                     projectApprovalLog.setType(2);
                     projectApprovalLogService.save(projectApprovalLog);
@@ -738,6 +739,7 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                 //新增操作记录数据
                 projectApprovalLog.setCreateTime(LocalDateTime.now());
                 projectApprovalLog.setProjectApprovalId(projectApproval.getId());
+                projectApprovalLog.setUserName(user.getName());
                 //驳回
                 projectApprovalLog.setType(3);
                 projectApprovalLogService.save(projectApprovalLog);
@@ -761,6 +763,7 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                 //新增操作记录数据
                 projectApprovalLog.setCreateTime(LocalDateTime.now());
                 projectApprovalLog.setProjectApprovalId(projectApproval.getId());
+                projectApprovalLog.setUserName(user.getName());
                 //驳回
                 projectApprovalLog.setType(4);
                 projectApprovalLogService.save(projectApprovalLog);

fhKeeper/formulahousekeeper/timesheet/src/views/projectApproval/projectApproval.vue

@@ -75,7 +75,7 @@
                         </el-table-column>
                         <el-table-column prop="status" :label="'审核状态'" min-width="100" >
                             <template slot-scope="scope">
-                                {{scope.row.status == null?"-":approvalStatusStr[scope.row.status-1]}}
+                                {{scope.row.status == null?"-":approvalStatusStr[scope.row.status]}}
                             </template>
                         </el-table-column>
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
@@ -380,7 +380,7 @@ return {
     page: 1,
     size: localStorage.getItem("projectPageSize")==null?20:parseInt(localStorage.getItem("projectPageSize")),
     listLoading:false,
-    approvalStatusStr:["待审核","已通过","已驳回"],
+    approvalStatusStr:["待审核","已通过","已驳回","已撤销"],
     importanceList:[{id:1,label:this.$t('zheng-chang')},{id:2,label:this.$t('jin-ji')},{id:3,label:this.$t('zhong-yao')},{id:4,label:this.$t('zhong-yao-qie-jin-ji')}],
     importanceListLable:[this.$t('zheng-chang'), this.$t('jin-ji'), this.$t('zhong-yao'), this.$t('zhong-yao-qie-jin-ji'), this.$t('di-feng-xian'), this.$t('zhong-feng-xian'), this.$t('gao-feng-xian')],
     addFormVisible:false,