From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/SOSetting/ExportNotice.html | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 0cda1be..50f02ac 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -65,7 +65,7 @@
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="7">鍏跺畠鍑哄簱</option>
<option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
@@ -147,15 +147,26 @@
</select>
</div>
</div>
+
+ <div class="layui-inline DivCheck">
+ <label class="layui-form-label">鎷ｈ揣鏂瑰紡</label>
+ <div class="layui-input-inline " style="width: 220px;">
+ <select name="CheckVlues" id="CheckVlues" lay-filter="CheckVlues" lay-search>
+ <option value=""></option>
+ <option value="0" selected>鏆傚瓨鍖烘嫞璐�</option>
+ <option value="1">鍑哄簱鍙ｆ嫞璐�</option>
+ </select>
+ </div>
+ </div>
+
<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
<label class="layui-form-label">瑁呰溅鍙�</label>
<div class="layui-input-inline" style="width: 220px;">
<select name="LoadingArea" id="LoadingArea" 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="3">4</option>
+ <option value="2">5</option>
+ <option value="1">6</option>
</select>
</div>
</div>
@@ -169,6 +180,8 @@
<option value="044">044</option>
<option value="051">051</option>
<option value="059">059</option>
+ <option value="440">440</option>
+ <option value="443">443</option>
</select>
</div>
</div>
@@ -184,7 +197,7 @@
<div class="layui-inline DivLoadingArea" style="margin-top: 10px;">
<label class="layui-form-label">瀵嗙爜</label>
<div class="layui-input-inline" style="width: 220px;">
- <input type="text" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
+ <input type="password" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
class="layui-input">
</div>
</div>
@@ -229,7 +242,7 @@
case "6":
return "浠ｅ偍鍑哄簱";
case "7":
- return "鍏朵粬鍑哄簱";
+ return "鍏跺畠鍑哄簱";
case "8":
return "瀵勫瓨鍑哄簱";
default:
@@ -372,13 +385,13 @@
<i class="layui-icon layui-icon-delete"></i>鍙栨秷鍒嗛厤
</a>`;
}
- if( d.Status == '2' || d.Status == '3'|| (d.Status == '4' && d.Type == "1")){
+ if( d.Status == '1' ||d.Status == '2' || d.Status == '3'|| (d.Status == '4' && d.Type == "1")){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
<i class="layui-icon layui-icon-ok"></i>鍑哄簱
</a>`;
}
}
- if( d.Status == '4'){
+ if( d.Status == '4' ||d.Status == '3'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs guanClass" lay-event="finish">
<i class="layui-icon layui-icon-ok"></i>鍏冲崟
</a>`;
@@ -876,11 +889,14 @@
area: ['1200px', '90%'],
});
}else if(obj.event === 'outKu'){
+
$("#UnstackWay").val(0)
$("#UnstackWay").attr("disabled",false);
$("#LoadingArea").val('')
$("#PickingArea").val('')
- $('.DivLoadingArea').show()
+ $('.DivLoadingArea').show()
+ $('.DivPickingArea2').show()
+
form.render('select');
var param = {
soNo: SoNo
@@ -894,10 +910,14 @@
$('.DivPickingArea2').show()
}else{
isNeedUnpack='0'
- $('.DivPickingArea2').hide()
+ $('.DivPickingArea2').hide()
+ $('.DivCheck').hide()
}
if($('#UnstackWay').val()=='1'){
$('.DivPickingArea2').show()
+ $('.DivCheck').hide()
+
+
}
outFunction(data.SONo)
@@ -910,10 +930,17 @@
});
}
});
+ $("#CheckVlues").val(0)
+ $("#CheckVlues").attr("disabled",false);
+ form.render('select');
}else{
$("#UnstackWay").val(1)
$("#UnstackWay").attr("disabled",true);
- form.render('select');
+ form.render('select');
+ $("#CheckVlues").val(0)
+ $("#CheckVlues").attr("disabled",true);
+ form.render('select');
+
$('.DivLoadingArea').hide()
@@ -1079,6 +1106,9 @@
btn: ['纭畾', '鍙栨秷'],
yes: function(index, layero) {
var pa = $('#PickingArea').val();
+ var check = $('#CheckVlues').val();
+ console.log("22222222222222"+check);
+
console.log(pa)
if (isChongFu== true) {
isChongFu= false;
@@ -1099,8 +1129,18 @@
isChongFu= true;
return;
}
- }
+ }else{if($("#PickingArea").val() == '')
+ {
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }}
+ if(isNeedUnpack == 1){
console.log($("#PickingArea").val())
+ if($('#UnstackWay').val()=='1'){
if($("#PickingArea").val() == '')
{
layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
@@ -1109,11 +1149,12 @@
});
isChongFu= true;
return;
- }
+ }}}
var param = {
soNo: soNo,
unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ checkmode:check,
loadingAddre:$('#LoadingArea').val()
};
console.log(param);
@@ -1245,14 +1286,20 @@
var value = data.value;
if(value==0){
$('.DivLoadingArea').show()
+ $('.DivCheck').hide()
if(isNeedUnpack=='0'){
$('.DivPickingArea2').hide()
}else{
$('.DivPickingArea2').show()
}
- }else{
+ }else{
+ console.log("11111111111");
+
$('.DivLoadingArea').hide()
- $('.DivPickingArea2').show()
+ $('.DivPickingArea2').show()
+
+ $('.DivCheck').show()
+
}
});
--
Gitblit v1.8.0