From a35cc87447118c64dd3ad6c778069275d0653189 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 14:38:32 +0800
Subject: [PATCH] 将定时任务统一使用线程池，线程数2*N
---
src/main/webapp/static/js/order/order.js | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 771480f..f333b04 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,6 +44,9 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
+ {field: 'defNumber', align: 'center', title: '鎿嶄綔绯荤粺鍙�', hide: false, width: 120},
+ {field: '鎿嶄綔鍗曟嵁', align: 'center', title: '鎿嶄綔鍗曟嵁', hide: true},
+ {field: '鎿嶄綔绫诲瀷', align: 'center', title: '鎿嶄綔绫诲瀷', hide: true},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
//{field: 'itemName', align: 'center', title: '鏍哥畻涓讳綋'},
{field: 'docType$', align: 'center', title: '鍗曟嵁绫诲瀷'},
@@ -51,6 +54,7 @@
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿'},
+ {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true},
@@ -58,7 +62,7 @@
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
{field: 'salesman', align: 'center',title: '閮ㄩ棬', hide: true},
- {field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: true},
+
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
@@ -189,6 +193,7 @@
}
});
+
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
admin.open({
@@ -197,7 +202,6 @@
content: $('#editDialog').html(),
area: '1600px',
success: function (layero, dIndex) {
- console.log(expTpe)
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
// 鍥炴樉鏁版嵁
@@ -253,7 +257,7 @@
headers: {token: localStorage.getItem('token')},
data: xxDataList,
page: true,
- height: '350px;',
+ //height: '350px;',
cellMinWidth: 100,
css: [ // 璁剧疆鍗曞厓鏍兼牱寮�
@@ -265,14 +269,13 @@
cols: [[
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'threeCode', title: '閿�鍞鍗曞彿(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'deadTime', title: '閿�鍞鍗曡鍙�(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'threeCode', title: '閿�鍞鍗曞彿(淇敼)', style: 'color: blue;font-weight: bold', edit: 'text', minWidth: 110, width: 110},
+ {field: 'deadTime', title: '閿�鍞鍗曡鍙�(淇敼)', style: 'color: blue;font-weight: bold', edit: 'text', minWidth: 110, width: 110},
{field: 'processSts', title: '宸ュ簭', templet: function (d) {
- console.log(d)
var select = `<select class="layui-select" name="processSts" data-state=${d.processSts} lay-filter="processStsSelect" data-value=${d.processSts} id=${d.id}>
<option value="">閫夋嫨鐘舵��</option>
<option value="1">寰呭姞宸�</option>
@@ -287,7 +290,6 @@
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
done: function (res,curr, count) {
- console.log(res)
$(layero).find('.layui-table-view').css('margin', '0');
$(".layui-table-body").css('overflow','visible');
$(".layui-table-box").css('overflow','visible');
@@ -296,7 +298,6 @@
var tableElem = this.elem.next('.layui-table-view');
count || tableElem.find('.layui-table-header').css('overflow', 'auto');
layui.each(tableElem.find('select[name="processSts"]'), function (index, item) {
- console.log(item)
var elem = $(item);
elem.val(elem.data('state')).parents('div.layui-table-cell').css('overflow', 'visible');
});
@@ -305,6 +306,7 @@
},
size: ''
};
+
if (!isExpAdd) {
$.ajax({
url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
@@ -359,7 +361,11 @@
});
// 鏄庣粏鏁版嵁淇敼
table.on('edit(formSSXMTable)', function (obj) {
- let index = obj.tr.attr("data-index");
+ let index = 0;
+ for (let k in xxDataList) {
+ if (obj.data.id === xxDataList[k].id)
+ index = k
+ }
let data = xxDataList[index];
if (obj.field === 'anfme'){
let vle = Number(obj.value);
--
Gitblit v1.9.1