From d1ecbc098962cfdcb1cf58abc06d16592fb3ce22 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 17 一月 2025 15:36:46 +0800
Subject: [PATCH] 1楼空托盘垛出库禁止AGV拉货
---
HTML/views/SOSetting/ExportNotice.html | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 86 insertions(+), 19 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 7934f3e..23b2a95 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -155,7 +155,6 @@
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
- <option value="4">4</option>
</select>
</div>
</div>
@@ -169,7 +168,25 @@
<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>
+ </div>
+ <div class="layui-inline" id="divFinish" style="display: none; padding-top: 10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐﹀彿</label>
+ <div class="layui-input-inline" style="width: 220px;">
+ <input type="text" id="admin" name="admin" placeholder="璐﹀彿" autocomplete="off"
+ class="layui-input">
+ </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;">
+ <input type="text" id="password" name="password" placeholder="瀵嗙爜" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
@@ -356,7 +373,7 @@
<i class="layui-icon layui-icon-delete"></i>鍙栨秷鍒嗛厤
</a>`;
}
- if( d.Status == '2' || d.Status == '3'){
+ 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>`;
@@ -977,27 +994,77 @@
}
});
}else if(obj.event === 'check'){//澶嶆牳
- // 浠ｇ爜鍖哄煙
- layer.confirm('纭畾澶嶆牳姝ゅ崟鎹悧锛�', function(index) {
- var param = {
- Id:data.Id,
- };
- sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- refreshTable();
- doing = true
+
+ layer.open({
+ type: 1,
+ title: '澶嶆牳纭',
+ content: $('#divFinish'),
+ maxmin: true,
+ area: ['350px','215px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function(index, layero) {
+ var pa = $('#PickingArea').val();
+ console.log(pa)
+ if (isChongFu== true) {
+ isChongFu= false;
+
+ if($('#admin').val()==''){
+ layer.msg("璇疯緭鍏ヨ处鍙�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }
+ if($("#password").val() == '')
+ {
+ layer.msg("璇疯緭鍏ュ瘑鐮�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ isChongFu= true;
+ return;
+ }
+
+ var param = {
+ Id:data.Id,
+ UserNo:$('#admin').val(),
+ Password:$('#password').val(),
+ };
+ console.log(param);
+ sendData(IP + "/UpApi/FinishExportNotice", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ refreshTable();
+ $('#admin').val("");
+ $('#password').val("");
+ isChongFu = true
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ isChongFu = true ;
+ $('#admin').val("");
+ $('#password').val("")
+ });
+ }
+ layer.close(index);
});
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
+
+
+ }else{
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
+ });
}
- });
+
+ }
});
}
});
--
Gitblit v1.8.0