From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001 From: zhaowc <526854230@qq.com> Date: 星期三, 18 九月 2024 16:37:13 +0800 Subject: [PATCH] 增加对申请入库时对平库库位的校验 --- HTML/views/SystemSettings/InterfaceDetail.html | 496 +++++++++++++++++++++++++++--------------------------- 1 files changed, 249 insertions(+), 247 deletions(-) diff --git a/HTML/views/SystemSettings/InterfaceDetail.html b/HTML/views/SystemSettings/InterfaceDetail.html index 595c477..90a6e5c 100644 --- a/HTML/views/SystemSettings/InterfaceDetail.html +++ b/HTML/views/SystemSettings/InterfaceDetail.html @@ -20,7 +20,8 @@ margin-left: -15px; margin-right: -15px; } - .layui-table-mend{ + + .layui-table-mend { position: relative; } </style> @@ -28,66 +29,66 @@ <body> <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list"> - <div class="layui-form-item" style="padding: 20px 30px 0 0;"> + <div class="layui-form-item" style="padding: 20px 30px 0 0;"> <div class="layui-inline"> - <label class="layui-form-label">鎺ュ彛缂栧彿</label> - <div class="layui-input-inline"> - <input type="text" id="InterfaceNo" name="InterfaceNo" autocomplete="off" class="layui-input"> - </div> + <label class="layui-form-label">鎺ュ彛缂栧彿</label> + <div class="layui-input-inline"> + <input type="text" id="InterfaceNo" name="InterfaceNo" autocomplete="off" class="layui-input"> + </div> </div> - + <div class="layui-inline"> - <label class="layui-form-label">鎺ュ彛鍚嶇О</label> - <div class="layui-input-inline"> - <input type="text" id="InterfaceName" name="InterfaceName" autocomplete="off" class="layui-input"> - </div> + <label class="layui-form-label">鎺ュ彛鍚嶇О</label> + <div class="layui-input-inline"> + <input type="text" id="InterfaceName" name="InterfaceName" autocomplete="off" class="layui-input"> + </div> </div> - + <div class="layui-inline"> - <label class="layui-form-label">鎺ュ彛鏂瑰悜</label> - <div class="layui-input-inline"> - <select name="Direction" id="Direction" lay-filter="Direction" lay-search> - <option value=""></option> - <option value="0">WMS=銆婼AP</option> - <option value="1">WMS=銆婨RP</option> + <label class="layui-form-label">鎺ュ彛鏂瑰悜</label> + <div class="layui-input-inline"> + <select name="Direction" id="Direction" lay-filter="Direction" lay-search> + <option value=""></option> + <option value="0">WMS=銆婼AP</option> + <option value="1">WMS=銆婨RP</option> <option value="2">WMS=銆婱ES</option> <option value="3">WMS=銆婥RM</option> <option value="4">WMS=銆婳A</option> - </select> - </div> - </div> - - <div class="layui-inline"> - <label class="layui-form-label">浼犺緭鏂瑰紡</label> - <div class="layui-input-inline"> - <select name="TransmissionMode" id="TransmissionMode" lay-filter="TransmissionMode" lay-search> - <option value=""></option> - <option value="0">Http+Json</option> - <option value="1">Http+Xml</option> - </select> - </div> - </div> - - <div class="layui-inline"> - <label class="layui-form-label">鏁版嵁鏉ユ簮</label> - <div class="layui-input-inline"> - <input type="text" id="DataSources" name="DataSources" autocomplete="off" class="layui-input"> - </div> + </select> + </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鎺ュ彛鍦板潃</label> - <div class="layui-input-inline"> - <input type="text" id="Url" name="Url" autocomplete="off" class="layui-input"> - </div> + <label class="layui-form-label">浼犺緭鏂瑰紡</label> + <div class="layui-input-inline"> + <select name="TransmissionMode" id="TransmissionMode" lay-filter="TransmissionMode" lay-search> + <option value=""></option> + <option value="0">Http+Json</option> + <option value="1">Http+Xml</option> + </select> + </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鎺ュ彛璇存槑</label> - <div class="layui-input-inline"> - <input type="text" id="Remark" name="Remark" autocomplete="off" class="layui-input"> - </div> - </div> + <label class="layui-form-label">鏁版嵁鏉ユ簮</label> + <div class="layui-input-inline"> + <input type="text" id="DataSources" name="DataSources" autocomplete="off" class="layui-input"> + </div> + </div> + + <div class="layui-inline"> + <label class="layui-form-label">鎺ュ彛鍦板潃</label> + <div class="layui-input-inline"> + <input type="text" id="Url" name="Url" autocomplete="off" class="layui-input"> + </div> + </div> + + <div class="layui-inline"> + <label class="layui-form-label">鎺ュ彛璇存槑</label> + <div class="layui-input-inline"> + <input type="text" id="Remark" name="Remark" autocomplete="off" class="layui-input"> + </div> + </div> <div class="layui-inline" style="margin-left: 10px;"> <button class="layui-btn layui-btn-sm layuiadmin-btn-list" data-type="add">娣诲姞鏄庣粏</button> @@ -100,9 +101,10 @@ <div class="layui-card"> <div class="layui-card-body"> <div style="width: 100%;right: 0;"> - <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"></table> + <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"> + </table> - <script type="text/html" id="templetIsNull"> + <script type="text/html" id="templetIsNull"> {{# function GetBtn(d){ var html = ''; html+= '<select name="IsNull" lay-filter="SelctIsNull" data-value="'+d.IsNull+'">'+ @@ -115,7 +117,7 @@ {{ GetBtn(d) }} </script> - <script type="text/html" id="templetFieldType"> + <script type="text/html" id="templetFieldType"> {{# function GetBtn1(d){ var html = ''; html+= '<select name="FieldType" lay-filter="SelctFieldType" data-value="'+d.FieldType+'">'+ @@ -130,7 +132,7 @@ {{ GetBtn1(d) }} </script> - <script type="text/html" id="templetDataType"> + <script type="text/html" id="templetDataType"> {{# function GetBtn2(d){ var html = ''; html+= '<select name="DataType" lay-filter="SelctDataType" data-value="'+d.DataType+'">'+ @@ -142,7 +144,7 @@ }} {{ GetBtn2(d) }} </script> - </div> + </div> <script type="text/html" id="table-content-list"> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a> @@ -172,7 +174,7 @@ elem: '#ExpirationDate' , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚� }); - var TypeValue=$("#Type").val(); + var TypeValue = $("#Type").val(); // table 鍩烘湰璁剧疆 var infoOptions = { @@ -183,133 +185,133 @@ limit: 30, limits: pageLimits, cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板 - done: function(){ - //閫変腑涓嬫媺妗嗙殑鍊� - layui.each($('select'), function (index, item) { - var elem = $(item); - if(elem.data('value')!='' && elem.data('value')!=undefined){ - elem.val(elem.data('value')).parents('table.layui-table-cell').css('overflow', 'visible'); - } - }); - form.render(); - }, + done: function () { + //閫変腑涓嬫媺妗嗙殑鍊� + layui.each($('select'), function (index, item) { + var elem = $(item); + if (elem.data('value') != '' && elem.data('value') != undefined) { + elem.val(elem.data('value')).parents('table.layui-table-cell').css('overflow', 'visible'); + } + }); + form.render(); + }, cols: [ - [{ - title: '搴忓彿', - type: 'numbers', - width: 50, - align: 'center', - fixed: 'left' - },{ - field: 'Id', - title: 'Id', - align: 'center', - hide:true, - width: 100, - edit: 'text' - }, - { - field: 'InterfaceNo', - title: '鎺ュ彛缂栧彿', - align: 'center', - width: 140 - }, - { - field: 'ExtField', - title: '澶栫郴缁熷瓧娈�', - align: 'center', - width: 180, - edit: 'text' - }, { - field: 'MapField', - title: '鏄犲皠瀛楁', - align: 'center', - width: 180, + [{ + title: '搴忓彿', + type: 'numbers', + width: 50, + align: 'center', + fixed: 'left' + }, { + field: 'Id', + title: 'Id', + align: 'center', + hide: true, + width: 100, edit: 'text' - }, { - field: 'Field', - title: '鏈郴缁熷瓧娈�', - align: 'center', - width: 180, - edit: 'text' - },{ - field: 'FieldType', - title: '瀛楁绫诲瀷', - align: 'center', - width: 100, + }, + { + field: 'InterfaceNo', + title: '鎺ュ彛缂栧彿', + align: 'center', + width: 140 + }, + { + field: 'ExtField', + title: '澶栫郴缁熷瓧娈�', + align: 'center', + width: 180, + edit: 'text' + }, { + field: 'MapField', + title: '鏄犲皠瀛楁', + align: 'center', + width: 180, + edit: 'text' + }, { + field: 'Field', + title: '鏈郴缁熷瓧娈�', + align: 'center', + width: 180, + edit: 'text' + }, { + field: 'FieldType', + title: '瀛楁绫诲瀷', + align: 'center', + width: 100, templet: '#templetFieldType' - }, { - field: 'DataType', - title: '鏁版嵁绫诲瀷', - align: 'center', - width: 100, + }, { + field: 'DataType', + title: '鏁版嵁绫诲瀷', + align: 'center', + width: 100, templet: '#templetDataType' - },{ - field: 'FieldFather', - title: '鐖剁骇瀛楁', - align: 'center', - width: 100, - edit: 'text' - }, - { - field: 'IsNull', - title: '鍏佽涓虹┖', - align: 'center', - width: 100, - templet: '#templetIsNull' - }, - { - field: 'Remark', - title: '璇存槑', - align: 'center', - width: 180, - edit: 'text' - },{ - field: 'CreateUserName', - title: '鍒涘缓浜�', - align: 'center', - hide:true, - width: 100, - edit: 'text' - }, - { - field: 'CreateTime', - title: '鍒涘缓鏃堕棿', - align: 'center', - hide:true, - width: 160, - templet: function (d) { - return formatDate(d.CreateTime); - } - }, - { - field: 'UpdateUserName', - title: '淇敼浜�', - align: 'center', - hide:true, - width: 150, - }, - { - field: 'UpdateTime', - title: '淇敼鏃堕棿', - align: 'center', - hide:true, - width: 150, - templet: function (d) { - return formatDate(d.UpdateTime); - } - }, - { - title: '鎿嶄綔', - fixed: 'right', - width: 120, - align: 'center', - templet: '#table-content-list' - }] - ] + }, { + field: 'FieldFather', + title: '鐖剁骇瀛楁', + align: 'center', + width: 100, + edit: 'text' + }, + { + field: 'IsNull', + title: '鍏佽涓虹┖', + align: 'center', + width: 100, + templet: '#templetIsNull' + }, + { + field: 'Remark', + title: '璇存槑', + align: 'center', + width: 180, + edit: 'text' + }, { + field: 'CreateUserName', + title: '鍒涘缓浜�', + align: 'center', + hide: true, + width: 100, + edit: 'text' + }, + { + field: 'CreateTime', + title: '鍒涘缓鏃堕棿', + align: 'center', + hide: true, + width: 160, + templet: function (d) { + return formatDate(d.CreateTime); + } + }, + { + field: 'UpdateUserName', + title: '淇敼浜�', + align: 'center', + hide: true, + width: 150, + }, + { + field: 'UpdateTime', + title: '淇敼鏃堕棿', + align: 'center', + hide: true, + width: 150, + templet: function (d) { + return formatDate(d.UpdateTime); + } + }, + { + title: '鎿嶄綔', + fixed: 'right', + width: 120, + align: 'center', + templet: '#table-content-list' + }] + ] }; - // 娓叉煋Table - refreshTable(null); + // 娓叉煋Table + refreshTable(null); // 娓叉煋table function refreshTable(data) { $.extend(infoOptions, { @@ -330,22 +332,23 @@ }; sendData(IP + "/Basis/GetInterfaceList", param, 'post', function (res) { if (res.code == 0) { - $("input[name='InterfaceNo']").val(res.data[0].InterfaceNo); - $("input[name='InterfaceName']").val(res.data[0].InterfaceName); - $("#Direction option[value = '" + res.data[0].Direction + "']").prop("selected", true); - $("#TransmissionMode option[value = '" + res.data[0].TransmissionMode + "']").prop("selected", true); - $("input[name='Remark']").val(res.data[0].Remark); - $("input[name='Url']").val(res.data[0].Url); - $("input[name='DataSources']").val(res.data[0].DataSources); + var data = res.data.Items[0]; + $("input[name='InterfaceNo']").val(data.InterfaceNo); + $("input[name='InterfaceName']").val(data.InterfaceName); + $("#Direction option[value = '" + data.Direction + "']").prop("selected", true); + $("#TransmissionMode option[value = '" + data.TransmissionMode + "']").prop("selected", true); + $("input[name='Remark']").val(data.Remark); + $("input[name='Url']").val(data.Url); + $("input[name='DataSources']").val(data.DataSources); $("#InterfaceNo").attr("disabled", "disabled"); var paramDetail = { - InterfaceNo:id + InterfaceNo: id }; sendData(IP + "/Basis/GetInterfaceDetailList", paramDetail, 'post', function (res) { if (res.code == 0) { //鎴愬姛 - var data = res.data; + var data = res.data.Items; //椤甸潰璧嬪�� $.extend(infoOptions, { data: data @@ -379,51 +382,50 @@ if (obj.event == 'del') { layer.confirm('纭畾鍒犻櫎鎺ュ彛鏄庣粏锛�', function (index) { var menu = layui.table.cache["LAY-app-content-list"]; - menu.splice(obj.tr.data('index'),1); - table.reload('LAY-app-content-list',{data : menu}); + menu.splice(obj.tr.data('index'), 1); + table.reload('LAY-app-content-list', { data: menu }); layer.close(index) }); } }); //娣诲姞鎺ュ彛鏄庣粏 - var MapFieldNum=0; + var MapFieldNum = 0; var $ = layui.$, - active = { - add: function () { - var InterfaceNo=$('#InterfaceNo').val(); - if(InterfaceNo==''){ - layer.msg("璇疯緭鍏ユ帴鍙g紪鍙凤紒", { - icon: 2, - time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 - }, function () { + active = { + add: function () { + var InterfaceNo = $('#InterfaceNo').val(); + if (InterfaceNo == '') { + layer.msg("璇疯緭鍏ユ帴鍙g紪鍙凤紒", { + icon: 2, + time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 + }, function () { - }); - return; - } - var menu = layui.table.cache["LAY-app-content-list"]; - - if(MapFieldNum==0){ - if(menu!=undefined){ - var menuLength=menu.length-1; - var lastNum=menu[menuLength].MapField.replace('Field',''); - MapFieldNum=parseInt(lastNum)+1; + }); + return; } - else{ - MapFieldNum=MapFieldNum+1; + var menu = layui.table.cache["LAY-app-content-list"]; + + if (MapFieldNum == 0) { + if (menu != undefined) { + var menuLength = menu.length - 1; + var lastNum = menu[menuLength].MapField.replace('Field', ''); + MapFieldNum = parseInt(lastNum) + 1; + } + else { + MapFieldNum = MapFieldNum + 1; + } } + else { + MapFieldNum = MapFieldNum + 1; + } + if (menu == undefined) { + menu = [] + } + var newRow = { InterfaceNo: InterfaceNo, MapField: 'Field' + MapFieldNum, IsNull: '0' }; + menu.push(newRow); + refreshTable(menu); } - else{ - MapFieldNum=MapFieldNum+1; - } - if(menu==undefined) - { - menu=[] - } - var newRow={InterfaceNo:InterfaceNo,MapField:'Field'+MapFieldNum,IsNull:'0'}; - menu.push(newRow); - refreshTable(menu); - } - }; + }; $('.layui-btn').on('click', function () { var type = $(this).data('type'); active[type] ? active[type].call(this) : ''; @@ -459,48 +461,48 @@ // 淇濆瓨鎺ュ彛淇℃伅 form.on('submit(form1)', function (data) { - var InterfaceNo=$('#InterfaceNo').val(); - if (InterfaceNo == "" || InterfaceNo ==undefined) { + var InterfaceNo = $('#InterfaceNo').val(); + if (InterfaceNo == "" || InterfaceNo == undefined) { layer.msg("璇疯緭鍏ユ帴鍙g紪鍙凤紒", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return; } - var InterfaceName=$('#InterfaceName').val(); - if (InterfaceName == "" || InterfaceName ==undefined) { + var InterfaceName = $('#InterfaceName').val(); + if (InterfaceName == "" || InterfaceName == undefined) { layer.msg("璇疯緭鍏ユ帴鍙e悕绉帮紒", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return; } - var Direction=$('#Direction').val(); - if (Direction == "" || Direction ==undefined) { + var Direction = $('#Direction').val(); + if (Direction == "" || Direction == undefined) { layer.msg("璇烽�夋嫨鎺ュ彛鏂瑰悜锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return; } - var TransmissionMode=$('#TransmissionMode').val(); - if (TransmissionMode == "" || TransmissionMode ==undefined) { + var TransmissionMode = $('#TransmissionMode').val(); + if (TransmissionMode == "" || TransmissionMode == undefined) { layer.msg("璇烽�夋嫨浼犺緭鏂瑰紡锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return; } - var DataSources=$('#DataSources').val(); - if (DataSources == "" || DataSources ==undefined) { + var DataSources = $('#DataSources').val(); + if (DataSources == "" || DataSources == undefined) { layer.msg("璇疯緭鍏ユ暟鎹潵婧愶紒", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return; } - var Url=$('#Url').val(); - if (Url == "" || Url ==undefined) { + var Url = $('#Url').val(); + if (Url == "" || Url == undefined) { layer.msg("璇疯緭鍏ユ帴鍙e湴鍧�锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 @@ -520,12 +522,12 @@ SetInterface(); }); //#region 浜嬩欢鏂规硶 - + // 娣诲姞鎺ュ彛淇℃伅 var doing = true; function SetInterface(data) { var item2 = getInterfaceInfo(); - if (item2 !=-1) { + if (item2 != -1) { if (doing) { doing = false; if (id == null) { @@ -577,7 +579,7 @@ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }, function () { doing = true }); } - } + } } // 鎻愪氦鑾峰彇鎺ュ彛淇℃伅 @@ -585,61 +587,61 @@ var DataList = []; var menu = layui.table.cache["LAY-app-content-list"]; for (var i in menu) { - if(menu[i]==[]){ + if (menu[i] == []) { continue; } - if (menu[i].InterfaceNo == "" || menu[i].InterfaceNo ==undefined) { + if (menu[i].InterfaceNo == "" || menu[i].InterfaceNo == undefined) { layer.msg("璇疯緭鍏ユ帴鍙g紪鍙凤紒", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; } - if (menu[i].ExtField == "" || menu[i].ExtField ==undefined) { + if (menu[i].ExtField == "" || menu[i].ExtField == undefined) { layer.msg("璇疯緭鍏ュ绯荤粺瀛楁锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; - } - if (menu[i].MapField == "" || menu[i].MapField ==undefined) { + } + if (menu[i].MapField == "" || menu[i].MapField == undefined) { layer.msg("璇疯緭鍏ユ槧灏勫瓧娈碉紒", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; } - if (menu[i].Field == "" || menu[i].Field ==undefined) { + if (menu[i].Field == "" || menu[i].Field == undefined) { layer.msg("璇疯緭鍏ユ湰绯荤粺瀛楁锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; } - if (menu[i].FieldType == "" || menu[i].FieldType ==undefined) { + if (menu[i].FieldType == "" || menu[i].FieldType == undefined) { layer.msg("璇烽�夋嫨瀛楁绫诲瀷锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; } - if (menu[i].DataType == "" || menu[i].DataType ==undefined) { + if (menu[i].DataType == "" || menu[i].DataType == undefined) { layer.msg("璇烽�夋嫨鏁版嵁绫诲瀷锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; } - if (menu[i].IsNull == "" || menu[i].IsNull ==undefined) { + if (menu[i].IsNull == "" || menu[i].IsNull == undefined) { layer.msg("璇烽�夋嫨鍏佽涓虹┖锛�", { icon: 2, time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級 }); return -1; - } + } var item = { - Id:menu[i].Id, + Id: menu[i].Id, InterfaceNo: menu[i].InterfaceNo, ExtField: menu[i].ExtField, MapField: menu[i].MapField, @@ -652,7 +654,7 @@ }; DataList.push(item); //灞炴�� } - + var item2 = { InterfaceNo: $("#InterfaceNo").val(), InterfaceName: $("#InterfaceName").val(), @@ -660,7 +662,7 @@ TransmissionMode: $("#TransmissionMode").val(), Remark: $("#Remark").val(), Url: $("#Url").val(), - DataSources:$("#DataSources").val(), + DataSources: $("#DataSources").val(), InterfaceDetail: DataList } return item2; -- Gitblit v1.8.0