From 265fa2b9f6816f62fffac3db611fcb1fc9dfe1a6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 17 十月 2024 18:47:53 +0800
Subject: [PATCH] 修改问题
---
HTML/views/SOSetting/ExportNotice.html | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index d9708df..846a008 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -164,10 +164,11 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="PickingArea" id="PickingArea" lay-search>
<option value=""></option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
+ <option value="033">033</option>
+ <option value="039">039</option>
+ <option value="044">044</option>
+ <option value="051">051</option>
+ <option value="059">059</option>
</select>
</div>
</div>
@@ -336,7 +337,7 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- if(d.Type != "8") {
+ if(d.Type != "8" && d.Type != "2" && d.Type != "3") {
html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
<i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
</a>`;
@@ -386,7 +387,11 @@
<script type="text/html" id="table-content-list2">
{{# function GetBtn2(d){
var html = '';
-
+ if((d.StatusZ == "2" || d.StatusZ == "3"|| d.StatusZ == "4") && (d.Type == "1" || d.Type == "2" || d.Type == "3") && d.IsWave == "0"){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
+ <i class="layui-icon layui-icon-ok"></i>鎵嬪姩鍒嗛厤
+ </a>`;
+ }
if((d.Status == "0" ||d.Status == "1") && d.Qty > d.AllotQty && d.IsWave == "0"){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs shoufenClass" lay-event="wan">
<i class="layui-icon layui-icon-ok"></i>鎵嬪姩鍒嗛厤
@@ -1227,9 +1232,13 @@
maxmin: true,
area: ['1200px', '90%'],
});
- }else if(obj.event === 'outKu'){
- $("#UnstackWay option[value='0']").attr("selected","selected");
- $("#UnstackWay").attr("disabled",false);
+ }else if(obj.event === 'outKu'){
+ $("#UnstackWay").val(0)
+ $("#UnstackWay").attr("disabled",false);
+ $("#LoadingArea").val('')
+ $("#PickingArea").val('')
+ $('.DivLoadingArea').show()
+ form.render('select');
var param = {
soNo: SoNo
};
@@ -1247,9 +1256,8 @@
if($('#UnstackWay').val()=='1'){
$('.DivPickingArea2').show()
}
-
- form.render('select');
- outFunction()
+
+ outFunction(data.SONo)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -1260,13 +1268,13 @@
}
});
}else{
- $("#UnstackWay option[value='1']").attr("selected","selected");
+ $("#UnstackWay").val(1)
$("#UnstackWay").attr("disabled",true);
form.render('select');
$('.DivLoadingArea').hide()
- outFunction()
+ outFunction(data.SONo)
}
@@ -1368,7 +1376,7 @@
});
//閫夋嫨鍑哄簱鍙ｅ脊绐楁柟娉�
- function outFunction(){
+ function outFunction(soNo){
layer.open({
type: 1,
title: '纭鍑哄簱鍙�',
@@ -1395,28 +1403,22 @@
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
- return;
- }
- if(isNeedUnpack=='1'){
- if(pa==''){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- }
- }else{
- if(pa==''){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
+ isChongFu= true;
return;
}
}
+ console.log($("#PickingArea").val())
+ if($("#PickingArea").val() == '')
+ {
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }
var param = {
- soNo: data.SONo,
+ soNo: soNo,
unstackingMode:$('#UnstackWay').val(),
outMode: pa,
loadingAddre:$('#LoadingArea').val()
@@ -1549,15 +1551,15 @@
form.on('select(UnstackWay)',function(data){
var value = data.value;
if(value==0){
- $('.DivLoadingArea').show()//.attr("style", "display:block")
+ $('.DivLoadingArea').show()
if(isNeedUnpack=='0'){
- $('.DivPickingArea2').hide()//.attr("style", "display:none")
+ $('.DivPickingArea2').hide()
}else{
- $('.DivPickingArea2').show()//.attr("style", "display:block")
+ $('.DivPickingArea2').show()
}
}else{
- $('.DivLoadingArea').hide()//.attr("style", "display:none")
- $('.DivPickingArea2').show()//.attr("style", "display:block")
+ $('.DivLoadingArea').hide()
+ $('.DivPickingArea2').show()
}
});
--
Gitblit v1.8.0