diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java
new file mode 100644
index 00000000..f3057807
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysContacts;
+import com.ruoyi.system.service.ISysContactsService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 其他开票信息 Controller
+ * 
+ * @author ruoyi
+ * @date 2022-11-16
+ */
+@Controller
+@RequestMapping("/system/invoice")
+public class SysInvoiceController extends BaseController
+{
+    private final String prefix = "system/invoice";
+
+    @RequiresPermissions("system:invoice:view")
+    @GetMapping()
+    public String contacts()
+    {
+        return prefix + "/invoice";
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
index b690e2a7..fd6d6352 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysContacts.java
@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * 联系人明细对象 sys_contacts
+ * 其他联系人 sys_contacts
  * 
  * @author ruoyi
  * @date 2022-11-16
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
index d1bc6eca..f3a7faaf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
@@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 客户基本信息对象 sys_customer
  * 
@@ -210,6 +212,8 @@ public class SysCustomer extends BaseEntity
     @Excel(name = "修改时间")
     private String updateInfoTime;
 
+    private List<SysCustomerQuoteChild> sysCustomerQuoteChildList;
+
     @Excel(name = "客户审核状态表示") //0表示审核中，1标识审核通过，2表示审核拒绝
     private String deginflag;
     @Excel(name = "客户的状态")
@@ -667,8 +671,6 @@ public class SysCustomer extends BaseEntity
         this.updateInfoTime = updateInfoTime;
     }
 
-
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
index 1b7b58ed..0c7475b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
@@ -115,7 +115,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
 
     @Override
     public String getId() {
-        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
+        String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format("%3d");
         return "KH" + time.substring(2);
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
index 02e0957b..de83fa62 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml
@@ -155,11 +155,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="restoreSysMakeOrderById" parameterType="Long">
         update sys_makeorder set del_flag = '0' where id = #{id}
     </update>
-    <select id="selectSysMakeOrderByFinsh">
-        select * from sys_makeorder where make_status = '5' and use_status = 0
+    <select id="selectSysMakeOrderByFinsh" resultType="int">
+        select count(id) from sys_makeorder
+            where make_status = '5' and use_status = 0
     </select>
 
-    <select id="selectSysMakeOrderByNOFinsh">
-        select * from sys_makeorder where make_status != '5' and use_status = 0
+    <select id="selectSysMakeOrderByNOFinsh" resultType="int">
+        select count(id) from sys_makeorder
+         where make_status != '5' and use_status = 0
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
index 348e738a..908de78e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
+++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
@@ -12,12 +12,7 @@
                         <ul>
                             <li>
                                 <label>企业代码：</label>
-<!--                                <select name="enterpriseCode">-->
-<!--                                    <option value="">所有</option>-->
-<!--                                    <option value="-1">代码生成请选择字典属性</option>-->
-<!--                                </select>-->
                                 <input type="text" name="enterpriseCode"/>
-
                             </li>
                             <li>
                                 <label>企业名称：</label>
@@ -44,15 +39,15 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:contacts:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:contacts:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:contacts:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:contacts:export">-->
-<!--                    <i class="fa fa-download"></i> 导出-->
-<!--                </a>-->
+                <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:contacts:edit">
+                                    <i class="fa fa-edit"></i> 修改
+                                </a>
+                                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:contacts:remove">
+                                    <i class="fa fa-remove"></i> 删除
+                                </a>
+                                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:contacts:export">
+                                    <i class="fa fa-download"></i> 导出
+                                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped" style="white-space: nowrap">
                 <table id="bootstrap-table"></table>
@@ -79,7 +74,6 @@
                 {
                     field: 'contactid',
                     title: '联系人id',
-                    visible: false
                 },
                 {
                     field: 'enterpriseCode',
@@ -159,17 +153,17 @@
                             return vArr[0];
                         }
                     }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.contactid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.contactid + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
                 }
-                // {
-                //     title: '操作',
-                //     align: 'center',
-                //     formatter: function(value, row, index) {
-                //         var actions = [];
-                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.contactid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.contactid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                //         return actions.join('');
-                //     }
-                // }
                 ]
             };
             $.table.init(options);
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index fd80b197..6e450466 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -80,7 +80,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">联系人：</label>
+                <label class="col-sm-3 control-label is-required">第一联系人：</label>
                 <div class="col-sm-8">
                     <input name="customerContact" class="form-control" type="text" required>
                 </div>
@@ -121,7 +121,7 @@
                     <input name="paymentTerms" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">常用币种：</label>
                 <div class="col-sm-8">
                     <select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
@@ -141,7 +141,7 @@
                     <input name="bankAccount" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">法人代表：</label>
                 <div class="col-sm-8">
                     <input name="legalRepresentative" class="form-control" type="text">
@@ -156,25 +156,25 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">开票客户名称：</label>
                 <div class="col-sm-8">
                     <input name="invoicingCustomerName" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">开票公司税号：</label>
                 <div class="col-sm-8">
                     <input name="invoicingCompanyName" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">信用额度：</label>
                 <div class="col-sm-8">
                     <input name="creditLimit" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">诚信评级：</label>
                 <div class="col-sm-8">
                     <select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">
@@ -209,32 +209,18 @@
                 </div>
             </div>
 
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">RMB注册资金：</label>
                 <div class="col-sm-8">
                     <input name="rmbRegisteredCapital" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">外币注册资金：</label>
                 <div class="col-sm-8">
                     <input name="registeredCapital" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">订单号长度：</label>
-                <div class="col-sm-8">
-                    <input name="orderLength" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">出货单格式模板名称：</label>
-                <div class="col-sm-8">
-                    <select name="shippingTemplate" class="form-control m-b" th:with="type=${@dict.getType('sys_shipping_template')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">业务员：</label>
                 <div class="col-sm-8">
@@ -242,7 +228,6 @@
                        <option value="">业务员</option>
                   </select> -->
                     <input name="businessMembers" readonly th:value="${@permission.getPrincipalProperty('userName')}" required class="form-control businessMembers is-required" type="text">
-
                 </div>
             </div>
             <div class="form-group" hidden="hidden">
@@ -269,21 +254,7 @@
                     <input name="unifiedNumbering" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注内容：</label>
-                <div class="col-sm-8">
-                    <textarea name="customerRemarks" class="form-control"></textarea>
-                </div>
-            </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">出货需录入使用量：</label>
-                <div class="col-sm-8">
-<!--                    <input name="shipmentUsage" class="form-control" type="text">-->
-                    <select name="shipmentUsage" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
+
             <div class="form-group" hidden="hidden">
                 <label class="col-sm-3 control-label">制单人：</label>
                 <div class="col-sm-8">
@@ -296,7 +267,7 @@
                     <input readonly name="identifyingPeople" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">是否含税：</label>
                 <div class="col-sm-8">
                     <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
@@ -305,29 +276,16 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">税率：</label>
                 <div class="col-sm-8">
-                    <select id="taxRate" name="taxRate" class="form-control"
-                            th:with="type=${@dict.getType('fin_customer_taxPercent')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">国家/地区编号：</label>
-                <div class="col-sm-8">
-                    <select name="countryNumber" class="form-control m-b" th:with="type=${@dict.getType('sys_country_number')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+                    <input name="taxRate" class="form-control" type="text="/>
                 </div>
             </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">国家/地区编号：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">备注内容：</label>
                 <div class="col-sm-8">
-                    <input name="delflag" class="form-control m-b" value="0"/>
-
+                    <textarea name="customerRemarks" class="form-control"></textarea>
                 </div>
             </div>
         </form>
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
index 60b66de1..842e1324 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -58,24 +58,42 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>客户/企业代码：</label>
+                            <label>客户ID：</label>
                             <input type="text" name="enterpriseCode"/>
                         </li>
                         <li>
-                            <label>内外销：</label>
-                            <select name="exportSales" th:with="type=${@dict.getType('sys_export_sales')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
+                            <label>客户公司名称：</label>
+                            <input type="text" name="enterpriseName"/>
+                        </li>
+                        <li>
+                            <label>事业部：</label>
+                            <input type="text" name="customerPurser"/>
+                        </li>
+                        <li>
+                            <label>公司简称名称：</label>
+                            <input type="text" name="enterpriseName"/>
                         </li>
                         <li>
-                            <label>客户/企业名称：</label>
+                            <label>审核状态：</label>
                             <input type="text" name="enterpriseName"/>
                         </li>
                         <li>
