From 7f04f17507063dbd922055bf5dcd1190da686071 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 18 十二月 2025 14:27:46 +0800
Subject: [PATCH] #客户+部门

---
 src/main/webapp/views/orderPakin/order.html                     |  164 +++++----
 src/main/java/com/zy/asrs/controller/OrderPakinController.java  |   35 +
 src/main/java/com/zy/asrs/entity/OrderPakin.java                |    4 
 src/main/java/com/zy/asrs/entity/OrderPakout.java               |    4 
 src/main/java/com/zy/asrs/entity/Order.java                     |    4 
 src/main/webapp/views/orderPakout/order.html                    |  164 +++++----
 src/main/java/com/zy/asrs/controller/OrderPakoutController.java |   23 +
 src/main/java/com/zy/asrs/entity/OrderPakinLog.java             |    4 
 src/main/webapp/static/js/orderPakout/order.js                  |  295 ++++++++++------
 src/main/java/com/zy/asrs/entity/OrderPakoutLog.java            |    4 
 src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java    |    5 
 src/main/java/com/zy/system/timer/LoadingConfigTimer.java       |    2 
 src/main/java/com/zy/asrs/entity/OrderLog.java                  |    6 
 src/main/webapp/static/js/order/order.js                        |    1 
 src/main/webapp/static/js/orderPakin/order.js                   |  295 ++++++++++------
 15 files changed, 601 insertions(+), 409 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index e136ea0..4b61e60 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -42,6 +42,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private WrkMastLogService wrkMastLogService;
+    @Autowired
+    private ClientService clientService;
 
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
@@ -112,19 +114,23 @@
         if (order != null) {
             return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
         }
+        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+        if (null == client){
+            return R.error("瀹㈡埛涓嶅瓨鍦�");
+        }
         Date now = new Date();
         order = new OrderPakin(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
                 param.getOrderNo(),    // 璁㈠崟缂栧彿
-                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+                param.getOrderTime(),    // 鍗曟嵁鏃ユ湡
                 param.getDocType(),    // 鍗曟嵁绫诲瀷
                 null,    // 椤圭洰缂栧彿
                 null,    //
                 null,    // 璋冩嫧椤圭洰缂栧彿
                 null,    // 鍒濆绁ㄦ嵁鍙�
                 null,    // 绁ㄦ嵁鍙�
-                null,    // 瀹㈡埛缂栧彿
-                null,    // 瀹㈡埛
+                client.getCode(),    // 瀹㈡埛缂栧彿
+                client.getName(),    // 瀹㈡埛
                 null,    // 鑱旂郴鏂瑰紡
                 null,    // 鎿嶄綔浜哄憳
                 null,    // 鍚堣閲戦
@@ -194,14 +200,23 @@
         }
         Date now = new Date();
         Long userId = getUserId();
+        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+        if (null == client){
+            return R.error("瀹㈡埛涓嶅瓨鍦�");
+        }
+        order.setCstmr(client.getCode());
+        order.setCstmrName(client.getName());
         // 淇敼涓绘。
-        if (!param.getDocType().equals(order.getDocType())) {
+        if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
+
             order.setDocType(param.getDocType());
-            order.setUpdateBy(userId);
-            order.setUpdateTime(now);
-            if (!orderService.updateById(order)) {
-                throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
-            }
+            order.setOrderTime(param.getOrderTime());
+
+        }
+        order.setUpdateBy(userId);
+        order.setUpdateTime(now);
+        if (!orderService.updateById(order)) {
+            throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
         }
         // 淇敼鏄庣粏妗�
 //        List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
@@ -310,7 +325,7 @@
                 .add("list", wrkTraceVos)
                 .add("orderNo", order.getOrderNo())
                 .add("totalQty", totalQty)
-                .add("wrkQty", wrkQty + endQty)
+                .add("wrkQty", wrkQty)
                 .add("lackQty", lackQty)
                 .add("endQty", endQty)
         );
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 9907431..461175e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -42,6 +42,8 @@
     private WrkMastService wrkMastService;
     @Autowired
     private WrkMastLogService wrkMastLogService;
+    @Autowired
+    private ClientService clientService;
 
     @RequestMapping(value = "/order/nav/list/auth")
     @ManagerAuth
@@ -112,19 +114,23 @@
         if (order != null) {
             return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
         }
+        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+        if (null == client){
+            return R.error("瀹㈡埛涓嶅瓨鍦�");
+        }
         Date now = new Date();
         order = new OrderPakout(
                 String.valueOf(snowflakeIdWorker.nextId()),    // 缂栧彿[闈炵┖]
                 param.getOrderNo(),    // 璁㈠崟缂栧彿
-                DateUtils.convert(now),    // 鍗曟嵁鏃ユ湡
+                param.getOrderTime(),    // 鍗曟嵁鏃ユ湡
                 param.getDocType(),    // 鍗曟嵁绫诲瀷
                 null,    // 椤圭洰缂栧彿
                 null,    //
                 null,    // 璋冩嫧椤圭洰缂栧彿
                 null,    // 鍒濆绁ㄦ嵁鍙�
                 null,    // 绁ㄦ嵁鍙�
-                null,    // 瀹㈡埛缂栧彿
-                null,    // 瀹㈡埛
+                client.getCode(),    // 瀹㈡埛缂栧彿
+                client.getName(),    // 瀹㈡埛
                 null,    // 鑱旂郴鏂瑰紡
                 null,    // 鎿嶄綔浜哄憳
                 null,    // 鍚堣閲戦
@@ -192,9 +198,16 @@
         }
         Date now = new Date();
         Long userId = getUserId();
+        Client client = clientService.selectOne(new EntityWrapper<Client>().eq("name", param.getCstmrName()));
+        if (null == client){
+            return R.error("瀹㈡埛涓嶅瓨鍦�");
+        }
         // 淇敼涓绘。
