From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:54:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

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

diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 2c8959e..a03ab95 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: [[
@@ -53,9 +54,9 @@
             // ,{field: 'barcode', align: 'center',title: ''}
             // ,{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: 'locType1$', 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