From fd4ceb219634c802a69828cdae2102278581ba9f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务，添加自动接单（未完成，逻辑还不清楚），调整环境配置
---
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 686640d..b3056e2 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -11,7 +11,7 @@
tableIns = table.render({
elem: '#wrkMast',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/wrkMastLog/list/auth',
+ url: baseUrl+'/agv/wrkMastLog/list/auth',
page: true,
where: {manu_type : '鎵嬪姩'},
limit: 50,
@@ -101,32 +101,40 @@
fields.push(col.field);
}
});
+ // var exportData = {};
+ // $.each($('#search-box [name]').serializeArray(), function() {
+ // exportData[this.name] = this.value;
+ // });
+ // var param = {
+ // 'wrkMast': exportData,
+ // 'fields': fields
+ // };
+ var param = '?';
var exportData = {};
$.each($('#search-box [name]').serializeArray(), function() {
exportData[this.name] = this.value;
+ param += this.name + '=' + this.value + '&';
});
- var param = {
- 'wrkMast': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/wrkMast/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- 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)
- }
- }
- });
+ window.location.href = baseUrl + "/report/download/wrkMastLog" + param;
+ layer.closeAll();
+ // $.ajax({
+ // url: baseUrl+"/wrkMast/export/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: JSON.stringify(param),
+ // dataType:'json',
+ // contentType:'application/json;charset=UTF-8',
+ // method: 'POST',
+ // success: function (res) {
+ // 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;
}
@@ -148,7 +156,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'wrkDetlLog.html',
+ content: 'wrkLog.html',
success: function(layero, index){
}
});
@@ -364,7 +372,7 @@
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: '璐ф灦鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
--
Gitblit v1.9.1