From 1b86f1120560fbfcad792606064a9bef15d42827 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:24:34 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/WareHouseSetting/Locate.html | 1110 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 599 insertions(+), 511 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 9f52be6..02f55f4 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -1,560 +1,648 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>鍌ㄤ綅鍒楄〃淇℃伅</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport"
- content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
- <script>
- // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
- //鑾峰彇table榛樿鏄剧ず鏁�
- pageCntFirst();
- });
- </script>
- </head>
- <body id="body">
- <div class="layui-fluid" style="padding-bottom: 0;">
- <div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
- <div class="layui-input-inline">
- <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
- <div class="layui-input-inline">
- <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
- <div class="layui-input-inline">
- <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鐘舵��</label>
- <div class="layui-input-inline">
- <select name="Status" id="Status" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">绌哄偍浣�</option>
- <option value="1">鏈夌墿鍝�</option>
- <option value="2">鍏ュ簱涓�</option>
- <option value="3">鍑哄簱涓�</option>
- <option value="4">绉诲叆涓�</option>
- <option value="5">绉诲嚭涓�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鏍囧織</label>
- <div class="layui-input-inline">
- <select name="Flag" id="Flag" lay-search>
- <option value=""></option>
- <option value="0">姝ｅ父</option>
- <option value="1">灞忚斀</option>
- <option value="2">鎹熷潖</option>
- </select>
- </div>
- </div>
- <div class="layui-inline" >
- <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅缂栫爜</label>
- <div class="layui-input-inline">
- <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅缂栫爜路路路" autocomplete="off"
- class="layui-input">
- </div>
- </div>
-
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄦ帓</label>
- <div class="layui-input-inline">
- <input type="number" id="Row" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">鍌ㄥ垪</label>
- <div class="layui-input-inline">
- <input type="number" id="Column" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Column" placeholder="鍒椔仿仿�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline" >
- <label class="layui-form-label" style="width: 60px;">鍌ㄥ眰</label>
- <div class="layui-input-inline">
- <input type="number" id="Layer" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Layer" placeholder="灞偮仿仿�"
- autocomplete="off" class="layui-input">
- </div>
- </div>
+<head>
+ <meta charset="utf-8">
+ <title>鍌ㄤ綅鍒楄〃淇℃伅</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script>
+ // 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
+ document.addEventListener("DOMContentLoaded", function () {
- <div class="layui-inline">
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
- lay-filter="LAY-app-contlist-search">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
- </button>
- </div>
- <div class="layui-inline">
- <button style="margin-right: 10px;" class="layui-btn layui-btn-normal layui-btn-sm layuiadmin-btn-list editClass"
- data-type="editList" id="approvalBtn">
- <i class="layui-icon layui-icon-edit layuiadmin-button-btn"> </i>鎵归噺缂栬緫
- </button>
+ //鑾峰彇table榛樿鏄剧ず鏁�
+ pageCntFirst();
+ });
+ </script>
+</head>
+
+<body id="body">
+
+ <div class="layui-fluid" style="padding-bottom: 0;">
+ <div class="layui-card">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
+ id="top">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <option value=""></option>
+ </select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲贩閬�</label>
+ <div class="layui-input-inline">
+ <select name="RoadwayNo" id="RoadwayNo" lay-filter="getRoadwayNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鐘舵��</label>
+ <div class="layui-input-inline">
+ <select name="Status" id="Status" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">绌哄偍浣�</option>
+ <option value="1">鏈夌墿鍝�</option>
+ <option value="2">鍏ュ簱涓�</option>
+ <option value="3">鍑哄簱涓�</option>
+ <option value="4">绉诲叆涓�</option>
+ <option value="5">绉诲嚭涓�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鏍囧織</label>
+ <div class="layui-input-inline">
+ <select name="Flag" id="Flag" lay-search>
+ <option value=""></option>
+ <option value="0">姝ｅ父</option>
+ <option value="1">灞忚斀</option>
+ <option value="2">鎹熷潖</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅缂栫爜路路路" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄦ帓</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Row" onkeyup="this.value=this.value.replace(/[, ]/g,'')" name="Row"
+ placeholder="鎺捖仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄥ垪</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Column" onkeyup="this.value=this.value.replace(/[, ]/g,'')"
+ name="Column" placeholder="鍒椔仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鍌ㄥ眰</label>
+ <div class="layui-input-inline">
+ <input type="number" id="Layer" onkeyup="this.value=this.value.replace(/[, ]/g,'')"
+ name="Layer" placeholder="灞偮仿仿�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ lay-filter="LAY-app-contlist-search">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button style="margin-right: 10px;"
+ class="layui-btn layui-btn-normal layui-btn-sm layuiadmin-btn-list editClass"
+ data-type="editList" id="approvalBtn">
+ <i class="layui-icon layui-icon-edit layuiadmin-button-btn"> </i>鎵归噺缂栬緫
+ </button>
+ </div>
+ <div class="layui-inline">
+ <button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass"
+ data-type="addList" lay-event="add">
+ <i class="layui-icon"></i>娣诲姞
+ </button>
+ </div>
</div>
- <div id="center"></div>
- <div class="layui-card-body">
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
- <script type="text/html" id="table-content-list">
+ </div>
+ <div id="center"></div>
+ <div class="layui-card-body">
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
+ <script type="text/html" id="table-content-list">
<a class="editBtn layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
</script>
- </div>
</div>
</div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- var uid = $.cookie('token');
- if (uid == null) {
- alert('鐧诲綍澶辨晥,璇烽噸鏂扮櫥褰曞悗鎿嶄綔');
- window.parent.location.href = '../Login.html'
- }
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer'], function() {
- var table = layui.table,
- form = layui.form,
- laypage = layui.laypage,
- layer = layui.layer,
- $ = layui.$;
- var houseid = 0;
- var h1 = GetTableHeight();
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var doing = true;
- active = {
-
- editList: function () {
- var checkStatus = table.checkStatus('LAY-app-content-list'),
+ </div>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ var uid = $.cookie('token');
+ if (uid == null) {
+ alert('鐧诲綍澶辨晥,璇烽噸鏂扮櫥褰曞悗鎿嶄綔');
+ window.parent.location.href = '../Login.html'
+ }
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'table', 'laypage', 'layer'], function () {
+ var table = layui.table,
+ form = layui.form,
+ laypage = layui.laypage,
+ layer = layui.layer,
+ $ = layui.$;
+ var houseid = 0;
+ var h1 = GetTableHeight();
+ // 琛ㄥ崟闇�瑕佺殑鍙橀噺
+ var doing = true;
+ active = {
+
+ editList: function () {
+ var checkStatus = table.checkStatus('LAY-app-content-list'),
checkData = checkStatus.data; //寰楀埌閫変腑鐨勬暟鎹�
- if (checkData.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- else if(checkData.length > 1)
- {
- var li = 0;
- var ping = 0;
- var WareNo = "W01";
- checkData.forEach(item => {
- if (item.WareHouseName == "鍔涜绔嬩綋搴�")
- {
- li += 1;
- WareNo = "W01";
- if (ping > 0)
- {
- return;
- }
- }
- if (item.WareHouseName == "鍔涜骞冲簱")
- {
- ping += 1;
- WareNo = "W02";
- if (li > 0)
- {
- return;
- }
- }
- });
- if (li != 0 && ping != 0)
- {
- return layer.msg('璇峰嬁閫夋嫨澶氱浠撳簱锛�');
- }
- }
-
- layer.open({
- type: 2,
- title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�',
- content: 'LocateFrom.html?WareHouseNo='+WareNo,
- maxmin: true,
- area: ['560px', '510px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-submit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(field);
- var msg = [];
- for (var i = 0; i < checkData.length; i++) {
- // msg.push(checkData[i].Id);
- msg.push(checkData[i].Id)
- }
- console.log(msg);
-
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: msg,
- Status:field.Status,
- Flag:field.Flag,
- Temperature:field.Temp
- };
- if (doing) {
- doing = false;
- sendData(IP + "/Sys/EditStorageLocatList", param, 'post', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- tableIns.reload({
- page: {
- curr: 1
- }
- });
- layer.close(index); //鍏抽棴寮瑰眰
- doing = true;
- });
- } else if(res.code == 1){
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- } else { //涓嶆垚鍔�
- layer.msg(res.statusText, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {doing = true;});
- }
- });
- }
-
- //$.ajax({});
- });
- submit.trigger('click');
- }
- });
+ if (checkData.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
}
- };
- $('.layui-btn.layuiadmin-btn-list').on('click', function () {
- var type = $(this).data('type');
- active[type] ? active[type].call(this) : '';
- });
- var where = {
- HouseNo: $("#WareHouseNo").val(),
- RoadwayNo: $("#RoadwayNo").val(),
- AreaNo: $("#AreaNo").val(),
- Status: $("#Status").val(),
- Flag: $("#Flag").val(),
- Locat: $("#LocatNo").val(),
- Row: parseInt($("#Row").val()),
- Col: parseInt($("#Column").val()),
- Layer: parseInt($("#Layer").val()),
- };
- console.log(where);
- var tableIns = table.render({
- elem: '#LAY-app-content-list',
- height: h1,
- id: 'LAY-app-content-list',
- url: IP + "/Sys/GetStorageLocatList",
- method: 'post',
- where: where,
- contentType: 'application/json',
- headers:{ToKen:$.cookie('token')},
- page: true,
- even: true,
- limit: pageCnt, //榛樿澶氬皯椤�
- limits: pageLimits, //榛樿鏁扮粍[10,20,30,40,50]
- cellMinWidth: 70,
- done: function() {
- $(function() {
- $(".editClass").hide();
- });
- sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
- for (var k = 0; k < res.data.length; k++) {
- if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
- $(function() {
- $(".editClass").show();
- });
- }
+ else if (checkData.length > 1) {
+ var li = 0;
+ var ping = 0;
+ var WareNo = "W01";
+ checkData.forEach(item => {
+ if (item.WareHouseName == "鍔涜绔嬩綋搴�") {
+ li += 1;
+ WareNo = "W01";
+ if (ping > 0) {
+ return;
}
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }
+ if (item.WareHouseName == "鍔涜骞冲簱") {
+ ping += 1;
+ WareNo = "W02";
+ if (li > 0) {
+ return;
+ }
}
});
- },
- cols: [
- [ {
- title: '搴忓彿',
- type: 'checkbox',
- width: 65,
- fixed: 'left'
- },{
- title: '搴忓彿',
- type: 'numbers',
- width: 65,
- fixed: 'left'
- }, {
- field: 'WareHouseName',
- title: '鎵�灞炰粨搴�',
- align: 'center',
- width: 140,
- fixed: 'left',
- templet: function(d) {
-
- return d.WareHouseNo + '-' + d.WareHouseName;
- }
- }, {
- field: 'RoadwayNo',
- title: '鎵�灞炲贩閬�',
- align: 'center',
- width: 130,
- templet: function(d) {
-
- return d.RoadwayNo + '-' + d.RoadwayName;
- }
- }, {
- field: 'AreaName',
- title: '鎵�灞炲尯鍩�',
- align: 'center',
- width: 130,
- templet: function(d) {
-
- return d.AreaNo + '-' + d.AreaName;
- }
- }, {
- field: 'LocatNo',
- title: '鍌ㄤ綅缂栫爜',
- align: 'center',
- }, {
- field: 'StatusName',
- title: '鍌ㄤ綅鐘舵��',
- align: 'center',
- width: 140,
- }, {
- field: 'FlagName',
- title: '鍌ㄤ綅鏍囪瘑',
- align: 'center',
- width: 90,
- }, {
- field: 'Row',
- title: '鎺�',
- align: 'center',
- width: 70,
- }, {
- field: 'Column',
- title: '鍒�',
- align: 'center',
- width: 70,
- }, {
- field: 'Layer',
- title: '灞�',
- align: 'center',
- width: 70,
- }, {
- field: 'Depth',
- title: '娣卞害',
- align: 'center',
- width: 70,
- }, {
- field: 'Height',
- title: '楂樺害',
- align: 'center',
- width: 90,
- }, {
- field: 'Weight',
- title: '閲嶉噺',
- align: 'center',
- width: 90,
- }, {
- field: 'TempName',
- title: '瀛樺偍鍧忓',
- align: 'center',
- width: 110,
- }, {
- title: '鎿嶄綔',
- fixed: 'right',
- width: 120,
- align: 'center',
- toolbar: '#table-content-list'
+ if (li != 0 && ping != 0) {
+ return layer.msg('璇峰嬁閫夋嫨澶氱浠撳簱锛�');
}
- ]
- ],
- })
- //鐩戝惉鎼滅储
- form.on('submit(LAY-app-contlist-search)', function(data) {
- tableIns.reload({
- where: { //璁惧畾寮傛鏁版嵁鎺ュ彛鐨勯澶栧弬鏁帮紝浠绘剰璁�
- HouseNo: $("#WareHouseNo").val(),
- RoadwayNo: $("#RoadwayNo").val(),
- AreaNo: $("#AreaNo").val(),
- Status: $("#Status").val(),
- Flag: $("#Flag").val(),
- Locat: $("#LocatNo").val(),
- Row: parseInt($("#Row").val()),
- Col: parseInt($("#Column").val()),
- Layer: parseInt($("#Layer").val()),
- },
- page: {
- curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- }
- });
- });
-
- table.on('tool(LAY-app-content-list)', function(obj) {
- var data = obj.data;
- var id = 0;
- if (obj.event === 'edit') {
- id = data.Id;
- layer.open({
- type: 2,
- title: '鍌ㄤ綅淇℃伅绠＄悊',
- content: 'LocateFrom.html?id=' + id,
- maxmin: true,
- area: ['560px', '510px'],
- btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- //鐩戝惉鎻愪氦
- iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
+ }
- var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
- console.log(data)
- //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: id,
- Status:field.Status,
- Flag:field.Flag,
- Temperature:field.Temp
- };
- sendData(IP + "/Sys/EditStorageLocat", param, 'post', function(res) {
+ layer.open({
+ type: 2,
+ title: '缂栬緫鍌ㄤ綅鐘舵�侀泦鍚�',
+ content: 'LocateFrom.html?WareHouseNo=' + WareNo,
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log("淇敼鐨勫瓧娈碉細"+field);
+ var msg = [];
+ for (var i = 0; i < checkData.length; i++) {
+ // msg.push(checkData[i].Id);
+ msg.push(checkData[i].Id)
+ }
+ console.log(msg);
+
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: msg,
+ Status: field.Status,
+ Flag: field.Flag,
+ Temperature: field.Temp,
+ AreaNo: field.AreaNo
+ };
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Sys/EditStorageLocatList", param, 'post', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
- layer.msg("淇敼鎴愬姛", {
+ layer.msg(res.msg, {
icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
tableIns.reload({
page: {
curr: 1
}
});
layer.close(index); //鍏抽棴寮瑰眰
+ doing = true;
});
- } else if(res.code == 1){
+ } else if (res.code == 1) {
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { doing = true; });
} else { //涓嶆垚鍔�
layer.msg(res.statusText, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () { doing = true; });
}
- });
- });
- submit.trigger('click');
+ });
+ }
+
+ //$.ajax({});
+ });
+ submit.trigger('click');
+ }
+ });
+ },
+ addList: function () {
+
+ layer.open({
+ type: 2,
+ title: '娣诲姞鍌ㄤ綅淇℃伅',
+ content: 'LocateAddFrom.html',
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index1, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index1],
+ submitID = 'layuiadmin-app-form-submit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ // var msg = [];
+ // for (var i = 0; i < checkData.length; i++) {
+ // // msg.push(checkData[i].Id);
+ // msg.push(checkData[i].Id)
+ // }
+ // console.log(msg);
+
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ // Id: msg,
+ Index: Number(field.IndexRow),
+ HouseNo: field.HouseNo,
+ RoadwayNo: field.RoadwayNo,
+ AreaNo: field.AreaNo,
+ Row: Number(field.Row),
+ Col: Number(field.Col),
+ Layer: Number(field.Layer),
+ Depth: field.Depth,
+ };
+ console.log(param)
+ if (doing) {
+ doing = false;
+ sendData(IP + "/Sys/AddStorageLocat", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 200) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
+ }
+ });
+ layer.close(index1); //鍏抽棴寮瑰眰
+ doing = true;
+ });
+ } else if (res.code == 1) {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { doing = true; });
+ }
+ });
+ }
+
+ //$.ajax({});
+ });
+ submit.trigger('click');
+ }
+ });
+ },
+ };
+
+ $('.layui-btn.layuiadmin-btn-list').on('click', function () {
+ var type = $(this).data('type');
+ active[type] ? active[type].call(this) : '';
+ });
+ var where = {
+ HouseNo: $("#WareHouseNo").val(),
+ RoadwayNo: $("#RoadwayNo").val(),
+ AreaNo: $("#AreaNo").val(),
+ Status: $("#Status").val(),
+ Flag: $("#Flag").val(),
+ Locat: $("#LocatNo").val(),
+ Row: parseInt($("#Row").val()),
+ Col: parseInt($("#Column").val()),
+ Layer: parseInt($("#Layer").val()),
+ };
+ console.log(where);
+ var tableIns = table.render({
+ elem: '#LAY-app-content-list',
+ height: h1,
+ id: 'LAY-app-content-list',
+ url: IP + "/Sys/GetStorageLocatList",
+ method: 'post',
+ where: where,
+ contentType: 'application/json',
+ headers: { ToKen: $.cookie('token') },
+ page: true,
+ even: true,
+ limit: pageCnt, //榛樿澶氬皯椤�
+ limits: pageLimits, //榛樿鏁扮粍[10,20,30,40,50]
+ cellMinWidth: 70,
+ done: function () {
+ $(function () {
+ $(".editClass").hide();
+ $(".addClass").hide();
+ });
+ sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var k = 0; k < res.data.length; k++) {
+ if (res.data[k].MenuName == "缂栬緫鍌ㄤ綅") {
+ $(function () {
+ $(".editClass").show();
+ });
+ }
+ if (res.data[k].MenuName == "娣诲姞鍌ㄤ綅") {
+ $(function () {
+ $(".addClass").show();
+ });
+ }
}
- });
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ },
+ cols: [
+ [{
+ title: '搴忓彿',
+ type: 'checkbox',
+ width: 65,
+ fixed: 'left'
+ }, {
+ title: '搴忓彿',
+ type: 'numbers',
+ width: 65,
+ fixed: 'left'
+ }, {
+ field: 'WareHouseName',
+ title: '鎵�灞炰粨搴�',
+ align: 'center',
+ width: 140,
+ fixed: 'left',
+ templet: function (d) {
+
+ return d.WareHouseNo + '-' + d.WareHouseName;
+ }
+ }, {
+ field: 'RoadwayNo',
+ title: '鎵�灞炲贩閬�',
+ align: 'center',
+ width: 130,
+ templet: function (d) {
+
+ return d.RoadwayNo + '-' + d.RoadwayName;
+ }
+ }, {
+ field: 'AreaName',
+ title: '鎵�灞炲尯鍩�',
+ align: 'center',
+ width: 130,
+ templet: function (d) {
+
+ return d.AreaNo + '-' + d.AreaName;
+ }
+ }, {
+ field: 'LocatNo',
+ title: '鍌ㄤ綅缂栫爜',
+ align: 'center',
+ }, {
+ field: 'StatusName',
+ title: '鍌ㄤ綅鐘舵��',
+ align: 'center',
+ width: 140,
+ }, {
+ field: 'FlagName',
+ title: '鍌ㄤ綅鏍囪瘑',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'Row',
+ title: '鎺�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Column',
+ title: '鍒�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Layer',
+ title: '灞�',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Depth',
+ title: '娣卞害',
+ align: 'center',
+ width: 70,
+ }, {
+ field: 'Height',
+ title: '楂樺害',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'Weight',
+ title: '閲嶉噺',
+ align: 'center',
+ width: 90,
+ }, {
+ field: 'TempName',
+ title: '瀛樺偍鍧忓',
+ align: 'center',
+ width: 110,
+ }, {
+ title: '鎿嶄綔',
+ fixed: 'right',
+ width: 120,
+ align: 'center',
+ toolbar: '#table-content-list'
}
- });
-
- //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
- sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
- if (res.code == 0) { //鎴愬姛
+ ]
+ ],
+ })
+ //鐩戝惉鎼滅储
+ form.on('submit(LAY-app-contlist-search)', function (data) {
+ tableIns.reload({
+ where: { //璁惧畾寮傛鏁版嵁鎺ュ彛鐨勯澶栧弬鏁帮紝浠绘剰璁�
+ HouseNo: $("#WareHouseNo").val(),
+ RoadwayNo: $("#RoadwayNo").val(),
+ AreaNo: $("#AreaNo").val(),
+ Status: $("#Status").val(),
+ Flag: $("#Flag").val(),
+ Locat: $("#LocatNo").val(),
+ Row: parseInt($("#Row").val()),
+ Col: parseInt($("#Column").val()),
+ Layer: parseInt($("#Layer").val()),
+ },
+ page: {
+ curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ }
+ });
+ });
+
+ table.on('tool(LAY-app-content-list)', function (obj) {
+ var data = obj.data;
+ var id = 0;
+ if (obj.event === 'edit') {
+ id = data.Id;
+ layer.open({
+ type: 2,
+ title: '鍌ㄤ綅淇℃伅绠＄悊',
+ content: 'LocateFrom.html?id=' + id,
+ maxmin: true,
+ area: ['560px', '510px'],
+ btn: ['纭畾', '鍙栨秷'],
+ yes: function (index, layero) {
+ var iframeWindow = window['layui-layer-iframe' + index],
+ submitID = 'layuiadmin-app-form-edit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(data)
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: id,
+ Status: field.Status,
+ Flag: field.Flag,
+ Temperature: field.Temp,
+ AreaNo: field.AreaNo
+ };
+ sendData(IP + "/Sys/EditStorageLocat", param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg("淇敼鎴愬姛", {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
+ }
+ });
+ layer.close(index); //鍏抽棴寮瑰眰
+ });
+ } else if (res.code == 1) {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.statusText, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ });
+ submit.trigger('click');
+ }
+ });
+ }
+ });
+
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
$("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
res.data[i].WareHouseName + '</option>');
- }
+ }
form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function (data) {
+ console.log(data);
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 宸烽亾涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageRoadwayByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
+ $("#RoadwayNo").empty();
+ $("#RoadwayNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
+ res.data[i].RoadwayName + '</option>');
+ }
+ form.render('select');
} else { //涓嶆垚鍔�
- layer.msg(res.msg, {
+ layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
+ }, function () {
+ //鍥炶皟
+ form.render('select');
+ });
}
});
-
- getAR("");
- form.on('select(getWareHouseNo)', function(data) {
- console.log(data);
- getAR(data.value);
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo=" + val, {}, 'get', function (res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
});
- function getAR(val) {
- //鑾峰彇 宸烽亾涓嬫媺妗�
- sendData(IP + "/Sys/GetStorageRoadwayByHouseNo?wareHouseNo="+val, {}, 'get', function(res) {
- $("#RoadwayNo").empty();
- $("#RoadwayNo").append('<option value =""></option>');
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
- res.data[i].RoadwayName + '</option>');
- }
- form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇宸烽亾淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- //鍥炶皟
- form.render('select');
- });
- }
- });
- //鑾峰彇 鍖哄煙涓嬫媺妗�
- sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+val, {}, 'get', function(res) {
- $("#AreaNo").empty();
- $("#AreaNo").append('<option value =""></option>');
- if (res.code == 0) { //鎴愬姛
- for (var i = 0; i < res.data.length; i++) {
- $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
- res.data[i].AreaName + '</option>');
- }
- form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- //鍥炶皟
- form.render('select');
- });
- }
- });
-
- };
-
- });
-
-
- </script>
- </body>
-</html>
+
+ };
+
+ });
+
+
+ </script>
+</body>
+
+</html>
\ No newline at end of file
--
Gitblit v1.8.0