From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/stoMan/stoQue.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 80f3022..ae9d342 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -7,26 +7,34 @@
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: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
+ // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
+ ,{field: 'qrCodeValue', align: 'center',title: '浜岀淮鐮佸��', sort:true}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
,{field: 'lev1', align: 'center',title: '灞�'}
- ,{field: 'fullPlt', align: 'center',title: '婊℃澘',event: 'locDetl', templet:function(row){
+ ,{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' >";
@@ -150,10 +158,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;
}
@@ -167,7 +175,7 @@
locNo = val;
layer.open({
type: 2,
- title: '宸ヤ綔妗ｆ槑缁�',
+ title: '搴撳瓨鏄庣粏',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
--
Gitblit v1.9.1