From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 0dd26b7..54fc129 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -1,4 +1,24 @@
var pageCurr;
+function getCol() {
+ 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 ";}
+ 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 ";}
+ html += ">";
+ return html;
+ }}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ return cols;
+}
layui.use(['table','laydate', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
@@ -17,25 +37,7 @@
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
- cols: [[
- // {type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-// ,{field: 'id', align: 'center',title: '缂栧彿'}
- {field: 'pakinId', align: 'center',title: '鍏ュ簱閫氱煡鍙�'}
- ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
- ,{field: 'status', align: 'center',title: '鐘舵��'}
- ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide:true}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide:true}
- // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
-
- // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
--
Gitblit v1.9.1