#合同编号

Junjie

2023-08-31 efebd2ae56950bfafdbb951e286ce5b982a427e4

#合同编号

 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());

 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(

 src/main/resources/contractTemplate/jcxm_1.docx

Binary files differ

 src/main/resources/contractTemplate/zjxm_1.docx

Binary files differ

 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>


 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: '公司名称'}

 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">