From d5a456fee1dd3b6beda90ec6cc1b91814ec2750f Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 三月 2022 12:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/static/js/order/order.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e473fef..14e4c5f 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -53,6 +53,7 @@
         }
     });
 
+
     /* 琛ㄦ牸鎼滅储 */
     form.on('submit(docTypeTableSearch)', function (data) {
         insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
@@ -199,7 +200,7 @@
             ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О', hide: true}
             ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿', hide: true}
             ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��', templet: '#settleTpl', width: 105}
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate',  width: 120}
+            // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate',  width: 120}
         ]],
         request: {
             pageName: 'curr',

--
Gitblit v1.9.1