From 3dd987e77e1f1dc6a7bd67cfa2e6e4a78e20520b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 16 十月 2023 16:40:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/webapp/static/js/basWhs/basWhs.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/basWhs/basWhs.js b/src/main/webapp/static/js/basWhs/basWhs.js
index 8d31c1f..387672a 100644
--- a/src/main/webapp/static/js/basWhs/basWhs.js
+++ b/src/main/webapp/static/js/basWhs/basWhs.js
@@ -13,6 +13,7 @@
url: baseUrl+'/basWhs/list/auth',
page: true,
limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
@@ -91,7 +92,7 @@
type: 2,
title: '鏂板',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basWhs_detail.html',
success: function(layero, index){
@@ -137,7 +138,7 @@
}
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -207,7 +208,7 @@
type: 2,
title: '淇敼',
maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ area: ['500px', top.detailHeight],
shadeClose: false,
content: 'basWhs_detail.html',
success: function(layero, index){
--
Gitblit v1.9.1