From 2be1922b035c182c3c516427aa68be54badd6938 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:15:52 +0800
Subject: [PATCH] 登录页修改
---
HTML/views/SOSetting/ExportNotice.html | 227 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 140 insertions(+), 87 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 8299035..0860965 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -66,6 +66,7 @@
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
@@ -142,7 +143,7 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
<option value="0" selected>鏈哄櫒浜烘媶鍨�</option>
- <option value="1">浜哄伐鎷嗗灈</option>
+ <option value="1">PDA鎷嗗灈</option>
</select>
</div>
</div>
@@ -163,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>
@@ -212,6 +214,8 @@
return "浠ｅ偍鍑哄簱";
case "7":
return "鍏朵粬鍑哄簱";
+ case "8":
+ return "瀵勫瓨鍑哄簱";
default:
return "";
}
@@ -333,9 +337,11 @@
var html = '';
if(d.IsWave == '0'){
if(d.Status == '0' || d.Status == '1' ){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
- <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
- </a>`;
+ if(d.Type != "8") {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs zifenClass" lay-event="auto">
+ <i class="layui-icon layui-icon-ok"></i>鑷姩鍒嗛厤
+ </a>`;
+ }
}
if(d.Status == '0' && d.Origin == 'WMS'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs uptClass" lay-event="edit">
@@ -1110,6 +1116,7 @@
console.log(data);
Id = data.Id;
SoNo = data.SONo;
+ var orderType=data.Type//鍗曟嵁绫诲瀷
if (obj.event === 'delete') {//鍒犻櫎
layer.confirm('纭畾鍒犻櫎姝ゅ崟鎹悧锛�', function(index) {
var param = {
@@ -1221,87 +1228,52 @@
maxmin: true,
area: ['1200px', '90%'],
});
- }else if(obj.event === 'outKu'){
- $("#UnstackWay option[value='0']").attr("selected","selected");
- form.render('select');
+ }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
};
- sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- if(res.data=="1"){
- isNeedUnpack='1'
- $('.DivPickingArea2').show()//.attr("style", "display:block")
- }else{
- isNeedUnpack='0'
- $('.DivPickingArea2').hide()//.attr("style", "display:none")
- }
- if($('#UnstackWay').val()=='1'){
- $('.DivPickingArea2').show()//.attr("style", "display:block")
- }
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- return;
- });
- }
- });
- layer.open({
- type: 1,
- title: '纭鍑哄簱鍙�',
- content: $('#divPickingArea'),
- maxmin: true,
- area: ['350px','285px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var pa = $('#PickingArea').val();
- console.log(pa)
- if (isChongFu== true) {
- isChongFu= false;
- if(pa == null)
- {
- layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- var param = {
- soNo: data.SONo,
- outMode: pa,
- };
- console.log(param);
- sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- isChongFu= true;
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- refreshTable();
- isChongFu= true;
- });
- }
- layer.close(index);
- });
- }else{
- layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ if(orderType=="0"){
+ // 鍒ゆ柇鏄惁闇�瑕佹媶绠憋紝闇�瑕佹媶绠卞氨闇�瑕侀�夋嫨鍑哄簱鍙�
+ sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ if(res.data=="1"){
+ isNeedUnpack='1'
+ $('.DivPickingArea2').show()
+ }else{
+ isNeedUnpack='0'
+ $('.DivPickingArea2').hide()
+ }
+ if($('#UnstackWay').val()=='1'){
+ $('.DivPickingArea2').show()
+ }
+
+ outFunction(data.SONo)
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ return;
});
}
-
- }
- });
+ });
+ }else{
+ $("#UnstackWay").val(1)
+ $("#UnstackWay").attr("disabled",true);
+ form.render('select');
+
+ $('.DivLoadingArea').hide()
+
+ outFunction(data.SONo)
+ }
+
+
}else if(obj.event === 'xml'){//缂栬緫
layer.confirm('纭畾瑕佸皢閫変腑鐨勫崟鎹笂浼犲悧锛�', function() {
if (isChongFu== true) {
@@ -1399,6 +1371,87 @@
}
});
+ //閫夋嫨鍑哄簱鍙ｅ脊绐楁柟娉�
+ function outFunction(soNo){
+ layer.open({
+ type: 1,
+ title: '纭鍑哄簱鍙�',
+ content: $('#divPickingArea'),
+ maxmin: true,
+ area: ['350px','285px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var pa = $('#PickingArea').val();
+ console.log(pa)
+ if (isChongFu== true) {
+ isChongFu= false;
+ if(pa == null)
+ {
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if($('#UnstackWay').val()=='0'){
+ if($('#LoadingArea').val()==''){
+ 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: soNo,
+ unstackingMode:$('#UnstackWay').val(),
+ outMode: pa,
+ loadingAddre:$('#LoadingArea').val()
+ };
+ console.log(param);
+ sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ refreshTable();
+ isChongFu= true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ refreshTable();
+ isChongFu= true;
+ });
+ }
+ layer.close(index);
+ });
+ }else{
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+
+ }
+ });
+ }
+
table.on('tool(LAY-app-content-list2)', function(obj) {
var data = obj.data;
var id = data.Id;
@@ -1494,15 +1547,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