9 Commits 2d83c7d93a ... 7ebb46dc2a

Author SHA1 Message Date
  lgl 7ebb46dc2a Merge branch 'master' into dev-lgl 5 months ago
  梁世豪 88e2ab0d40 部门默认审核人-电源中心 5 months ago
  梁世豪 b4643ac140 已报账费用申请页面查看限制 5 months ago
  梁世豪 275d040361 费用限制错误问题 5 months ago
  梁世豪 9e66769d63 Merge remote-tracking branch 'origin/master' 5 months ago
  梁世豪 96dbaedf3c 405申请类型修改 费用申请总金额限制逻辑错误 5 months ago
  ly 504cb23624 费用类别 5 months ago
  ly 670d2f6362 费用类别请求方式修改 5 months ago
  ly f83bde9fa0 报账模块差旅 5 months ago

+ 1 - 2
src/main/java/com/liang/controller/StaBudgetapprovalController.java

@@ -1397,7 +1397,7 @@ public class StaBudgetapprovalController extends BaseController {
1397 1397
      * @return
1398 1398
      */
1399 1399
     @ResponseBody
1400
-    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.POST)
1400
+    @RequestMapping(value = "/getSubNode/{nys}", method = RequestMethod.GET)
1401 1401
     public Object getSubNode(@PathVariable Integer nys,
1402 1402
                              @RequestParam Integer page,
1403 1403
                              @RequestParam Integer limit,
@@ -1405,7 +1405,6 @@ public class StaBudgetapprovalController extends BaseController {
1405 1405
     ) {
1406 1406
         Integer count = prjAnnualbudgetdetailService.getSubNodeCount(nys, page, limit);
1407 1407
         List<PrjAnnualbudgetdetail> list = prjAnnualbudgetdetailService.getSubNode(nys, page, limit, mc);
1408
-
1409 1408
         Map<String, Object> resultMap = new HashMap<>();
1410 1409
         resultMap.put("code", 0);
1411 1410
         resultMap.put("msg", "");

+ 5 - 1
src/main/java/com/liang/controller/SysUserPostController.java

@@ -138,7 +138,11 @@ public class SysUserPostController extends BaseController {
138 138
         paraMap.put("postId", postId.toString());
139 139
         paraMap.put("userName", userName);
140 140
         paraMap.put("postName",postName);
141
-        paraMap.put("deptName", String.valueOf(userInfo.getDeptName()));
141
+        String deptName = userInfo.getDeptName();
142
+        if(deptName.contains("电源")){
143
+            deptName = null;
144
+        }
145
+        paraMap.put("deptName", deptName);
142 146
         List<SysUserPost> list = sysUserPostService.getPostUserList(paraMap);
143 147
         List<SysUserPost> list_power = new ArrayList<>();
144 148
 //如果是电源相关部门就只传一个李华

+ 11 - 0
src/main/java/com/liang/entity/StaActualexpenses.java

@@ -25,6 +25,17 @@ public class StaActualexpenses implements Serializable {
25 25
      * 出差人
26 26
      */
27 27
     private Integer ccr;
28
+
29
+    private String ccsy;
30
+
31
+    public String getCcsy() {
32
+        return ccsy;
33
+    }
34
+
35
+    public void setCcsy(String ccsy) {
36
+        this.ccsy = ccsy;
37
+    }
38
+
28 39
     private String ccrxm;
29 40
     /**
30 41
      * 出差地点

+ 2 - 2
src/main/resources/mapper/SysUserPostDao.xml

@@ -165,8 +165,8 @@
165 165
         <if test="userName!= null and userName!= ''">
166 166
             and u.name like '%'+#{userName}+'%'
167 167
         </if>
168
-        <if test="postId ==28">
169
-            and sdi.dept_name = #{deptName}
168
+        <if test="postId == 28 and deptName!= null">
169
+                    and sdi.dept_name = #{deptName}
170 170
         </if>
171 171
             ORDER BY u.order_code DESC
172 172
     </select>

+ 5 - 3
src/main/resources/templates/annualbudget/add_apply.html

@@ -440,6 +440,8 @@
440 440
                     </button>
441 441
                 </div>
442 442
             </div>
443
+        </div>
444
+            </div>
443 445
 </form>
444 446
 </div>
445 447
 <!--常规结束-->
@@ -3492,15 +3494,15 @@
3492 3494
             var nysje = parseFloat(dataTj[1].ysje) * 10000;//年度预算金额
3493 3495
             var ysqje = parseFloat(dataTj[0].ysqje);
3494 3496
             var nysqje = parseFloat(dataTj[1].ysqje);
3495
-            if (sqje + nysqje > nysje) {
3497
+            if (sqje + ysqje > nysje) {
3496 3498
                 Message.error("费用申请的总金额,不能超过年度总预算!", 2000);
3497 3499
                 return false;
3498 3500
             } else if ($("#fjmc").val().indexOf("业务费") > -1) {
3499
-                if (sqje + ysqje > ysje * 1.2) {
3501
+                if (ysqje > ysje * 1.2) {
3500 3502
                     Message.error("业务费申请的总金额,不能超过预算金额的20%!", 2000);
3501 3503
                     return false;
3502 3504
                 }
3503
-            } else if (sqje > ysje) {
3505
+            } else if (ysqje > ysje*1.2) {
3504 3506
                 Message.error("该科目申请的费用总金额,不能超过预算金额!", 2000);
3505 3507
                 return false;
3506 3508
             }

+ 19 - 15
src/main/resources/templates/stabudgetapproval/list_reported.html

@@ -518,22 +518,26 @@
518 518
                         "rws": data[0].xmid,
519 519
                         "rwsmc": data[0].xmmc
520 520
                     };
521
+                    if(data[0].spzt != '审批结束'){
522
+                        Message.warning("你的费用申请还未审批结束!", 1500);
523
+                    }else {
524
+                        var index = layer.open({
525
+                            title: '新建付款申请',
526
+                            type: 2,
527
+                            shade: 0.3,
528
+                            maxmin: true,
529
+                            shadeClose: true,
530
+                            area: ['1000px', '750px'],
531
+                            content: AjaxUtil.ctx + "staPayapproval/forAdd/" + data[0].id,
532
+                            end: function () {
533
+                                if (updateflag == 1)
534
+                                    currTable.reload();
535
+                                updateflag = 0;
536
+                                layer.close(index);
537
+                            }
538
+                        });
539
+                    }
521 540
 
522
-                    var index = layer.open({
523
-                        title: '新建付款申请',
524
-                        type: 2,
525
-                        shade: 0.3,
526
-                        maxmin: true,
527
-                        shadeClose: true,
528
-                        area: ['1000px', '750px'],
529
-                        content: AjaxUtil.ctx + "staPayapproval/forAdd/" + data[0].id,
530
-                        end: function () {
531
-                            if (updateflag == 1)
532
-                                currTable.reload();
533
-                            updateflag = 0;
534
-                            layer.close(index);
535
-                        }
536
-                    });
537 541
                 }
538 542
             } else if (obj.event === 'nullify') {  // 监听删除操作
539 543
                 var dataBudget = table.cache["currentTableId"];