From 0651efda1f08d417c82994887c68dfea2c9b4235 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 11 十二月 2024 11:28:37 +0800
Subject: [PATCH] 修改问题
---
HTML/views/StatisticalReport/BoxInfor.html | 549 +++++++++++-------------------------------------------
1 files changed, 119 insertions(+), 430 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 35b4739..b50c733 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -47,10 +47,10 @@
<div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off" class="layui-input">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="妗跺彿" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline mingxi">
+ <!-- <div class="layui-inline mingxi">
<label class="layui-form-label" style="width: 60px;">璐т富缂栫爜</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="OwnerNo" name="OwnerNo" placeholder="璐т富缂栫爜" autocomplete="off"
@@ -63,7 +63,7 @@
<input type="text" id="OwnerName" name="OwnerName" placeholder="璐т富鍚嶇О" autocomplete="off"
class="layui-input">
</div>
- </div>
+ </div> -->
<div class="layui-inline mingxi">
<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -73,12 +73,12 @@
<!-- 绠辩爜 绠辨敮鐘舵�� 妫�楠屾爣璁� 闆剁鏍囪 璐ㄩ噺鐘舵�� -->
- <div class="layui-inline zongdan" >
+ <!-- <div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">绠辩爜</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="BoxNo" name="BoxNo" placeholder="绠辩爜" autocomplete="off" class="layui-input">
</div>
- </div>
+ </div> -->
<!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">绠辨敮鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -91,7 +91,7 @@
</select>
</div>
</div> -->
- <div class="layui-inline zhijian">
+ <!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">鎶芥鏍囪</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<select name="InspectMark" id="InspectMark" lay-filter="InspectMark"
@@ -123,7 +123,7 @@
<option value="1">鏄�</option>
</select>
</div>
- </div>
+ </div> -->
<div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
@@ -138,7 +138,7 @@
</div>
</div>
- <div class="layui-inline zhijian">
+ <!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" autocomplete="off" id="StartTime" class="layui-input"
@@ -151,95 +151,32 @@
<input type="text" autocomplete="off" id="EndTime" class="layui-input"
placeholder="缁撴潫鏃堕棿">
</div>
- </div>
+ </div> -->
<div class="layui-inline sousuo">
<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>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ <!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="daochu">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
- </button>
+ </button> -->
</div>
</div>
</div>
-
+ <div id="center"></div>
<div class="layui-card-body">
- <div style="position: relative;">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title" id="tab">
- <li class="layui-this">鎵樼洏鏄庣粏</li>
- <li >绠辩爜鏄庣粏</li>
- </ul>
-
- <div id="center">
- </div>
-
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
- <!-- #region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
- </div>
- </div>
- <div class="layui-tab-item">
- <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
- <!-- #region 鑷畾涔夎〃澶� -->
- <div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
- <i class="layui-icon"></i>
- </button>
- </div>
- <!-- #endregion -->
-
- <!-- #region 鑷畾涔夎〃澶� -->
- <script type="text/html" id="templetProductionTime">
- {{# function GetBtn(d){
- return formatDate(d.ProductionTime);
- }
- }}
- {{ GetBtn(d) }}
- </script>
-
- <script type="text/html" id="templetInspectTime">
- {{# function GetBtn1(d){
- return formatDate(d.InspectTime);
- }
- }}
- {{ GetBtn1(d) }}
- </script>
- <!-- #endregion -->
- </div>
- </div>
- </div>
+ <div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+ <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <!-- #region 鑷畾涔夎〃澶� -->
+ <div class="headerSetIcon">
+ <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
+ <i class="layui-icon"></i>
+ </button>
</div>
-
+ <!-- #endregion -->
</div>
- <script type="text/html" id="BoxStatus">
- {{# if(d.Status=='0'){ }}
- <p>鏈粍鎵�</p>
- {{# } else if(d.Status == '1') { }}
- <p>宸茬粍鎵�</p>
- {{# } else if(d.Status == '2') { }}
- <p>宸插叆搴�</p>
- {{# } else if(d.Status == '3') { }}
- <p>宸插嚭搴�</p>
- {{# } else if(d.Status == '4') { }}
- <p>宸插垎閰�</p>
- {{# } else if(d.Status == '5') { }}
- <p>宸叉嫞璐�</p>
- {{# } }}
-
- </script>
<script type="text/html" id="InspectMarkStatus">
{{# if(d.InspectMark=='0'){ }}
<p>鍚�</p>
@@ -254,8 +191,24 @@
<p>鏄�</p>
{{# } }}
</script>
-
- <script type="text/html" id="InspectStatus1">
+ <script type="text/html" id="InspectPalletStatus">
+ {{# function GetBtn11(d){
+ var html = ``;
+ if(d.PalletStatus=='0'){
+ html = `鍑�妗禶;
+ } else if(d.PalletStatus=='1') {
+ html = `棰勬贩`;
+ } else if(d.PalletStatus=='2') {
+ html = `鍗婃垚鍝乣;
+ }else if(d.PalletStatus=='3') {
+ html = `鑴忔《`;
+ }
+ return html;
+ }
+ }}
+ {{ GetBtn11(d) }}
+ </script>
+ <script type="text/html" id="InspectStatus1">
{{# if(d.InspectStatus == '0') { }}
<p>寰呮楠�</p>
{{# } else if(d.InspectStatus == '1'){ }}
@@ -266,18 +219,12 @@
<p>鏀剧疆鏈�</p>
{{# } }}
</script>
- <script type="text/html" id="BitPalletMarkStatus1">
- {{# if(d.BitBoxMark=='0'){ }}
- <p>鍚�</p>
- {{# } else if(d.BitBoxMark == '1') { }}
- <p>鏄�</p>
- {{# } }}
- </script>
- <script type="text/html" id="table-content-list">
- <button class="layui-btn layui-btn-normal layui-btn-xs approvalBtnupt" id="approvalBtnupt" lay-event="edit">
- <i class="layui-icon layui-icon-edit"></i>璇︽儏
- </button>
- </script>
+ <script type="text/html" id="toolbarDemo">
+
+ <!-- <button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
+ <i class="layui-icon"></i>娣诲姞
+ </button> -->
+ </script>
</div>
</div>
</div>
@@ -300,9 +247,7 @@
element = layui.element;
laydate = layui.laydate;
- var h1 = GetTableTabHeight();
- // var h1 = GetTkableTopHeight();
- // console.log(h1)
+ var h1 = GetTableHeight();
laydate.render({
elem: '#StartTime',
@@ -409,24 +354,26 @@
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
{field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
- {field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
+ //{field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
{field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
- {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
+ {field: 'PalletNo', title: '妗跺彿', align: 'center'},
+ {field: 'PalletStatus', title: '妗剁姸鎬�', align: 'center', templet: '#InspectPalletStatus'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
- {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
+ //{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
+ //{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
+ //{field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
+ //{field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
- {field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
+ //{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
{field: 'Qty', title: '鏁伴噺', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
- {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
- {field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
+ {field: 'InspectStatus', title: '璐ㄦ鐘舵��', align: 'center', templet: '#InspectStatus1'},
+ //{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
+ //{field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -455,6 +402,8 @@
limit: pageCnt,
limits: pageLimits,
even: true,
+ toolbar: '#toolbarDemo',
+ defaultToolbar: [''], //'print', 'exports'
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function(){
//鑷畾涔夊垪瀹�
@@ -500,178 +449,67 @@
});
});
//#endregion
- }
-
- // 琛ㄥ崟闇�瑕佺殑鍙橀噺
- var infoOptions2;
- //#region 鍘熷闈炶嚜瀹氫箟鍒�
- // infoOptions2 = {
- // elem: '#LAY-app-content-list2',
- // height: 'full-206',
- // id: 'LAY-app-content-list2',
- // page: true,
- // limit: pageCnt,
- // limits: pageLimits,
- // even: true,
- // cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- // cols:
- // [[
- // {
- // title: '搴忓彿', type: 'numbers', fixed: 'left'
- // },
- // {
- // field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center',
- // },
- // {
- // field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center',
- // },
- // {
- // field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110,
- // },
- // {
- // field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100,
- // },
- // {
- // field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus',
- // },
- // {
- // field: 'LotNo', title: '鎵规鍙�', align: 'center',
- // },
- // {
- // field: 'LotText', title: '鎵规鎻忚堪', align: 'center',
- // },
- // {
- // field: 'Qty', title: '鏁伴噺', width: 90, align: 'center',
- // },
- // {
- // field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center',
- // },
- // {
- // field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',
- // templet: function(d) {
- // return formatDate(d.ProductionTime);
- // },
- // },
- // {
- // field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus',
- // },
- // {
- // field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center',
- // },
- // {
- // field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center',
- // },
- // {
- // field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',
- // templet: function(d) {
- // return formatDate(d.InspectTime);
- // },
- // },
- // {
- // title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list'
- // }
- // ]]
- // };
- //#endregion
+ }
- //鑾峰彇鏄庣粏淇℃伅
- //#region 鑷畾涔夎〃澶�
- var DetailColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',fixed: 'left', "disabled": true},
- {field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
- {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110},
- {field: 'BoxNo', title: '绠辩爜', align: 'center', width: 100},
- {field: 'Status', title: '绠辨敮鐘舵��', align: 'center', templet: '#BoxStatus'},
- {field: 'LotNo', title: '鎵规鍙�', align: 'center'},
- {field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
- {field: 'Qty', title: '鏁伴噺', width: 90, align: 'center'},
- {field: 'FullQty', title: '鏁寸鏁伴噺', width: 100, align: 'center'},
- {field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center',templet: '#templetProductionTime'},
- {field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
- {field: 'BitBoxMark', templet: '#BitPalletMarkStatus1', title: '闆剁鏍囪', align: 'center'},
- {field: 'InspectStatus', templet: '#InspectStatus1', title: '璐ㄦ鐘舵��', align: 'center'},
- {field: 'InspectTime', title: '澶嶆鏃堕棿', align: 'center',templet: '#templetInspectTime'},
- {field: 'caozuo',title: '鎿嶄綔', fixed: 'right', align: 'center', toolbar: '#table-content-list', "disabled": true}
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
- //#endregion
- function refreshTable2(Id,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime) {
- //#region 鑷畾涔夎〃澶�
- var colsJson2
- var param1={
- Href:'Statistical/GetBoxInfo'
- };
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson2=DetailColsArr
- }else{
- colsJson2= eval(res.data);
- }
- }else{
- colsJson2=DetailColsArr
- }
- infoOptions2 = {
- elem: '#LAY-app-content-list2',
- height: h1,
- id: 'LAY-app-content-list2',
- page: true,
- limit: pageCnt,
- limits: pageLimits,
- even: true,
- cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
- //鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list2','Statistical/GetBoxInfo',DetailColsSysArr);
- },
- cols:colsJson2
- };
-
- var param = {
- Id:Id,
- SkuNo:SkuNo,
- SkuName:SkuName,
- LotNo:LotNo,
- PalletNo:PalletNo,
- BoxNo:BoxNo,
- Status:Status,
- InspectMark:InspectMark,
- BitBoxMark:BitBoxMark,
- InspectStatu:InspectStatus,
- StartTime:StartTime,
- EndTime:EndTime,
- }
- sendData(IP + "/Statistical/GetBoxInfo", param, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
- {
- var list = res.data;
- $.extend(infoOptions2, {
- data: list
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(LAY-app-content-list)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ if (obj.event == "add") {
+ layer.open({
+ type: 2,
+ title: '娣诲姞鎵樼洏搴撳瓨鏄庣粏',
+ content: 'PalletAddFrom.html',
+ maxmin: true,
+ area: ['530px', '530px'],
+ 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; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ PalletNo:field.PalletNo,//鎵樼洏鐮�
+ WareHouseNo: field.WareHouseNo, //鎵�灞炰粨搴�
+ AreaNo: field.AreaNo, //鎵�灞炲尯鍩�
+ LocatNo:field.LocatNo,//鎵�灞炲偍浣�
+ PalletStatus: field.PalletStatus, //鎵樼洏绫诲埆
+ SkuNo:field.SkuNo,
+ SkuName:field.SkuName,
+ LotNo:field.LotNo
+ };
+ if(doing){
+ doing = false;
+ sendData(IP + "/Statistical/InsertStockDetail", param, 'post',function(res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ layer.close(index); //鍏抽棴寮瑰眰
+ refreshTable("","","","","","","","","","","","","","");
+ doing = true;
+ });
+ }
+ else
+ { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {doing = true;});
+ }
+ });
+ }
});
- infoOptions2.page = {
- curr: 1
- }
- tableIns2 = table.render(infoOptions2);
+ submit.trigger('click');
}
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- })
- });
- //#endregion
- }
-
- //var url = IP + "/Statistical/GetInventoryList1";
-
-
-
- //鎺ュ彈鍏ㄥ眬鍙橀噺
- let quanid = '';
+ });
+ }
+ });
+
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function(data) {
var SkuNo = $("#SkuNo").val();
@@ -692,27 +530,10 @@
var StartTime = $("#StartTime").val();
var EndTime = $("#EndTime").val();
- if(yemianid == 0){
- console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
- }else if(yemianid == 1){
- quanid = '';
- console.log("鏄庣粏");
- refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
- }
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
});
- //瑙﹀彂琛屽弻鍑讳簨浠�
- table.on('rowDouble(LAY-app-content-list)', function(obj) {
- $(".layui-tab-title>li").attr("class", "");
- $('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
- $('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
- $('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
- console.log(obj.data.Id);
- quanid = obj.data.Id;
- refreshTable2(obj.data.Id);
- yemianid=1;
- });
+
//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
element.on('tab(docDemoTabBrief)', function(data){
@@ -734,130 +555,9 @@
var StartTime = $("#StartTime").val();
var EndTime = $("#EndTime").val();
- console.log(data.index);
- yemianid = data.index
- if(yemianid == 0){
- console.log("鎬诲崟");
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
- }else if(yemianid == 1){
- console.log("鏄庣粏");
- refreshTable2(quanid,SkuNo,SkuName,LotNo,PalletNo,BoxNo,Status,InspectMark,BitBoxMark,InspectStatus,StartTime,EndTime);
- }
+ refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
});
var doing = true;
- // ------------------------------------璇︽儏---------------------------------------------------
- table.on('tool(LAY-app-content-list2)', function(obj) {
- console.log(obj)
- var data = obj.data;
- //璇︽儏
- if (obj.event === 'edit') {
- BoxNo = data.BoxNo;
- console.log(data)
- layer.open({
- type: 2,
- title: '绠辨敮璇︽儏淇℃伅',
- content: 'BoxSupportInfor.html?BoxNo=' + BoxNo,
- maxmin: true,
- area: ['80%', '85%'],
- btn: ['鍏抽棴'],
- yes: function(index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- if(doing)
- {
- doing = false;
-
- layer.close(index); //鍏抽棴寮瑰眰
- refreshTable();
- doing = true;
-
-
- }
- }
- });
- }
- });
-
- form.on('submit(daochu)', function () {
- layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function(index) {
- if(yemianid == 0){
- console.log("鎵樼洏鏄庣粏");
- var param = {
- SkuNo : $("#SkuNo").val(),
- SkuName : $("#SkuName").val(),
- LotNo : $("#LotNo").val(),
- PalletNo : $("#PalletNo").val(),
-
- BoxNo : $("#BoxNo").val(),
- Status : $("#Status").val(),
- InspectMark : $("#InspectMark").val(),
- BitPalletMark : $("#BitPalletMark").val(),
- BitBoxMark : $("#BitBoxMark").val(),
- InspectStatus : $("#InspectStatus").val(),
-
- StartTime: $("#StartTime").val(),
- EndTime: $("#EndTime").val(),
- };
-
- sendData(IP + "/Statistical/GetBindListDaoChu", param, 'get', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- table.exportFile(tableIns.config.id, list,'xls',"鎵樼洏鏄庣粏淇℃伅"+getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
- layer.msg('瀵煎嚭鎴愬姛锛�', {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
-
- });
-
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }else if(yemianid == 1){
- console.log("绠辩爜鏄庣粏");
- var param = {
- Id:quanid,
- SkuNo: $("#SkuNo").val(),
- SkuName: $("#SkuName").val(),
- LotNo:$("#LotNo").val(),
- LocatNo:$("#LocatNo").val(),
- PalletNo:$("#PalletNo").val(),
- Status:$("#Status").val(),
- InspectStatus:$("#InspectStatus").val(),
- IsSamolingTray:$("#IsSamolingTray").val(),
- StartTime: $("#StartTime").val(),
- EndTime: $("#EndTime").val(),
- };
- sendData(IP + "/Statistical/GetBoxInfoDaoChu", param, 'get', function (res) {
- console.log(res);
- if (res.code == 0) { //鎴愬姛
- var list = res.data;
- table.exportFile(tableIns2.config.id, list,'xls',"绠辩爜鏄庣粏淇℃伅"+getNowTime(),); //data 涓鸿瀹炰緥涓殑浠绘剰鏁伴噺鐨勬暟鎹�
- layer.msg('瀵煎嚭鎴愬姛锛�', {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
-
- });
-
- } else { //涓嶆垚鍔�
- layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- });
- }
- });
-
-
- });
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
@@ -872,17 +572,6 @@
area: ['970px', '650px']
});
},
- customCols2: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetBoxInfo&ColsSysArr='+DetailColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
- }
-
};
$('.layui-btn').on('click', function() {
var type = $(this).data('type');
--
Gitblit v1.8.0