From 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 13:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/order/out.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1ebda0a..9123594 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -330,10 +330,50 @@
}
}
- ,yes: function(index, layero){
- //鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
- pakout(tableCache, index);
+ ,yes: function(layerIndex, layero){
+ // 绔嬪嵆鍑哄簱鎸夐挳鐐瑰嚮 鈫� 鍏堣姹備笅鎷夊垪琛�
+ let loadIndex = layer.load(10);
+ $.ajax({
+ url: baseUrl + "/getMesOrder/auth", // 浣犳彁渚涚殑鎺ュ彛
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function(res){
+ layer.close(loadIndex);
+ if(res.code === 200){
+ // 寮瑰嚭浜屾纭妗�
+ layer.open({
+ type: 1,
+ title: '璇烽�夋嫨缁勮揣鍗曞彿',
+ area: ['400px','200px'],
+ content: $('#staBatchSelectDialog').html(),
+ success: function(layero2, index2){
+ // 娓叉煋涓嬫媺妗�
+ let select = $(layero2).find('#batchSelectStaBox');
+ select.empty().append(`<option value="">璇烽�夋嫨缁勮揣鍗曞彿</option>`); // 淇濇寔榛樿绌�
+ res.data.forEach(item => {
+ select.append(`<option value="${item}">${item}</option>`);
+ });
+ layui.form.render('select'); // 閲嶆柊娓叉煋涓嬫媺妗�
+
+
+ // 纭鎸夐挳
+ form.on('submit(staBatchSelectConfirm)', function(obj){
+ let selectedValue = obj.field.batchSta;
+ console.log(selectedValue)
+ layer.close(index2);
+ // 璋冪敤鍘熸潵鐨勫嚭搴撳嚱鏁帮紝鍚屾椂浼犱笅鎷夊��
+ pakout(tableCache, layerIndex, selectedValue);
+ return false;
+ });
+ }
+ });
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
}
+
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
layer.close(index)
@@ -349,14 +389,14 @@
})
}
- function pakout(tableCache, layerIndex) {
- // let loadIndex = layer.load(2);
+ function pakout(tableCache, layerIndex, optionValue) {
+ // 鍙互鎶� optionValue 浼犵粰鎺ュ彛
notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
$.ajax({
url: baseUrl + "/out/pakout/auth",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
- data: JSON.stringify(tableCache),
+ data: JSON.stringify({tableCache,optionValue}),
method: 'POST',
success: function (res) {
notice.destroy();
@@ -376,6 +416,8 @@
+
+
/* 鍒犻櫎璁㈠崟 */
function doDelSensor(obj) {
layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
--
Gitblit v1.9.1