Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -124,7 +124,7 @@ public class GroupBudgetReviewController {
             queryWrapper.eq(GroupBudgetReview::getProjectId,projectId);
         }
         if(status!=null){
-            queryWrapper.eq(GroupBudgetReview::getStatus,status);
+            queryWrapper.eq(GroupBudgetReview::getStatus,status-1);
         }
         if(!StringUtils.isEmpty(submitUserId)){
             queryWrapper.eq(GroupBudgetReview::getCreatorId,submitUserId);

fhKeeper/formulahousekeeper/timesheet/src/views/project/budgetReview.vue

@@ -180,9 +180,9 @@ export default {
             searchUsersList: [],
             projectList: [],
             auditStatus: [
-                { id: 0, label: '待审核' },
-                { id: 1, label: '审核通过' },
-                { id: 2, label: '驳回' }
+                { id: 1, label: '待审核' },
+                { id: 2, label: '审核通过' },
+                { id: 3, label: '已驳回' }
             ],
 
             screeningConditionForm: {
@@ -199,6 +199,30 @@ export default {
         }
     },
     methods: {
+
+        review(id,checkType){
+            this.http.post("/group-budget-review/check", {id:id,checkType:checkType},
+            res => {
+                if (res.code == "ok") {
+                    this.$message({
+                        message:"操作成功",
+                        type: "success"
+                    });
+                    this.getList();
+                } else {
+                    this.$message({
+                        message: res.msg,
+                        type: "error"
+                    });
+                }
+            },
+            error => {
+                this.$message({
+                    message: error,
+                    type: "error"
+                });
+            });
+        },
         //获取待审核的数据列表
         getList() {
             this.listLoading = true;