From 9c03b47fc8099eca8f19b6520401a8f527a9b223 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 20 七月 2025 23:49:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs
---
src/main/webapp/static/js/stoMan/stoQue.js | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 4fe0666..95d3552 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -7,33 +7,55 @@
var layDate = layui.laydate;
var form = layui.form;
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#stoQue',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locMast/list/auth',
page: true,
- limit: 10,
+ limit: 20,
+ limits: [20, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'locType$', align: 'center',title: '搴撲綅鐘舵��', width: 180, 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: 'locNo', align: 'center',title: '搴撲綅鍙�', hide:false}
+ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323', hide:false}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷', width: 180, style: 'color: #8E2323', hide:false}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��',
+ templet: function(d) {
+ // 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
+ if (d.frozen$ === '宸插喕缁�') {
+ return '<span style="color: #34a8de;">' +d.frozen$ + '</span>';
+ } else {
+ return '<span">' +d.frozen$ + '</span>';
+ }
+ }}
+ ,{field: 'frozenMemo', align: 'center',title: '鍐荤粨鍘熷洜'}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿', sort:true, hide:false}
+ ,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:true}
+ ,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:true}
+ ,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:true}
+ ,{field: 'gro1', align: 'center',title: '缁�', sort:true, hide:true}
,{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: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�', hide:false}
+ ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷', hide:true}
+ ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷', hide:true}
+ ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷', hide:true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180, hide:false}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
]],
request: {
@@ -150,10 +172,10 @@
// 鏌ョ湅鏄庣粏
case 'locDetl':
// locDetl(data.locNo);
- if (data.locType.trim() === ''
- || data.locType.trim() === 'S'
- || data.locType.trim() === 'D'
- || data.locType.trim() === 'O') {
+ if (data.locSts.trim() === ''
+ || data.locSts.trim() === 'S'
+ || data.locSts.trim() === 'D'
+ || data.locSts.trim() === 'O') {
layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
return;
}
--
Gitblit v1.9.1