From 26356a0e6472be4620651adceddda0e38c78fffa Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 17 十月 2024 18:09:50 +0800
Subject: [PATCH] 修改问题
---
HTML/views/StatisticalReport/InventoryStatistics.html | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index cee3e63..8ba163b 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -65,9 +65,9 @@
</div>
</div>
<div class="layui-inline mingxi">
- <label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
- <input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+ <input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
class="layui-input">
</div>
</div>
@@ -296,7 +296,7 @@
var $ = layui.$;
var yemianid = 0;
- refreshTable("", "");
+ refreshTable("", "","","","");
// 琛ㄥ崟闇�瑕佺殑鍙橀噺
var infoOptions;
@@ -357,7 +357,7 @@
{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',totalRowText: "鍚堣:", "disabled": true},
{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center', "disabled": true},
{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center', "disabled": true},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center', "disabled": true},
+ {field: 'LotNo',title: '杩涘巶缂栧彿',align: 'center', "disabled": true},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center'},
{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
@@ -368,7 +368,7 @@
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎬婚噺淇℃伅
- function refreshTable() {
+ function refreshTable(SkuNo,SkuName,OwnerNo,OwnerName,LotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -400,8 +400,14 @@
},
cols:colsJson
};
-
- sendData(IP + "/Statistical/GetInventoryList?SkuNo=" + $("#SkuNo").val() + "&&SkuName=" + $("#SkuName").val() + "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val()+"&&LotNo=" + $("#LotNo").val(), {}, 'get', function (res) {
+ var param = {
+ SkuNo:SkuNo, //鐗╂枡鍙�
+ SkuName:SkuName, //鐗╂枡鍚嶇О
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName, //璐т富鍚嶇О
+ LotNo:LotNo, //杩涘巶缂栧彿
+ };
+ sendData(IP + "/Statistical/GetInventoryList", param, 'get', function (res) {
console.log(res)
if (res.code == 0) { //鎴愬姛
var list = res.data;
@@ -474,7 +480,7 @@
// align: 'center',
// }, {
// field: 'LotNo',
- // title: '鎵规鍙�',
+ // title: '杩涘巶缂栧彿',
// align: 'center',
// }, {
// field: 'Qty',
@@ -524,11 +530,11 @@
{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: '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: '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'},
@@ -537,7 +543,7 @@
]];
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(sku,lotNo) {
+ function refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1={
@@ -568,8 +574,18 @@
},
cols:colsJson2
};
-
- sendData(IP + "/Statistical/GetInventoryList1?SkuNo=" + sku + "&&SkuName=" + $("#SkuName").val() + "&&LotNo=" + lotNo + "&&LocatNo=" + $("#LocatNo").val() + "&&PalletNo=" + $("#PalletNo").val() + "&&Status=" + $("#Status").val() + "&&InspectStatus=" + $("#InspectStatus").val()+ "&&OwnerNo=" + $("#OwnerNo").val()+ "&&OwnerName=" + $("#OwnerName").val(), {}, 'get', function (res) {
+ var param = {
+ SkuNo:SkuNo, //鐗╂枡鍙�
+ SkuName:SkuName, //鐗╂枡鍚嶇О
+ OwnerNo:OwnerNo, //璐т富缂栫爜
+ OwnerName:OwnerName, //璐т富鍚嶇О
+ LotNo:LotNo, //杩涘巶缂栧彿
+ LocatNo:LocatNo,//鍌ㄤ綅鍦板潃
+ PalletNo:PalletNo, //鎵樼洏鍙�
+ Status:Status,//搴撳瓨鐘舵��
+ InspectStatus:InspectStatus //璐ㄦ鐘舵��
+ };
+ sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
if (res.code == 0) //鎴愬姛
{
var list = res.data;
@@ -595,8 +611,6 @@
//var url = IP + "/Statistical/GetInventoryList1";
-
-
//鎺ュ彈鍏ㄥ眬鍙橀噺
let quanSkuNo = '';
let quanLotNo='';
@@ -613,12 +627,12 @@
var InspectStatus = $("#InspectStatus").val();
if (yemianid == 0) {
console.log("鎬诲崟");
- refreshTable(SkuNo, SkuName);
+ refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
} else if (yemianid == 1) {
quanSkuNo = '';
quanLotNo='';
console.log("鏄庣粏");
- refreshTable2(SkuNo,LotNo);
+ refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
}
});
@@ -631,20 +645,29 @@
console.log(obj);
quanSkuNo = obj.data.SkuNo;
quanLotNo=obj.data.lotNo;
- refreshTable2(obj.data.SkuNo,obj.data.LotNo);
+ refreshTable2(obj.data.SkuNo,"","","",obj.data.LotNo);
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);
+ refreshTable(SkuNo, SkuName,OwnerNo,OwnerName,LotNo);
} else if (yemianid == 1) {
console.log("鏄庣粏");
- refreshTable2(quanSkuNo,quanLotNo);
+ refreshTable2(SkuNo,SkuName,OwnerNo,OwnerName,LotNo,LocatNo,PalletNo,Status,InspectStatus);
}
});
--
Gitblit v1.8.0