From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/StatisticalReport/InventoryStatistics.html | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/HTML/views/StatisticalReport/InventoryStatistics.html b/HTML/views/StatisticalReport/InventoryStatistics.html
index 7643476..b7ce93e 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>
@@ -211,17 +219,17 @@
<script type="text/html" id="buttonTpl">
{{# if(d.Status=='0'){ }}
- <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭垎閰�</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">寰呭垎閰�</button>
{{# } else if(d.Status == '1') { }}
- <button class="layui-btn layui-btn-radius layui-btn-xs">閮ㄥ垎鍒嗛厤</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">閮ㄥ垎鍒嗛厤</button>
{{# } else if(d.Status == '2') { }}
- <button class="layui-btn layui-btn-radius layui-btn-xs">宸插垎閰�</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">宸插垎閰�</button>
{{# } else if(d.Status == '3') { }}
- <button class="layui-btn layui-btn-radius layui-btn-xs">鐩樼偣閿佸畾</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">鐩樼偣閿佸畾</button>
{{# } else if(d.Status == '4') { }}
- <button class="layui-btn layui-btn-radius layui-btn-xs">绉诲簱閿佸畾</button>
+ <button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">绉诲簱閿佸畾</button>
{{# } else if(d.Status == '5') { }}
- <button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger">寮傚父閿佸畾</button>
+ <button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-normal">寮傚父閿佸畾</button>
{{# } }}
</script>
<script type="text/html" id="buttonTp2">
@@ -334,7 +342,10 @@
{ field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
{ 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: 'InspectStatus', templet: '#buttonTp2', title: '璐ㄦ鐘舵��', width: 90, align: 'center' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', width: 130, align: 'center' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈熻嚦', width: 130, align: 'center' },
]];
var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -409,6 +420,7 @@
var DetailColsArr = [[
{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 110, },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 100, },
+ { field: 'PLCLocatNo', 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' },
@@ -416,6 +428,8 @@
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
{ field: 'Standard', title: '鐗╂枡瑙勬牸', width: 130, align: 'center' },
{ field: 'Type', title: '鐗╂枡绫诲瀷', width: 130, align: 'center', templet: '#SkuType' },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', width: 130, align: 'center' },
+ { field: 'ExpirationTime', title: '鏈夋晥鏈熻嚦', width: 130, align: 'center' },
{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center' },
{ field: 'OwnerNo', title: '璐т富缂栫爜', align: 'center' },
{ field: 'OwnerName', title: '璐т富鍚嶇О', align: 'center' },
@@ -429,7 +443,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 +486,7 @@
InspectStatus: InspectStatus, //璐ㄦ鐘舵��
HouseNo: HouseNo,
AreaNo: AreaNo, // 鎵�灞炲尯鍩�
+ CategoryNo:CategoryNo, //閫昏緫搴撳尯
Type: Type,
};
sendData(IP + "/Statistical/GetInventoryList1", param, 'get', function (res) {
@@ -514,6 +529,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 +538,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 +570,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 +578,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 +611,7 @@
}
});
} else if (yemianid == 1) {
- console.log("鏄庣粏");
+ console.log("鏄庣粏22");
var SkuNo = $("#SkuNo").val();
if (SkuNo == '') {
SkuNo = quanSkuNo;
@@ -727,6 +744,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