From 5d94e93813ca45250287c802db2ad8796eeabe79 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 19 七月 2024 15:56:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
HTML/views/StatisticalReport/InventoryStatistics.html | 398 +++++++-------------------------------------------------
1 files changed, 53 insertions(+), 345 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index dea2a48..23cecbc 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -36,6 +36,18 @@
<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
+ <div class="layui-inline ">
+ <label class="layui-form-label" style="width: 60px;">鏌ヨ绫诲瀷</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <select name="SelectType" id="SelectType" lay-filter="SelectType" lay-search>
+ <option value="">姝ｅ父</option>
+ <option value="0">鐗╂枡淇℃伅</option>
+ <option value="1">鎵规淇℃伅</option>
+ <option value="2">璐ㄦ淇℃伅</option>
+ <option value="3">璐т富淇℃伅</option>
+ </select>
+ </div>
+ </div>
<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;">
@@ -71,7 +83,7 @@
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="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅鍦板潃" autocomplete="off"
@@ -84,7 +96,7 @@
<input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off"
class="layui-input">
</div>
- </div>
+ </div> -->
<div class="layui-inline ">
<label class="layui-form-label" style="width: 60px;">搴撳瓨鐘舵��</label>
@@ -123,7 +135,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;">
<input type="text" autocomplete="off" id="StartTime" class="layui-input"
@@ -136,7 +148,7 @@
<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">
@@ -151,19 +163,15 @@
</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 id="center">
+ </div> -->
<div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
+ <!-- <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 鑷畾涔夎〃澶� -->
@@ -174,29 +182,6 @@
</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="templetCompleteTime">
- {{# function GetBtn(d){
- return formatDate(d.CompleteTime);
- }
- }}
- {{ GetBtn(d) }}
- </script>
- <!-- #endregion -->
- </div>
- </div>
</div>
</div>
@@ -258,7 +243,7 @@
element = layui.element;
laydate = layui.laydate;
- var h1 = GetTableTabHeight();
+ var h1 = GetTableHeight();
laydate.render({
elem: '#StartTime',
@@ -296,7 +281,7 @@
var $ = layui.$;
var yemianid = 0;
- refreshTable("", "","","","");
+ refreshTable("", "", "", "", "", "", "", "");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
@@ -361,14 +346,17 @@
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
+ {field: 'Status',title: '搴撳瓨鐘舵��',align: 'center',templet: '#buttonTpl'},
+ {field: 'InspectStatus',title: '璐ㄦ鐘舵��',align: 'center',templet: '#buttonTp2'},
{field: 'Qty',title: '搴撳瓨鏁伴噺',align: 'center',totalRow: true},
{field: 'LockQty',title: '閿佸畾鏁伴噺',align: 'center',totalRow: true},
- {field: 'FrozenQty',title: '鍐荤粨鏁伴噺',align: 'center',totalRow: true}
+ {field: 'FrozenQty',title: '鍐荤粨鏁伴噺',align: 'center',totalRow: true},
+ {field: 'InspectQty',title: '鍙娊妫�鏁伴噺',align: 'center',totalRow: true},
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎬婚噺淇℃伅
- function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
+ function refreshTable(SelectType,SkuNo,SkuName,OwnerNo,OwnerName,LotNo,Status,InspectStatus) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -401,11 +389,14 @@
cols:colsJson
};
var param = {
+ SelectType:SelectType, //鏌ヨ绫诲瀷
SkuNo:SkuNo, //鐗╂枡鍙�
SkuName:SkuName, //鐗╂枡鍚嶇О
OwnerNo:OwnerNo, //璐т富缂栫爜
OwnerName:OwnerName, //璐т富鍚嶇О
LotNo:LotNo, //鎵规鍙�
+ Status:Status, //搴撳瓨鐘舵�� = $("#Status").val();
+ InspectStatus:InspectStatus, //璐ㄦ鐘舵�� = $("#InspectStatus").val();
};
sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
console.log(res)
@@ -428,319 +419,47 @@
});
});
//#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:
- // [[
- // {
- // field: 'PalletNo',
- // title: '鎵樼洏鍙�',
- // align: 'center',
- // width: 110,
- // }, {
- // field: 'LocatNo',
- // title: '鍌ㄤ綅鍦板潃',
- // align: 'center',
- // width: 100,
- // }, {
- // field: 'RoadwayName',
- // title: '鎵�灞炲贩閬�',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'WareHouseName',
- // title: '鎵�灞炰粨搴�',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'SkuNo',
- // title: '鐗╂枡缂栫爜',
- // width: 100,
- // align: 'center',
- // }, {
- // field: 'SkuName',
- // title: '鐗╂枡鍚嶇О',
- // align: 'center',
- // }, {
- // field: 'Standard',
- // title: '鐗╂枡瑙勬牸',
- // width: 130,
- // align: 'center',
- // }, {
- // field: 'LotNo',
- // title: '鎵规鍙�',
- // align: 'center',
- // }, {
- // field: 'Qty',
- // title: '搴撳瓨鏁伴噺',
- // width: 110,
- // align: 'center',
- // }, {
- // field: 'LockQty',
- // title: '閿佸畾鏁伴噺',
- // width: 110,
- // align: 'center',
- // },
- // {
- // field: 'Status',
- // templet: '#buttonTpl',
- // title: '搴撳瓨鐘舵��',
- // width: 90,
- // align: 'center',
- // }, {
- // field: 'InspectStatus',
- // templet: '#buttonTp2',
- // title: '璐ㄦ鐘舵��',
- // width: 90,
- // align: 'center',
- // },
- // {
- // field: 'CompleteTime',
- // title: '鍏ュ簱鏃堕棿',
- // align: 'center',
- // width: 150,
- // templet: function (d) {
- // return formatDate(d.CompleteTime);
- // },
- // },
- // ]]
- //};
- //#endregion
-
- //鑾峰彇鏄庣粏淇℃伅
- //#region 鑷畾涔夎〃澶�
- var DetailColsArr = [[
- {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 110,},
- {field: 'LocatNo',title: '鍌ㄤ綅鍦板潃',align: 'center',width: 100,},
- {field: 'WareHouseName',title: '鎵�灞炰粨搴�',width: 90,align: 'center'},
- {field: 'RoadwayName',title: '鎵�灞炲贩閬�',width: 90,align: 'center'},
- {field: 'AreaName',title: '鎵�灞炲尯鍩�',width: 90,align: 'center'},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',width: 100,align: 'center'},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
- {field: 'Standard',title: '鐗╂枡瑙勬牸',width: 130,align: 'center'},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center'},
- {field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
- {field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
- {field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
- {field: 'SupplierName',title: '渚涘簲鍟嗗悕绉�',align: 'center'},
- {field: 'Qty',title: '搴撳瓨鏁伴噺',width: 110,align: 'center'},
- {field: 'LockQty',title: '閿佸畾鏁伴噺',width: 110,align: 'center'},
- {field: 'Status',templet: '#buttonTpl',title: '搴撳瓨鐘舵��',width: 90,align: 'center'},
- {field: 'InspectStatus',templet: '#buttonTp2',title: '璐ㄦ鐘舵��',width: 90,align: 'center'},
- {field: 'CompleteTime',title: '鍏ュ簱鏃堕棿',align: 'center',width: 150,templet: '#templetCompleteTime'},
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
- //#endregion
- function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus,StartTime,EndTime) {
- //#region 鑷畾涔夎〃澶�
- var colsJson2
- var param1={
- Href:'Statistical/GetInventoryList1'
- };
- 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/GetInventoryList1',DetailColsSysArr);
- },
- cols:colsJson2
- };
- var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- LotNo:LotNo, //鎵规鍙�
- LocatNo:LocatNo,//鍌ㄤ綅鍦板潃
- PalletNo:PalletNo, //鎵樼洏鍙�
- Status:Status,//搴撳瓨鐘舵��
- InspectStatus:InspectStatus, //璐ㄦ鐘舵��
- StartTime:StartTime,//寮�濮嬫椂闂�
- EndTime:EndTime, //缁撴潫鏃堕棿
- };
- sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- var list = res.data;
- $.extend(infoOptions2, {
- data: list
- });
- infoOptions2.page = {
- curr: 1
- }
- tableIns2 = table.render(infoOptions2);
- }
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇鏄庣粏鍒楄〃淇℃伅澶辫触锛�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
- }
- })
- });
- //#endregion
- }
+ }
- //var url = IP + "/Statistical/GetInventoryList1";
-
- //鎺ュ彈鍏ㄥ眬鍙橀噺
- let quanSkuNo = '';
- let quanLotNo='';
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function (data) {
+ var SelectType = $("#SelectType").val();
var SkuNo = $("#SkuNo").val();
var SkuName = $("#SkuName").val();
var LotNo = $("#LotNo").val();
- var LocatNo = $("#LocatNo").val();
- var PalletNo = $("#PalletNo").val();
var OwnerNo = $("#OwnerNo").val();
var OwnerName = $("#OwnerName").val();
var Status = $("#Status").val();
var InspectStatus = $("#InspectStatus").val();
- var StartTime = $("#StartTime").val();
- var EndTime = $("#EndTime").val();
- if (yemianid == 0) {
- console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
- } else if (yemianid == 1) {
- //quanSkuNo = quanSkuNo;
- //quanLotNo='';
- console.log("鏄庣粏");
- console.log(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus,StartTime,EndTime)
- refreshTable2(quanSkuNo,SkuName,OwnerNo,OwnerName,quanLotNo,LocatNo,PalletNo,Status,InspectStatus,StartTime,EndTime);
- }
+ refreshTable(SelectType,SkuNo, SkuName,OwnerNo,OwnerName,LotNo,Status,InspectStatus);
- });
- //瑙﹀彂琛屽弻鍑讳簨浠�
- 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);
- quanSkuNo = obj.data.SkuNo;
- quanLotNo=obj.data.lotNo;
- refreshTable2(obj.data.SkuNo,obj.data.SkuName,obj.data.OwnerNo,obj.data.OwnerName,obj.data.LotNo,obj.data.LocatNo,obj.data.PalletNo,obj.data.Status,obj.data.InspectStatus,obj.data.StartTime,obj.data.EndTime);
- yemianid = 1;
- });
-
- //鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
- element.on('tab(docDemoTabBrief)', function (data) {
- var SkuNo = $("#SkuNo").val();
- var SkuName = $("#SkuName").val();
- var LotNo = $("#LotNo").val();
- var LocatNo = $("#LocatNo").val();
- var PalletNo = $("#PalletNo").val();
- var OwnerNo = $("#OwnerNo").val();
- var OwnerName = $("#OwnerName").val();
- var Status = $("#Status").val();
- var InspectStatus = $("#InspectStatus").val();
- console.log(data.index);
- yemianid = data.index
- if (yemianid == 0) {
- console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
- } else if (yemianid == 1) {
- console.log("鏄庣粏");
- refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus,StartTime,EndTime);
- }
});
form.on('submit(daochu)', function () {
layer.confirm('纭畾瀵煎嚭褰撳墠鏁版嵁鍚楋紵', function (index) {
- if (yemianid == 0) {
- console.log("鎬诲崟");
- var param = {
- SkuNo: $("#SkuNo").val(),
- SkuName: $("#SkuName").val(),
- };
- sendData(IP + "/Statistical/GetInventoryListDaoChu", 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 () {
+ var param = {
+ SkuNo: $("#SkuNo").val(),
+ SkuName: $("#SkuName").val(),
+ };
+ sendData(IP + "/Statistical/GetInventoryListDaoChu", 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 SkuNo = $("#SkuNo").val();
- if (SkuNo == '') {
- SkuNo = quanSkuNo;
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触锛�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
}
- var param = {
- SkuNo: SkuNo,
- 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/GetInventoryList1DaoChu", 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 () { });
- }
- });
- }
+ });
});
@@ -757,18 +476,7 @@
resize: false,
area: ['970px', '650px']
});
- },
- customCols2: function(){
- layer.open({
- type: 2,
- title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=Statistical/GetInventoryList1&ColsSysArr='+DetailColsSysArr,
- maxmin: false,
- resize: false,
- area: ['970px', '650px']
- });
}
-
};
$('.layui-btn').on('click', function() {
var type = $(this).data('type');
--
Gitblit v1.8.0