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/locDetl/locDetl.js | 2 ++
src/main/webapp/static/js/order/out.js | 18 ++++++++++++++++++
src/main/webapp/views/order/out.html | 8 +++-----
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 7adbca0..fb3fe5b 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -190,6 +190,7 @@
'locDetl': exportData,
'fields': fields
};
+ var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/locDetl/export/auth",
headers: {'token': localStorage.getItem('token')},
@@ -198,6 +199,7 @@
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');
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1e0aad8..67ece60 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -166,6 +166,7 @@
tableCache = tableData = table.cache.stoPreTab;
}
});
+ // 淇敼鍑哄簱绔�
form.on('select(tbBasicTbStaNos)', function (obj) {
let index = obj.othis.parents('tr').attr("data-index");
let data = tableCache[index];
@@ -178,6 +179,23 @@
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){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 551d937..254a593 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -159,11 +159,9 @@
<div class="layui-card-body" style="padding: 10px">
<table id="stoPreTab" lay-filter="stoPreTab"></table>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="originTableSearch" lay-submit>-->
-<!-- 鎵归噺淇敼-->
-<!-- </button>-->
-<!-- </div>-->
+ <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
+ 鎵归噺淇敼
+ </button>
</div>
</script>
--
Gitblit v1.9.1