Merge branch 'master' into dev-lgl

src/main/java/com/liang/controller/StaBudgetapprovalController.java

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

src/main/java/com/liang/controller/SysUserPostController.java

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

src/main/java/com/liang/entity/StaActualexpenses.java

@@ -25,6 +25,17 @@ public class StaActualexpenses implements Serializable {
      * 出差人
      */
     private Integer ccr;
+
+    private String ccsy;
+
+    public String getCcsy() {
+        return ccsy;
+    }
+
+    public void setCcsy(String ccsy) {
+        this.ccsy = ccsy;
+    }
+
     private String ccrxm;
     /**
      * 出差地点

src/main/resources/mapper/SysUserPostDao.xml

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

src/main/resources/templates/annualbudget/add_apply.html

@@ -440,6 +440,8 @@
                     </button>
                 </div>
             </div>
+        </div>
+            </div>
 </form>
 </div>
 <!--常规结束-->
@@ -3492,15 +3494,15 @@
             var nysje = parseFloat(dataTj[1].ysje) * 10000;//年度预算金额
             var ysqje = parseFloat(dataTj[0].ysqje);
             var nysqje = parseFloat(dataTj[1].ysqje);
-            if (sqje + nysqje > nysje) {
+            if (sqje + ysqje > nysje) {
                 Message.error("费用申请的总金额，不能超过年度总预算!", 2000);
                 return false;
             } else if ($("#fjmc").val().indexOf("业务费") > -1) {
-                if (sqje + ysqje > ysje * 1.2) {
+                if (ysqje > ysje * 1.2) {
                     Message.error("业务费申请的总金额，不能超过预算金额的20%!", 2000);
                     return false;
                 }
-            } else if (sqje > ysje) {
+            } else if (ysqje > ysje*1.2) {
                 Message.error("该科目申请的费用总金额，不能超过预算金额!", 2000);
                 return false;
             }

src/main/resources/templates/stabudgetapproval/list_reported.html

@@ -518,22 +518,26 @@
                         "rws": data[0].xmid,
                         "rwsmc": data[0].xmmc
                     };
+                    if(data[0].spzt != '审批结束'){
+                        Message.warning("你的费用申请还未审批结束！", 1500);
+                    }else {
+                        var index = layer.open({
+                            title: '新建付款申请',
+                            type: 2,
+                            shade: 0.3,
+                            maxmin: true,
+                            shadeClose: true,
+                            area: ['1000px', '750px'],
+                            content: AjaxUtil.ctx + "staPayapproval/forAdd/" + data[0].id,
+                            end: function () {
+                                if (updateflag == 1)
+                                    currTable.reload();
+                                updateflag = 0;
+                                layer.close(index);
+                            }
+                        });
+                    }
 
-                    var index = layer.open({
-                        title: '新建付款申请',
-                        type: 2,
-                        shade: 0.3,
-                        maxmin: true,
-                        shadeClose: true,
-                        area: ['1000px', '750px'],
-                        content: AjaxUtil.ctx + "staPayapproval/forAdd/" + data[0].id,
-                        end: function () {
-                            if (updateflag == 1)
-                                currTable.reload();
-                            updateflag = 0;
-                            layer.close(index);
-                        }
-                    });
                 }
             } else if (obj.event === 'nullify') {  // 监听删除操作
                 var dataBudget = table.cache["currentTableId"];