-                            <label>送货地址：</label>
-                            <input type="text" name="deliveryAddress"/>
+                            <label>使用状态：</label>
+                            <input type="text" name="enterpriseName"/>
+                        </li>
+                        <li>
+                            <label>业务员：</label>
+                            <input type="text" name="enterpriseName"/>
+                        </li>
+                        <li>
+                            <label>客户标识：</label>
+                            <input type="text" name="enterpriseName"/>
+                        </li>
+                        <li class="select-time">
+                            <label>录入时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                         </li>
                         <li>
                             <a class="btn btn-primary
@@ -92,32 +110,31 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customer:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
-               shiro:hasPermission="system:customer:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="system:customer:remove">
-                <i class="fa fa-remove"></i> 删除
-            </a>
-<!--            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customer:export">-->
-<!--                <i class="fa fa-download"></i> 导出-->
-<!--            </a>-->
-<!--            <a class="btn btn-warning single disabled" onclick="exportCustomerInfo()" shiro:hasPermission="system:customer:export" >-->
-<!--                <i class="fa fa-download"></i> 导出-->
-<!--            </a>-->
-            <!--            <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">-->
-            <!--                <i class="fa fa-download"></i> 单个导出-->
-            <!--            </a>-->
+            <!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+                           shiro:hasPermission="system:customer:edit">
+                            <i class="fa fa-edit"></i> 修改
+                        </a>
+                        <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+                           shiro:hasPermission="system:customer:remove">
+                            <i class="fa fa-remove"></i> 删除
+                        </a>
+                        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customer:export">
+                            <i class="fa fa-download"></i> 导出
+                        </a>
+                        <a class="btn btn-warning single disabled" onclick="exportCustomerInfo()" shiro:hasPermission="system:customer:export" >
+                            <i class="fa fa-download"></i> 导出
+                       </a>
+                                    <a class="btn btn-danger" onclick="oneexport()" shiro:hasPermission="system:customer:export">
+                                        <i class="fa fa-download"></i> 单个导出
+                                    </a>-->
             <a class="btn btn-success" id="tocontacts" onclick="addContacts()" shiro:hasPermission="system:contacts:add">
-                <i class="fa fa-plus"></i> 添加联系人明细
+                <i class="fa fa-plus"></i> 添加其他联系人明细
             </a>
-            <a class="btn btn-primary" onclick="showaddress()"  shiro:hasPermission="system:shippingaddress:add">
-
-                <i class="fa fa-ambulance"></i> 添加送货地址
+            <a class="btn btn-success" onclick="showaddress()"  shiro:hasPermission="system:shippingaddress:add">
+                <i class="fa fa-ambulance"></i> 添加其他送货地址
             </a>
             <a class="btn btn-success" onclick="showdetails()" >
-                <i class="fa fa-file-text"></i> 详情列表
+                <i class="fa fa-file-text"></i> 修改客户标识
             </a>
 
         </div>
@@ -325,7 +342,6 @@
             <div class="modal-body details-body">
                 <div class="row">
                     <div class="base-customer">
-
                         <div class="form-group" hidden="hidden">
                             <label class="col-sm-3 control-label">客户/企业代码：</label>
                             <div class="col-sm-8">
@@ -426,7 +442,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">开票公司代码/label>
+                            <label class="col-sm-3 control-label">开票公司代码</label>
                             <div class="col-sm-8">
                                 <input name="invoicingCompanyName" class="form-control" type="text" readonly>
                             </div>
@@ -659,7 +675,6 @@
                             <div class="details" style="padding: 8px 0;font-size: 18px">操作历史</div>
                             <table id="oper-table"></table>
                         </div>
-
                     </div>
                 </div>
 
@@ -745,6 +760,9 @@
     var confirmTaxDatas = [[${@dict.getType('sys_confirm_tax')}]];
     var shipmentUsageDatas = [[${@dict.getType('sys_shipment_usage')}]];
     var countryNumberDatas = [[${@dict.getType('sys_country_number')}]];
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var useStatusDatas = [[${@dict.getType('useStatus')}]];
+
     var prefix = ctx + "system/customer";
 
     $(function () {
@@ -756,322 +774,289 @@
             exportUrl: prefix + "/export",
             clickToSelect: true,
             modalName: "客户基本信息",
+            fixedColumns:true,
+            fixedRightNumber:1,
             columns: [{
                 checkbox: true
             },
-                {
-                    field: 'deginflag',
-                    title: '审核状态',
-                    formatter: function (value, row, index) {
-                        if (value == 0){
-                            return "待审核";
-                        }
-                        if(value==1){
-                            return "审核通过";
-                        }
-                        if (value == 2){
-                            return "审核拒绝";
-                        }
-                    },
-                },
-                {
-                    field: 'delflag',
-                    title: '客户状态',
-                    formatter: function (value, row, index) {
-                        if (value == 0){
-                            return "否";
-                        }
-                        if(value==1){
-                            return "是";
-                        }
-                        if (value == 2){
-                            return "作废";
-                        }
-                    },
-                },
-                {
-                    field: 'customerId',
-                    title: '客户id',
-                    visible: false
-                },
-                {
-                    field: 'enterpriseCode',
-                    title: '客户/企业代码'
-                },
-                {
-                    field: 'exportSales',
-                    title: '内外销',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(exportSalesDatas, value);
-                    },
-                    visible: false
-                },
-                {
-                    field: 'enterpriseName',
-                    title: '客户/企业名称'
-                },
-                {
-                    field: 'englishName',
-                    title: '英文名称',
-                    visible: false
-                },
-                {
-                    field: 'customerAddress',
-                    title: '地址',
-                    visible: false
-                },
-                {
-                    field: 'deliveryAddress',
-                    title: '送货地址'
+            {
+                field: 'deginflag',
+                title: '审核状态',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(auditStatusDatas, value);
+                }
+            },
+            {
+                field: 'delflag',
+                title: '客户状态',
+                formatter: function (value, row, index) {
+                  return $.table.selectDictLabel(useStatusDatas, value);
                 },
-                {
-                    field: 'postalCode',
-                    title: '邮编',
-                    visible: false
+            },
+            {
+                field: 'businessMembers',
+                title: '业务员',
+                visible: false
+            },
+            {
+                field: 'enterpriseCode',
+                title: '客户ID',
+            },
+            {
+                field: 'enterpriseName',
+                title: '客户公司名称'
+            },
+            {
+                field: 'customerAbbreviation',
+                title: '客户公司简称',
+            },
+            {
+                field: 'englishName',
+                title: '英文名称',
+            },
+            {
+                field: 'customerPurser',
+                title: '事业部',
+            },
+            {
+                field: 'customerAddress',
+                title: '公司地址',
+            },
 
+            {
+                field: 'customerOffice',
+                title: '职务',
+                visible: false
+            },
+            {
+                field: 'exportSales',
+                title: '内外销',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(exportSalesDatas, value);
                 },
-                {
-                    field: 'customerCountry',
-                    title: '国家地区',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(customerCountryDatas, value);
-                    },
-                    visible: false
-                },
-                {
-                    field: 'commonCurrency',
-                    title: '常用币种',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(commonCurrencyDatas, value);
-                    },
-                    visible: false
-                },
-                {
-                    field: 'customerRemarks',
-                    title: '备注内容',
-                    visible: false
-                },
-                {
-                    field: 'legalRepresentative',
-                    title: '法人代表',
-                    visible: false
-                },
-                {
-                    field: 'invoicingCustomerName',
-                    title: '开票客户名称',
-                    visible: false
-                },
-                {
-                    field: 'invoicingCompanyName',
-                    title: '开票公司名称',
-                    visible: false
-                },
-                {
-                    field: 'creditLimit',
-                    title: '信用额度',
-                    visible: false
-                },
-                {
-                    field: 'integrityRating',
-                    title: '诚信评级',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(integrityRatingDatas, value);
-                    },
-                    visible: false
-                },
-                {
-                    field: 'customerContact',
-                    title: '联系人'
-                },
-                {
-                    field: 'contactNumber',
-                    title: '联系电话'
-                },
-                {
-                    field: 'customerFax',
-                    title: '传真'
-                },
-                {
-                    field: 'customerEmail',
-                    title: 'Email'
-                },
-                {
-                    field: 'customerAbbreviation',
-                    title: '客户简称',
-                    visible: false
-                },
-                {
-                    field: 'customsCode',
-                    title: '海关代码',
-                    visible: false
-                },
-                {
-                    field: 'paymentTerms',
-                    title: '付款条件'
-                },
-                {
-                    field: 'invoiceCode',
-                    title: '发票代码',
-                    visible: false
-                },
-                {
-                    field: 'portOfDestination',
-                    title: '目的港',
-                    visible: false
-                },
-                {
-                    field: 'establishedTime',
-                    title: '成立日期'
+                visible: false
+            },
 
