From dd02021c93ac8df899823ba4aa48c1ecb1b102d1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 15:18:30 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basDevp/basDevp.js | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 60dd95f..3d337a5 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -1752,6 +1752,117 @@
]);
+ var basDevpFieldOrder = [
+ 'id',
+ 'devpNo',
+ 'status',
+ 'memo',
+ 'stationList',
+ 'barcodeStationList',
+ 'inStationList',
+ 'outStationList',
+ 'runBlockReassignLocStationList',
+ 'isOutOrderList',
+ 'isLiftTransferList',
+ 'createBy',
+ 'createTime',
+ 'updateBy',
+ 'updateTime'
+ ];
+
+ var basDevpFieldSettings = {
+ id: {
+ label: '缂栧彿',
+ minWidth: 90
+ },
+ devpNo: {
+ label: '璁惧缂栧彿',
+ minWidth: 110
+ },
+ status: {
+ label: '鐘舵��',
+ minWidth: 110
+ },
+ memo: {
+ label: '澶囨敞',
+ textarea: true,
+ minWidth: 180
+ },
+ stationList: {
+ label: '绔欑偣鏁版嵁',
+ textarea: true,
+ minWidth: 220
+ },
+ barcodeStationList: {
+ label: '鏉＄爜绔欑偣鏁版嵁',
+ textarea: true,
+ minWidth: 220
+ },
+ inStationList: {
+ label: '鍏ュ簱绔欑偣鏁版嵁',
+ textarea: true,
+ minWidth: 220
+ },
+ outStationList: {
+ label: '鍑哄簱绔欑偣鏁版嵁',
+ textarea: true,
+ minWidth: 220
+ },
+ runBlockReassignLocStationList: {
+ label: '鍫靛閲嶅垎閰嶅簱浣嶇珯鐐规暟鎹�',
+ textarea: true,
+ minWidth: 240
+ },
+ isOutOrderList: {
+ label: '鍑哄簱鎺掑簭浜や簰鐐�',
+ textarea: true,
+ minWidth: 220
+ },
+ isLiftTransferList: {
+ label: '椤跺崌绉绘牻鐐�',
+ textarea: true,
+ minWidth: 220
+ },
+ createBy: {
+ label: '鍒涘缓浜哄憳',
+ editable: false,
+ minWidth: 110
+ },
+ createTime: {
+ label: '鍒涘缓鏃堕棿',
+ editable: false,
+ minWidth: 168
+ },
+ updateBy: {
+ label: '淇敼浜哄憳',
+ editable: false,
+ minWidth: 110
+ },
+ updateTime: {
+ label: '淇敼鏃堕棿',
+ editable: false,
+ minWidth: 168
+ }
+ };
+
+ fieldMeta = filterFieldMetaByOrder(fieldMeta, basDevpFieldOrder, basDevpFieldSettings);
+
+ function filterFieldMetaByOrder(list, order, settings) {
+ var metaMap = {};
+ (list || []).forEach(function (field) {
+ if (!field || !field.field) {
+ return;
+ }
+ metaMap[field.field] = Object.assign({}, field);
+ });
+ return (order || []).map(function (fieldName) {
+ if (!metaMap[fieldName]) {
+ return null;
+ }
+ return Object.assign({}, metaMap[fieldName], settings && settings[fieldName] ? settings[fieldName] : {});
+ }).filter(Boolean);
+ }
+
function formatFieldLabel(field) {
var raw = field && field.label ? String(field.label).trim() : '';
if (raw) {
@@ -1813,7 +1924,7 @@
}
function isSearchableField(field) {
- return !!field && field.kind !== 'image' && !field.textarea;
+ return !!field && field.searchable !== false && field.kind !== 'image' && !field.textarea;
}
function isSortableField(field) {
@@ -2195,7 +2306,7 @@
},
editableFields: function () {
return this.fieldMeta.filter(function (field) {
- return !field.primaryKey;
+ return !field.primaryKey && field.editable !== false;
});
},
exportColumns: function () {
--
Gitblit v1.9.1