diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index 99b31bb750..013d61116a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -166,7 +166,7 @@ public interface BusArrearsCarryVehicleApplyFeign { @ApiOperation(value = "欠款提车申请打印pdf") @GetMapping(value = "/printApplyPdf") @ResponseBody - ResultBean printApplyPdf(@RequestParam("sid")String sid); + ResultBean printApplyPdf(@RequestParam("sid")String sid,@RequestParam("name")String name); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 1d0d083d00..f36669c9b5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -163,7 +163,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry } @Override - public ResultBean printApplyPdf(String sid) { + public ResultBean printApplyPdf(String sid,String name) { return null; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 8c013fc6eb..dbbf37f7e5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -254,8 +254,8 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp } @Override - public ResultBean printApplyPdf(String sid) { - return busArrearsCarryVehicleApplyService.printApplyPdf(sid); + public ResultBean printApplyPdf(String sid,String name) { + return busArrearsCarryVehicleApplyService.printApplyPdf(sid,name); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index bbca8f943f..a07861e7eb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -2470,7 +2470,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService printApplyPdf(String sid) { + public ResultBean printApplyPdf(String sid,String name) { ResultBean rb = ResultBean.fireFail(); Map map = new HashMap<>(); /* ResultBean resultBean = details(sid); @@ -2600,47 +2600,51 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService flowRecordVo = flowableFeignPro.flowRecordAndComment(busArrearsCarryVehicleApply.getProcInstId(), "1").getData(); List busArrearsCarryVehicleFlowableVos = new ArrayList<>(); - for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { - if (flowTask.getFlowableRecordVo() != null) { - Map flowableRecordVo = flowTask.getFlowableRecordVo(); - BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); - List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); - Map comment = ConstantUtils.getMap(flowableRecordVo, "comment"); - String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); - String comment1 = (String) comment.get("comment"); - busArrearsCarryVehicleFlowableVo.setName(assigneeName); - busArrearsCarryVehicleFlowableVo.setComment(comment1); - if(flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != ""){ - busArrearsCarryVehicleFlowableVo.setSpsj(flowableRecordVo.get("finishTime").toString()); - }else{ - busArrearsCarryVehicleFlowableVo.setSpsj(null); - } - busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); - } else { - Map processCommentVo = flowTask.getProcessCommentVo(); - BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); - busArrearsCarryVehicleFlowableVo.setName(processCommentVo.get("title").toString()); - busArrearsCarryVehicleFlowableVo.setComment(processCommentVo.get("content").toString()); - busArrearsCarryVehicleFlowableVo.setSpsj(processCommentVo.get("time").toString()); - busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); - List fileLists = (List) processCommentVo.get("fileList"); - fileLists.removeAll(Collections.singleton(null)); - if (fileLists.size() > 0) { - for (String image : fileLists) { - if (image.contains(fileUploadComponent.getUrlPrefix())) { - image = image.replace(fileUploadComponent.getUrlPrefix(), ""); - try { - image = fileUploadComponent.getUrlPrefix() + URLEncoder.encode(image, "utf-8"); - String image2Base64 = image2Base64(image); - photoList.add(image2Base64); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + flowRecordVo.removeAll(Collections.singleton(null)); + if(!flowRecordVo.isEmpty()){ + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + Map comment = ConstantUtils.getMap(flowableRecordVo, "comment"); + String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); + String comment1 = (String) comment.get("comment"); + busArrearsCarryVehicleFlowableVo.setName(assigneeName); + busArrearsCarryVehicleFlowableVo.setComment(comment1); + if(flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != ""){ + busArrearsCarryVehicleFlowableVo.setSpsj(flowableRecordVo.get("finishTime").toString()); + }else{ + busArrearsCarryVehicleFlowableVo.setSpsj(null); + } + busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); + } else { + Map processCommentVo = flowTask.getProcessCommentVo(); + BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); + busArrearsCarryVehicleFlowableVo.setName(processCommentVo.get("title").toString()); + busArrearsCarryVehicleFlowableVo.setComment(processCommentVo.get("content").toString()); + busArrearsCarryVehicleFlowableVo.setSpsj(processCommentVo.get("time").toString()); + busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); + List fileLists = (List) processCommentVo.get("fileList"); + fileLists.removeAll(Collections.singleton(null)); + if (fileLists.size() > 0) { + for (String image : fileLists) { + if (image.contains(fileUploadComponent.getUrlPrefix())) { + image = image.replace(fileUploadComponent.getUrlPrefix(), ""); + try { + image = fileUploadComponent.getUrlPrefix() + URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + photoList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } } } } } } } + List messages = messageFeign.selectByBusinessSid(busArrearsCarryVehicleApply.getSid()).getData(); if (messages.size() > 0) { for (Message message : messages) { @@ -2665,6 +2669,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carList, String sid) { - for (int i = 0; i < carList.size(); i++) { - BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails(); - AppCarListDto appCarListDto = carList.get(i); - busDeliveredApplyDetails.setRemarks(appCarListDto.getCarRemarks()); - busDeliveredApplyDetails.setVinNo(appCarListDto.getVin()); -// busDeliveredApplyDetails.setPrice(appCarListDto.getPrice()); - busDeliveredApplyDetails.setApplySid(sid); - if (carList.get(i).getUseInfo() != null) { - AppUseInfoDto useInfo = carList.get(i).getUseInfo(); - BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage(); - /* busDeliveredUseMessage.setProvince(useInfo.getProvince()); - busDeliveredUseMessage.setCity(useInfo.getCity()); - busDeliveredUseMessage.setCounty(useInfo.getCounty());*/ - busDeliveredUseMessage.setAddress(useInfo.getAddress()); - busDeliveredUseMessage.setIdNo(useInfo.getIdNumber()); - busDeliveredUseMessage.setName(useInfo.getCustomer()); - busDeliveredUseMessage.setMobile(useInfo.getMobile()); - busDeliveredUseMessage.setApplySid(sid); - busDeliveredUseMessageService.save(busDeliveredUseMessage); - busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid()); - } - BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); - baseVehicleTempstateDto.setBusSid(sid); - baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ISSUE_APPLY.getCode()); - baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ISSUE_APPLY.getRemarks()); - baseVehicleTempstateDto.setTempKey("1"); - baseVehicleTempstateDto.setTempValue("待审核"); - for (AppCarListDto carListDto : carList) { - baseVehicleTempstateDto.setVinNo(carListDto.getVin()); - BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(carListDto.getVin()).getData(); - baseVehicleTempstateDto.setVehSid(data.getSid()); - baseVehicleTempstateFeign.save(baseVehicleTempstateDto); - } - save(busDeliveredApplyDetails); - } - } - /** * 根据出库申请sid删除车辆关联的信息 * diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl index c2f8aed97a..ec1446e5e2 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply.ftl @@ -31,20 +31,20 @@ 孟哲 底 孟哲 底 2 - 0 - 2023-06-01T06:18:00Z - 2023-06-01T06:18:00Z + 1 + 2023-06-01T06:50:00Z + 2023-06-01T06:50:00Z 1 95 - 547 + 546 4 1 - 641 + 640 16 2052-11.1.0.14309 - 7DB537130C5E4B92A2A3C388DB9C8029_13 + D86A6C1F85DA44EDB6BCC61952F7648C_13 @@ -657,9 +657,9 @@ - + - + @@ -673,41 +673,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -766,7 +731,6 @@ - @@ -874,7 +838,6 @@ - @@ -891,6 +854,7 @@ + @@ -912,7 +876,6 @@ - @@ -922,6 +885,7 @@ + @@ -937,13 +901,14 @@ + - + @@ -999,11 +964,11 @@ - - - + + + - + @@ -1012,8 +977,8 @@ - + @@ -1023,7 +988,7 @@ - + @@ -1040,8 +1005,8 @@ - + @@ -1051,7 +1016,7 @@ - + @@ -1068,8 +1033,8 @@ - + @@ -1079,7 +1044,7 @@ - + @@ -1096,8 +1061,8 @@ - + @@ -1107,7 +1072,7 @@ - + @@ -1124,8 +1089,8 @@ - + @@ -1135,7 +1100,7 @@ - + @@ -1152,8 +1117,8 @@ - + @@ -1163,7 +1128,7 @@ - + @@ -1175,7 +1140,7 @@ - + @@ -1184,8 +1149,8 @@ - + @@ -1195,7 +1160,7 @@ - + @@ -1212,8 +1177,8 @@ - + @@ -1223,7 +1188,7 @@ - + @@ -1240,8 +1205,8 @@ - + @@ -1251,7 +1216,7 @@ - + @@ -1268,8 +1233,8 @@ - + @@ -1279,7 +1244,7 @@ - + @@ -1296,8 +1261,8 @@ - + @@ -1307,7 +1272,7 @@ - + @@ -1324,8 +1289,8 @@ - + @@ -1335,7 +1300,7 @@ - + @@ -1347,7 +1312,7 @@ - + @@ -1356,8 +1321,8 @@ - + @@ -1367,7 +1332,7 @@ - + @@ -1384,8 +1349,8 @@ - + @@ -1395,7 +1360,7 @@ - + @@ -1407,7 +1372,7 @@ - + @@ -1416,8 +1381,8 @@ - + @@ -1427,7 +1392,7 @@ - + @@ -1444,8 +1409,8 @@ - + @@ -1455,7 +1420,7 @@ - + @@ -1467,7 +1432,7 @@ - + @@ -1476,8 +1441,8 @@ - + @@ -1487,7 +1452,7 @@ - + @@ -1504,8 +1469,8 @@ - + @@ -1515,7 +1480,7 @@ - + @@ -1527,7 +1492,7 @@ - + @@ -1536,8 +1501,8 @@ - + @@ -1547,7 +1512,7 @@ - + @@ -1564,8 +1529,8 @@ - + @@ -1575,7 +1540,7 @@ - + @@ -1587,7 +1552,7 @@ - + @@ -1597,8 +1562,8 @@ - + @@ -1609,7 +1574,7 @@ - + @@ -1621,7 +1586,8 @@ - + + @@ -1631,8 +1597,8 @@ - + @@ -1642,7 +1608,7 @@ - + @@ -1659,8 +1625,8 @@ - + @@ -1670,7 +1636,7 @@ - + @@ -1687,8 +1653,8 @@ - + @@ -1698,7 +1664,7 @@ - + @@ -1715,8 +1681,8 @@ - + @@ -1726,7 +1692,7 @@ - + @@ -1739,7 +1705,7 @@ <#list adCarListVoList as list> - + @@ -1750,8 +1716,8 @@ - + @@ -1761,7 +1727,7 @@ - + @@ -1779,8 +1745,8 @@ - + @@ -1790,7 +1756,7 @@ - + @@ -1808,8 +1774,8 @@ - + @@ -1819,7 +1785,7 @@ - + @@ -1837,8 +1803,8 @@ - + @@ -1848,7 +1814,7 @@ - + @@ -1862,7 +1828,7 @@ <#if (tralierList?size>0) > - + @@ -1872,8 +1838,8 @@ - + @@ -1883,7 +1849,7 @@ - + @@ -1895,7 +1861,7 @@ - + @@ -1905,8 +1871,8 @@ - + @@ -1916,7 +1882,7 @@ - + @@ -1933,8 +1899,8 @@ - + @@ -1944,7 +1910,7 @@ - + @@ -1961,8 +1927,8 @@ - + @@ -1972,7 +1938,7 @@ - + @@ -1986,11 +1952,11 @@ - + - + @@ -2000,7 +1966,7 @@ - + @@ -2014,11 +1980,10 @@ - - + @@ -2028,7 +1993,7 @@ - + @@ -2041,7 +2006,7 @@ <#list tralierList as gcList> - + @@ -2052,8 +2017,8 @@ - + @@ -2063,7 +2028,7 @@ - + @@ -2081,8 +2046,8 @@ - + @@ -2092,7 +2057,7 @@ - + @@ -2110,8 +2075,8 @@ - + @@ -2121,7 +2086,7 @@ - + @@ -2135,12 +2100,12 @@ - + - + @@ -2150,7 +2115,7 @@ - + @@ -2164,12 +2129,11 @@ - - + @@ -2179,7 +2143,7 @@ - + @@ -2193,7 +2157,7 @@ - + @@ -2203,8 +2167,8 @@ - + @@ -2214,7 +2178,7 @@ - + @@ -2231,8 +2195,8 @@ - + @@ -2242,7 +2206,7 @@ - + @@ -2259,8 +2223,8 @@ - + @@ -2270,7 +2234,7 @@ - + @@ -2282,7 +2246,7 @@ - + @@ -2292,8 +2256,8 @@ - + @@ -2303,7 +2267,7 @@ - + @@ -2320,8 +2284,8 @@ - + @@ -2331,7 +2295,7 @@ - + @@ -2343,7 +2307,7 @@ - + @@ -2353,8 +2317,8 @@ - + @@ -2364,7 +2328,7 @@ - + @@ -2381,8 +2345,8 @@ - + @@ -2392,7 +2356,7 @@ - + @@ -2404,7 +2368,7 @@ - + @@ -2414,8 +2378,8 @@ - + @@ -2425,7 +2389,7 @@ - + @@ -2442,8 +2406,8 @@ - + @@ -2453,7 +2417,7 @@ - + @@ -2465,7 +2429,7 @@ - + @@ -2477,8 +2441,8 @@ - + @@ -2488,7 +2452,7 @@ - + @@ -2500,18 +2464,133 @@ <#list lcList as lc> - <#if (lc_index==0)> + <#if (lc_index==0)> + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + + + + + + + + + + + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + <#list lcList as lc> + <#if (lc_index>0)> + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + @@ -2520,7 +2599,7 @@ - + @@ -2530,7 +2609,7 @@ ${lc.comment!} - + @@ -2539,7 +2618,7 @@ - + @@ -2552,25 +2631,27 @@ - + + - + + - + @@ -2580,150 +2661,11 @@ ${lc.spsj!} - - - - - - - - - - - - - - - <#list lcList as lc> - <#if (lc_index>0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - - - - - - - - - - - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - - - - - - - - - - - - - - - - + + + @@ -2738,8 +2680,8 @@ - + @@ -2749,13 +2691,13 @@ - + - 下载人 + 下载人： @@ -2770,8 +2712,8 @@ - + @@ -2781,7 +2723,7 @@ - + @@ -2802,8 +2744,8 @@ - + @@ -2813,13 +2755,13 @@ - + - 下载时间 + 下载时间： @@ -2834,8 +2776,8 @@ - + @@ -2845,7 +2787,7 @@ - + @@ -2857,7 +2799,7 @@ - + @@ -2868,11 +2810,11 @@ <#list photoPath64 as photo> - + - + @@ -2908,7 +2850,7 @@ - + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply111.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply111.ftl deleted file mode 100644 index dcb22f50bc..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/qktcApply111.ftl +++ /dev/null @@ -1,2341 +0,0 @@ - - - - - 孟哲 底 - 孟哲 底 - 2 - 0 - 2023-05-31T10:08:00Z - 2023-05-31T10:08:00Z - 1 - 89 - 509 - 4 - 1 - 597 - 16 - - - 2052-11.1.0.14309 - E5FC2BD06CD84C7DA05F5CF206EA9439_12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 欠款提车申请单 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 发起人 - - - - - - - - - - - - - - - - - - - - - ${applyName!} - - - - - - - - - - - - - - - - - - 发起部门 - - - - - - - - - - - - - - - - - - - - - ${applyDept!} - - - - - - - - - - - - - - - - - - 发起日期 - - - - - - - - - - - - - - - - - - - - - ${createDate!} - - - - - - - - - - - - - - - - - - - 销售专员 - - - - - - - - - - - - - - - - - - - - - ${staffName!} - - - - - - - - - - - - - - - - - - 销售部门 - - - - - - - - - - - - - - - ${staffDeptName!} - - - - - - - - - - - - - - - - - - 销售类型 - - - - - - - - - - - - - - - - - - - - - ${paymentMethod!} - - - - - - - - - - - - - - - - - - - 合同编号 - - - - - - - - - - - - - - - - - - - - - ${contractId!} - - - - - - - - - - - - - - - - - - - - - - 开票单位 - - - - - - - - - - - - - - - - - - - - - - - - ${openTickName!} - - - - - - - - - - - - - - - - - - - - - - 客户名称 - - - - - - - - - - - - - - - - - - - - - - - - ${customerName!} - - - - - - - - - - - - - - - - - - - 车型 - - - - - - - - - - - - - - - - - - - - - ${modelName!} - - - - - - - - - - - - - - - - - - - - - - - 车辆信息 - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - 车架号 - - - - - - - - - - - - - - - - - - 成交价 - - - - - - - - - - - - - - - - - - 平台已收款 - - - - - <#list adCarListVoList as list> - - - - - - - - - - - - - - - - - - - - - ${list_index+1} - - - - - - - - - - - - - - - - - - - - - ${list.vin!} - - - - - - - - - - - - - - - - - - - - - ${list.price!} - - - - - - - - - - - - - - - - - - - - - ${list. subscribedAll!} - - - - - - <#if (tralierList?size>0) > - - - - - - - - - - - - - - - - - - - 挂车信息 - - - - - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - - - - 挂车车架号 - - - - - - - - - - - - - - - - - - - - - 主车车架号 - - - - - - - - - - - - - - - - - - - - - 成交价 - - - - - - - - - - - - - - - - - - - - 平台已收款 - - - - - <#list tralierList as gcList> - - - - - - - - - - - - - - - - - - - - - - ${gcList_index+1} - - - - - - - - - - - - - - - - - - - - - - - - ${gcList.vinNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${gcList.gcVinNo!} - - - - - - - - - - - - - - - - - - - - - - - - ${gcList.price!} - - - - - - - - - - - - - - - - - - - - - - - ${gcList.subscribedAll!} - - - - - - - - - - - - - - - - - - - - - - - - - - - 欠款提车原因 - - - - - - - - - - - - - - - - - - - - - ${reasonValue!} - - - - - - - - - - - - - - - - - - - - - ${reason!} - - - - - - - - - - - - - - - - - - - 合同总金额 - - - - - - - - - - - - - - - - - - - - - ${contractMoney!} - - - - - - - - - - - - - - - - - - - - - - 平台收款总金额 - - - - - - - - - - - - - - - - - - - - - - - - ${contractCollectionMoney!} - - - - - - - - - - - - - - - - - - - - - - 承诺回款日期 - - - - - - - - - - - - - - - - - - - - - - - - ${commitmentMoneyDate!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 审批流程 - - - - <#list lcList as lc> - <#if (lc_index==0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - - - - - - - - - - - - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - - - <#list lcList as lc> - <#if (lc_index>0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - - - - - - - - - - - - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - - - - <#list photoPath64 as photo> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${photo!} - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue index 756ce81887..31bb5d54df 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue @@ -168,8 +168,8 @@
注:若车辆列表信息或承诺回款日期需要修改，请在修改后点击生成附件按钮重新生成相关附件
- 生成附件 - 下载附件 + 生成合同 + 下载合同
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue index 9e51ef5a6c..8d4ac1a164 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue @@ -287,7 +287,7 @@ export default { }) }, handlePrint() { - createPdf({ sid: this.formobj.sid }).then((resp) => { + createPdf({ sid: this.formobj.sid, name: window.sessionStorage.getItem('name') }).then((resp) => { if (resp.success) { var xhr = new XMLHttpRequest() xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '财务', true) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue index 290383eebb..80ec595ead 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue @@ -148,7 +148,7 @@
- 下载附件 + 下载合同
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue index e752c08a2e..e5152243ff 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue @@ -167,8 +167,8 @@
注:若车辆列表信息或承诺回款日期需要修改，请在修改后点击生成附件按钮重新生成相关附件
- 生成附件 - 下载附件 + 生成合同 + 下载合同
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue index abc3111755..8d2004788e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue @@ -376,7 +376,7 @@ export default { }) }, handlePrint() { - createPdf({ sid: this.formobj.sid }).then((resp) => { + createPdf({ sid: this.formobj.sid, name: window.sessionStorage.getItem('name') }).then((resp) => { if (resp.success) { var xhr = new XMLHttpRequest() xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '财务', true) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js index 1cc8eef573..a6ad3a1e5e 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/arrearsbilling.js @@ -158,3 +158,13 @@ export function getPreviousNodesForReject(data) { params: data }) } + +// 下载欠款开票审批单 +export function createPdf(data) { + return request({ + url: '/fin/v1/finbillapplication/createPdf', + method: 'post', + params: data + }) +} + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue index 34d23c362a..2f01022fa6 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue @@ -69,42 +69,42 @@ {{ scope.row.nodeState }} - + - + - + - + - + - + - + - + @@ -114,17 +114,17 @@ {{ scope.row.returnedMoneyDate }} - + - + - + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue index b17434e9f7..523f610682 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue @@ -199,6 +199,14 @@ +
欠款领票相关附件
+ + + + + + +
@@ -237,6 +245,7 @@ export default { image_list2: [], image_list3: [], image_list4: [], + image_list5: [], formobj: { applyDate: '', arrearsMoney: '', @@ -285,7 +294,8 @@ export default { staffSid: '', useOrgSid: '', createBySid: '', - zjApplicationAppendxs: [] + zjApplicationAppendxs: [], + arrearsCollectionAppendxs: [] }, rules: { oneBillMoney: [{ required: true, message: '单台开票金额不能为空', trigger: 'blur' }], @@ -396,6 +406,14 @@ export default { }) }) } + if (this.formobj.arrearsCollectionAppendxs.length > 0) { + this.formobj.arrearsCollectionAppendxs.forEach((e) => { + this.image_list5.push({ + name: e.fileName, + url: e.fileUrl + }) + }) + } if (this.formobj.khkpsqsApplicationAppendxs.length > 0) { this.formobj.khkpsqsApplicationAppendxs.forEach((e) => { this.image_list2.push({ @@ -608,6 +626,24 @@ export default { } else { this.formobj.kpxxqrsApplicationAppendxs = [] } + if (this.image_list5.length > 0) { + const cc = [] + for (var p = 0; n < this.image_list5.length; p++) { + cc.push({ + attachType: '', + billAppSid: '', + createByName: window.sessionStorage.getItem('name'), + fileSid: '', + fileName: this.image_list5[p].name, + fileType: this.image_list5[p].name.substr(this.image_list5[p].name.lastIndexOf('.')), + fileUrl: this.image_list5[p].url, + sid: '' + }) + } + this.formobj.arrearsCollectionAppendxs = cc + } else { + this.formobj.arrearsCollectionAppendxs = [] + } }, resetState() { this.viewState = 1 @@ -671,12 +707,14 @@ export default { useOrgSid: '', userSid: '', createBySid: '', - zjApplicationAppendxs: [] + zjApplicationAppendxs: [], + arrearsCollectionAppendxs: [] } this.image_list1 = [] this.image_list2 = [] this.image_list3 = [] this.image_list4 = [] + this.image_list5 = [] this.moneyEdit = false this.submitdisabled = false this.$refs['form_obj'].resetFields() diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue index 38eb86b9a5..b605c277f2 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingInfo.vue @@ -6,6 +6,7 @@
{{ viewTitle }}
+ 打印 关闭
@@ -165,13 +166,23 @@ +
欠款领票相关附件
+ + + + + + +