From 71d1dcdf796f08fa01cbc2d3faab86eea28b295b Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 17 十二月 2025 08:59:03 +0800
Subject: [PATCH] 物料管理页面修改
---
HTML/views/StatisticalReport/BoxInfor.html | 146 ++++++++++++++++++++++++------------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 08e4611..2a38654 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -92,6 +92,18 @@
<input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off" class="layui-input">
</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;">
+ <select name="PalletStatus" id="PalletStatus" lay-filter="PalletStatus"
+ lay-search> =
+ <option value=""></option>
+ <option value="0">鍑�妗�</option>
+ <option value="2">婊℃《</option>
+ <option value="3">鑴忔《</option>
+ </select>
+ </div>
+ </div>
<!-- 绠辩爜 绠辨敮鐘舵�� 妫�楠屾爣璁� 闆剁鏍囪 璐ㄩ噺鐘舵�� -->
@@ -113,17 +125,7 @@
</select>
</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;">
- <select name="InspectMark" id="InspectMark" lay-filter="InspectMark"
- lay-search>
- <option value=""></option>
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
- </select>
- </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;">
@@ -198,6 +200,18 @@
</div>
<!-- #endregion -->
</div>
+
+ <script type="text/html" id="buttonTpl">
+ {{# function GetBtn1(d){
+ var html = '';
+ html =`<a class="layui-btn layui-btn-xs" lay-event="del"><i
+ class="layui-icon layui-icon-ok"></i>鍒犻櫎</a>`;
+
+ return html;
+ }
+ }}
+ {{ GetBtn1(d) }}
+ </script>
<script type="text/html" id="InspectMarkStatus">
{{# if(d.InspectMark=='0'){ }}
@@ -219,9 +233,9 @@
if(d.PalletStatus=='0'){
html = `鍑�妗禶;
} else if(d.PalletStatus=='1') {
- html = `棰勬贩`;
+ html = `娓呮礂涓璥;
} else if(d.PalletStatus=='2') {
- html = `鍗婃垚鍝乣;
+ html = `婊℃《`;
}else if(d.PalletStatus=='3') {
html = `鑴忔《`;
}
@@ -337,8 +351,9 @@
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
{field: 'PalletNo', title: '妗跺彿', align: 'center'},
{field: 'PalletStatus', title: '妗剁姸鎬�', align: 'center', templet: '#InspectPalletStatus'},
+ {field: 'Standard',title: '妗惰鏍�',align: 'center'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
- {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
+ {field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
//{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
//{field: 'OwnerName',title: '璐т富鍚嶇О',align: 'center'},
//{field: 'SupplierNo',title: '渚涘簲鍟嗙紪鐮�',align: 'center'},
@@ -347,18 +362,26 @@
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
//{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
{field: 'Status', title: '鍒嗛厤鐘舵��', align: 'center', templet: '#TempletStatus'},
- {field: 'Qty', title: '鏁伴噺', align: 'center'},
+ {field: 'Qty', title: '閲嶉噺锛圞G锛�', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
{field: 'InspectStatus', title: '璐ㄦ鐘舵��', align: 'center', templet: '#InspectStatus1'},
- {field: 'UDF1', title: '鎵�灞炶澶囩紪鐮�', align: 'center'},
+ {field: 'UDF1', title: '鎵�灞炶澶囩紪鐮�', align: 'center'}
+ , {
+ field: 'caozuo',
+ title: '鎿嶄綔',
+ fixed: 'right',
+ align: 'center',
+ width: 205,
+ toolbar: '#buttonTpl'
+ }
//{field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#InspectMarkStatus'},
//{field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', templet: '#BitPalletMarkStatus'},
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎵樼洏鏄庣粏
- function refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo) {
+ function refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo,PalletStatus) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -398,7 +421,7 @@
locatNo:LocatNo,
palletNo:PalletNo, //鎵樼洏鍙�
LotNo:LotNo, //鎵规鍙�
-
+ PalletStatus:PalletStatus,
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
console.log(res)
@@ -423,64 +446,40 @@
//#endregion
}
- //澶村伐鍏锋爮浜嬩欢
- 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;});
+ table.on('tool(LAY-app-content-list)', function (obj) {
+
+ var data = obj.data;
+ console.log(data)
+ if (obj.event === 'del') {
+ layer.confirm('纭畾鍒犻櫎褰撳墠鎵樼洏搴撳瓨锛�', function (index) {
+ var param = {
+ id: uid,
+ StockId:data.Id
+ };
+ var postUrl='/DownApi/DelStockWms'
+ sendData(IP + postUrl, param, 'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ tableIns.reload({
+ page: {
+ curr: 1
}
});
- }
- });
- submit.trigger('click');
- }
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
});
}
- });
+ })
//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -533,8 +532,9 @@
var LocatNo = $("#LocatNo").val();
var PalletNo = $("#PalletNo").val();
var LotNo = $("#LotNo").val();
+ var PalletStatus = $("#PalletStatus").val();
- refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo);
+ refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo,PalletStatus);
});
--
Gitblit v1.8.0