diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 8c0e8b7fa0..043e8b7b8c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2677,6 +2677,10 @@ public class CommonContractService extends MybatisBaseService> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath()); if (!busList.getData().isEmpty()) { qw.in("busSid", busList.getData()); + }else{ + IPage page = PagerUtil.queryToPage(query); + page.setRecords(new ArrayList<>()); + return page; } if (StringUtils.isNotBlank(params.getName())) { qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 61b910cabc..76b4ef59b9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -86,7 +86,7 @@ public interface BusSalesOrderVehicleFeign { @PostMapping("/appVehicleQKKPList") ResultBean> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query); - @ApiOperation("欠款提车选择车辆") + @ApiOperation("移动端欠款提车选择车辆") @PostMapping("/getCanUseCars") ResultBean> getCanUseCars(@RequestBody QCarQuery query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java index 61939cdd12..9c3592ea6c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java @@ -18,7 +18,7 @@ import java.util.List; @Data public class QCarVo implements Vo { private static final long serialVersionUID = 4862519509571252488L; - + //pc端使用以下 @ApiModelProperty("车辆sid") private String carSid; @ApiModelProperty("车架号") 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 d0bb931dda..11ead8d349 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 @@ -769,30 +769,39 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService map) { String url = ""; - Map map = new HashMap<>(); - String ftl = "gd"; + String ftl = "gd2"; InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl"); //生成word文件名 String targetPath = docPdfComponent.getUploadTemplateUrl(); @@ -994,6 +1010,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService stringLists = Arrays.asList(commitmentMoneyDate.split("-")); @@ -1232,9 +1250,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid()); if (invoicingDetailsVoResultBean.getData() != null) { map.put("orgName", invoicingDetailsVoResultBean.getData().getName()); + map.put("useOrgName",invoicingDetailsVoResultBean.getData().getName()); } } map.put("mobile", appOrderDetailsVo.getPhone()); @@ -1845,7 +1864,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 7fa269e8d1..dd7aeec720 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -401,6 +401,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid()); if (stringResultBean.getData() != null) { adCarListVo.setSubscribedAll(stringResultBean.getData()); + qCarVo.setSubscribedAll(stringResultBean.getData()); } List gcList = new ArrayList<>(); ResultBean voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl new file mode 100644 index 0000000000..2d11720fcb --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl @@ -0,0 +1,1275 @@ + + + + + Administrator + 孟哲 底 + 2 + 0 + 2023-05-17T03:04:00Z + 2023-05-17T03:04:00Z + 1 + 56 + 321 + 2 + 1 + 376 + 16 + + + wqlLaW5nc29mdCBQREYgdG8gV1BTIDgw + 2023-05-17T11:01:14Z + 2052-11.1.0.14309 + BCA06B95B3094C66B326482CD9041023_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 司股东会对外担保决议 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 一、时间: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 、地点: + + + + + + + + + + + + + + + + + + + + + + 三、议题:关于 + + + + + + + + + + + + + + + + + + + + 否同意本公司在 + + + + + + + + + + + + + + + + + + + + + + ${contractName!} + + + + + + + + + + + (合同) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${customerName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${useOrgName!} + + + + + + + + + + + + + + + + + + + + + 提供 (反) 担 + + + + + + + + + + + + + + + + + + + 事宜。 + + + + + + + + + + + + + + + + + + + + + + 四、根据《公 + + + + + + + + + + + + + + + + + + + + 法》和公司章程规定,股东会会议应到股东 + + + + + + + + + + + + + + + + + + + + + 名,实 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 名,所持股份占公司全部股份 + + + + + + + + + + + + + + + + + + + + + %。本次股东会召集与 + + + + + + + + + + + + + + + + + + + 所作决议符合公司章程和《公司法》的规定,所作决议合法有效。与会股东经 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 、表决,一致通过以下决议: + + + + + + + + + + + + + + + + + + + + + + + 同意 + + + + + + + + + + + + + + + + + + + + + + 公司在上述合同中提供 (反) 担保事宜。 + + + + + + + + + + + + + + + + + + + + + + 股东签字 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 公司 + + + + + + + + + + + + + + + + + + + + (公章) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 月 日 + + + + + + + + + \ 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 bc7b4075b8..79064cce07 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 @@ -108,30 +108,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
@@ -243,9 +245,15 @@ export default { data() { return { pickerOptions: { - disabledDate(time) { - var oneDay = 3600 * 1000 * 24 * 11 - return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay + disabledDate: (time) => { + // 设置可选择的日期为今天之后的一个月内 + const curDate = (new Date()).getTime() + // 这里算出一个月的毫秒数, + // 这里使用30的平均值,实际中应根据具体的每个月有多少天计算 + const day = 10 * 24 * 3600 * 1000 + const dateRegion = curDate + day + return time.getTime() < Date.now() - 8.64e7 || + time.getTime() > dateRegion } }, viewTitle: '', 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 421c987380..c79ae754f0 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 @@ -93,30 +93,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue index c681917596..cdd78d4f93 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue @@ -95,30 +95,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue index 15d3e47faf..e77e75f895 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue @@ -95,30 +95,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
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 99ffda0c69..09e2495177 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 @@ -95,30 +95,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue index f107cf35ce..df237b8012 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue @@ -95,30 +95,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
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 82a4ff9982..59a1de15e3 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 @@ -107,30 +107,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因
@@ -242,9 +244,15 @@ export default { data() { return { pickerOptions: { - disabledDate(time) { - var oneDay = 3600 * 1000 * 24 * 11 - return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay + disabledDate: (time) => { + // 设置可选择的日期为今天之后的一个月内 + const curDate = (new Date()).getTime() + // 这里算出一个月的毫秒数, + // 这里使用30的平均值,实际中应根据具体的每个月有多少天计算 + const day = 10 * 24 * 3600 * 1000 + const dateRegion = curDate + day + return time.getTime() < Date.now() - 8.64e7 || + time.getTime() > dateRegion } }, viewTitle: '', 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 7ad60d0daf..8e1f4efcb2 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 @@ -93,30 +93,32 @@ -
挂车信息
- - - - - - - - - - - - - - - +
+
挂车信息
+ + + + + + + + + + + + + + + +
*欠款提车原因