diff --git a/running/pdf/contract.pdf b/running/pdf/contract.pdf index 2252b3039..54ab709ed 100644 Binary files a/running/pdf/contract.pdf and b/running/pdf/contract.pdf differ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java index 43025ca9d..1c5422107 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java @@ -110,6 +110,7 @@ public class SysContractController extends BaseController { data.put("serveTime", contract.getServeTime() + ""); data.put("tutor", contract.getTutor()); data.put("servePromise", contract.getServePromise()); + data.put("remark", contract.getRemark()); ajax.put("data", data); } return ajax; diff --git a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java index 407b4d5ed..1d14c87f3 100644 --- a/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java +++ b/ruoyi-custom/src/main/java/com/ruoyi/custom/service/impl/SysContractServiceImpl.java @@ -132,6 +132,11 @@ public class SysContractServiceImpl implements ISysContractService { form.setField("promise", sysContract.getServePromise(), true); form.setField("date", DateUtils.getDate(), true); form.setField("cusId", sysContract.getCusId(), true); + String remark = ""; + if (sysContract.getRemark() != null && !sysContract.getRemark().equals("")) { + remark = "(备注:" + sysContract.getRemark() + ")"; + } + form.setField("remark", remark, true); stamper.setFormFlattening(true);// 如果为false那么生成的PDF文件还能编辑,一定要设为true diff --git a/ruoyi-ui/src/views/custom/signContract/index.vue b/ruoyi-ui/src/views/custom/signContract/index.vue index 22022a4c6..dbcc75634 100644 --- a/ruoyi-ui/src/views/custom/signContract/index.vue +++ b/ruoyi-ui/src/views/custom/signContract/index.vue @@ -15,7 +15,10 @@ {{form.serveTimeStr}} - 健康吃瘦{{form.serveTimeStr}}斤 + 健康吃瘦{{form.servePromise}}斤 + + + {{form.remark}} @@ -65,7 +68,8 @@

第二条 合作内容及费用

经甲乙双方协商确定,乙方向甲方购买 {{form.serveTimeStr}} “胜唐体控瘦身指导服务”(以下简称服务)。 - 经甲乙双方协商一致,确定乙方向甲方支付服务费用为人民币 {{form.amount}},大写:{{form.amountUpper}}。 + 经甲乙双方协商一致,确定乙方向甲方支付服务费用为人民币 {{form.amount}},大写:{{form.amountUpper}}{{form.remark ? + `(备注:${form.remark})`:''}}