From 2bcd2e34b928daf86ecb1c478a7b8a54fd698c7e Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期一, 30 十二月 2024 19:11:00 +0800
Subject: [PATCH] 修改问题
---
HTML/views/StatisticalReport/BoxInfor.html | 259 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 203 insertions(+), 56 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 55b4d25..4901114 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -32,7 +32,7 @@
<div class="layui-card">
<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 zongdan" >
+ <!-- <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;">
<input type="text" id="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off" class="layui-input">
@@ -43,11 +43,33 @@
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off" class="layui-input">
</div>
+ </div> -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" 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="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
</div>
<div class="layui-inline zongdan" >
- <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="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off" class="layui-input">
+ <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅鍦板潃" autocomplete="off" class="layui-input">
+ </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;">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="妗跺彿" autocomplete="off" class="layui-input">
</div>
</div>
<!-- <div class="layui-inline mingxi">
@@ -124,19 +146,19 @@
</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;">
<select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus"
lay-search>
<option value=""></option>
- <option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
- <option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
- <option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
- <option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
+ <option value="0">寰呰川妫�</option>
+ <option value="1">妫�楠屽悎鏍�</option>
+ <option value="2">涓嶅悎鏍�</option>
+ <option value="3">鏀剧疆鏈�</option>
</select>
</div>
- </div>
+ </div> -->
<!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
@@ -157,10 +179,10 @@
<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
+ <!-- <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
lay-filter="daochu">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>瀵煎嚭
- </button>
+ </button> -->
</div>
</div>
</div>
@@ -190,18 +212,56 @@
{{# } else if(d.BitPalletMark == '1') { }}
<p>鏄�</p>
{{# } }}
- <script type="text/html" id="InspectPalletStatus">
- {{# if(d.PalletStatus=='0'){ }}
- <p>鍑�妗�</p>
- {{# } else if(d.PalletStatus == '1') { }}
- <p>棰勬贩</p>
- {{# } else if(d.PalletStatus == '2') { }}
- <p>鍗婃垚鍝�</p>
- {{# } else if(d.PalletStatus == '3') { }}
- <p>鑴忔《</p>
- {{# } }}
- </script>
</script>
+ <script type="text/html" id="InspectPalletStatus">
+ {{# function GetBtn11(d){
+ var html = ``;
+ if(d.PalletStatus=='0'){
+ html = `鍑�妗禶;
+ } else if(d.PalletStatus=='1') {
+ html = `棰勬贩`;
+ } else if(d.PalletStatus=='2') {
+ html = `鍗婃垚鍝乣;
+ }else if(d.PalletStatus=='3') {
+ html = `鑴忔《`;
+ }
+ return html;
+ }
+ }}
+ {{ GetBtn11(d) }}
+ </script>
+ <script type="text/html" id="InspectStatus1">
+ {{# if(d.InspectStatus == '0') { }}
+ <p>寰呮楠�</p>
+ {{# } else if(d.InspectStatus == '1'){ }}
+ <p>妫�楠屽悎鏍�</p>
+ {{# } else if(d.InspectStatus == '2'){ }}
+ <p>涓嶅悎鏍�</p>
+ {{# } else if(d.InspectStatus == '4') { }}
+ <p>鏀剧疆鏈�</p>
+ {{# } }}
+ </script>
+ <script type="text/html" id="TempletStatus">
+ {{# if(d.Status=='0'){ }}
+ <button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭垎閰�</button>
+ {{# } else if(d.Status == '1') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">閮ㄥ垎鍒嗛厤</button>
+ {{# } else if(d.Status == '2') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">宸插垎閰�</button>
+ {{# } else if(d.Status == '3') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">鐩樼偣閿佸畾</button>
+ {{# } else if(d.Status == '4') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs">绉诲簱閿佸畾</button>
+ {{# } else if(d.Status == '5') { }}
+ <button class="layui-btn layui-btn-radius layui-btn-xs layui-btn-danger">寮傚父閿佸畾</button>
+ {{# } }}
+ </script>
+ <script type="text/html" id="toolbarDemo">
+
+ <!-- <button class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" lay-event="add">
+ <i class="layui-icon"></i>娣诲姞
+ </button> -->
+ </script>
</div>
</div>
</div>
@@ -331,11 +391,11 @@
var TotalColsArr = [[
{field: '',title: '搴忓彿',type:'numbers',align: 'center',fixed: 'left', "disabled": true},
{field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center'},
- {field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
+ //{field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center'},
{field: 'AreaName', title: '鎵�灞炲尯鍩�', align: 'center'},
{field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center'},
- {field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center'},
- {field: 'PalletStatus', title: '鎵樼洏鐘舵��', align: 'center', templet: '#InspectPalletStatus'},
+ {field: 'PalletNo', title: '妗跺彿', align: 'center'},
+ {field: 'PalletStatus', title: '妗剁姸鎬�', align: 'center', templet: '#InspectPalletStatus'},
{field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center'},
{field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
//{field: 'OwnerNo',title: '璐т富缂栫爜',align: 'center'},
@@ -345,16 +405,18 @@
{field: 'LotNo', title: '鎵规鍙�', align: 'center'},
{field: 'LotText', title: '鎵规鎻忚堪', align: 'center'},
//{field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center'},
+ {field: 'Status', title: '鍒嗛厤鐘舵��', align: 'center', templet: '#TempletStatus'},
{field: 'Qty', title: '鏁伴噺', align: 'center'},
{field: 'LockQty', title: '閿佸畾鏁伴噺', align: 'center',},
{field: 'FrozenQty', title: '鍐荤粨鏁伴噺', align: 'center'},
+ {field: 'InspectStatus', title: '璐ㄦ鐘舵��', align: 'center', templet: '#InspectStatus1'},
//{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(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime) {
+ function refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -378,6 +440,8 @@
limit: pageCnt,
limits: pageLimits,
even: true,
+ toolbar: '#toolbarDemo',
+ defaultToolbar: [''], //'print', 'exports'
cellMinWidth: 80, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function(){
//鑷畾涔夊垪瀹�
@@ -387,20 +451,12 @@
};
var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
+ wareHouseName:WareHouseName,
+ areaName:AreaName,
+ locatNo:LocatNo,
palletNo:PalletNo, //鎵樼洏鍙�
LotNo:LotNo, //鎵规鍙�
- BoxNo:BoxNo, //绠辩爜
- Status:Status, //绠辨敮鐘舵��
- InspectMark:InspectMark, //妫�楠屾爣璁�
- BitPalletMark:BitPalletMark, //闆舵墭鏍囪
- BitBoxMark:BitBoxMark, //闆剁鏍囪
- InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- StartTime:StartTime, //寮�濮嬫椂闂�
- EndTime:EndTime, //缁撴潫鏃堕棿
+
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
console.log(res)
@@ -423,29 +479,120 @@
});
});
//#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;});
+ }
+ });
+ }
+ });
+ submit.trigger('click');
+ }
+ });
+ }
+ });
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function(data) {
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+val, {}, 'get', function(res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+
+ };
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function(data) {
- var SkuNo = $("#SkuNo").val();
- var SkuName = $("#SkuName").val();
- var LotNo = $("#LotNo").val();
+
+ var WareHouseName = $("#WareHouseNo").val();
+ var AreaName = $("#AreaNo").val();
+ var LocatNo = $("#LocatNo").val();
var PalletNo = $("#PalletNo").val();
+ var LotNo = $("#LotNo").val();
- var BoxNo = $("#BoxNo").val();
- var Status = $("#Status").val();
- var InspectMark = $("#InspectMark").val();
- var BitPalletMark = $("#BitPalletMark").val();
- var BitBoxMark = $("#BitBoxMark").val();
- var InspectStatus = $("#InspectStatus").val();
-
- var OwnerNo = $("#OwnerNo").val();
- var OwnerName = $("#OwnerName").val();
-
- var StartTime = $("#StartTime").val();
- var EndTime = $("#EndTime").val();
-
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
+ refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo);
});
--
Gitblit v1.8.0