From 7fd4de087a1b9629d419e3178a5321eeb50dd75d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 16:14:04 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/custOrder/custOrder.js | 11 +++++++----
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 87d453a..218a5f1 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -130,7 +130,7 @@
dto.setCustOrders(custOrders);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
- return R.ok();
+ return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
}
@Override
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index f5dfd80..90bcf04 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -196,7 +196,6 @@
}),
method: 'POST',
success: function (res) {
- console.log(JSON.stringify(res.data))
layer.close(loadIndex);
// 鎴愬姛
if (res.code === 200){
@@ -205,7 +204,8 @@
,title: false
,closeBtn: false
,offset: '100px'
- ,area: '800px;'
+ // ,area: ['800px','450px']
+ ,area: '800px'
,shade: 0.5
,id: 'LAY_layuipro'
,btn: ['绔嬪嵆鐢熸垚', '绋嶅悗澶勭悊']
@@ -218,6 +218,8 @@
data: res.data,
page: true,
cellMinWidth: 100,
+ // ,width: admin.screen() > 1 ? 892 : ''
+ height: 332,
cols: [[
{field: 'title', title: '鍟嗗搧', align: 'center'},
{field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80},
@@ -228,6 +230,7 @@
]],
done: function () {
tableX.merges('stoPreTab', [0,1]);
+ $('.layui-table-body.layui-table-main').css("overflow", "auto")
}
});
@@ -276,7 +279,7 @@
// 寮�濮嬫嫞璐�
function stockOut(number) {
- layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
+ // layer.confirm(number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
layer.closeAll();
$.ajax({
url: baseUrl+"/work/stock/out",
@@ -318,7 +321,7 @@
$(".layui-laypage-btn")[0].click();
}
})
- });
+ // });
}
// 鎵撳嵃鎷ｈ揣鍗�
--
Gitblit v1.9.1