-        if (!param.getDocType().equals(order.getDocType())) {
+        if (!param.getDocType().equals(order.getDocType()) || !param.getOrderTime().equals(order.getOrderTime())) {
+            order.setCstmr(client.getCode());
+            order.setCstmrName(client.getName());
             order.setDocType(param.getDocType());
+            order.setOrderTime(param.getOrderTime());
             order.setUpdateBy(userId);
             order.setUpdateTime(now);
             if (!orderService.updateById(order)) {
@@ -307,7 +320,7 @@
                 .add("list", wrkTraceVos)
                 .add("orderNo", order.getOrderNo())
                 .add("totalQty", totalQty)
-                .add("wrkQty", wrkQty + endQty)
+                .add("wrkQty", wrkQty)
                 .add("lackQty", lackQty)
                 .add("endQty", endQty)
         );
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index f0784c8..74eb840 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -279,7 +279,7 @@
     public Order() {
     }
 
-    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderLog.java b/src/main/java/com/zy/asrs/entity/OrderLog.java
index 387a427..db8108d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -279,7 +279,7 @@
     public OrderLog() {
     }
 
-    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
@@ -316,7 +316,7 @@
         this.memo = memo;
     }
 
-    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
+    public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakin.java b/src/main/java/com/zy/asrs/entity/OrderPakin.java
index 4a395d5..53bdc2d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakin.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -277,7 +277,7 @@
     private Integer pakinPakoutStatus;
 
 
-    public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index a61321b..1d06134 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -279,7 +279,7 @@
     public OrderPakinLog() {
     }
 
-    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index a9ee821..51963b0 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -279,7 +279,7 @@
     public OrderPakout() {
     }
 
-    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
index cba4446..418e3e7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
@@ -94,7 +94,7 @@
      * 瀹㈡埛缂栧彿
      */
     @ApiModelProperty(value = "瀹㈡埛缂栧彿")
-    private Long cstmr;
+    private String cstmr;
 
     /**
      * 瀹㈡埛
@@ -279,7 +279,7 @@
     public OrderPakoutLog() {
     }
 
-    public OrderPakoutLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+    public OrderPakoutLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, String cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
         this.uuid = uuid;
         this.orderNo = orderNo;
         this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
index 352cfe3..12d40f7 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -5,6 +5,7 @@
 import com.zy.asrs.entity.OrderDetlPakout;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,6 +20,10 @@
 
     private String orderNo;
 
+    private String orderTime;
+
+    private String cstmrName;
+
     private List<OrderDetl> orderDetlList;
     private List<OrderDetlPakin> orderDetlPakinList;
     private List<OrderDetlPakout> orderDetlPakoutList;
diff --git a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
index e9760c4..49b4f83 100644
--- a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
+++ b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -18,7 +18,7 @@
     /**
      * token鏈夋晥鏈熸椂闂�
      */
-    private Integer tokenExpire = 1000 * 30 * 60;
+    private Integer tokenExpire = 100000 * 30 * 60;
     /**
      * token鏁伴噺闄愬埗
      */
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6345ea7..13e0430 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,6 +43,7 @@
         cols: [[
             {type: 'numbers'},
             {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+            {field: 'orderTime', align: 'center', title: '涓氬姟鏃堕棿' },
             {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
             {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
             {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
diff --git a/src/main/webapp/static/js/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 2492f3e..0293607 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -14,22 +14,22 @@
 
     // 娓叉煋鎼滅储妯℃澘
     $.ajax({
-        url: baseUrl+"/docType/list/auth",
-        headers: {'token': localStorage.getItem('token')},
+        url: baseUrl + "/docType/list/auth",
+        headers: { 'token': localStorage.getItem('token') },
         data: {
             limit: 9999,
             pakin: 1
         },
         method: 'POST',
         success: function (res) {
-            if (res.code === 200){
+            if (res.code === 200) {
                 let template = Handlebars.compile($('#docTypeTpl').html());
                 $('#docType-query').html(template(res.data));
                 layui.form.render('select');
-            } else if (res.code === 403){
-                top.location.href = baseUrl+"/";
+            } else if (res.code === 403) {
+                top.location.href = baseUrl + "/";
             } else {
-                layer.msg(res.msg, {icon: 2})
+                layer.msg(res.msg, { icon: 2 })
             }
         }
     })
@@ -37,19 +37,21 @@
     // 娓叉煋琛ㄦ牸
     var insTb = table.render({
         elem: '#order',
-        url: baseUrl+'/order/pakin/order/head/page/auth',
-        headers: {token: localStorage.getItem('token')},
+        url: baseUrl + '/order/pakin/order/head/page/auth',
+        headers: { token: localStorage.getItem('token') },
         page: true,
         cellMinWidth: 100,
         cols: [[
-            {type: 'numbers'},
-            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
-            {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
-            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
-            {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
-            {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
-            {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
-            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+            { type: 'numbers' },
+            { field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl' },
+            { field: 'orderTime', align: 'center', title: '涓氬姟鏃堕棿', },
+            { field: 'cstmrName', align: 'center', title: '瀹㈡埛', },
+            { field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160 },
+            { align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
+            { field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200 },
+            { field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160 },
+            { field: 'memo', align: 'center', title: '澶囨敞', hide: true },
+            { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180 }
         ]],
         request: {
             pageName: 'curr',
@@ -69,7 +71,7 @@
         done: function (res, curr, count) {
             limit();
             if (res.code === 403) {
-                top.location.href = baseUrl+"/";
+                top.location.href = baseUrl + "/";
             }
             insTbCount = count;
         }
@@ -77,7 +79,7 @@
 
     // 鎼滅储
     form.on('submit(tbSearch)', function (data) {
-        insTb.reload({where: data.field, page: {curr: 1}});
+        insTb.reload({ where: data.field, page: { curr: 1 } });
     });
 
     // 娣诲姞
@@ -114,21 +116,21 @@
                 success: function (layero) {
                     table.render({
                         elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/order/pakin/orderDetl/list/auth',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/order/pakin/orderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
                         cellMinWidth: 100,
                         cols: [[
-                            {type: 'numbers'},
-                            {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
-                            {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            {field: 'batch', title: '鎵瑰彿'},
-                            {field: 'anfme', title: '鏁伴噺'},
-                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
-                            {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+                            { type: 'numbers' },
+                            { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                            { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+                            { field: 'batch', title: '鎵瑰彿' },
+                            { field: 'anfme', title: '鏁伴噺' },
+                            { field: 'workQty', title: '浣滀笟鏁伴噺' },
+                            { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -137,7 +139,7 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'}
+                            { field: 'specs', title: '瑙勬牸' }
                         ]],
                         request: {
                             pageName: 'curr',
@@ -179,46 +181,103 @@
                 if (expTpe) {
                     $('#orderNo').attr("disabled", "disabled");
                 }
+                // 鍒濆鍖栦笟鍔℃椂闂存棩鏈熼�夋嫨鍣�
+                layDate.render({
+                    elem: '#orderTime',
+                    type: 'datetime',
+                    format: 'yyyy-MM-dd HH:mm:ss'
+                });
+                // 鍒濆鍖栧鎴烽�夋嫨鍣�
+                var cstmrData = [];
+                $.ajax({
+                    url: baseUrl + "/client/list/auth",
+                    headers: { 'token': localStorage.getItem('token') },
+                    data: { limit: 9999 },
+                    method: 'POST',
+                    async: false,
+                    success: function (res) {
+                        if (res.code === 200) {
+                            // 杞崲涓� xmSelect 闇�瑕佺殑鏍煎紡
+                            res.data.records.forEach(function (item) {
+                                cstmrData.push({
+                                    name: item.name,
+                                    value: item.code
+                                });
+                            });
+                        } else {
+                            layer.msg(res.msg, { icon: 2 });
+                        }
+                    }
+                });
+                var cstmrXmSelect = xmSelect.render({
+                    el: '#cstmrSelect',
+                    radio: true,
+                    clickClose: true,
+                    filterable: true,
+                    create: function (val, arr) {
+                        if (arr.length === 0) {
+                            return {
+                                name: val,
+                                value: val
+                            }
+                        }
+                    },
+                    model: {
+                        icon: 'hidden',
+                        label: {
+                            type: 'text',
+                        }
+                    },
+                    data: cstmrData,
+                    initValue: expTpe && expTpe.cstmr ? [expTpe.cstmr] : []
+                });
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(orderEditSubmit)', function (data) {
+                    // 楠岃瘉瀹㈡埛蹇呴��
+                    if (!cstmrXmSelect.getValue()[0]) {
+                        layer.msg('璇烽�夋嫨瀹㈡埛', { icon: 2 });
+                        return false;
+                    }
                     // 缁勮鏁版嵁
                     if (xxDataList.length <= 0) {
-                        layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+                        layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', { tips: [1, '#ff4c4c'] });
                         return false;
                     }
                     let nList = admin.util.deepClone(xxDataList);
                     for (let xi = 0; xi < nList.length; xi++) {
-                        if (nList[xi].anfme <= 0){
-                            layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+                        if (nList[xi].anfme <= 0) {
+                            layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', { icon: 2 });
                             return false;
                         }
-                        if (nList[xi].anfme < nList[xi].workQty){
-                            layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
+                        if (nList[xi].anfme < nList[xi].workQty) {
+                            layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', { icon: 2 });
                             return false;
                         }
                     }
                     layer.load(2);
                     $.ajax({
-                        url: baseUrl+"/order/pakin/order/form/" + (isExpAdd?"add":"modify") + "/auth",
-                        headers: {'token': localStorage.getItem('token')},
+                        url: baseUrl + "/order/pakin/order/form/" + (isExpAdd ? "add" : "modify") + "/auth",
+                        headers: { 'token': localStorage.getItem('token') },
                         data: JSON.stringify({
                             orderId: Number(data.field.id),
                             docType: Number(data.field.docType),
                             orderNo: data.field.orderNo,
+                            cstmrName: cstmrXmSelect.getValue()[0] ? cstmrXmSelect.getValue()[0].name : null,
+                            orderTime: data.field.orderTime,
                             orderDetlPakinList: nList
                         }),
-                        contentType:'application/json;charset=UTF-8',
+                        contentType: 'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
                             layer.closeAll('loading');
-                            if (res.code === 200){
+                            if (res.code === 200) {
                                 layer.close(dIndex);
                                 $(".layui-laypage-btn")[0].click();
-                                layer.msg(res.msg, {icon: 1});
-                            } else if (res.code === 403){
-                                top.location.href = baseUrl+"/";
-                            }else {
-                                layer.msg(res.msg, {icon: 2});
+                                layer.msg(res.msg, { icon: 1 });
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg, { icon: 2 });
                             }
                         }
                     })
@@ -228,22 +287,22 @@
                 var xxDataList = [];
                 var tbOptions = {
                     elem: '#formSSXMTable',
-                    headers: {token: localStorage.getItem('token')},
+                    headers: { token: localStorage.getItem('token') },
                     data: xxDataList,
                     page: true,
                     height: '350px;',
                     cellMinWidth: 100,
                     cols: [[
-                        {type: 'numbers', title: '#'},
-                        {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
-                        {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
-                        {field: 'batch', title: '鎵瑰彿', edit: true},
-                        {field: 'specs', title: '瑙勬牸'},
-                        {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
-                        {field: 'workQty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
+                        { type: 'numbers', title: '#' },
+                        { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                        { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200 },
+                        { field: 'batch', title: '鎵瑰彿', edit: true },
+                        { field: 'specs', title: '瑙勬牸' },
+                        { field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110 },
+                        { field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100 },
                         // {field: 'unit', title: '鍗曚綅', width: 80},
-                        {field: 'memo', title: '澶囨敞' , edit: true},
-                        {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
+                        { field: 'memo', title: '澶囨敞', edit: true },
+                        { align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right' }
                     ]],
                     done: function (res) {
                         $(layero).find('.layui-table-view').css('margin', '0');
@@ -252,18 +311,18 @@
                 };
                 if (!isExpAdd) {
                     $.ajax({
-                        url: baseUrl+"/order/pakin/order/detl/all/auth?orderId=" + expTpe.id,
-                        headers: {'token': localStorage.getItem('token')},
+                        url: baseUrl + "/order/pakin/order/detl/all/auth?orderId=" + expTpe.id,
+                        headers: { 'token': localStorage.getItem('token') },
                         method: 'GET',
                         async: false,
                         success: function (res) {
-                            if (res.code === 200){
+                            if (res.code === 200) {
                                 xxDataList = res.data;
                                 tbOptions.data = xxDataList;
-                            } else if (res.code === 403){
-                                top.location.href = baseUrl+"/";
-                            }else {
-                                layer.msg(res.msg, {icon: 2})
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg, { icon: 2 })
                             }
                         }
                     })
@@ -276,8 +335,8 @@
                     if (layEvent === 'edit') {
                         showEditModel2(data);
                     } else if (layEvent === 'del') {
-                        if(data.workQty > 0){
-                            layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2});
+                        if (data.workQty > 0) {
+                            layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", { icon: 2 });
                             return;
                         }
                         layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
@@ -291,7 +350,7 @@
                                     break;
                                 }
                             }
-                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+                            insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
                         });
                     }
                 });
@@ -299,20 +358,20 @@
                 table.on('edit(formSSXMTable)', function (obj) {
                     let index = obj.tr.attr("data-index");
                     let data = xxDataList[index];
-                    if (obj.field === 'anfme'){
+                    if (obj.field === 'anfme') {
                         let vle = Number(obj.value);
                         if (isNaN(vle)) {
-                            layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+                            layer.msg("璇疯緭鍏ユ暟瀛�", { icon: 2 });
                             return false;
                         } else {
                             if (vle <= 0) {
-                                layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+                                layer.msg("鏁伴噺蹇呴』澶т簬闆�", { icon: 2 });
                                 // data[obj.field] = 0;
                                 // insTbSSXM.reload({data: xxDataList});
                                 return false;
                             }
-                            if(obj.value < data.workQty){
-                                layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2});
+                            if (obj.value < data.workQty) {
+                                layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", { icon: 2 });
                                 // data[obj.field] = 0;
                                 // insTbSSXM.reload({data: xxDataList});
                                 return false;
@@ -320,7 +379,7 @@
                         }
                     }
                     data[obj.field] = obj.value;
-                    insTbSSXM.reload({data: xxDataList});
+                    insTbSSXM.reload({ data: xxDataList });
                 });
 
                 $('#matAddBtnComment').click(function () {
@@ -341,22 +400,22 @@
                             // 琛ㄥ崟鎻愪氦浜嬩欢
                             form.on('submit(matEditSubmit)', function (data) {
                                 let selectList = matXmSelect.getValue();
-                                for (let i = 0; i<selectList.length; i++) {
+                                for (let i = 0; i < selectList.length; i++) {
                                     let item = selectList[i];
                                     // 鏌ヨ鐗╂枡璇︽儏
                                     $.ajax({
-                                        url: baseUrl+"/mat/covert/"+item.value+"/auth",
-                                        headers: {'token': localStorage.getItem('token')},
+                                        url: baseUrl + "/mat/covert/" + item.value + "/auth",
+                                        headers: { 'token': localStorage.getItem('token') },
                                         method: 'GET',
                                         async: false,
                                         success: function (res) {
-                                            if (res.code === 200){
+                                            if (res.code === 200) {
                                                 xxDataList.push(res.data);
-                                                insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
-                                            } else if (res.code === 403){
-                                                top.location.href = baseUrl+"/";
-                                            }else {
-                                                layer.msg(res.msg, {icon: 2})
+                                                insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
+                                            } else if (res.code === 403) {
+                                                top.location.href = baseUrl + "/";
+                                            } else {
+                                                layer.msg(res.msg, { icon: 2 })
                                             }
                                         }
                                     })
@@ -374,20 +433,20 @@
                                 toolbar: { show: true },
                                 filterable: true,
                                 remoteSearch: true,
-                                remoteMethod: function(val, cb, show){
+                                remoteMethod: function (val, cb, show) {
                                     $.ajax({
-                                        url: baseUrl+"/mat/all/get/kv",
-                                        headers: {'token': localStorage.getItem('token')},
+                                        url: baseUrl + "/mat/all/get/kv",
+                                        headers: { 'token': localStorage.getItem('token') },
                                         data: {
                                             condition: val
                                         },
                                         method: 'POST',
                                         success: function (res) {
-                                            if (res.code === 200){
+                                            if (res.code === 200) {
                                                 cb(res.data)
                                             } else {
                                                 cb([]);
-                                                layer.msg(res.msg, {icon: 2});
+                                                layer.msg(res.msg, { icon: 2 });
                                             }
                                         }
                                     });
@@ -413,25 +472,25 @@
             layer.close(i);
             layer.load(2);
             $.ajax({
-                url: baseUrl+"/order/pakin/order/delete/auth",
-                headers: {'token': localStorage.getItem('token')},
+                url: baseUrl + "/order/pakin/order/delete/auth",
+                headers: { 'token': localStorage.getItem('token') },
                 data: {
                     orderId: orderId
                 },
                 method: 'POST',
                 success: function (res) {
                     layer.closeAll('loading');
-                    if (res.code === 200){
+                    if (res.code === 200) {
                         if (insTbCount === 0) {
-                            insTb.reload({page: {curr: 1}});
+                            insTb.reload({ page: { curr: 1 } });
                         } else {
                             $(".layui-laypage-btn")[0].click();
                         }
-                        layer.msg(res.msg, {icon: 1});
-                    } else if (res.code === 403){
-                        top.location.href = baseUrl+"/";
-                    }else {
-                        layer.msg(res.msg, {icon: 2});
+                        layer.msg(res.msg, { icon: 1 });
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/";
+                    } else {
+                        layer.msg(res.msg, { icon: 2 });
                     }
                 }
             })
@@ -449,8 +508,8 @@
             console.log(orderId);
             console.log(settle);
             $.ajax({
-                url: baseUrl+"/order/pakin/order/update/auth",
-                headers: {'token': localStorage.getItem('token')},
+                url: baseUrl + "/order/pakin/order/update/auth",
+                headers: { 'token': localStorage.getItem('token') },
                 data: {
                     id: orderId,
                     orderNo: orderNo,
@@ -459,17 +518,17 @@
                 method: 'POST',
                 success: function (res) {
                     layer.closeAll('loading');
-                    if (res.code === 200){
+                    if (res.code === 200) {
                         if (insTbCount === 0) {
-                            insTb.reload({page: {curr: 1}});
+                            insTb.reload({ page: { curr: 1 } });
                         } else {
                             $(".layui-laypage-btn")[0].click();
                         }
-                        layer.msg(res.msg, {icon: 1});
-                    } else if (res.code === 403){
-                        top.location.href = baseUrl+"/";
-                    }else {
-                        layer.msg(res.msg, {icon: 2});
+                        layer.msg(res.msg, { icon: 1 });
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/";
+                    } else {
+                        layer.msg(res.msg, { icon: 2 });
                     }
                 }
             })
@@ -478,17 +537,17 @@
 
     // 浠诲姟杩芥函
     function showWrkTrace(orderId) {
-        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        let loadIndex = layer.msg('璇锋眰涓�...', { icon: 16, shade: 0.01, time: false });
         $.ajax({
-            url: baseUrl+"/order/pakin/order/wrk/trace/auth",
-            headers: {'token': localStorage.getItem('token')},
+            url: baseUrl + "/order/pakin/order/wrk/trace/auth",
+            headers: { 'token': localStorage.getItem('token') },
             data: {
                 orderId: orderId
             },
             method: 'POST',
             success: function (res) {
                 layer.close(loadIndex);
-                if (res.code === 200){
+                if (res.code === 200) {
                     laytpl(wrkTraceDialog.innerHTML).render(res.data, function (html) {
                         admin.open({
                             type: 1,
@@ -503,26 +562,26 @@
                                 var traceOptions = {
                                     title: {
                                         text: '鎬婚噺/浣滀笟/瀹屾垚', x: 'center', y: '38%',
-                                        textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
-                                        subtextStyle: {fontSize: 36, color: '#10B4E8'},
+                                        textStyle: { fontSize: 18, color: '#262626', fontWeight: 'normal' },
+                                        subtextStyle: { fontSize: 36, color: '#10B4E8' },
                                         itemGap: 20
                                     },
                                     color: ['#10B4E8', '#E0E0E0', '#FF0000'],
-                                    tooltip: {trigger: 'item'},
-                                    series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+                                    tooltip: { trigger: 'item' },
+                                    series: [{ name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: { normal: { show: false } } }]
                                 };
                                 traceCharts.setOption(traceOptions);
                                 // 璧嬪��
                                 traceCharts.setOption({
                                     title: {
-                                        subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+                                        subtext: res.data.totalQty + "/" + res.data.wrkQty + "/" + res.data.endQty
                                     },
                                     series: [
                                         {
                                             data: [
-                                                {name: '宸蹭綔涓�', value: res.data.wrkQty},
-                                                {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
-                                                {name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
+                                                { name: '宸蹭綔涓�', value: res.data.wrkQty },
+                                                { name: '鏈綔涓�', value: res.data.totalQty - res.data.wrkQty - res.data.lackQty },
+                                                { name: '搴撳瓨涓嶈冻', value: res.data.lackQty },
                                             ]
                                         }
                                     ]
@@ -530,10 +589,10 @@
                             }
                         });
                     });
-                } else if (res.code === 403){
-                    top.location.href = baseUrl+"/";
-                }else {
-                    layer.msg(res.msg, {icon: 2});
+                } else if (res.code === 403) {
+                    top.location.href = baseUrl + "/";
+                } else {
+                    layer.msg(res.msg, { icon: 2 });
                 }
             }
         })
@@ -541,7 +600,7 @@
 
     layDate.render({
         elem: '.layui-laydate-range'
-        ,type: 'datetime'
-        ,range: true
+        , type: 'datetime'
+        , range: true
     });
 });
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index eddda0f..03cdccc 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -14,22 +14,22 @@
 
     // 娓叉煋鎼滅储妯℃澘
     $.ajax({
-        url: baseUrl+"/docType/list/auth",
-        headers: {'token': localStorage.getItem('token')},
+        url: baseUrl + "/docType/list/auth",
+        headers: { 'token': localStorage.getItem('token') },
         data: {
             limit: 9999,
             pakout: 1
         },
         method: 'POST',
         success: function (res) {
-            if (res.code === 200){
+            if (res.code === 200) {
                 let template = Handlebars.compile($('#docTypeTpl').html());
                 $('#docType-query').html(template(res.data));
                 layui.form.render('select');
-            } else if (res.code === 403){
-                top.location.href = baseUrl+"/";
+            } else if (res.code === 403) {
+                top.location.href = baseUrl + "/";
             } else {
-                layer.msg(res.msg, {icon: 2})
+                layer.msg(res.msg, { icon: 2 })
             }
         }
     })
@@ -37,19 +37,21 @@
     // 娓叉煋琛ㄦ牸
     var insTb = table.render({
         elem: '#order',
-        url: baseUrl+'/order/pakout/order/head/page/auth',
-        headers: {token: localStorage.getItem('token')},
+        url: baseUrl + '/order/pakout/order/head/page/auth',
+        headers: { token: localStorage.getItem('token') },
         page: true,
         cellMinWidth: 100,
         cols: [[
-            {type: 'numbers'},
-            {field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
-            {field: 'docType$', align: 'center', title: '绫诲瀷',  minWidth: 160, width: 160},
-            {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
-            {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
-            {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
-            {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
-            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+            { type: 'numbers' },
+            { field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl' },
+            { field: 'orderTime', align: 'center', title: '涓氬姟鏃堕棿' },
+            { field: 'cstmrName', align: 'center', title: '瀹㈡埛' },
+            { field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160 },
+            { align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160 },
+            { field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200 },
+            { field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160 },
+            { field: 'memo', align: 'center', title: '澶囨敞', hide: true },
+            { align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180 }
         ]],
         request: {
             pageName: 'curr',
@@ -69,7 +71,7 @@
         done: function (res, curr, count) {
             limit();
             if (res.code === 403) {
-                top.location.href = baseUrl+"/";
+                top.location.href = baseUrl + "/";
             }
             insTbCount = count;
         }
@@ -77,7 +79,7 @@
 
     // 鎼滅储
     form.on('submit(tbSearch)', function (data) {
-        insTb.reload({where: data.field, page: {curr: 1}});
+        insTb.reload({ where: data.field, page: { curr: 1 } });
     });
 
     // 娣诲姞
@@ -114,21 +116,21 @@
                 success: function (layero) {
                     table.render({
                         elem: '#lookSSXMTable',
-                        headers: {token: localStorage.getItem('token')},
-                        url: baseUrl+'/order/pakout/orderDetl/list/auth',
+                        headers: { token: localStorage.getItem('token') },
+                        url: baseUrl + '/order/pakout/orderDetl/list/auth',
                         where: {
                             order_id: data.id
                         },
                         page: true,
                         cellMinWidth: 100,
                         cols: [[
-                            {type: 'numbers'},
-                            {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
-                            {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            {field: 'batch', title: '鎵瑰彿'},
-                            {field: 'anfme', title: '鏁伴噺'},
-                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
-                            {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+                            { type: 'numbers' },
+                            { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                            { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+                            { field: 'batch', title: '鎵瑰彿' },
+                            { field: 'anfme', title: '鏁伴噺' },
+                            { field: 'workQty', title: '浣滀笟鏁伴噺' },
+                            { field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold' },
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -137,7 +139,7 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'}
+                            { field: 'specs', title: '瑙勬牸' }
                         ]],
                         request: {
                             pageName: 'curr',
@@ -179,46 +181,103 @@
                 if (expTpe) {
                     $('#orderNo').attr("disabled", "disabled");
                 }
+                // 鍒濆鍖栦笟鍔℃椂闂存棩鏈熼�夋嫨鍣�
+                layDate.render({
+                    elem: '#orderTime',
+                    type: 'datetime',
+                    format: 'yyyy-MM-dd HH:mm:ss'
+                });
+                // 鍒濆鍖栧鎴烽�夋嫨鍣�
+                var cstmrData = [];
+                $.ajax({
+                    url: baseUrl + "/client/list/auth",
+                    headers: { 'token': localStorage.getItem('token') },
+                    data: { limit: 9999 },
+                    method: 'POST',
+                    async: false,
+                    success: function (res) {
+                        if (res.code === 200) {
+                            // 杞崲涓� xmSelect 闇�瑕佺殑鏍煎紡
+                            res.data.records.forEach(function (item) {
+                                cstmrData.push({
+                                    name: item.name,
+                                    value: item.code
+                                });
+                            });
+                        } else {
+                            layer.msg(res.msg, { icon: 2 });
+                        }
+                    }
+                });
+                var cstmrXmSelect = xmSelect.render({
+                    el: '#cstmrSelect',
+                    radio: true,
+                    clickClose: true,
+                    filterable: true,
+                    create: function (val, arr) {
+                        if (arr.length === 0) {
+                            return {
+                                name: val,
+                                value: val
+                            }
+                        }
+                    },
+                    model: {
+                        icon: 'hidden',
+                        label: {
+                            type: 'text',
+                        }
+                    },
+                    data: cstmrData,
+                    initValue: expTpe && expTpe.cstmr ? [expTpe.cstmr] : []
+                });
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(orderEditSubmit)', function (data) {
+                    // 楠岃瘉瀹㈡埛蹇呴��
+                    if (!cstmrXmSelect.getValue()[0]) {
+                        layer.msg('璇烽�夋嫨瀹㈡埛', { icon: 2 });
+                        return false;
+                    }
                     // 缁勮鏁版嵁
                     if (xxDataList.length <= 0) {
-                        layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+                        layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', { tips: [1, '#ff4c4c'] });
                         return false;
                     }
                     let nList = admin.util.deepClone(xxDataList);
                     for (let xi = 0; xi < nList.length; xi++) {
-                        if (nList[xi].anfme <= 0){
-                            layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+                        if (nList[xi].anfme <= 0) {
+                            layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', { icon: 2 });
                             return false;
                         }
-                        if (nList[xi].anfme < nList[xi].workQty){
-                            layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
+                        if (nList[xi].anfme < nList[xi].workQty) {
+                            layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', { icon: 2 });
                             return false;
                         }
                     }
                     layer.load(2);
                     $.ajax({
-                        url: baseUrl+"/order/pakout/order/form/" + (isExpAdd?"add":"modify") + "/auth",
-                        headers: {'token': localStorage.getItem('token')},
+                        url: baseUrl + "/order/pakout/order/form/" + (isExpAdd ? "add" : "modify") + "/auth",
+                        headers: { 'token': localStorage.getItem('token') },
                         data: JSON.stringify({
                             orderId: Number(data.field.id),
                             docType: Number(data.field.docType),
                             orderNo: data.field.orderNo,
+                            cstmrName: cstmrXmSelect.getValue()[0] ? cstmrXmSelect.getValue()[0].name : null,
+                            orderTime: data.field.orderTime,
                             orderDetlPakoutList: nList
                         }),
-                        contentType:'application/json;charset=UTF-8',
+                        contentType: 'application/json;charset=UTF-8',
                         method: 'POST',
                         success: function (res) {
                             layer.closeAll('loading');
-                            if (res.code === 200){
+                            if (res.code === 200) {
                                 layer.close(dIndex);
                                 $(".layui-laypage-btn")[0].click();
-                                layer.msg(res.msg, {icon: 1});
-                            } else if (res.code === 403){
-                                top.location.href = baseUrl+"/";
-                            }else {
-                                layer.msg(res.msg, {icon: 2});
+                                layer.msg(res.msg, { icon: 1 });
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg, { icon: 2 });
                             }
                         }
                     })
@@ -228,22 +287,22 @@
                 var xxDataList = [];
                 var tbOptions = {
                     elem: '#formSSXMTable',
-                    headers: {token: localStorage.getItem('token')},
+                    headers: { token: localStorage.getItem('token') },
                     data: xxDataList,
                     page: true,
                     height: '350px;',
                     cellMinWidth: 100,
                     cols: [[
-                        {type: 'numbers', title: '#'},
-                        {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
-                        {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
-                        {field: 'batch', title: '鎵瑰彿', edit: true},
-                        {field: 'specs', title: '瑙勬牸'},
-                        {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
-                        {field: 'workQty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
+                        { type: 'numbers', title: '#' },
+                        { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+                        { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200 },
+                        { field: 'batch', title: '鎵瑰彿', edit: true },
+                        { field: 'specs', title: '瑙勬牸' },
+                        { field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110 },
+                        { field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100 },
                         // {field: 'unit', title: '鍗曚綅', width: 80},
-                        {field: 'memo', title: '澶囨敞' , edit: true},
-                        {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
+                        { field: 'memo', title: '澶囨敞', edit: true },
+                        { align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right' }
                     ]],
                     done: function (res) {
                         $(layero).find('.layui-table-view').css('margin', '0');
@@ -252,18 +311,18 @@
                 };
                 if (!isExpAdd) {
                     $.ajax({
-                        url: baseUrl+"/order/pakout/order/detl/all/auth?orderId=" + expTpe.id,
-                        headers: {'token': localStorage.getItem('token')},
+                        url: baseUrl + "/order/pakout/order/detl/all/auth?orderId=" + expTpe.id,
+                        headers: { 'token': localStorage.getItem('token') },
                         method: 'GET',
                         async: false,
                         success: function (res) {
-                            if (res.code === 200){
+                            if (res.code === 200) {
                                 xxDataList = res.data;
                                 tbOptions.data = xxDataList;
-                            } else if (res.code === 403){
-                                top.location.href = baseUrl+"/";
-                            }else {
-                                layer.msg(res.msg, {icon: 2})
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl + "/";
+                            } else {
+                                layer.msg(res.msg, { icon: 2 })
                             }
                         }
                     })
@@ -276,8 +335,8 @@
                     if (layEvent === 'edit') {
                         showEditModel2(data);
                     } else if (layEvent === 'del') {
-                        if(data.workQty > 0){
-                            layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", {icon: 2});
+                        if (data.workQty > 0) {
+                            layer.msg("宸插瓨鍦ㄤ綔涓氭暟閲忥紝涓嶈兘鍒犻櫎", { icon: 2 });
                             return;
                         }
                         layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
@@ -291,7 +350,7 @@
                                     break;
                                 }
                             }
-                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+                            insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
                         });
                     }
                 });
@@ -299,20 +358,20 @@
                 table.on('edit(formSSXMTable)', function (obj) {
                     let index = obj.tr.attr("data-index");
                     let data = xxDataList[index];
-                    if (obj.field === 'anfme'){
+                    if (obj.field === 'anfme') {
                         let vle = Number(obj.value);
                         if (isNaN(vle)) {
-                            layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+                            layer.msg("璇疯緭鍏ユ暟瀛�", { icon: 2 });
                             return false;
                         } else {
                             if (vle <= 0) {
-                                layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+                                layer.msg("鏁伴噺蹇呴』澶т簬闆�", { icon: 2 });
                                 // data[obj.field] = 0;
                                 // insTbSSXM.reload({data: xxDataList});
                                 return false;
                             }
-                            if(obj.value < data.workQty){
-                                layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", {icon: 2});
+                            if (obj.value < data.workQty) {
+                                layer.msg("杈撳叆鏁伴噺涓嶈兘灏忎簬浣滀笟涓暟閲�", { icon: 2 });
                                 // data[obj.field] = 0;
                                 // insTbSSXM.reload({data: xxDataList});
                                 return false;
@@ -320,7 +379,7 @@
                         }
                     }
                     data[obj.field] = obj.value;
-                    insTbSSXM.reload({data: xxDataList});
+                    insTbSSXM.reload({ data: xxDataList });
                 });
 
                 $('#matAddBtnComment').click(function () {
@@ -341,22 +400,22 @@
                             // 琛ㄥ崟鎻愪氦浜嬩欢
                             form.on('submit(matEditSubmit)', function (data) {
                                 let selectList = matXmSelect.getValue();
-                                for (let i = 0; i<selectList.length; i++) {
+                                for (let i = 0; i < selectList.length; i++) {
                                     let item = selectList[i];
                                     // 鏌ヨ鐗╂枡璇︽儏
                                     $.ajax({
-                                        url: baseUrl+"/mat/covert/"+item.value+"/auth",
-                                        headers: {'token': localStorage.getItem('token')},
+                                        url: baseUrl + "/mat/covert/" + item.value + "/auth",
+                                        headers: { 'token': localStorage.getItem('token') },
                                         method: 'GET',
                                         async: false,
                                         success: function (res) {
-                                            if (res.code === 200){
+                                            if (res.code === 200) {
                                                 xxDataList.push(res.data);
-                                                insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
-                                            } else if (res.code === 403){
-                                                top.location.href = baseUrl+"/";
-                                            }else {
-                                                layer.msg(res.msg, {icon: 2})
+                                                insTbSSXM.reload({ data: xxDataList, page: { curr: 1 } });
+                                            } else if (res.code === 403) {
+                                                top.location.href = baseUrl + "/";
+                                            } else {
+                                                layer.msg(res.msg, { icon: 2 })
                                             }
                                         }
                                     })
@@ -374,20 +433,20 @@
                                 toolbar: { show: true },
                                 filterable: true,
                                 remoteSearch: true,
-                                remoteMethod: function(val, cb, show){
+                                remoteMethod: function (val, cb, show) {
                                     $.ajax({
-                                        url: baseUrl+"/mat/all/get/kv",
-                                        headers: {'token': localStorage.getItem('token')},
+                                        url: baseUrl + "/mat/all/get/kv",
+                                        headers: { 'token': localStorage.getItem('token') },
                                         data: {
                                             condition: val
                                         },
                                         method: 'POST',
                                         success: function (res) {
-                                            if (res.code === 200){
+                                            if (res.code === 200) {
                                                 cb(res.data)
                                             } else {
                                                 cb([]);
-                                                layer.msg(res.msg, {icon: 2});
+                                                layer.msg(res.msg, { icon: 2 });
                                             }
                                         }
                                     });
@@ -413,25 +472,25 @@
             layer.close(i);
             layer.load(2);
             $.ajax({
-                url: baseUrl+"/order/pakout/order/delete/auth",
-                headers: {'token': localStorage.getItem('token')},
+                url: baseUrl + "/order/pakout/order/delete/auth",
+                headers: { 'token': localStorage.getItem('token') },
                 data: {
                     orderId: orderId
                 },
                 method: 'POST',
                 success: function (res) {
                     layer.closeAll('loading');
-                    if (res.code === 200){
+                    if (res.code === 200) {
                         if (insTbCount === 0) {
-                            insTb.reload({page: {curr: 1}});
+                            insTb.reload({ page: { curr: 1 } });
                         } else {
                             $(".layui-laypage-btn")[0].click();
                         }
-                        layer.msg(res.msg, {icon: 1});
-                    } else if (res.code === 403){
-                        top.location.href = baseUrl+"/";
-                    }else {
-                        layer.msg(res.msg, {icon: 2});
+                        layer.msg(res.msg, { icon: 1 });
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/";
+                    } else {
+                        layer.msg(res.msg, { icon: 2 });
                     }
                 }
             })
@@ -449,8 +508,8 @@
             console.log(orderId);
             console.log(settle);
             $.ajax({
-                url: baseUrl+"/order/pakout/order/update/auth",
-                headers: {'token': localStorage.getItem('token')},
+                url: baseUrl + "/order/pakout/order/update/auth",
+                headers: { 'token': localStorage.getItem('token') },
                 data: {
                     id: orderId,
                     orderNo: orderNo,
@@ -459,17 +518,17 @@
                 method: 'POST',
                 success: function (res) {
                     layer.closeAll('loading');
-                    if (res.code === 200){
+                    if (res.code === 200) {
                         if (insTbCount === 0) {
-                            insTb.reload({page: {curr: 1}});
+                            insTb.reload({ page: { curr: 1 } });
                         } else {
                             $(".layui-laypage-btn")[0].click();
                         }
-                        layer.msg(res.msg, {icon: 1});
-                    } else if (res.code === 403){
-                        top.location.href = baseUrl+"/";
-                    }else {
-                        layer.msg(res.msg, {icon: 2});
+                        layer.msg(res.msg, { icon: 1 });
+                    } else if (res.code === 403) {
+                        top.location.href = baseUrl + "/";
+                    } else {
+                        layer.msg(res.msg, { icon: 2 });
                     }
                 }
             })
@@ -478,17 +537,17 @@
 
     // 浠诲姟杩芥函
     function showWrkTrace(orderId) {
-        let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+        let loadIndex = layer.msg('璇锋眰涓�...', { icon: 16, shade: 0.01, time: false });
         $.ajax({
-            url: baseUrl+"/order/pakout/order/wrk/trace/auth",
-            headers: {'token': localStorage.getItem('token')},
+            url: baseUrl + "/order/pakout/order/wrk/trace/auth",
+            headers: { 'token': localStorage.getItem('token') },
             data: {
                 orderId: orderId
             },
             method: 'POST',
             success: function (res) {
                 layer.close(loadIndex);
-                if (res.code === 200){
+                if (res.code === 200) {
                     laytpl(wrkTraceDialog.innerHTML).render(res.data, function (html) {
                         admin.open({
                             type: 1,
@@ -503,26 +562,26 @@
                                 var traceOptions = {
                                     title: {
                                         text: '鎬婚噺/浣滀笟/瀹屾垚', x: 'center', y: '38%',
-                                        textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
-                                        subtextStyle: {fontSize: 36, color: '#10B4E8'},
+                                        textStyle: { fontSize: 18, color: '#262626', fontWeight: 'normal' },
+                                        subtextStyle: { fontSize: 36, color: '#10B4E8' },
                                         itemGap: 20
                                     },
                                     color: ['#10B4E8', '#E0E0E0', '#FF0000'],
-                                    tooltip: {trigger: 'item'},
-                                    series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+                                    tooltip: { trigger: 'item' },
+                                    series: [{ name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: { normal: { show: false } } }]
                                 };
                                 traceCharts.setOption(traceOptions);
                                 // 璧嬪��
                                 traceCharts.setOption({
                                     title: {
-                                        subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+                                        subtext: res.data.totalQty + "/" + res.data.wrkQty + "/" + res.data.endQty
                                     },
                                     series: [
                                         {
                                             data: [
-                                                {name: '宸蹭綔涓�', value: res.data.wrkQty},
-                                                {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
-                                                {name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
+                                                { name: '宸蹭綔涓�', value: res.data.wrkQty },
+                                                { name: '鏈綔涓�', value: res.data.totalQty - res.data.wrkQty - res.data.lackQty },
+                                                { name: '搴撳瓨涓嶈冻', value: res.data.lackQty },
                                             ]
                                         }
                                     ]
@@ -530,10 +589,10 @@
                             }
                         });
                     });
-                } else if (res.code === 403){
-                    top.location.href = baseUrl+"/";
-                }else {
-                    layer.msg(res.msg, {icon: 2});
+                } else if (res.code === 403) {
+                    top.location.href = baseUrl + "/";
+                } else {
+                    layer.msg(res.msg, { icon: 2 });
                 }
             }
         })
@@ -541,7 +600,7 @@
 
     layDate.render({
         elem: '.layui-laydate-range'
-        ,type: 'datetime'
-        ,range: true
+        , type: 'datetime'
+        , range: true
     });
 });
diff --git a/src/main/webapp/views/orderPakin/order.html b/src/main/webapp/views/orderPakin/order.html
index c6945d0..d01938c 100644
--- a/src/main/webapp/views/orderPakin/order.html
+++ b/src/main/webapp/views/orderPakin/order.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8">
     <title></title>
@@ -25,77 +26,84 @@
         .layui-timeline:first-child .layui-timeline-item {
             margin-top: 30px;
         }
+
         .btn-add {
             display: none;
         }
+
         .btn-edit {
             display: none;
         }
+
         .btn-complete {
             display: none;
         }
+
         .btn-delete {
             display: none;
         }
     </style>
 </head>
+
 <body>
 
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body">
-            <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
-            <div class="layui-form toolbar">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline mr0">
-                            <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+    <!-- 姝ｆ枃寮�濮� -->
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
+                <div class="layui-form toolbar">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <div class="layui-input-inline mr0">
+                                <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿" />
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline" style="width: 300px">
-                        <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        <div class="layui-inline" style="width: 300px">
+                            <div class="layui-input-inline">
+                                <input class="layui-input layui-laydate-range" name="create_time" type="text"
+                                    placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <select name="doc_type" id="docType-query">
-                            </select>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <select name="doc_type" id="docType-query">
+                                </select>
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <select name="settle">
-                                <option value="">閫夋嫨鐘舵��</option>
-                                <option value="1">寰呭鐞�</option>
-                                <option value="2">浣滀笟涓�</option>
-                                <option value="4">宸插畬鎴�</option>
-                                <option value="6">涓婃姤瀹屾垚</option>
-                            </select>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <select name="settle">
+                                    <option value="">閫夋嫨鐘舵��</option>
+                                    <option value="1">寰呭鐞�</option>
+                                    <option value="2">浣滀笟涓�</option>
+                                    <option value="4">宸插畬鎴�</option>
+                                    <option value="6">涓婃姤瀹屾垚</option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
-                            <i class="layui-icon">&#xe615;</i>鎼滅储
-                        </button>
-                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞
-                        </button>
+                        <div class="layui-inline">
+                            <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
+                                <i class="layui-icon">&#xe615;</i>鎼滅储
+                            </button>
+                            <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i
+                                    class="layui-icon">&#xe654;</i>娣诲姞
+                            </button>
+                        </div>
                     </div>
                 </div>
+                <table id="order" lay-filter="order"></table>
             </div>
-            <table id="order" lay-filter="order"></table>
+        </div>
+        <div class="layui-card">
+            <div class="layui-card-body">
+                鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+                <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+            </div>
         </div>
     </div>
-    <div class="layui-card">
-        <div class="layui-card-body">
-            鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
-            <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
-        </div>
-    </div>
-</div>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="operate">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="operate">
     {{# if (d.settle == 0 || d.settle == 1) { }}
         <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
         <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -104,15 +112,15 @@
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
     {{# } }}
 </script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="tbLook">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="tbLook">
     <span class="layui-text">
         <a href="javascript:;" lay-event="look">
             <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 鏌ョ湅鍗曟嵁鏄庣粏
         </a>
     </span>
 </script>
-<script type="text/html" id="orderNoTpl">
+    <script type="text/html" id="orderNoTpl">
     {{d.orderNo}}
     {{# if(d.settle > 1 && d.settle !== 3){ }}
 
@@ -120,10 +128,10 @@
     <i class="layui-icon layui-icon-about wrk-trace" lay-tips="鏌ョ湅浠诲姟杩芥函" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i>
 </script>
 
-<!--<script type="text/html" id="settleTpl">-->
-<!--    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
-<!--</script>-->
-<script type="text/html" id="settleTpl">
+    <!--<script type="text/html" id="settleTpl">-->
+    <!--    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
+    <!--</script>-->
+    <script type="text/html" id="settleTpl">
     <span name="settle"
           {{# if( d.settle === 1){ }}
           class="layui-badge layui-badge-red"
@@ -140,8 +148,8 @@
           {{# } }}
     >{{d.settle$}}</span>
 </script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
+    <!-- 琛ㄥ崟寮圭獥 -->
+    <script type="text/html" id="editDialog">
     <form id="editForm" lay-filter="editForm" class="layui-form model-form">
         <input name="id" type="hidden"/>
         <div class="layui-form-item">
@@ -163,6 +171,19 @@
 <!--                lay-verify="required"-->
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">瀹㈡埛锛�</label>
+            <div class="layui-input-block">
+                <input id="cstmr" name="cstmr" type="hidden" />
+                <div id="cstmrSelect" ></div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">涓氬姟鏃堕棿锛�</label>
+            <div class="layui-input-block">
+                <input id="orderTime" name="orderTime" placeholder="閫夋嫨涓氬姟鏃堕棿" type="text" class="layui-input" autocomplete="off" lay-verType="tips" />
+            </div>
+        </div>
         <div class="layui-form-item" style="position: relative;">
             <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
             <div class="layui-input-block">
@@ -179,13 +200,13 @@
         </div>
     </form>
 </script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="formSSXMTableBar">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="formSSXMTableBar">
     <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-</script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="matEditDialog">
+    </script>
+    <!-- 琛ㄥ崟寮圭獥 -->
+    <script type="text/html" id="matEditDialog">
     <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
         <input name="experimentId" type="hidden"/>
         <div class="layui-form-item" style="float: left">
@@ -201,8 +222,8 @@
         </div>
     </form>
 </script>
-<!-- 璁㈠崟浠诲姟杩芥函 -->
-<script id="wrkTraceDialog" type="text/html" style="position: relative">
+    <!-- 璁㈠崟浠诲姟杩芥函 -->
+    <script id="wrkTraceDialog" type="text/html" style="position: relative">
     <div style="position: absolute; top: 0; left: 0;">
         <div class="layui-card" style="overflow: hidden;">
             <div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div>
@@ -301,15 +322,15 @@
 
 
 </script>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/orderPakin/order.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+    <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/orderPakin/order.js" charset="utf-8"></script>
 
-<script type="text/template" id="docTypeTpl">
+    <script type="text/template" id="docTypeTpl">
     <option value="">閫夋嫨绫诲瀷</option>
     {{#each records}}
     <option value="{{docId}}">{{docName}}</option>
@@ -317,5 +338,4 @@
 </script>
 </body>
 
-</html>
-
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/orderPakout/order.html b/src/main/webapp/views/orderPakout/order.html
index 4f3577d..ad42261 100644
--- a/src/main/webapp/views/orderPakout/order.html
+++ b/src/main/webapp/views/orderPakout/order.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="utf-8">
     <title></title>
@@ -25,77 +26,84 @@
         .layui-timeline:first-child .layui-timeline-item {
             margin-top: 30px;
         }
+
         .btn-add {
             display: none;
         }
+
         .btn-edit {
             display: none;
         }
+
         .btn-complete {
             display: none;
         }
+
         .btn-delete {
             display: none;
         }
     </style>
 </head>
+
 <body>
 
-<!-- 姝ｆ枃寮�濮� -->
-<div class="layui-fluid">
-    <div class="layui-card">
-        <div class="layui-card-body">
-            <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
-            <div class="layui-form toolbar">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline mr0">
-                            <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+    <!-- 姝ｆ枃寮�濮� -->
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <!-- 琛ㄦ牸椤堕儴宸ュ叿鏍� -->
+                <div class="layui-form toolbar">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <div class="layui-input-inline mr0">
+                                <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿" />
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline" style="width: 300px">
-                        <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        <div class="layui-inline" style="width: 300px">
+                            <div class="layui-input-inline">
+                                <input class="layui-input layui-laydate-range" name="create_time" type="text"
+                                    placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <select name="doc_type" id="docType-query">
-                            </select>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <select name="doc_type" id="docType-query">
+                                </select>
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <select name="settle">
-                                <option value="">閫夋嫨鐘舵��</option>
-                                <option value="1">寰呭鐞�</option>
-                                <option value="2">浣滀笟涓�</option>
-                                <option value="4">宸插畬鎴�</option>
-                                <option value="6">涓婃姤瀹屾垚</option>
-                            </select>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline">
+                                <select name="settle">
+                                    <option value="">閫夋嫨鐘舵��</option>
+                                    <option value="1">寰呭鐞�</option>
+                                    <option value="2">浣滀笟涓�</option>
+                                    <option value="4">宸插畬鎴�</option>
+                                    <option value="6">涓婃姤瀹屾垚</option>
+                                </select>
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
-                            <i class="layui-icon">&#xe615;</i>鎼滅储
-                        </button>
-                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞
-                        </button>
+                        <div class="layui-inline">
+                            <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
+                                <i class="layui-icon">&#xe615;</i>鎼滅储
+                            </button>
+                            <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i
+                                    class="layui-icon">&#xe654;</i>娣诲姞
+                            </button>
+                        </div>
                     </div>
                 </div>
+                <table id="order" lay-filter="order"></table>
             </div>
-            <table id="order" lay-filter="order"></table>
+        </div>
+        <div class="layui-card">
+            <div class="layui-card-body">
+                鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
+                <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+            </div>
         </div>
     </div>
-    <div class="layui-card">
-        <div class="layui-card-body">
-            鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
-            <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
-        </div>
-    </div>
-</div>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="operate">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="operate">
     {{# if (d.settle == 0 || d.settle == 1) { }}
         <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
         <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
@@ -104,15 +112,15 @@
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
     {{# } }}
 </script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="tbLook">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="tbLook">
     <span class="layui-text">
         <a href="javascript:;" lay-event="look">
             <i class="layui-icon" style="font-size: 12px;">&#xe61a;</i> 鏌ョ湅鍗曟嵁鏄庣粏
         </a>
     </span>
 </script>
-<script type="text/html" id="orderNoTpl">
+    <script type="text/html" id="orderNoTpl">
     {{d.orderNo}}
     {{# if(d.settle > 1 && d.settle !== 3){ }}
 
@@ -120,10 +128,10 @@
     <i class="layui-icon layui-icon-about wrk-trace" lay-tips="鏌ョ湅浠诲姟杩芥函" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i>
 </script>
 
-<!--<script type="text/html" id="settleTpl">-->
-<!--    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
-<!--</script>-->
-<script type="text/html" id="settleTpl">
+    <!--<script type="text/html" id="settleTpl">-->
+    <!--    <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>-->
+    <!--</script>-->
+    <script type="text/html" id="settleTpl">
     <span name="settle"
           {{# if( d.settle === 1){ }}
           class="layui-badge layui-badge-red"
@@ -140,8 +148,8 @@
           {{# } }}
     >{{d.settle$}}</span>
 </script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
+    <!-- 琛ㄥ崟寮圭獥 -->
+    <script type="text/html" id="editDialog">
     <form id="editForm" lay-filter="editForm" class="layui-form model-form">
         <input name="id" type="hidden"/>
         <div class="layui-form-item">
@@ -163,6 +171,19 @@
 <!--                lay-verify="required"-->
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">瀹㈡埛锛�</label>
+            <div class="layui-input-block">
+                <input id="cstmr" name="cstmr" type="hidden" />
+                <div id="cstmrSelect" ></div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">涓氬姟鏃堕棿锛�</label>
+            <div class="layui-input-block">
+                <input id="orderTime" name="orderTime" placeholder="閫夋嫨涓氬姟鏃堕棿" type="text" class="layui-input" autocomplete="off" lay-verType="tips" />
+            </div>
+        </div>
         <div class="layui-form-item" style="position: relative;">
             <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
             <div class="layui-input-block">
@@ -179,13 +200,13 @@
         </div>
     </form>
 </script>
-<!-- 琛ㄦ牸鎿嶄綔鍒� -->
-<script type="text/html" id="formSSXMTableBar">
+    <!-- 琛ㄦ牸鎿嶄綔鍒� -->
+    <script type="text/html" id="formSSXMTableBar">
     <!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-</script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="matEditDialog">
+    </script>
+    <!-- 琛ㄥ崟寮圭獥 -->
+    <script type="text/html" id="matEditDialog">
     <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
         <input name="experimentId" type="hidden"/>
         <div class="layui-form-item" style="float: left">
@@ -201,8 +222,8 @@
         </div>
     </form>
 </script>
-<!-- 璁㈠崟浠诲姟杩芥函 -->
-<script id="wrkTraceDialog" type="text/html" style="position: relative">
+    <!-- 璁㈠崟浠诲姟杩芥函 -->
+    <script id="wrkTraceDialog" type="text/html" style="position: relative">
     <div style="position: absolute; top: 0; left: 0;">
         <div class="layui-card" style="overflow: hidden;">
             <div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div>
@@ -301,15 +322,15 @@
 
 
 </script>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/orderPakout/order.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+    <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+    <script type="text/javascript" src="../../static/js/orderPakout/order.js" charset="utf-8"></script>
 
-<script type="text/template" id="docTypeTpl">
+    <script type="text/template" id="docTypeTpl">
     <option value="">閫夋嫨绫诲瀷</option>
     {{#each records}}
     <option value="{{docId}}">{{docName}}</option>
@@ -317,5 +338,4 @@
 </script>
 </body>
 
-</html>
-
+</html>
\ No newline at end of file

--
Gitblit v1.9.1