Browse Source

全系统增加审核人校验

ly 4 months ago
parent
commit
1559e6c7c2

+ 9 - 4
src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -866,15 +866,20 @@ public class PrjAnnualbudgetController extends BaseController {
866 866
     @RequestMapping(value = "/getshr",method = RequestMethod.GET)
867 867
     public BaseResult getshr(@RequestParam Integer xmid,
868 868
                              @RequestParam String spzt){
869
-
870 869
         Map<String, Object> paraMap1 = new HashMap<>();
871 870
         paraMap1.put("xmid", xmid);
872 871
         paraMap1.put("zt", spzt);
873 872
         paraMap1.put("wc", "0");
874 873
         List<PrjApproverecord> approveList = prjApproverecordService.getApproveByXmId(paraMap1);
875
-
876
-
877
-        return BaseResult.failure("你不是当前项目审核人");
874
+        Integer id = getSysUserId();
875
+        if (approveList.size() == 1){
876
+            if (approveList.get(0).getShr().equals(id)){
877
+                return BaseResult.success("OK");
878
+            }
879
+        }else {
880
+            return BaseResult.failure(-1,"数据异常,请联系管理员!");
881
+        }
882
+        return BaseResult.failure(-2,"你不是当前项目审核人");
878 883
     }
879 884
 
880 885
 

+ 27 - 30
src/main/resources/templates/annualbudget/list.html

@@ -564,42 +564,39 @@
564 564
                         url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
565 565
                         contentType: "application/json",
566 566
                         success: function (res) {
567
-                            if (res.code === 0) {
568
-                                Message.success(1500, res.message, function () {
569
-                                    // 重载表格
570
-                                    currTable.reload();
567
+                            if (res.code === -1) {
568
+                             layer.msg(res.message,{icon:2});
569
+                             return;
570
+                            } else if (res.code === -2){
571
+                                layer.msg(res.message,{icon:2});
572
+                                return;
573
+                            }else {
574
+                                xmApproval = {
575
+                                    "xmid": data[0].id,
576
+                                    "xm": data[0].mc,
577
+                                    "ysje": data[0].ysje
578
+                                };
579
+                                var index = layer.open({
580
+                                    title: '审核',
581
+                                    type: 2,
582
+                                    shade: 0.3,
583
+                                    maxmin: true,
584
+                                    shadeClose: true,
585
+                                    area: ['1020px', layerheight + 'px'],
586
+                                    content: AjaxUtil.ctx
587
+                                        + 'prjAnnualbudget/forApproveUpdate/' + data[0].id + '?spzt=' + data[0].spzt,
588
+                                    end: function () {
589
+                                        if (updateflag == 1)
590
+                                            currTable.reload();
591
+                                        updateflag = 0;
592
+                                        layer.close(index);
593
+                                    }
571 594
                                 });
572
-                            } else {
573
-                                Message.error(res.message, 1000);
574 595
                             }
575 596
                         },
576 597
                         error: function (error) {
577 598
                         }
578 599
                     });
579
-
580
-
581
-
582
-                    xmApproval = {
583
-                        "xmid": data[0].id,
584
-                        "xm": data[0].mc,
585
-                        "ysje": data[0].ysje
586
-                    };
587
-                    var index = layer.open({
588
-                        title: '审核',
589
-                        type: 2,
590
-                        shade: 0.3,
591
-                        maxmin: true,
592
-                        shadeClose: true,
593
-                        area: ['1020px', layerheight + 'px'],
594
-                        content: AjaxUtil.ctx
595
-                            + 'prjAnnualbudget/forApproveUpdate/' + data[0].id + '?spzt=' + data[0].spzt,
596
-                        end: function () {
597
-                            if (updateflag == 1)
598
-                                currTable.reload();
599
-                            updateflag = 0;
600
-                            layer.close(index);
601
-                        }
602
-                    });
603 600
                 }
604 601
             } else if (obj.event === 'spList') {
605 602
                 var dataBudget = table.cache["currentTableId"];

+ 37 - 19
src/main/resources/templates/payapply/list.html

@@ -475,25 +475,43 @@
475 475
                 } else if (data[0].spzt == "作废") {
476 476
                     Message.warning("该付款申请已作废!", 1500);
477 477
                 } else {
478
-                    xmApproval = {
479
-                        "xmid": data[0].id,
480
-                        "xm": data[0].sqmc,
481
-                        "zt": data[0].spzt,
482
-                        "htje": data[0].htje
483
-                    };
484
-                    var index = layer.open({
485
-                        title: '审批意见',
486
-                        type: 2,
487
-                        shade: 0.3,
488
-                        maxmin: true,
489
-                        shadeClose: true,
490
-                        area: ['1020px', layerheight + 'px'],
491
-                        content: AjaxUtil.ctx + 'staPayapproval/forApproveUpdate/' + data[0].id + '/' + data[0].htje + '?spzt=' + data[0].spzt,
492
-                        end: function () {
493
-                            if (updateflag == 1)
494
-                                currTable.reload();
495
-                            updateflag = 0;
496
-                            layer.close(index);
478
+
479
+                    // 判断当前人员是否是审核人
480
+                    AjaxUtil.get({
481
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
482
+                        contentType: "application/json",
483
+                        success: function (res) {
484
+                            if (res.code === -1) {
485
+                                layer.msg(res.message,{icon:2});
486
+                                return;
487
+                            } else if (res.code === -2){
488
+                                layer.msg(res.message,{icon:2});
489
+                                return;
490
+                            }else {
491
+                                xmApproval = {
492
+                                    "xmid": data[0].id,
493
+                                    "xm": data[0].sqmc,
494
+                                    "zt": data[0].spzt,
495
+                                    "htje": data[0].htje
496
+                                };
497
+                                var index = layer.open({
498
+                                    title: '审批意见',
499
+                                    type: 2,
500
+                                    shade: 0.3,
501
+                                    maxmin: true,
502
+                                    shadeClose: true,
503
+                                    area: ['1020px', layerheight + 'px'],
504
+                                    content: AjaxUtil.ctx + 'staPayapproval/forApproveUpdate/' + data[0].id + '/' + data[0].htje + '?spzt=' + data[0].spzt,
505
+                                    end: function () {
506
+                                        if (updateflag == 1)
507
+                                            currTable.reload();
508
+                                        updateflag = 0;
509
+                                        layer.close(index);
510
+                                    }
511
+                                });
512
+                            }
513
+                        },
514
+                        error: function (error) {
497 515
                         }
498 516
                     });
499 517
                 }

+ 36 - 18
src/main/resources/templates/prjproject/list.html

@@ -552,24 +552,42 @@
552 552
                 } else if (data[0].spzt == "审批结束") {
553 553
                     Message.warning("该任务书已审批结束!", 1500);
554 554
                 } else {
555
-                    xmApproval = {
556
-                        "xmid": data[0].id,
557
-                        "xm": data[0].zwmc,
558
-                        "ysje": data[0].ysje
559
-                    };
560
-
561
-                    layer.open({
562
-                        title: '审批意见',
563
-                        type: 2,
564
-                        shade: 0.3,
565
-                        maxmin: true,
566
-                        shadeClose: true,
567
-                        area: ['1025px', layerheight + 'px'],
568
-                        content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
569
-                        end: function (index) {
570
-                            if (updateflag == 1)
571
-                                currTable.reload();
572
-                            updateflag = 0;
555
+                    // 判断当前人员是否是审核人
556
+                    AjaxUtil.get({
557
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
558
+                        contentType: "application/json",
559
+                        success: function (res) {
560
+                            if (res.code === -1) {
561
+                                layer.msg(res.message,{icon:2});
562
+                                return;
563
+                            } else if (res.code === -2){
564
+                                layer.msg(res.message,{icon:2});
565
+                                return;
566
+                            }else {
567
+
568
+                                xmApproval = {
569
+                                    "xmid": data[0].id,
570
+                                    "xm": data[0].zwmc,
571
+                                    "ysje": data[0].ysje
572
+                                };
573
+
574
+                                layer.open({
575
+                                    title: '审批意见',
576
+                                    type: 2,
577
+                                    shade: 0.3,
578
+                                    maxmin: true,
579
+                                    shadeClose: true,
580
+                                    area: ['1025px', layerheight + 'px'],
581
+                                    content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
582
+                                    end: function (index) {
583
+                                        if (updateflag == 1)
584
+                                            currTable.reload();
585
+                                        updateflag = 0;
586
+                                    }
587
+                                });
588
+                            }
589
+                        },
590
+                        error: function (error) {
573 591
                         }
574 592
                     });
575 593
                 }

+ 37 - 18
src/main/resources/templates/prjproject/list_deptproject.html

@@ -158,7 +158,7 @@
158 158
             cols: [
159 159
                 [
160 160
                     {type: "checkbox", fixed: 'left'},
161
-                    {type: 'numbers', align: 'center'},
161
+                    {type: 'numbers', align: 'center',title: '序号'},
162 162
                     {field: 'zwmc', width: '26%', title: '中文名称'},
163 163
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
164 164
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
@@ -433,26 +433,45 @@
433 433
                 } else if (data[0].spzt == "审批结束") {
434 434
                     Message.warning("该任务书已审批结束!", 1500);
435 435
                 } else {
436
-                    xmApproval = {
437
-                        "xmid": data[0].id,
438
-                        "xm": data[0].zwmc,
439
-                        "ysje": data[0].ysje
440
-                    };
441 436
 
442
-                    layer.open({
443
-                        title: '审批意见',
444
-                        type: 2,
445
-                        shade: 0.3,
446
-                        maxmin: true,
447
-                        shadeClose: true,
448
-                        area: ['1025px', layerheight + 'px'],
449
-                        content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
450
-                        end: function (index) {
451
-                            if (updateflag == 1)
452
-                                currTable.reload();
453
-                            updateflag = 0;
437
+                    // 判断当前人员是否是审核人
438
+                    AjaxUtil.get({
439
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
440
+                        contentType: "application/json",
441
+                        success: function (res) {
442
+                            if (res.code === -1) {
443
+                                layer.msg(res.message,{icon:2});
444
+                                return;
445
+                            } else if (res.code === -2){
446
+                                layer.msg(res.message,{icon:2});
447
+                                return;
448
+                            }else {
449
+                                xmApproval = {
450
+                                    "xmid": data[0].id,
451
+                                    "xm": data[0].zwmc,
452
+                                    "ysje": data[0].ysje
453
+                                };
454
+
455
+                                layer.open({
456
+                                    title: '审批意见',
457
+                                    type: 2,
458
+                                    shade: 0.3,
459
+                                    maxmin: true,
460
+                                    shadeClose: true,
461
+                                    area: ['1025px', layerheight + 'px'],
462
+                                    content: AjaxUtil.ctx + 'prjProject/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
463
+                                    end: function (index) {
464
+                                        if (updateflag == 1)
465
+                                            currTable.reload();
466
+                                        updateflag = 0;
467
+                                    }
468
+                                });
469
+                            }
470
+                        },
471
+                        error: function (error) {
454 472
                         }
455 473
                     });
474
+
456 475
                 }
457 476
             } else if (obj.event === 'spList') {
458 477
                 var projects = table.cache["currentTableId"];

+ 36 - 19
src/main/resources/templates/reimburse/list.html

@@ -460,25 +460,42 @@
460 460
                 } else if (data[0].spzt == "作废") {
461 461
                     Message.warning("该报账已作废!", 1500);
462 462
                 } else {
463
-                    xmApproval = {
464
-                        "xmid": data[0].id,
465
-                        "xm": data[0].mc,
466
-                        "zt": data[0].spzt,
467
-                        "bzje": data[0].bzje
468
-                    };
469
-                    var index = layer.open({
470
-                        title: '审批意见',
471
-                        type: 2,
472
-                        shade: 0.3,
473
-                        maxmin: true,
474
-                        shadeClose: true,
475
-                        area: ['1020px', layerheight + 'px'],
476
-                        content: AjaxUtil.ctx + 'staReimbursement/forApproveUpdate/' + data[0].id + '/' + data[0].bzje + '?spzt=' + data[0].spzt,
477
-                        end: function () {
478
-                            if (updateflag == 1)
479
-                                currTable.reload();
480
-                            updateflag = 0;
481
-                            layer.close(index);
463
+                    // 判断当前人员是否是审核人
464
+                    AjaxUtil.get({
465
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
466
+                        contentType: "application/json",
467
+                        success: function (res) {
468
+                            if (res.code === -1) {
469
+                                layer.msg(res.message,{icon:2});
470
+                                return;
471
+                            } else if (res.code === -2){
472
+                                layer.msg(res.message,{icon:2});
473
+                                return;
474
+                            }else {
475
+                                xmApproval = {
476
+                                    "xmid": data[0].id,
477
+                                    "xm": data[0].mc,
478
+                                    "zt": data[0].spzt,
479
+                                    "bzje": data[0].bzje
480
+                                };
481
+                                var index = layer.open({
482
+                                    title: '审批意见',
483
+                                    type: 2,
484
+                                    shade: 0.3,
485
+                                    maxmin: true,
486
+                                    shadeClose: true,
487
+                                    area: ['1020px', layerheight + 'px'],
488
+                                    content: AjaxUtil.ctx + 'staReimbursement/forApproveUpdate/' + data[0].id + '/' + data[0].bzje + '?spzt=' + data[0].spzt,
489
+                                    end: function () {
490
+                                        if (updateflag == 1)
491
+                                            currTable.reload();
492
+                                        updateflag = 0;
493
+                                        layer.close(index);
494
+                                    }
495
+                                });
496
+                            }
497
+                        },
498
+                        error: function (error) {
482 499
                         }
483 500
                     });
484 501
                 }

+ 41 - 26
src/main/resources/templates/reportinfo/list.html

@@ -93,22 +93,21 @@
93 93
 
94 94
         <script type="text/html" id="toolbarDemo">
95 95
             <div class="layui-btn-container">
96
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add" th:if="${addRight}">
96
+              <!--  <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add" th:if="${addRight}">
97 97
                     <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新增
98
-                </button>
98
+                </button>-->
99 99
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit" th:if="${editRight}">
100 100
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
101 101
                 </button>
102 102
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="browse">
103 103
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
104 104
                 </button>
105
-                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete" th:if="${delRight}">
105
+            <!--    <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete" th:if="${delRight}">
106 106
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
107
-                </button>
108
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
107
+                </button>-->
108
+<!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
109 109
                     <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批
110
-                </button>
111
-
110
+                </button>-->
112 111
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
113 112
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
114 113
                 </button>
@@ -487,26 +486,42 @@
487 486
                 } else if (data[0].spzt == "审批结束") {
488 487
                     Message.warning("该可研报告已审批结束!", 1500);
489 488
                 } else {
490
-                    xmApproval = {
491
-                        "xmid": data[0].id,
492
-                        "xm": data[0].mc,
493
-                        "ysje": data[0].ysje
494
-                    };
489
+                    AjaxUtil.get({
490
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
491
+                        contentType: "application/json",
492
+                        success: function (res) {
493
+                            if (res.code === -1) {
494
+                                layer.msg(res.message,{icon:2});
495
+                                return;
496
+                            } else if (res.code === -2){
497
+                                layer.msg(res.message,{icon:2});
498
+                                return;
499
+                            }else {
500
+                                xmApproval = {
501
+                                    "xmid": data[0].id,
502
+                                    "xm": data[0].mc,
503
+                                    "ysje": data[0].ysje
504
+                                };
495 505
 
496
-                    layer.open({
497
-                        title: '审批意见',
498
-                        type: 2,
499
-                        shade: 0.3,
500
-                        maxmin: true,
501
-                        shadeClose: true,
502
-                        area: ['1025px', layerheight + 'px'],
503
-                        // content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id  + '?spzt=' + data[0].spzt,
504
-                        content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
505
-                        end: function (index) {
506
-                            if (updateflag == 1)
507
-                                currTable.reload();
508
-                            updateflag = 0;
509
-                            layer.close(index);
506
+                                layer.open({
507
+                                    title: '审批意见',
508
+                                    type: 2,
509
+                                    shade: 0.3,
510
+                                    maxmin: true,
511
+                                    shadeClose: true,
512
+                                    area: ['1025px', layerheight + 'px'],
513
+                                    // content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id  + '?spzt=' + data[0].spzt,
514
+                                    content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
515
+                                    end: function (index) {
516
+                                        if (updateflag == 1)
517
+                                            currTable.reload();
518
+                                        updateflag = 0;
519
+                                        layer.close(index);
520
+                                    }
521
+                                });
522
+                            }
523
+                        },
524
+                        error: function (error) {
510 525
                         }
511 526
                     });
512 527
                 }

+ 95 - 24
src/main/resources/templates/reportinfo/list_deptproject.html

@@ -93,20 +93,23 @@
93 93
 
94 94
         <script type="text/html" id="toolbarDemo">
95 95
             <div class="layui-btn-container">
96
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add" th:if="${addRight}">
96
+              <!--  <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add" th:if="${addRight}">
97 97
                     <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新增
98
-                </button>
98
+                </button>-->
99 99
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="edit" th:if="${editRight}">
100 100
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>编辑
101 101
                 </button>
102 102
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="browse">
103 103
                     <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
104 104
                 </button>
105
-                <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete" th:if="${delRight}">
105
+              <!--  <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="delete" th:if="${delRight}">
106 106
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>删除
107
-                </button>
108
-                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
107
+                </button>-->
108
+<!--                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjApprove">
109 109
                     <i class="layui-icon layui-icon-ok" style="font-size: 10px;"></i>提交审批
110
+                </button>-->
111
+                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
112
+                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
110 113
                 </button>
111 114
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
112 115
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
@@ -483,26 +486,43 @@
483 486
                 } else if (data[0].spzt == "审批结束") {
484 487
                     Message.warning("该可研报告已审批结束!", 1500);
485 488
                 } else {
486
-                    xmApproval = {
487
-                        "xmid": data[0].id,
488
-                        "xm": data[0].mc,
489
-                        "ysje": data[0].ysje
490
-                    };
491 489
 
492
-                    layer.open({
493
-                        title: '审批意见',
494
-                        type: 2,
495
-                        shade: 0.3,
496
-                        maxmin: true,
497
-                        shadeClose: true,
498
-                        area: ['1025px', layerheight + 'px'],
499
-                        // content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id  + '?spzt=' + data[0].spzt,
500
-                        content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
501
-                        end: function (index) {
502
-                            if (updateflag == 1)
503
-                                currTable.reload();
504
-                            updateflag = 0;
505
-                            layer.close(index);
490
+                    AjaxUtil.get({
491
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
492
+                        contentType: "application/json",
493
+                        success: function (res) {
494
+                            if (res.code === -1) {
495
+                                layer.msg(res.message,{icon:2});
496
+                                return;
497
+                            } else if (res.code === -2){
498
+                                layer.msg(res.message,{icon:2});
499
+                                return;
500
+                            }else {
501
+                                xmApproval = {
502
+                                    "xmid": data[0].id,
503
+                                    "xm": data[0].mc,
504
+                                    "ysje": data[0].ysje
505
+                                };
506
+
507
+                                layer.open({
508
+                                    title: '审批意见',
509
+                                    type: 2,
510
+                                    shade: 0.3,
511
+                                    maxmin: true,
512
+                                    shadeClose: true,
513
+                                    area: ['1025px', layerheight + 'px'],
514
+                                    // content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id  + '?spzt=' + data[0].spzt,
515
+                                    content: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data[0].id + '/' + data[0].ysje + '?spzt=' + data[0].spzt,
516
+                                    end: function (index) {
517
+                                        if (updateflag == 1)
518
+                                            currTable.reload();
519
+                                        updateflag = 0;
520
+                                        layer.close(index);
521
+                                    }
522
+                                });
523
+                            }
524
+                        },
525
+                        error: function (error) {
506 526
                         }
507 527
                     });
508 528
                 }
@@ -560,6 +580,57 @@
560 580
 
561 581
                     });
562 582
                 }
583
+            }else if(obj.event === 'tjrevokeApprove'){
584
+                var projects = table.cache["currentTableId"];
585
+                if (projects.length == 0)
586
+                    return;
587
+                var checkStatus = table.checkStatus('currentTableId')
588
+                    , data = checkStatus.data;
589
+                if (data == null || data.length === 0) {
590
+                    Message.warning("请选择要撤销的可研报告!", 1500);
591
+                } else if (data.length > 1) {
592
+                    Message.warning("请选择一条记录进行撤销!", 1500);
593
+                } else if (data[0].spzt == "审批结束") {
594
+                    Message.warning("该可研报告已审批结束!", 1500);
595
+                }
596
+                    // else if (data[0].cjr != userId) {
597
+                // Message.error("您不是该可研报告的创建人!", 1500);}
598
+                else {
599
+                    xmApproval = {
600
+                        "xmid": data[0].id,
601
+                        "xm": data[0].zwmc,
602
+                        "zt": "未提交"
603
+                    };
604
+                    if (data[0].spzt == null) {
605
+                        xmApproval.zt = "未提交";
606
+                        data[0].spzt = "未提交";
607
+                    }
608
+                    var project = {
609
+                        "id": xmApproval.xmid,
610
+                        "spzt": '未提交'
611
+                    }
612
+                    layer.confirm('确定撤销项目任务书吗?', function (index) {
613
+                        layer.close(index);
614
+                        AjaxUtil.post({
615
+                            url: AjaxUtil.ctx + "reportinfo/TJrevokeApprove",
616
+                            contentType: "application/json",
617
+                            data: JSON.stringify(project),
618
+                            success: function (res) {
619
+                                if (res.code === 0) {
620
+                                    Message.success(1500, res.message, function () {
621
+                                        // 重载表格
622
+                                        currTable.reload();
623
+                                    });
624
+                                } else {
625
+                                    Message.error(res.message, 1000);
626
+                                }
627
+                            },
628
+                            error: function (error) {
629
+                            }
630
+                        });
631
+                    });
632
+                }
633
+
563 634
             }
564 635
         });
565 636
 

+ 3 - 3
src/main/resources/templates/reportinfo/list_myproject.html

@@ -112,9 +112,9 @@
112 112
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="tjrevokeApprove">
113 113
                     <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>撤销审批
114 114
                 </button>
115
-                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
116
-                    <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
117
-                </button>
115
+               <!--     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
116
+                        <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
117
+                    </button>-->
118 118
                 <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
119 119
                     <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
120 120
                 </button>

+ 40 - 23
src/main/resources/templates/stafeemanage/list_allapply.html

@@ -649,29 +649,46 @@
649 649
                 } else if (data[0].spzt == "作废") {
650 650
                     Message.warning("该费用申请已作废!", 1500);
651 651
                 } else {
652
-                    xmApproval = {
653
-                        "xmid": data[0].id,
654
-                        "xm": data[0].sqmc,
655
-                        "zt": data[0].spzt,
656
-                        "sqje": data[0].sqje
657
-                    };
658
-
659
-                    var content = AjaxUtil.ctx + 'staBudgetapproval/forApproveAdd';
660
-                    if (data[0].spzt != "未提交")
661
-                        content = AjaxUtil.ctx + 'staBudgetapproval/forApproveUpdate/' + data[0].id + '/' + data[0].sqje + '?spzt=' + data[0].spzt + '&fymc=' + data[0].fylbmc;
662
-
663
-                    layer.open({
664
-                        title: '审批意见',
665
-                        type: 2,
666
-                        shade: 0.3,
667
-                        maxmin: true,
668
-                        shadeClose: true,
669
-                        area: ['1025px', layerheight + 'px'],
670
-                        content: content,
671
-                        end: function (index) {
672
-                            if (updateflag == 1)
673
-                                currTable.reload();
674
-                            updateflag = 0;
652
+                    // 判断当前人员是否是审核人
653
+                    AjaxUtil.get({
654
+                        url: AjaxUtil.ctx + "prjAnnualbudget/getshr?xmid="+data[0].id+'&spzt='+data[0].spzt,
655
+                        contentType: "application/json",
656
+                        success: function (res) {
657
+                            if (res.code === -1) {
658
+                                layer.msg(res.message,{icon:2});
659
+                                return;
660
+                            } else if (res.code === -2){
661
+                                layer.msg(res.message,{icon:2});
662
+                                return;
663
+                            }else {
664
+                                xmApproval = {
665
+                                    "xmid": data[0].id,
666
+                                    "xm": data[0].sqmc,
667
+                                    "zt": data[0].spzt,
668
+                                    "sqje": data[0].sqje
669
+                                };
670
+
671
+                                var content = AjaxUtil.ctx + 'staBudgetapproval/forApproveAdd';
672
+                                if (data[0].spzt != "未提交")
673
+                                    content = AjaxUtil.ctx + 'staBudgetapproval/forApproveUpdate/' + data[0].id + '/' + data[0].sqje + '?spzt=' + data[0].spzt + '&fymc=' + data[0].fylbmc;
674
+
675
+                                layer.open({
676
+                                    title: '审批意见',
677
+                                    type: 2,
678
+                                    shade: 0.3,
679
+                                    maxmin: true,
680
+                                    shadeClose: true,
681
+                                    area: ['1025px', layerheight + 'px'],
682
+                                    content: content,
683
+                                    end: function (index) {
684
+                                        if (updateflag == 1)
685
+                                            currTable.reload();
686
+                                        updateflag = 0;
687
+                                    }
688
+                                });
689
+                            }
690
+                        },
691
+                        error: function (error) {
675 692
                         }
676 693
                     });
677 694
                 }