From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs
---
src/main/webapp/static/js/order/out.js | 139 ++++++++++++++--------------------------------
1 files changed, 43 insertions(+), 96 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index d9f3b50..67ece60 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -20,7 +20,7 @@
insTb2 = table.render({
elem: '#orderDetlTable',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/list/auth',
+ url: baseUrl+'/orderDetl/pakout/list/auth',
page: true,
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
@@ -32,7 +32,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -115,10 +115,6 @@
case 'pakoutPreview':
pakoutPreview([data.id])
break;
- // 缂栬緫
- case 'edit':
- showEditModel(data);
- break;
}
});
@@ -139,7 +135,7 @@
,title: false
,closeBtn: false
,offset: '100px'
- ,area: '1200px'
+ ,area: ['1200px', '700px']
,shade: 0.5
,shadeClose: true
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
@@ -150,18 +146,19 @@
table.render({
elem: '#stoPreTab',
data: res.data,
- height: 450,
+ height: 520,
page: false,
limit: Number.MAX_VALUE,
cellMinWidth: 100,
cols: [[
- {type: 'checkbox', merge: ['orderNo']},
+ // {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
- {field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
- {field: 'batch', title: '鎵瑰彿', merge: ['title'], align: 'center'},
+ {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
- {field: 'staNo', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+ {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+ {type: 'checkbox', merge: ['locNo']},
]],
done: function (res) {
tableMerge.render(this);
@@ -169,16 +166,40 @@
tableCache = tableData = table.cache.stoPreTab;
}
});
+ // 淇敼鍑哄簱绔�
form.on('select(tbBasicTbStaNos)', function (obj) {
let index = obj.othis.parents('tr').attr("data-index");
let data = tableCache[index];
- data['staNo'] = Number(obj.elem.value);
+ for (let i = 0; i<tableCache.length; i++) {
+ if (tableCache[i].locNo === data.locNo) {
+ tableCache[i]['staNo'] = Number(obj.elem.value);
+ }
+ }
+ // data['staNo'] = Number(obj.elem.value);
+ obj.othis.children().find("input").css("color", "blue");
return false;
});
+ // 鎵归噺淇敼鍑哄簱绔�
+ form.on('submit(batchModifySta)', function () {
+ let stoPreTabData = layui.table.checkStatus('stoPreTab').data;
+ console.log(stoPreTabData)
+ if (stoPreTabData.length < 1) {
+ layer.msg("璇疯嚦灏戦�夋嫨涓�鏉′互涓婂悎骞舵暟鎹�", {icon: 7});
+ return false;
+ }
+ modifySta(stoPreTabData.map(function (d) {
+ return d.id;
+ }));
+ });
+ // 鎵归噺淇敼鍑哄簱绔� - 绔欑偣閫夋嫨
+ function modifySta(data) {
+
+ }
+
}
,yes: function(index, layero){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
- pakout(tableCache);
+ pakout(tableCache, index);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
@@ -195,8 +216,9 @@
})
}
- function pakout(tableCache) {
- let loadIndex = layer.load(2);
+ function pakout(tableCache, layerIndex) {
+ // let loadIndex = layer.load(2);
+ notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
$.ajax({
url: baseUrl + "/out/pakout/auth",
headers: {'token': localStorage.getItem('token')},
@@ -204,9 +226,12 @@
data: JSON.stringify(tableCache),
method: 'POST',
success: function (res) {
- layer.close(loadIndex);
+ notice.destroy();
if (res.code === 200) {
- layer.msg(res.msg, {icon: 1})
+ layer.close(layerIndex);
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({where: null});
+ insTb2.reload({where: null, page: {curr: 1}});
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -216,84 +241,6 @@
});
}
-
- /* 鏄剧ず琛ㄥ崟寮圭獥 */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '900px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁惧',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- // 鍥炴樉琛ㄥ崟鏁版嵁
- form.val('detail', mData);
- // 鍦板浘瀹氫綅鍥炴樉
- if (mData) {
- setTimeout(function () {
- $("#mapIframe")[0].contentWindow.position(mData.lon, mData.lat);
- }, 500)
- }
- // 琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(editSubmit)', function (data) {
- data.field.sensorModel = insXmSel.getValue('valueStr');
- if (isEmpty(data.field.hostId)) {
- layer.msg('璇烽�夋嫨鎵�灞為」鐩�', {icon: 2});
- return false;
- }
- data.field.lon = $("#mapIframe").contents().find("#lon").val();
- data.field.lat = $("#mapIframe").contents().find("#lat").val();
- data.field.city = $("#mapIframe").contents().find("#city").val();
- if (isEmpty(data.field.lon) || isEmpty(data.field.lat)) {
- layer.msg('璁惧涓嶅湪瀹氫綅', {icon: 2});
- return false;
- }
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/sensor/"+(mData?'update':'add')+"/auth?sensorType="+sensorType,
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- $(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- // 娓叉煋涓嬫媺鏍�
- var insXmSel = xmSelect.render({
- el: '#modelSel',
- height: '250px',
- data: modelTb.options.data,
- initValue: mData&&mData.sensorModel ? [mData.sensorModel] : [],
- model: {label: {type: 'text'}},
- prop: {
- name: 'name',
- value: 'id'
- },
- radio: true,
- clickClose: true,
- tree: {
- show: true,
- indent: 15,
- strict: false,
- expandedKeys: true
- }
- });
- // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
/* 鍒犻櫎璁㈠崟 */
--
Gitblit v1.9.1