From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/flowLog/flowLog.js | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/flowLog/flowLog.js b/src/main/webapp/static/js/flowLog/flowLog.js
index c16df4a..d21becb 100644
--- a/src/main/webapp/static/js/flowLog/flowLog.js
+++ b/src/main/webapp/static/js/flowLog/flowLog.js
@@ -20,14 +20,17 @@
toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-120',
+ even: true,
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox', merge: ['fid']}
,{field: 'id', align: 'center',title: '鏁版嵁缂栧彿',hide: true}
- ,{field: 'fid', align: 'center',title: '娴佹按鍙�'}
- ,{field: 'opType', align: 'center',title: '鎿嶄綔绫诲瀷'}
+ ,{field: 'fid', align: 'center',title: '娴佹按鍙�',merge: true}
+ ,{field: 'spare2', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'opType$', align: 'center',title: '鎿嶄綔绫诲瀷'}
,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�'}
,{field: 'threeCode', align: 'center',title: '閿�鍞崟鍙�'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'spare1', align: 'center',title: '璐ф灦鐮�'}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'orderPrevious', align: 'center',title: '璁㈠崟鏁伴噺鍙樻洿鍓�'}
--
Gitblit v1.9.1