From f7359e4c48b19293798798f8226463519bcdd659 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 19 十二月 2024 11:08:56 +0800
Subject: [PATCH] 优化AGV工作处理及上报逻辑
---
src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
index 7ddff9f..b9255a6 100644
--- a/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/agvLocDetlStatis/locDetlStatis.js
@@ -3,12 +3,18 @@
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
];
- arrRemove(detlCols, "field", "anfme")
- arrRemove(detlCols, "field", "zpallet")
+ arrRemove(detlCols, "field", "anfme");
+ arrRemove(detlCols,"field","suppCode");
+ arrRemove(detlCols, "field", "zpallet");
+ arrRemove(detlCols, "field", "orderNo");
+ arrRemove(detlCols, "field", "threeCode");
+ arrRemove(detlCols, "field", "deadTime");
+ arrRemove(detlCols, "field", "batch");
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
return cols;
+
}
layui.use(['table','laydate', 'form'], function(){
@@ -103,10 +109,44 @@
var checkStatus = table.checkStatus(obj.config.id);
switch(obj.event) {
case 'exportAll':
- layer.closeAll();
- layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/agv/locDetl/statis/export";
- layer.closeAll('loading');
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'locDetl': exportData,
+ 'fields': fields
+ };
+ var loadIndex = layer.msg('姝ｅ湪瀵煎嚭...', {icon: 16, shade: 0.01, time: false});
+ $.ajax({
+ url: baseUrl+"/agv/locDetl/statis/export",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ });
break;
case 'exportData':
layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
--
Gitblit v1.9.1