From f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 24 四月 2023 08:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs' into stasrs

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

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 2c8959e..54454f9 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -15,6 +15,7 @@
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
         even: true,
+        // size: 'sm',
         toolbar: '#toolbar',
         cellMinWidth: 50,
         cols: [[
@@ -54,8 +55,8 @@
             // ,{field: 'PdcType', align: 'center',title: ''}
             // ,{field: 'ctnNo', align: 'center',title: ''}
             ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
-            ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
-            ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
+            // ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
+            // ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
         ]],

--
Gitblit v1.9.1