From e28026a099829f9e5c7b7b98405c7006c6343942 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 26 五月 2023 08:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/bfasrs6' into bfasrs6
---
src/main/webapp/static/js/common.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index bd063c5..fc8d3be 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,12 +181,12 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 290}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'specs', align: 'center',title: '瑙勬牸', width: 200}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 150}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -223,7 +223,7 @@
,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
,{field: 'storeMaxDate$', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
,{field: 'inoutEveryday$', align: 'center',title: '楂橀', width: 60}
- ,{field: 'manType$', align: 'center',title: '鐗╂枡绫诲瀷', width: 100}
+ ,{field: 'matType$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
]
--
Gitblit v1.9.1