-                },
-                {
-                    field: 'settlementBank',
-                    title: '结汇银行',
-                    visible: false
-                },
-                {
-                    field: 'exchangeSettlementAccount',
-                    title: '结汇账号',
-                    visible: false
+            {
+                field: 'deliveryAddress',
+                title: '送货地址'
+            },
+            {
+                field: 'postalCode',
+                title: '邮编',
+                visible: false
 
+            },
+            {
+                field: 'customerCountry',
+                title: '国家地区',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(customerCountryDatas, value);
                 },
-                {
-                    field: 'depositBank',
-                    title: '开户银行',
-                    // visible: false
-                },
-                {
-                    field: 'bankAccount',
-                    title: '开户银行账号',
-                    // visible: false
-                },
-                {
-                    field: 'rmbRegisteredCapital',
-                    title: 'RMB注册资金',
-                    visible: false
-                },
-                {
-                    field: 'registeredCapital',
-                    title: '外币注册资金',
-                    visible: false
+                visible: false
+            },
+            {
+                field: 'commonCurrency',
+                title: '币种',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(commonCurrencyDatas, value);
                 },
-                {
-                    field: 'orderLength',
-                    title: '订单号长度',
-                    visible: false
-
+                visible: false
+            },
+            {
+                field: 'customerRemarks',
+                title: '备注内容',
+                visible: false
+            },
+            {
+                field: 'legalRepresentative',
+                title: '法人代表',
+                visible: false
+            },
+            {
+                field: 'invoicingCustomerName',
+                title: '开票客户名称',
+                visible: false
+            },
+            {
+                field: 'invoicingCompanyName',
+                title: '开票公司名称',
+                visible: false
+            },
+            {
+                field: 'creditLimit',
+                title: '信用额度',
+                visible: false
+            },
+            {
+                field: 'integrityRating',
+                title: '诚信评级',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(integrityRatingDatas, value);
                 },
-                {
-                    field: 'shippingTemplate',
-                    title: '出货单格式模板名称',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(shippingTemplateDatas, value);
-                    },
-                    visible: false
-
+                visible: false
+            },
+            {
+                field: 'customerContact',
+                title: '联系人'
+            },
+            {
+                field: 'contactNumber',
+                title: '联系电话'
+            },
+            {
+                field: 'customerFax',
+                title: '传真'
+            },
+            {
+                field: 'customerEmail',
+                title: 'Email'
+            },
+            {
+                field: 'customsCode',
+                title: '海关代码',
+                visible: false
+            },
+            {
+                field: 'paymentTerms',
+                title: '付款条件'
+            },
+            {
+                field: 'invoiceCode',
+                title: '发票代码',
+                visible: false
+            },
+            {
+                field: 'portOfDestination',
+                title: '目的港',
+                visible: false
+            },
+            {
+                field: 'establishedTime',
+                title: '成立日期'
+            },
+            {
+                field: 'settlementBank',
+                title: '结汇银行',
+                visible: false
+            },
+            {
+                field: 'exchangeSettlementAccount',
+                title: '结汇账号',
+                visible: false
 
-                },
-                {
-                    field: 'businessMembers',
-                    title: '业务员',
-                    visible: false
+            },
+            {
+                field: 'depositBank',
+                title: '开户银行',
+                // visible: false
+            },
+            {
+                field: 'bankAccount',
+                title: '开户银行账号',
+                // visible: false
+            },
+            {
+                field: 'rmbRegisteredCapital',
+                title: 'RMB注册资金',
+                visible: false
+            },
+            {
+                field: 'registeredCapital',
+                title: '外币注册资金',
+                visible: false
+            },
 
+            {
+                field: 'confirmTax',
+                title: '是否含税',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(confirmTaxDatas, value);
                 },
-                {
-                    field: 'destinationPortCode',
-                    title: '目的地港代号',
-                    visible: false
-                },
-                {
-                    field: 'departurePotentialName',
-                    title: '起运潜名',
-                    visible: false
-                },
-                {
-                    field: 'departurePotentialCode',
-                    title: '起运潜代号',
-                    visible: false
-                },
-                {
-                    field: 'unifiedNumbering',
-                    title: '统一编号',
-                    visible: false
-                },
-                {
-                    field: 'shipmentUsage',
-                    title: '出货需录入使用量',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(shipmentUsageDatas, value);
-                    },
-                    visible: false
-                },
-                {
-                    field: 'voucherPreparation',
-                    title: '制单人',
-                    visible: false
-                },
-                {
-                    field: 'identifyingPeople',
-                    title: '确认人',
-                    // visible: false
-                },
-                {
-                    field: 'confirmTax',
-                    title: '是否含税',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(confirmTaxDatas, value);
-                    },
-                    // visible: false
-                },
-                {
-                    field: 'taxRate',
-                    title: '税率',
-                    // visible: false
-                },
-                {
-                    field: 'countryNumber',
-                    title: '国家/地区编号',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(countryNumberDatas, value);
-                    },
-                    visible: false
+                // visible: false
+            },
+            {
+                field: 'taxRate',
+                title: '税率',
+                // visible: false
+            },
+            {
+                field: 'countryNumber',
+                title: '国家/地区编号',
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(countryNumberDatas, value);
                 },
-                {
-                    field: 'firstAddTime',
-                    title: '录入时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            return value;
-                        }
+                visible: false
+            },
+            {
+                field: 'firstAddTime',
+                title: '录入时间',
+                formatter: function (value, row, index) {
+                    if (value == null) {
+                        return " ";
+                    } else {
+                        return value;
                     }
-                },
-                {
-                    field: 'updateInfoTime',
-                    title: '上次修改时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            var vArr = value.split(',')
-                            return vArr[0];
+                }
+            },
+            {
+                field: 'updateInfoTime',
+                title: '上次修改时间',
+                formatter: function (value, row, index) {
+                    if (value == null) {
+                        return " ";
+                    } else {
+                        var vArr = value.split(',')
+                        return vArr[0];
+                    }
+                }
+            },
+            {
+                title: '操作',
+                align: 'center',
+                formatter: function(value, row, index) {
+                    var actions = [];
+                    // 审核状态-审核通过 使用状态-是 未发起作废流程
+                    if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId){
+                        // 作废
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i> 作废</a>');
+                        // 编辑
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                    }
+                    // 已作废
+                    if(row.useStatus=="2" && !row.restoreInstanceId){
+                        // 恢复
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                    }
+                    // 有流程实例id
+                    if (row.instanceId) {
+                        // 有待办人展示审批按钮，
+                        if (row.todoUserId) {
+                            var todoUserIdList = row.todoUserId.split(",");
+                            if(todoUserIdList.includes(loginName) || loginName == 'admin'){
+                                var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
+                                actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                            }
                         }
+                        // 审批历史
+                        actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                        // 进度查看
+                        actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                     }
+                    // 详情
+                    actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
+
+                    /*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                    actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="showdetails(\'' + index + '\')"><i class="fa fa-eye"></i>详情</a> ');
+                    actions.push('<a class="btn btn-success btn-xs ' + auditFlag + '" href="javascript:void(0)" onclick="showMaterial(\'' + index + '\')"><i class="fa fa-file-o"></i>审核</a> ');
+                    if(row.delFlag == '0'){
+                        actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a>');
+                    }else{
+                        actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a>');
+                    }*/
+                    return actions.join('');
                 }
-                // ,
-                // {
-                //     title: '操作',
-                //     align: 'center',
-                //     formatter: function (value, row, index) {
-                //         var actions = [];
-                //         actions.push('<a class="btn btn-success btn-xs ' + tocontacts + '" href="javascript:void(0)" onclick="addContactsTwo(\'' + row.customerId + '\')"><i class="fa fa-plus"></i>联系人明细</a> ');
-                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.customerId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.customerId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                //         return actions.join('');
-                //     }
-                // }
-                ]
+            }]
         };
         $.table.init(options);
     });
@@ -1136,12 +1121,6 @@
         }
         console.log(data)
     }
-
-    var prefix2 = ctx + "system/shippingaddress"
-    $("#form-contacts-add").validate({
-        focusCleanup: true
-    });
-
     function submitaddress() {
         if ($.validate.form('form-address-add')) {
             $.operate.save(prefix2 + "/add", $('#form-address-add').serialize());
@@ -1149,7 +1128,14 @@
         }
     }
 
