From 3a050b4d542dd2aefa65de27a6acecca1d9dda3d Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期日, 25 五月 2025 14:27:04 +0800
Subject: [PATCH] 修改问题
---
HTML/views/SOSetting/ExportNotice.html | 142 +++++++++++++++++++++--------------------------
1 files changed, 63 insertions(+), 79 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index e10b7b3..375d93b 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -130,7 +130,7 @@
</div>
<!-- 纭鍑哄簱鍙ｅ脊绐� -->
<div class="layui-inline" id="divPickingArea" style="display: none; padding-top: 10px;">
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<label class="layui-form-label">鎷嗗灈鏂瑰紡</label>
<div class="layui-input-inline" style="width: 220px;">
<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
@@ -138,7 +138,7 @@
<option value="1">PDA鎷嗗灈</option>
</select>
</div>
- </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;">
@@ -156,10 +156,8 @@
<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="17">17宸ヤ綅</option>
+ <option value="18">18宸ヤ綅</option>
</select>
</div>
</div>
@@ -340,7 +338,11 @@
</script>
<!-- #endregion -->
</div>
-
+<!-- if(d.Type == "1" && (d.Status == '2' || d.Status == '3')){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="beiLiaoOutKu">
+ <i class="layui-icon layui-icon-ok"></i>澶囨枡
+ </a>`;
+ } -->
<script type="text/html" id="table-content-list">
{{# function GetBtn1(d){
var html = '';
@@ -365,11 +367,7 @@
<i class="layui-icon layui-icon-delete"></i>鍙栨秷鍒嗛厤
</a>`;
}
- if(d.Type == "1" && (d.Status == '2' || d.Status == '3')){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="beiLiaoOutKu">
- <i class="layui-icon layui-icon-ok"></i>澶囨枡
- </a>`;
- }
+
if( d.Status == '2' || d.Status == '3'){
html += `<a class="layui-btn layui-btn-normal layui-btn-xs outClass" lay-event="outKu">
<i class="layui-icon layui-icon-ok"></i>鍑哄簱
@@ -1274,50 +1272,12 @@
area: ['1200px', '90%'],
});
} 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
- };
- 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)
- }
-
+
+ //if(data.WareHouseName =="鎴愬搧搴�"){
+ outFunction(data.SONo);
+ // }else{
+ // outFunction2(data.SONo)
+ // }
} else if (obj.event === 'beiLiaoOutKu') {
if (orderType != "1") {
@@ -1430,6 +1390,7 @@
//閫夋嫨鍑哄簱鍙ｅ脊绐楁柟娉�
function outFunction(soNo) {
+
layer.open({
type: 1,
title: '纭鍑哄簱鍙�',
@@ -1438,29 +1399,11 @@
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() == '') {
+
+ if ($("#PickingArea").val() == '' || $('#PickingArea').val() == null) {
layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1470,8 +1413,8 @@
}
var param = {
soNo: soNo,
- unstackingMode: $('#UnstackWay').val(),
- outMode: pa,
+ //unstackingMode: $('#UnstackWay').val(),
+ outMode: $("#PickingArea").val(),
//loadingAddre: $('#LoadingArea').val()
};
console.log(param);
@@ -1506,6 +1449,47 @@
}
});
}
+
+ //涓嶉�夋嫨鍑哄簱鍙ｇ殑寮圭獥鏂规硶
+ function outFunction2(soNo) {
+ layer.confirm('纭畾褰撳墠鍗曟嵁鍑哄簱鍚楋紵', function (index) {
+
+ if (isChongFu == true) {
+ isChongFu = false;
+
+ var param = {
+ soNo: soNo,
+ };
+ 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绉掞級
+ });
+ }
+ });
+ }
//閫夋嫨鍑哄簱鍙ｅ脊绐楁柟娉�
function beiLiaoOutFunction(soNo) {
--
Gitblit v1.8.0