Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/templates/reimburse/mylist.html

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

@@ -180,12 +180,19 @@ public class StaPayapprovalController extends BaseController {
 
     @ApiOperation(value = "页面初始化", notes = "页面初始化")
     @RequestMapping(value = "/init_payApply", method = RequestMethod.GET)
-    public String init_payApply(Model model) {
+    public String init_payApply(Model model,
+                                @RequestParam(required = false, defaultValue = "", value = "id") Integer id
+                                ) {
+//       获取当前报账的费用申请id
+        String fysq=staReimbursementDao.getfysqmc(id);
         //审批状态
         List<Map<String, String>> approveList = sysDictInfoService.queryByCode("pay_status");
         model.addAttribute("approveList", approveList);
         //当前用户ID
         model.addAttribute("userId", getSysUserId());
+        if (fysq!=null && fysq != ""){
+        model.addAttribute("fysq",fysq);
+        }
 
         return "payapply/mylist";
     }
@@ -197,6 +204,7 @@ public class StaPayapprovalController extends BaseController {
     @RequestMapping(value = "/mylist", method = RequestMethod.POST)
     public BaseResult mylist(@RequestParam("page") Integer pageNum,
                              @RequestParam("limit") Integer pageSize,
+                             @RequestParam(required = false, defaultValue = "", value = "fysq") String fysq,
                              @RequestParam(required = false, defaultValue = "", value = "fysqmc") String fysqmc,
                              @RequestParam(required = false, defaultValue = "", value = "cjr") String cjr,
                              @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
@@ -224,6 +232,7 @@ public class StaPayapprovalController extends BaseController {
         Map<String, String> paraMap = new HashMap<>();
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
+        paraMap.put("fysq",fysq);
         paraMap.put("fysqmc", fysqmc);
         paraMap.put("cjr", cjr);
         paraMap.put("spzt", spzt);

src/main/java/com/liang/dao/StaReimbursementDao.java

@@ -134,5 +134,7 @@ public interface StaReimbursementDao {
     List<String> getYearList();
 
     int tjrevokeApprove1(StaReimbursement bzrxm);
+
+    String getfysqmc(Integer id);
 }
 

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -235,6 +235,9 @@
         <if test="spzt != null and spzt != ''">
             and b.SPZT = #{spzt}
         </if>
+        <if test="fysq != null and fysq != ''">
+            and b.fysq=#{fysq}
+        </if>
         <if test="fysqmc != null and fysqmc != ''">
             and g.SQMC like '%'+#{fysqmc}+'%'
         </if>

src/main/resources/mapper/StaReimbursementDao.xml

@@ -250,6 +250,11 @@
         from
             sta_Reimbursement
     </select>
+    <select id="getfysqmc" resultType="java.lang.String">
+        SELECT b.id,b.SQMC FROM sta_Reimbursement a
+                               LEFT JOIN sta_BudgetApproval b on a.FYSQ = b.id
+                            where a.id=#{id}
+    </select>
 
     <!--批量删除报账-->
     <delete id="batchDelete" parameterType="java.util.ArrayList">

src/main/resources/templates/payapply/mylist.html

@@ -106,7 +106,7 @@
             laydate = layui.laydate,
             table = layui.table;
         var userId = $("#userId").val();
-
+        var fysq = [[${fysq}]];
 
         //日期
         laydate.render({
@@ -122,6 +122,9 @@
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
+            where: {
+              fysq:fysq
+            },
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},

src/main/resources/templates/reimburse/mylist.html

@@ -469,12 +469,18 @@
 
                 var checkStatus = table.checkStatus('currentTableId')
                     , data = checkStatus.data;
+                var project = {
+                    "id": xmApproval.xmid,
+                    "spzt": data[0].spzt
+                }
                 if (data == null || data.length === 0) {
                     Message.warning("请选择要修改付款的报账！", 1500);
                 } else if (data.length > 1) {
                     Message.warning("请选择一条记录进行付款修改！", 1500);
                 } else if (data[0].spzt == "作废") {
                     Message.warning("该报账已作废！", 1500);
+                }else if (data[0].spzt != "审批结束"){
+                    Message.warning("请审批结束后再使用此功能！", 1500);
                 } else {
                     xmApproval = {
                         "fysq": data[0].fysq,
@@ -498,7 +504,38 @@
                         }
                     });
                 }
-            } else if (obj.event === 'nullify') {  // 监听删除操作
+            }else if (obj.event==='viewPay'){ //监听查看费用申请
+                var projects = table.cache["currentTableId"];
+                if (projects.length == 0)
+                    return;
+
+                var checkStatus = table.checkStatus('currentTableId')
+                    , data = checkStatus.data;
+                if (data == null || data.length === 0) {
+                    Message.warning("请选择要查看的报账！", 1500);
+                } else if (data.length > 1) {
+                    Message.warning("请选择一条记录进行操作！", 1500);
+                }else 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/init_payApply?id=" + data[0].id,
+                        end: function () {
+                            if (updateflag == 1)
+                                currTable.reload();
+                            updateflag = 0;
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            else if (obj.event === 'nullify') {  // 监听删除操作
                 var projects = table.cache["currentTableId"];
                 if (projects.length == 0)
                     return;