-    function showdetails() {
+    var prefix2 = ctx + "system/shippingaddress"
+    $("#form-contacts-add").validate({
+        focusCleanup: true
+    });
+
+
+
+    function showdetails(index) {
         var data = $("#bootstrap-table").bootstrapTable("getSelections");
         // var enterpriseCode=data[0].enterpriseCode;
         // console.log(data.length,enterpriseCode)
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
index c584a8ee..6940170d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
@@ -216,20 +216,6 @@
                     <input name="registeredCapital" th:field="*{registeredCapital}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">订单号长度：</label>
-                <div class="col-sm-8">
-                    <input name="orderLength" th:field="*{orderLength}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">出货单格式模板名称：</label>
-                <div class="col-sm-8">
-                    <select name="shippingTemplate" class="form-control m-b" th:with="type=${@dict.getType('sys_shipping_template')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{shippingTemplate}"></option>
-                    </select>
-                </div>
-            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">业务员：</label>
                 <div class="col-sm-8">
@@ -270,15 +256,6 @@
                     <textarea name="customerRemarks" class="form-control">[[*{customerRemarks}]]</textarea>
                 </div>
             </div>
-            <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">出货需录入使用量：</label>
-                <div class="col-sm-8">
-<!--                    <input name="shipmentUsage" th:field="*{shipmentUsage}" class="form-control" type="text">-->
-                    <select name="shipmentUsage" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{shipmentUsage}"></option>
-                    </select>
-                </div>
-            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">制单人：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
index 5fb6adc3..dd97302e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
@@ -9,19 +9,19 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-customerQuote-add">
             <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">客户报价编号：</label>
+                <label class="col-sm-4 control-label">客户报价编号：</label>
                 <div class="col-sm-8">
                     <input name="supplierCode" class="form-control" type="text" readonly>
                 </div>
             </div>
             <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">业务员：</label>
+                <label class="col-sm-4 control-label">业务员：</label>
                 <div class="col-sm-8">
                     <input name="createBy" class="form-control" type="text" th:value="${@permission.getPrincipalProperty('userName')}" readonly>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">客户编号：</label>
+                <label class="col-sm-4 control-label">客户编号：</label>
                 <div class="col-sm-8">
                     <select class="form-control" onclick="selMaterialTb()" id="customerCode" name="customerCode" required>
 
@@ -29,26 +29,26 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">客户名称：</label>
+                <label class="col-sm-4 control-label">客户名称：</label>
                 <div class="col-sm-8">
                     <input name="customerName" class="form-control m-b" type="text" readonly />
 
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">物料合计：</label>
+                <label class="col-sm-4 control-label">物料合计：</label>
                 <div class="col-sm-8">
                     <input name="enterprise" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">数量合计：</label>
+                <label class="col-sm-4 control-label">数量合计：</label>
                 <div class="col-sm-8">
                     <input name="enterpriseSum" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">报价币种：</label>
+                <label class="col-sm-4 control-label">报价币种：</label>
                 <div class="col-sm-8">
                     <select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -56,15 +56,13 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">国内税率：</label>
+                <label class="col-sm-4 control-label">国内税率：</label>
                 <div class="col-sm-8">
-                    <select name="rmbTax" class="form-control m-b" th:with="type=${@dict.getType('fin_customer_taxPercent')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                </select>
+                    <input name="countTax" class="form-control" type="text" placeholder="13%" />
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">美元汇率：</label>
+                <label class="col-sm-4 control-label">美元汇率：</label>
                 <div class="col-sm-8">
                     <input name="usdTax" class="form-control" type="text">
                 </div>
@@ -95,60 +93,46 @@
             </div>
             -->
             <div class="form-group" hidden="hidden">
-                <label class="col-sm-3 control-label">审核标志: </label>
+                <label class="col-sm-4 control-label">审核标志: </label>
                 <div class="col-sm-8">
                     <input name="deginFlag" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
+                <label class="col-sm-4 control-label">备注：</label>
                 <div class="col-sm-8">
                     <textarea name="remark" class="form-control"></textarea>
                 </div>
             </div>
-        </form>
-        <div><h4 class="form-header h4">客户报价子信息</h4></div>
-        <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="insertRow()">
-                <i class="fa fa-plus"></i> 新增行
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick="removeRow()">
-                <i class="fa fa-remove"></i> 删除选择行
-            </a>
-        </div>
-        <div class="row">
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-sub-table-1"></table>
+            <div>
+                <h4 class="form-header h4">客户报价子信息</h4>
             </div>
-        </div>
-
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="insertRow()">
+                    <i class="fa fa-plus"></i> 新增行
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="removeRow()">
+                    <i class="fa fa-remove"></i> 删除选择行
+                </a>
+            </div>
+            <div class="row">
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-sub-table-1"></table>
+                </div>
+            </div>
+        </form>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: bootstrap-table-editable-js" />
     <th:block th:include="include :: select2-js" />
     <script th:inline="javascript">
+        var materialTypeDatas = [[${@dict.getType('sys_material_type')}]];
+        var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
         var prefix = ctx + "system/customerQuote"
         $("#form-customerQuote-add").validate({
-            focusCleanup: true
+            focusCleanup: true,
         });
         function submitHandler() {
-
-            if ($.validate.form()) {
-                var formData = $("#form-bom-add").serializeArray();
-                console.log("formData",formData);
-                var tableData = $("#bootstrap-sub-table-1").bootstrapTable('getData');
-                console.log("tableData",JSON.stringify(tableData))
-                var rows = tableData.length;
-                if(rows==0){
-                    $.modal.alertWarning("子表数据不能为空！");
-                }else{
-                    formData.push({"name": "erpBomList", "value": tableData});
-                    var jsonData = $.common.formDataToJson(formData);
-                    console.log("jsonData");
-                    console.log(jsonData);
-                    $.operate.saveJson(prefix + "/add", jsonData);
-                }
-            }
             if ($.validate.form()) {
                 var formData = $('#form-customerQuote-add').serializeArray();
                 console.log("formData",formData);
@@ -220,7 +204,7 @@
         });
         $(function() {
             var options = {
-                id:'bootstarp-sub-table-1',
+                id:'bootstrap-sub-table-1',
                 url: ctx + "system/quoteChild/list",
                 pagination: false,
                 showSearch: false,
@@ -228,6 +212,7 @@
                 showToggle: false,
                 showColumns: false,
                 sidePagination: "client",
+                model: "物料报价信息",
                 columns: [{
                     checkbox: true
                 },
@@ -284,15 +269,21 @@
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
+                {
+                    field: '',
+                    title: '对外售价'
+                },
                 {
                     field: 'countTax',
                     align: 'center',
                     title: '国内税率',
+                    visible: false
                 },
                 {
                     field: 'usdTax',
                     align: 'center',
                     title: '美元汇率',
+                    visible: false,
                     editable: true
                 },
                 {
@@ -346,47 +337,47 @@
                     field: 'materialRmbSum',
                     align: 'center',
                     title: '物料的不含税总价(RMB)'
-
                 },
                 {
                     field: 'createBy',
                     align: 'center',
                     title: '创建人',
+                    visible: false
                 },
                 {
                     field: 'createTime',
                     align: 'center',
                     title: '创建时间',
-
+                    visible: false
                 },
                 {
                     field: 'updateBy',
                     align: 'center',
                     title: '修改人',
-
+                    visible: false
                 },
                 {
                     field: 'updateTime',
                     align: 'center',
                     title: '修改时间',
-
+                    visible: false
                 },
                 {
                     field: 'remark',
                     align: 'center',
                     title: '备注',
-
+                    visible: false
                 },
                 {
                     field: 'deginFlag',
                     align: 'center',
                     title: '审核状态',
                     formatter: function(value, row, index) {
-
+                        return $.table.selectDictLabel(auditStatusDatas, value);
                     }
                 }]
             };
-            $table.init(options);
+            $.table.init(options);
         });
         //获取单号
         $.ajax({
@@ -444,7 +435,6 @@
                     unit: rowData.unit,
                     processMethod: rowData.processMethod,
                     photoUrl: "",
-                    describe: "",
                     countTax: "",
                     usdTax: "",
                     materialNum: "",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
index c9ef9b42..73181c7e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
@@ -15,25 +15,32 @@
                                 <input type="text" name="supplierCode"/>
                             </li>
                             <li>
-                                <label>客户的编号：</label>
+                                <label>客户ID：</label>
                                 <input type="text" name="customerCode"/>
                             </li>
                             <li>
-                                <label>客户名称：</label>
+                                <label>客户公司名称：</label>
                                 <input type="text" name="customerName"/>
                             </li>
                             <li>
-                                <label>报价币种：</label>
-                                <select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
+                                <label>审核标志：</label>
+                                <select name="deginFlag" th:with="type=${@dict.getType('auditStatus')}">
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
                             <li>
-                                <label>审核标志：</label>
-                                <select name="deginFlag" class="form-control m-b" th:with="type=${@dict.getType('auditStatus')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                                </select>
+                                <label>料号：</label>
+                                <input type="text" name="materialCode"/>
+                            </li>
+                            <li>
+                                <label>物料名称：</label>
+                                <input type="text" name="materialCode"/>
                             </li>
+                            <li>
+                                <label>定价时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -47,18 +54,18 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customerQuote:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:customerQuote:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:customerQuote:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:customerQuote:audit">
                     <i class="fa fa-edit"></i> 审核
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:customerQuote:remove">
                     <i class="fa fa-remove"></i> 删除
+                </a> -->
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customerQuote:export">
+                    <i class="fa fa-download"></i> 导出
                 </a>
-<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customerQuote:export">-->
-<!--                    <i class="fa fa-download"></i> 导出-->
-<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -71,8 +78,9 @@
         var removeFlag = [[${@permission.hasPermi('system:customerQuote:remove')}]];
         var cancelFlag = [[${@permission.hasPermi('system:customerQuote:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('system:customerQuote:restore')}]];
+        var auditStatusData  = [[${@dict.getType('auditStatus')}]];
+        var useStatusData  = [[${@dict.getType('useStatus')}]];
         var prefix = ctx + "system/customerQuote";
-
         $(function() {
             var options = {
                 url: prefix + "/list",
@@ -88,33 +96,30 @@
                 columns: [{
                     checkbox: true
                 },
-                {
-                    field: 'id',
-                    title: '客户报价表编号',
-                    visible: false
-                },
                 {
                     field: 'deginFlag',
                     title: '审核状态',
                     formatter:function (value){
-                        if (value = 0){
-                            return  '待审核'
-                        }
-                        if (value = 1){
-                            return '审核通过';
-                        }
-                        if(value = 3){
-                            return '审核拒绝';
-                        }
+                        $.table.selectDictLabel(auditStatusData,value);
                     }
                 },
+                {
+                    field: 'businessMembers',
+                    title: '业务员',
+                },
+                {
+                    field: 'id',
+                    title: '客户报价表编号',
+                    visible: false
+                },
+
                 {
                     field: 'supplierCode',
                     title: '客户报价编号'
                 },
                 {
                     field: 'customerCode',
-                    title: '客户的编号'
+                    title: '客户编号'
                 },
                 {
                     field: 'customerName',
@@ -156,7 +161,36 @@
                     field: 'usdSum',
                     title: '含税总价(美元)'
                 },
-
+                {
+                    field: 'createBy',
+                    title: '录入人'
+                },
+                {
+                    field: 'createTime',
+                    title: '定价时间',
+                    formatter: function(value, row, index) {
+                        if (value == null) {
+                            return " ";
+                        } else {
+                            return value;
+                        }
+                    }
+                },
+                {
+                    field: 'updateBy',
+                    title: '更新人'
+                },
+                {
+                    field: 'updateInfoTime',
+                    title: '上次修改时间',
+                    formatter: function(value, row, index) {
+                        if (value == null) {
+                            return " ";
+                        } else {
+                            return value;
+                        }
+                    }
+                },
                 {
                     field: 'remark',
                     title: '备注'
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
index 8ce8718b..99ad3311 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
@@ -95,7 +95,7 @@
                 <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i></button>
                 <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus"> 删除</i></button>
                 <div class="col-sm-12 select-table table-striped">
-                    <table id="bootstrap-table"></table>
+                    <table id="bootstrap-table-sub-1"></table>
                 </div>
             </div>
         </div>
@@ -128,7 +128,7 @@
                 {
                     field: 'index',
                     align: 'center',
-                    title: "序号",
+                    title: "表序号",
                     formatter: function (value, row, index) {
                     	var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
                     	return columnIndex + $.table.serialNumber(index);
@@ -385,7 +385,6 @@
         function addColumn() {
             var count = $("#" + table.options.id).bootstrapTable('getData').length;
             sub.editColumn();
-        	
             $("#" + table.options.id).bootstrapTable('insertRow', {
                 index: count,
                 row: {
diff --git a/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
new file mode 100644
index 00000000..22581452
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+  <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+  <head>
+    <th:block th:include="include :: header('开票信息列表')"/>
+  </head>
+  <body class="gray-bg">
+  <div class="container-div">
+    <div class="row">
+      <div class="col-sm-12 search-collapse">
+        <form id="formId">
+          <div class="select-list">
+            <ul>
+              <li>
+                <label>企业名称：</label>
+                <input type="text" name="enterpriseName"/>
+              </li>
+              <li>
+                <label>业务员：</label>
+                <input type="text" name="enterpriseName"/>
+              </li>
+              <li>
+                <label>客户标识：</label>
+                <input type="text" name="enterpriseName"/>
+              </li>
+              <li class="select-time">
+                <label>录入时间：</label>
+                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                <span>-</span>
+                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+              </li>
+              <li>
+                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                        class="fa fa-search"></i>&nbsp;搜索</a>
+                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                        class="fa fa-refresh"></i>&nbsp;重置</a>
+              </li>
+            </ul>
+          </div>
+        </form>
+      </div>
+
+      <div class="btn-group-sm" id="toolbar" role="group">
+       <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:invoicing:add">
+          <i class="fa fa-plus"></i> 添加
+        </a>
+        <!--        <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+                  shiro:hasPermission="system:invoicing:edit">
+                 <i class="fa fa-edit"></i> 修改
+               </a>
+               <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
+                  shiro:hasPermission="system:invoicing:remove">
+                 <i class="fa fa-remove"></i> 删除
+               </a>
+                           <a class="btn btn-warning" onclick="$.table.exportExcel()"
+                              shiro:hasPermission="system:shippingaddress:export">
+                               <i class="fa fa-download"></i> 导出
+                           </a>-->
+      </div>
+      <div class="col-sm-12 select-table table-striped">
+        <table id="bootstrap-table"  style="white-space:nowrap"></table>
+      </div>
+    </div>
+  </div>
+  <th:block th:include="include :: footer"/>
+  <script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:invoicing:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('system:invoicing:remove')}]];
+    var prefix = ctx + "system/shippingaddress";
+    $(function () {
+      var options = {
+        url: prefix + "/list",
+        createUrl: prefix + "/add",
+        updateUrl: prefix + "/edit/{id}",
+        removeUrl: prefix + "/remove",
+        exportUrl: prefix + "/export",
+        clickToSelect: true,
+        modalName: "开票信息",
+        fixedColumns: true, // 启用冻结列
+        fixedRightNumber: 1, // 冻结右列个数
+        columns: [
+          {
+            field: 'id',
+            title: '开票表id',
+            visible: false
+          },
+          {
+            field: 'invoiceId',
+            title: '开票ID',
+          },
+          {
+            field:'',
+            title:'业务员'
+          },
+          {
+            field: 'enterpriseCode',
+            title: '客户/企业代码'
+          },
+          {
+            field: 'enterpriseName',
+            title: '客户公司名称'
+          },
+          {
+            field: 'invoiceCompanyName',
+            title: '开票公司名称',
+          },
+          {
+            field: 'invoiceCode',
+            title: '开票公司税号',
+          },
+          {
+            field: 'depositBank',
+            title: '公司开户行',
+          },
+          {
+            field: 'bankAccount',
+            title: '公司开户账号',
+          },
+          {
+            field: 'firstAddTime',
+            title: '录入时间',
+            formatter: function (value, row, index) {
+              if (value == null) {
+                return " ";
+              } else {
+                return value;
+              }
+            }
+          },
+          {
+            field: 'updateBy',
+            title: '更新人',
+          },
+          {
+            field: 'updateInfoTime',
+            title: '上次修改时间',
+            formatter: function (value, row, index) {
+              if (value == null) {
+                return " ";
+              } else {
+                var vArr = value.split(',')
+                return vArr[0];
+              }
+            }
+          },
+          {
+              title: '操作',
+              align: 'center',
+              formatter: function (value, row, index) {
+                  var actions = [];
+                  actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.Id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                  actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.Id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.Id + '\')"><i class="fa fa-remove"></i>详情</a>');
+                  return actions.join('');
+              }
+          }
+        ]
+      };
+      $.table.init(options);
+    });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
index 50640541..2b3dfcd6 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('新增销售订单')"/>
+    <th:block th:include="include :: header('新增客户销售订单')"/>
     <th:block th:include="include :: datetimepicker-css"/>
     <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
     <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
@@ -66,53 +66,100 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m " id="form-salesOrder-add">
+        <div class="form-group" hidden="hidden">
+            <label class="col-sm-3 control-label is-required">销售订单编号：</label>
+            <div class="col-sm-8">
+                <input name="salesOrderCode" class="form-control" type="text" required>
+            </div>
+        </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">订单编号：</label>
+            <label class="col-sm-3 control-label is-required">客户ID：</label>
             <div class="col-sm-8">
-                <input name="salesOrderCode" class="form-control" type="text" required readonly>
+                <select id="enterpriseCode" name="enterpriseCode" class="form-control m-b" required>
+                    <option value="">请选择</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">订单号码：</label>
+            <label class="col-sm-3 control-label is-required">客户名称：</label>
             <div class="col-sm-8">
-                <input name="salesOrderNumber" class="form-control" type="text" required>
+                <input required name="enterpriseName" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">-->
+            <label class="col-sm-3 control-label">事业部：</label>
+            <div class="col-sm-8">
+                <input readonly name="customerPurser" class="form-control" type="text">
             </div>
         </div>
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">预约单号：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <input name="appointmentNumber" class="form-control" type="text">-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">开单日期时间：</label>
+            <label class="col-sm-3 control-label is-required">客户联系人：</label>
             <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="billingTime" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
+                <select id="customerContact" name="customerContact" class="form-control m-b" required>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">联系人职务：</label>
+            <div class="col-sm-8">
+                <input readonly name="salesOrderNumber" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">联系人电话：</label>
+            <div class="col-sm-8">
+                <input readonly name="salesOrderNumber" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">联系人邮箱：</label>
+            <div class="col-sm-8">
+                <input readonly name="salesOrderNumber" class="form-control" type="text" required>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">客户代码：</label>
+            <label class="col-sm-3 control-label is-required">客户收货人：</label>
             <div class="col-sm-8">
-                <select name="enterpriseCode" class="form-control m-b" required>
-                    <option value="">请选择客户代码</option>
+                <select id="customerContact" name="customerContact" class="form-control m-b" required>
                 </select>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">客户名称：</label>
+            <label class="col-sm-3 control-label is-required">收货人电话：</label>
             <div class="col-sm-8">
-                <!--                    <select name="enterpriseName" class="form-control m-b">-->
-                <!--                        <option value="">所有</option>-->
-                <!--                    </select>-->
-
-                <input name="enterpriseName" class="form-control" type="text" readonly>
-
+                <input readonly name="salesOrderNumber" class="form-control" type="text" required>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">收货地址：</label>
+            <div class="col-sm-8">
+                <input readonly name="salesOrderNumber" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">客户订单号：</label>
+            <div class="col-sm-8">
+                <input name="salesOrderNumber" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">客户订单号：</label>
+            <div class="col-sm-8">
+                <select id="selectOderType" name="customerOrderType" class="form-control m-b" required>
 
+                </select>
+            </div>
+        </div>
+<!--
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">开单日期时间：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="billingTime" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">联系人：</label>
             <div class="col-sm-8">
@@ -132,11 +179,11 @@
             <div class="col-sm-8">
                 <input name="contactNumber" class="form-control" type="text">
             </div>
-        </div>
+        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">业务人员：</label>
             <div class="col-sm-8">
-<!--                <input name="businessMembers" class="form-control" type="text">-->
+                <input name="businessMembers" class="form-control" type="text">
                 <select name="businessMembers" class="form-control m-b" required>
                 </select>
             </div>
@@ -222,50 +269,6 @@
             </div>
         </div>
 
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">结案人：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <input name="auditName" class="form-control" type="text" readonly>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">结案时间：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <div class="input-group date">-->
-<!--                    <input name="auditTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text" readonly>-->
-<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">结案备注：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <textarea name="auditRemarks" class="form-control" readonly></textarea>-->
-<!--            </div>-->
-<!--        </div>-->
-        <div class="form-group hidden">
-            <label class="col-sm-3 control-label">确认否：</label>
-            <div class="col-sm-8">
-                <select name="confirmNo" class="form-control m-b" th:with="type=${@dict.getType('sys_whether')}">
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                </select>
-            </div>
-        </div>
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">确认日期：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <div class="input-group date">-->
-<!--                    <input name="confirmTime" class="form-control" placeholder="yyyy-mm-dd hh:ii:ss" type="text">-->
-<!--                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--        </div>-->
-<!--        <div class="form-group">-->
-<!--            <label class="col-sm-3 control-label">确认人：</label>-->
-<!--            <div class="col-sm-8">-->
-<!--                <input name="confirmName" class="form-control" type="text">-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">备注内容：</label>
             <div class="col-sm-8">
@@ -317,18 +320,18 @@
             </div>
         </div>
 
-        <!--            <div class="form-group">    -->
-        <!--                <label class="col-sm-3 control-label">备用一：</label>-->
-        <!--                <div class="col-sm-8">-->
-        <!--                    <input name="standbyOne" class="form-control" type="text">-->
-        <!--                </div>-->
-        <!--            </div>-->
-        <!--            <div class="form-group">    -->
-        <!--                <label class="col-sm-3 control-label">备用二：</label>-->
-        <!--                <div class="col-sm-8">-->
-        <!--                    <input name="standbyTwo" class="form-control" type="text">-->
-        <!--                </div>-->
-        <!--            </div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备用一：</label>
+            <div class="col-sm-8">
+                <input name="standbyOne" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备用二：</label>
+            <div class="col-sm-8">
+                <input name="standbyTwo" class="form-control" type="text">
+            </div>
+        </div>
     </form>
 </div>
 
@@ -346,7 +349,6 @@
             <table id="addFinishbomTable" style="white-space:nowrap"></table>
         </div>
     </div>
-
     <div class="modal inmodal" id="FinishModal"
          role="dilog" aria-hidden="true">
         <div class="modal-dialog" style="width: 1000px;background-color: #FFFFFF">
@@ -391,7 +393,6 @@
             </div>
         </div>
     </div>
-
 </div>
 
 <th:block th:include="include :: footer"/>
@@ -505,31 +506,58 @@
         }
     })
 
-    //客户信息
-    var customerodata = []
-    $.ajax({
-        url: ctx + "system/customer/list",
-        type: "POST",
-        success: function (res) {
-            // console.log(res)
-            if (res.rows.length > 0) {
-                customerodata = res.rows;
-                //alert(JSON.stringify(data));
-                // console.log(res.rows)
-                for (let i in customerodata) {
-                    $("select[name='enterpriseCode']").append("<option value='" + customerodata[i].enterpriseCode + "'>" + customerodata[i].enterpriseCode + "</option>");
-                    // $("select[name='enterpriseName']").append("<option value='" + customerodata[i].enterpriseName + "'>" + customerodata[i].enterpriseName + "</option>");
+    //获取客户信息
+    $("#enterpriseCode").select2({
+        theme: "bootstrap",
+        allowClear: true,
+        placeholder: "请选择客户",
+        ajax:{
+            type: "post",
+            url:ctx + "system/customer/list",
+            dataType:"json",
+            delay:250,
+            data:function(params){
+                var searchVal = params.term;
+                var obj = {
+                    params:{
+                        enterpriseCode: searchVal
+                    }
+                };
+                return obj;
+            },
+            cache:true,
+            processResults: function (res, params) {
+                var resultList = res.rows;
+                console.log("传输的数值");
+                console.log(resultList);
+                var options = [];
+                for(var i= 0, len=resultList.length;i<len;i++){
+                    var option = resultList[i];
+                    option.id = resultList[i]["enterpriseCode"];
+                    option.text = resultList[i]["enterpriseCode"];
+                    options.push(option);
                 }
-            } else {
-                $.modal.msgError(res.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-
+                return {
+                    results: options,
+                    pagination: {
+                        // more:res["data"]["more"]
+                    }
+                };
+            },
+            escapeMarkup: function (markup) { return markup; },
+            // minimumInputLength: 1
         }
-
-    })
+    });
+    $('#enterpriseCode').on('select2:select', function (e) {
+        var data = e.params.data;
+        $("input[name='enterpriseName']").val(data.enterpriseName)
+        $("input[name='contactNumber']").val(data.contactNumber)
+        $("input[name='businessMembers']").val(data.businessMembers)
+        $("input[name='customerFax']").val(data.customerFax)
+        $("input[name='deliveryAddress']").val(data.deliveryAddress)
+        $("input[name='customerContact']").val(data.customerContact)
+        $("input[name='paymentTerms']").val(data.paymentTerms)
+    });
     //获取单号
     $.ajax({
         url: prefix + "/getId",
@@ -546,53 +574,8 @@
             $.modal.msgError("后台出错啦！");
         }
     });
-    $("select[name='enterpriseCode']").change(function () {
-        var enterpriseCode = $(this).val();
-        for (i = 0; i < customerodata.length; i++) {
-            if (customerodata[i].enterpriseCode === enterpriseCode) {
-                // console.log(customerodata)
-                $("input[name='enterpriseName']").val(customerodata[i].enterpriseName)
-                $("input[name='contactNumber']").val(customerodata[i].contactNumber)
-                // $("input[name='businessMembers']").val(customerodata[i].businessMembers)
-                $("input[name='customerFax']").val(customerodata[i].customerFax)
-                $("input[name='deliveryAddress']").val(customerodata[i].deliveryAddress)
-                $("input[name='customerContact']").val(customerodata[i].customerContact)
-                $("input[name='paymentTerms']").val(customerodata[i].paymentTerms)
-
-                if (customerodata[i].confirmTax == 1) {
-
-                    $("input[name='confirmTax']").val("是")
-
-                } else {
-                    $("input[name='confirmTax']").val("否")
 
-                }
-                $("input[name='taxRate']").val(customerodata[i].taxRate)
-                $.ajax({
-                    url: ctx + "system/shippingaddress/list",
-                    type: 'post',
-                    data: {
-                        enterpriseCode: enterpriseCode
-                    },
-                    success: function (res) {
-                        $("select[name='customerFactory']").empty();
-                        var data = res.rows;
-                        $("select[name='customerFactory']").append("<option value=''>请选择客户厂区</option>");
-                        for (let i in data) {
-                            // console.log(data[i].plantArea)
-                            if (data[i].plantArea!=="") {
-                                // console.log(data[i].plantArea!=="")
-                                $("select[name='customerFactory']").append("<option value='" + data[i].plantArea + "'>" + data[i].plantArea + "</option>");
-                            }
-                        }
-                    }
-                })
-
-            }
-        }
-    })
-
-    /*用户列表*/
+    /*获取用户列表*/
     $.ajax({
         url: ctx + 'system/user/list',
         type: 'post',
@@ -615,7 +598,6 @@
     })
 
     // 添加成品
-
     function addFinish() {
 
         if($("select[name='enterpriseCode']").val()==''||$("select[name='enterpriseCode']").val()==null){
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
index 8d595654..c4b7f0a1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html
@@ -100,48 +100,56 @@
             <form id="formId">
                 <div class="select-list">
                     <ul>
-                        <li class="select-time">
-                            <label>创建时间： </label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
-                            <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
-                        </li>
                         <li>
-                            <label>订单编号：</label>
+                            <label>销售单号：</label>
                             <input type="text" name="salesOrderCode"/>
                         </li>
                         <li>
-                            <label>订单号码：</label>
-                            <input type="text" name="salesOrderNumber"/>
+                            <label>客户ID：</label>
+                            <input type="text" name="customerCode"/>
+                        </li>
+                        <li>
+                            <label>客户公司名称：</label>
+                            <input type="text" name="enterpriseName"/>
                         </li>
-<!--                        <li>-->
-<!--                            <label>预约单号：</label>-->
-<!--                            <input type="text" name="appointmentNumber"/>-->
-<!--                        </li>-->
                         <li>
                             <label>客户代码：</label>
                             <input type="text" name="enterpriseCode"/>
                         </li>
                         <li>
-                            <label>客户名称：</label>
-
-                            <input type="text" name="enterpriseName"/>
-
+                            <label>客户公司单号：</label>
+                            <input type="text" name=""/>
+                        </li>
+                        <li>
+                            <label>料号：</label>
+                            <input type="text" name="materialCode"/>
+                        </li>
+                        <li>
+                            <label>物料名称：</label>
+                            <input type="text" name="materialCode"/>
+                        </li>
+                        <li>
+                            <label>审核状态：</label>
+                            <select name="deginFlag" th:with="type=${@dict.getType('auditStatus')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
                         </li>
                         <li>
-                            <label>联系人：</label>
-                            <input type="text" name="customerContact"/>
+                            <label>生产状态：</label>
+                            <input type="text" name=""/>
                         </li>
                         <li>
-                            <label>联系电话：</label>
-                            <input type="text" name="contactNumber"/>
+                            <label>出售状态：</label>
+                            <input type="text" name=""/>
                         </li>
                         <li>
-                            <label>业务人员：</label>
-                            <input type="text" name="businessMembers"/>
+                            <label>业务员：</label>
+                           <select name="businessMembers" >
+                            <option value=''>所有</option>
+                           </select>
                         </li>
                         <li>
-                            <label>结案否：</label>
+                            <label>收款结案状态：</label>
                             <select name="auditNo" th:with="type=${@dict.getType('sys_whether')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -156,12 +164,19 @@
                                         th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
+                        <li class="select-time">
+                            <label>录入时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                     class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
                         </li>
+
                     </ul>
                 </div>
             </form>
@@ -171,7 +186,7 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:salesOrder:add">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
+<!--            <a class="btn btn-primary single disabled" onclick="$.operate.edit()"
                shiro:hasPermission="system:salesOrder:edit">
                 <i class="fa fa-edit"></i> 修改
             </a>
@@ -188,9 +203,8 @@
                 <i class="fa fa-hand-grab-o"></i> 结案
             </a>
             <a class="btn btn-success" onclick="reviewConfirm()" shiro:hasPermission="system:salesOrder:confirm">
-
                 <i class="fa fa-hand-grab-o"></i> 确认
-            </a>
+            </a>-->
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table" style="white-space:nowrap"></table>
@@ -626,252 +640,265 @@
             exportUrl: prefix + "/export",
             clickToSelect: true,
             modalName: "销售订单",
+            rightFixedColumns: true,       // 是否启用冻结列（右侧）
+            fixedRightNumber: 1,
             columns: [{
                 checkbox: true
             },
-                {
-                    field: 'salesOrderId',
-                    title: '订单id',
-                    visible: false
-                },
-                {
-                    field: 'auditNo',
-                    title: '结案否',
-                    formatter: function (value, row, index) {
-                        // return $.table.selectDictLabel(auditNoDatas, value);
-                        var actions = [];
-                        if ($.table.selectDictLabel(auditNoDatas, value) == "<span class=''>是</span>") {
-                            actions.push('<a class="btn btn-primary btn-xs disabled">已结案</a> ');
-                        } else {
-                            actions.push('<a class="btn btn-danger btn-xs disabled">未结案</a> ');
-                        }
-                        return actions.join('');
-                    }
-                },
-                {
-                    field: 'confirmNo',
-                    title: '确认否',
-                    formatter: function (value, row, index) {
-                        // return $.table.selectDictLabel(confirmNoDatas, value);
-
-                        var actions = [];
-                        if ($.table.selectDictLabel(confirmNoDatas, value) == "<span class=''>是</span>") {
-                            actions.push('<a class="btn btn-primary btn-xs disabled">已确认</a> ');
-                        } else {
-                            actions.push('<a class="btn btn-danger btn-xs disabled">未确认</a> ');
-                        }
-                        return actions.join('');
-                    }
-                },
-
-                {
-                    field: 'salesOrderCode',
-                    title: '订单编号'
-                },
-                {
-                    field: 'salesOrderNumber',
-                    title: '订单号码'
-                },
-                // {
-                //     field: 'appointmentNumber',
-                //     title: '预约单号'
-                // },
-                {
-                    field: 'enterpriseCode',
-                    title: '客户代码'
-                },
-                {
-                    field: 'enterpriseName',
-                    title: '客户名称'
-                },
-                {
-                    field: 'paymentTerms',
-                    title: '付款条件'
-                },
-                {
-                    field: 'deliveryConditions',
-                    title: '交货条件'
-                },
-                {
-                    field: 'deliveryMethod',
-                    title: '交货方式'
-                },
-                {
-                    field: 'orderReceivingMode',
-                    title: '接单方式'
-                },
-                {
-                    field: 'customerContact',
-                    title: '联系人'
-                },
-                {
-                    field: 'customerFactory',
-                    title: '客户厂区'
-                },
-                {
-                    field: 'contactNumber',
-                    title: '联系电话'
-                },
-                {
-                    field: 'businessMembers',
-                    title: '业务人员',
-                    visible: false
-
-                },
-                {
-                    field: 'customerFax',
-                    title: '传真号码'
-                },
-                {
-                    field: 'deliveryAddress',
-                    title: '交货地点'
-                },
-                {
-                    field: 'orderReceivingTime',
-                    title: '接单日期',
-                    visible: false
-
-                },
-                {
-                    field: 'billingTime',
-                    title: '开单日期时间',
-                    visible: false
-
-                },
-                {
-                    field: 'customerRemarks',
-                    title: '备注内容',
-                    visible: false
-
-                },
-                {
-                    field: 'currentInventory',
-                    title: '当前库存数',
-
-
-                },
-                {
-                    field: 'creditLimit',
-                    title: '信用额度'
-                },
-                {
-                    field: 'unpaidAmount',
-                    title: '未付款数'
-                },
-                {
-                    field: 'availableCredit',
-                    title: '可用额度'
-                },
-                {
-                    field: 'confirmTax',
-                    title: '是否含税',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(confirmTaxDatas, value);
-                    }
-                },
-                {
-                    field: 'taxRate',
-                    title: '税率'
-                },
-                {
-                    field: 'totalAmount',
-                    title: '合计金额'
-                },
-                {
-                    field: 'fileUpload',
-                    title: '文件存储',
-                    formatter: function(value, row, index) {
-                        var filepath = value.substring(value.lastIndexOf("/")+1)
-                        var actions = [];
-                        actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
-                        return actions.join('');
+            {
+                field: 'salesOrderId',
+                title: '订单id',
+                visible: false
+            },
+            {
+                field: '',
+                title: '使用状态',
+            },
+            {
+                field: '',
+                title: '生产状态',
+            },
+            {
+                field: '',
+                title: '出货状态',
+            },
+            {
+                field: 'auditNo',
+                title: '收款结案状态',
+                formatter: function (value, row, index) {
+                    var actions = [];
+                    if ($.table.selectDictLabel(auditNoDatas, value) == "<span class=''>是</span>") {
+                        actions.push('<a class="btn btn-primary btn-xs disabled">已结案</a> ');
+                    } else {
+                        actions.push('<a class="btn btn-danger btn-xs disabled">未结案</a> ');
                     }
-                },
-                {
-                    field: 'modificationTime',
-                    title: '修改日期',
-                    visible: false
-
-                },
+                    return actions.join('');
+                }
+            },
 
-                {
-                    field: 'auditName',
-                    title: '结案人',
-                    visible: false
+            {
+                field: 'customerPhone',
+                title: '客户电话',
+                sortable: true
+            },
+            {
+                field: 'businessMembers',
+                title: '业务人员',
+                visible: false
+            },
+            {
+                field: 'salesOrderCode',
+                title: '销售单号'
+            },
+            {
+                field: 'salesOrderStatus',
+                title: '订单类型',
+            },
+            {
+                field: 'enterpriseCode',
+                title: '客户ID'
+            },
+            {
+                field: 'enterpriseName',
+                title: '客户名称'
+            },
+            {
+                field: 'salesOrderNumber',
+                title: '客户订单号'
+            },
+            {
+                field: '',
+                title: '物料合计'
+            },
+            {
+                field: '',
+                title: '数量合计'
+            },
+            {
+                field: 'noRmbSum',
+                title: '不含税总价(RMB)'
+            },
+            {
+                field: 'rmbSum',
+                title: '含税总价(RMB)'
+            },
+            {
+                field: 'noUsdSum',
+                title: '不含税总价(美元)'
+            },
+            {
+                field: 'usdSum',
+                title: '含税总价(美元)'
+            },
+            {
+                field:'',
+                title: '交付时间'
+            },
+            {
+                field: 'paymentTerms',
+                title: '付款条件'
+            },
+            {
+                field: 'deliveryConditions',
+                title: '交货条件'
+            },
+            {
+                field: 'customerContact',
+                title: '联系人'
+            },
+            {
+                field: 'contactNumber',
+                title: '联系电话'
+            },
+            {
+                field: 'customerFax',
+                title: '传真号码',
+                visible: false
+            },
+            {
+                field: 'deliveryAddress',
+                title: '收货地址'
+            },
+            {
+                field: 'orderReceivingTime',
+                title: '接单日期',
+                visible: false
+            },
+            {
+                field: 'orderReceivingMode',
+                title: '接单方式',
+                visible: false
+            },
+            {
+                field: 'deliveryMethod',
+                title: '交货方式',
+                visible: false
+            },
+            {
+                field: 'billingTime',
+                title: '开单日期时间',
+                visible: false
 
-                },
-                {
-                    field: 'auditTime',
-                    title: '结案时间',
-                    visible: false
+            },
+            {
+                field: 'customerRemarks',
+                title: '备注内容',
+                visible: false
+            },
+            {
+                field: 'currentInventory',
+                title: '待出库数',
+            },
+            {
+                field: '',
+                title: '已出库数',
+            },
+            {
+                field: 'confirmTax',
+                title: '是否含税',
+                visible: false,
+                formatter: function (value, row, index) {
+                    return $.table.selectDictLabel(confirmTaxDatas, value);
+                }
+            },
+            {
+                field: 'taxRate',
+                title: '税率',
+                visible:  false
+            },
+            {
+                field: 'totalAmount',
+                title: '合计金额',
+                visible: false
+            },
+            {
+                field: 'fileUpload',
+                title: '文件存储',
+                formatter: function(value, row, index) {
+                    var filepath = value.substring(value.lastIndexOf("/")+1)
+                    var actions = [];
+                    actions.push('<a href="javascript:void(0)" onclick="downloadFile(\'' + value + '\')">'+filepath+'</a> ');
+                    return actions.join('');
+                }
+            },
 
-                },
-                {
-                    field: 'auditRemarks',
-                    title: '结案备注',
-                    visible: false
+            {
+                field: 'auditName',
+                title: '结案人',
+                visible: false
 
+            },
+            {
+                field: 'auditTime',
+                title: '结案时间',
+                visible: false
 
-                },
-                {
-                    field: 'confirmTime',
-                    title: '确认日期',
-                    visible: false
+            },
+            {
+                field: 'auditRemarks',
+                title: '结案备注',
+                visible: false
 
-                },
 
-                {
-                    field: 'confirmName',
-                    title: '确认人',
-                    visible: false
+            },
+            {
+                field: 'confirmTime',
+                title: '确认日期',
+                visible: false
 
-                },
-                {
-                    field: 'standbyOne',
-                    title: '备用一',
-                    visible: false
+            },
 
-                },
-                {
-                    field: 'standbyTwo',
-                    title: '备用二',
-                    visible: false
+            {
+                field: 'confirmName',
+                title: '确认人',
+                visible: false
 
-                },
-                {
-                    field: 'firstAddTime',
-                    title: '录入时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            return value;
-                        }
+            },
+            {
+                field: 'standbyOne',
+                title: '实收金额(RMB)',
+            },
+            {
+                field: 'standbyTwo',
+                title: '实收金额(美元)',
+            },
+            {
+                field: 'firstAddTime',
+                title: '录入时间',
+                formatter: function (value, row, index) {
+                    if (value == null) {
+                        return " ";
+                    } else {
+                        return value;
                     }
-                },
-                {
-                    field: 'updateInfoTime',
-                    title: '上次修改时间',
-                    formatter: function (value, row, index) {
-                        if (value == null) {
-                            return " ";
-                        } else {
-                            var vArr = value.split(',')
-                            return vArr[0];
-                        }
+                }
+            },
+            {
+                field: 'updateInfoName',
+                title: '更新人',
+            },
+            {
+                field: 'updateInfoTime',
+                title: '更新时间',
+                formatter: function (value, row, index) {
+                    if (value == null) {
+                        return " ";
+                    } else {
+                        var vArr = value.split(',')
+                        return vArr[0];
                     }
                 }
-                // {
-                //     title: '操作',
-                //     align: 'center',
-                //     formatter: function (value, row, index) {
-                //         var actions = [];
-                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.salesOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.salesOrderId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                //         return actions.join('');
-                //     }
-                // }
-                ]
+            },
+            {
+                title: '操作',
+                align: 'center',
+                formatter: function (value, row, index) {
+                    var actions = [];
+                    actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.salesOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.salesOrderId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                    return actions.join('');
+                }
+            }]
         };
         $.table.init(options);
     });
@@ -901,8 +928,6 @@
 
     }*/
 
-
-
     //结案
     function reviewAudit() {
         let data = $("#bootstrap-table").bootstrapTable("getSelections");
diff --git a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
index 7fa2627a..686cbadd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
+++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
@@ -80,7 +80,6 @@
                 {
                     field: 'deliveryId',
                     title: '送货id',
-                    visible: false
                 },
                 {
                     field: 'enterpriseCode',