From efebd2ae56950bfafdbb951e286ce5b982a427e4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 31 八月 2023 10:58:33 +0800
Subject: [PATCH] #合同编号
---
src/main/java/com/zy/crm/manager/entity/Contract.java | 9 ++++++++-
src/main/resources/mapper/ContractMapper.xml | 1 +
src/main/webapp/static/js/contract/contract.js | 3 ++-
src/main/resources/contractTemplate/jcxm_1.docx | 0
src/main/java/com/zy/crm/manager/controller/ContractController.java | 1 +
src/main/resources/contractTemplate/zjxm_1.docx | 0
src/main/webapp/views/contract/contract.html | 8 +++++++-
7 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ContractController.java b/src/main/java/com/zy/crm/manager/controller/ContractController.java
index 93fca31..4853b8d 100644
--- a/src/main/java/com/zy/crm/manager/controller/ContractController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ContractController.java
@@ -121,6 +121,7 @@
return null;
}
HashMap<String, Object> map = new HashMap<>();
+ map.put("{{serial}}", contract.getSerial());
map.put("{{customer}}", contract.getCustomer());
map.put("{{address}}", contract.getAddress());
map.put("{{company}}", contract.getCompany());
diff --git a/src/main/java/com/zy/crm/manager/entity/Contract.java b/src/main/java/com/zy/crm/manager/entity/Contract.java
index 713659f..d52c20e 100644
--- a/src/main/java/com/zy/crm/manager/entity/Contract.java
+++ b/src/main/java/com/zy/crm/manager/entity/Contract.java
@@ -172,9 +172,15 @@
@ApiModelProperty(value= "娉曚汉鎴栨巿鏉冧唬琛�")
private String boss;
+ /**
+ * 鍚堝悓缂栧彿
+ */
+ @ApiModelProperty(value= "鍚堝悓缂栧彿")
+ private String serial;
+
public Contract() {}
- public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long createBy, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss) {
+ public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long createBy, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial) {
this.id = id;
this.customer = customer;
this.address = address;
@@ -198,6 +204,7 @@
this.status = status;
this.memo = memo;
this.boss = boss;
+ this.serial = serial;
}
// Contract contract = new Contract(
diff --git a/src/main/resources/contractTemplate/jcxm_1.docx b/src/main/resources/contractTemplate/jcxm_1.docx
index 55c9b7f..0baa041 100644
--- a/src/main/resources/contractTemplate/jcxm_1.docx
+++ b/src/main/resources/contractTemplate/jcxm_1.docx
Binary files differ
diff --git a/src/main/resources/contractTemplate/zjxm_1.docx b/src/main/resources/contractTemplate/zjxm_1.docx
index 3dc3eab..d716d65 100644
--- a/src/main/resources/contractTemplate/zjxm_1.docx
+++ b/src/main/resources/contractTemplate/zjxm_1.docx
Binary files differ
diff --git a/src/main/resources/mapper/ContractMapper.xml b/src/main/resources/mapper/ContractMapper.xml
index 0dee7cc..5b93ae4 100644
--- a/src/main/resources/mapper/ContractMapper.xml
+++ b/src/main/resources/mapper/ContractMapper.xml
@@ -27,6 +27,7 @@
<result column="status" property="status" />
<result column="memo" property="memo" />
<result column="boss" property="boss" />
+ <result column="serial" property="serial" />
</resultMap>
diff --git a/src/main/webapp/static/js/contract/contract.js b/src/main/webapp/static/js/contract/contract.js
index c99f6e3..017b027 100644
--- a/src/main/webapp/static/js/contract/contract.js
+++ b/src/main/webapp/static/js/contract/contract.js
@@ -22,7 +22,8 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: '#ID'}
+ // ,{field: 'id', align: 'center',title: '#ID'}
+ ,{field: 'serial', align: 'center',title: '鍚堝悓缂栧彿'}
,{field: 'name', align: 'center',title: '鍚堝悓鍚嶇О'}
,{field: 'customer', align: 'center',title: '鐢叉柟'}
,{field: 'company', align: 'center',title: '鍏徃鍚嶇О'}
diff --git a/src/main/webapp/views/contract/contract.html b/src/main/webapp/views/contract/contract.html
index 041ffd4..a18ff51 100644
--- a/src/main/webapp/views/contract/contract.html
+++ b/src/main/webapp/views/contract/contract.html
@@ -19,7 +19,7 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="serial" placeholder="鍚堝悓缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -82,6 +82,12 @@
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">鍚堝悓缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="serial" placeholder="璇疯緭鍏ュ悎鍚岀紪鍙�" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍚堝悓鍚嶇О: </label>
<div class="layui-input-block">
<input class="layui-input" name="name" placeholder="璇疯緭鍏ュ悎鍚屽悕绉�" lay-verify="required">
--
Gitblit v1.9.1