From fb57e7836338304b16c09fec4fb5c68fb688c39e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:03:24 +0800
Subject: [PATCH] 1.新增分区查询 2.任务档新增分区字段
---
src/main/webapp/static/js/stoMan/stoQue.js | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 4847999..8c448e0 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -7,34 +7,41 @@
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}
- ,{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: '婊℃澘',event: 'locDetl', 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}
- ,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', hide:false}
+ ,{field: 'locAlias', align: 'center',title: '搴撲綅鍒悕', hide:false}
+ ,{field: 'areaId$', align: 'center',title: '搴撳尯', hide:false}
+ ,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323', hide:false}
+ ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿', sort:true, hide:false}
+ ,{field: 'row1', align: 'center',title: '鎺�', sort:true, hide:false}
+ ,{field: 'bay1', align: 'center',title: '鍒�', sort:true, hide:false}
+ ,{field: 'lev1', align: 'center',title: '灞�', sort:true, hide:false}
+ ,{field: 'gro1', align: 'center',title: '缁�', sort:true, hide:true}
+ ,{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', width: 120}
]],
request: {
pageName: 'curr',
@@ -103,7 +110,7 @@
alert("杩樻病鍋�");
break;
case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', function(){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -117,11 +124,11 @@
exportData[this.name] = this.value;
});
var param = {
- 'wrkLastno': exportData,
+ 'locMast': exportData,
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkLastno/export/auth",
+ url: baseUrl+"/locMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -150,14 +157,31 @@
// 鏌ョ湅鏄庣粏
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;
}
locDetlToLayer(data.locNo);
+ break;
+ case 'viewPhoto':
+ $.ajax({
+ url: baseUrl + "/photo/loc/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {locNo: data.locNo},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ showPhotoViewer(layer, res.data);
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg);
+ }
+ }
+ });
break;
}
});
@@ -167,7 +191,7 @@
locNo = val;
layer.open({
type: 2,
- title: '宸ヤ綔妗ｆ槑缁�',
+ title: '搴撳瓨鏄庣粏',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
@@ -194,7 +218,7 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
--
Gitblit v1.9.1