From 4acb88b7afaab5b18a1c9ca8a78ce346297c382f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 10:59:38 +0800
Subject: [PATCH] 修改问题
---
HTML/views/StatisticalReport/InventoryStatistics.html | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 7643476..35c5693 100644
--- a/HTML/views/StatisticalReport/InventoryStatistics.html
+++ b/HTML/views/StatisticalReport/InventoryStatistics.html
@@ -65,7 +65,7 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
<option value=""></option>
- <option value="0">鍘熸枡</option>
+ <option value="0">鍘熻緟鏂�</option>
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
@@ -100,6 +100,14 @@
<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="CategoryNo" id="CategoryNo" lay-filter="getCategoryNo" lay-search>
<option value=""></option>
</select>
</div>
@@ -429,7 +437,7 @@
]];
var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
- function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type) {
+ function refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type) {
//#region 鑷畾涔夎〃澶�
var colsJson2
var param1 = {
@@ -472,6 +480,7 @@
InspectStatus: InspectStatus, //璐ㄦ鐘舵��
HouseNo: HouseNo,
AreaNo: AreaNo, // 鎵�灞炲尯鍩�
+ CategoryNo:CategoryNo, //閫昏緫搴撳尯
Type: Type,
};
sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
@@ -514,6 +523,7 @@
var InspectStatus = $("#InspectStatus").val();
var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var CategoryNo =$("#CategoryNo").val();
var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
if (yemianid == 0) {
@@ -522,9 +532,9 @@
} else if (yemianid == 1) {
quanSkuNo = '';
quanLotNo = '';
- console.log("鏄庣粏");
+ console.log("鏄庣粏33");
console.log(HouseNo);
- refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
}
});
@@ -554,6 +564,7 @@
var InspectStatus = $("#InspectStatus").val();
var HouseNo = $("#WareHouseNo").val(); // 鎵�灞炰粨搴�
var AreaNo = $("#AreaNo").val(); // 鎵�灞炲尯鍩�
+ var CategoryNo = $("#CategoryNo").val();
var Type = $("#Type").val(); // 鐗╂枡绫诲瀷
console.log(data.index);
yemianid = data.index
@@ -561,8 +572,8 @@
console.log("鎬诲崟");
refreshTable(SkuNo, SkuName, OwnerNo, OwnerName, LotNo);
} else if (yemianid == 1) {
- console.log("鏄庣粏");
- refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo, Type);
+ console.log("鏄庣粏11");
+ refreshTable2(SkuNo, SkuName, OwnerNo, OwnerName, LotNo, LocatNo, PalletNo, Status, InspectStatus, HouseNo, AreaNo,CategoryNo, Type);
}
});
@@ -594,7 +605,7 @@
}
});
} else if (yemianid == 1) {
- console.log("鏄庣粏");
+ console.log("鏄庣粏22");
var SkuNo = $("#SkuNo").val();
if (SkuNo == '') {
SkuNo = quanSkuNo;
@@ -727,6 +738,29 @@
}
});
+ //鑾峰彇閫昏緫搴撳尯涓嬫媺妗�
+ sendData(IP + "/Sys/GetMaterialCategories?wareHouseNo=" + val, {}, 'get', function (res) {
+ console.log("ret.data:"+res.data[4].CategoryNo)
+ console.log("code:"+res.code)
+ $("#CategoryNo").empty();
+ $("#CategoryNo").append('<option value =""></option>');
+ if (res.code == 1) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryNo + '-' +
+ res.data[i].CategoryName + '</option>');
+ }
+ form.render('select');
+ } else {
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000
+ }, function () {
+
+ form.render('select');
+ });
+ }
+ });
+
};
});
--
Gitblit v1.8.0