1

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ParticipationMapper.xml

@@ -34,6 +34,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="projectIdList==null">
+            ORDER BY a.project_id,a.id
+        </if>
     </select>
 
 </mapper>

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

@@ -216,39 +216,63 @@ export default {
         }
     },
     methods: {
-
         review(id,checkType){
-            this.$prompt('请输入驳回理由', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            }).then(({ value }) => {
+            if(checkType==2){
+                this.$prompt('请输入驳回理由', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                }).then(({ value }) => {
                 this.http.post("/group-budget-review/check", {id:id,checkType:checkType,rejectReason:value},
-            res => {
-                if (res.code == "ok") {
+                    res => {
+                    if (res.code == "ok") {
+                        this.$message({
+                            message:"操作成功",
+                            type: "success"
+                        });
+                        this.getList();
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
                     this.$message({
-                        message:"操作成功",
-                        type: "success"
+                        message: error,
+                        type: "error"
                     });
-                    this.getList();
-                } else {
+                });
+                }).catch(() => {
                     this.$message({
-                        message: res.msg,
+                        type: 'info',
+                        message: '取消驳回'
+                    });       
+                    });
+                }else{
+                this.http.post("/group-budget-review/check", {id:id,checkType:checkType,rejectReason:""},
+                    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"
                     });
-                }
-            },
-            error => {
-                this.$message({
-                    message: error,
-                    type: "error"
                 });
-            });
-            }).catch(() => {
-            this.$message({
-                type: 'info',
-                message: '取消驳回'
-            });       
-            });
+            }
+            
         },
         //获取待审核的数据列表
         getList() {