From bcb5e464f879458c421069e7d8c72d8c16b4ac7b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:32:46 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/webapp/static/js/stoMan/stoQue.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..3a4f55d 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -28,18 +28,20 @@
{type: 'checkbox'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+ ,{field: 'fireStatus$', align: 'center',title: '娑堥槻鐘舵��', width: 90, style: 'color: #8E2323'}
+ ,{field: 'packStatus$', align: 'center',title: '浜у搧鐘舵��', width: 90, style: 'color: #8E2323'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- if(row.fullPlt === 'Y'){html += " checked ";}
- html += "disabled='disabled' >";
- return html;
- },width:80}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
+ // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
+ // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.fullPlt === 'Y'){html += " checked ";}
+ // html += "disabled='disabled' >";
+ // return html;
+ // },width:80}
+ ,{field: 'barcode', align: 'center',title: 'PACK鐮�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
--
Gitblit v1.9.1