From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 0e3e360..274d542 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,18 +3,22 @@
var cols = [
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鐘舵��', templet:function(row){
- var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='寰呭叆搴搢宸插惎鍔�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.status !== 'Y'){html += " checked ";}
+ cols.push(
+ {field: 'createBy$', align: 'center',title: '鎿嶄綔浜�', minWidth: 160, width: 160}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.status === 'Y'){html += " checked ";}
html += ">";
return html;
}}
,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
- var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱|鍑哄簱' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.ioStatus !== 'Y'){html += " checked ";}
+ var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='杩愯涓瓅寰呭鐞�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ if(row.ioStatus === 'Y'){html += " checked ";}
html += ">";
return html;
}}
+
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
--
Gitblit v1.9.1