From b0253945570d45c0d44c2613397debc98848c5b6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 09 三月 2024 10:38:33 +0800
Subject: [PATCH] 功能测试修改bug
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 277 ++++++-----
HTML/views/ASNSetting/BoxInfo.html | 102 ++--
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 2
HTML/views/ASNSetting/PalletBind.html | 309 ++++++------
HTML/views/BaseSetting/MaterialsForm.html | 678 ++++++++++++++--------------
5 files changed, 689 insertions(+), 679 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index a01103b..3b3f5ec 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -21,17 +21,18 @@
margin-left: -15px;
margin-right: -15px;
}
- .layui-table-mend{
+
+ .layui-table-mend {
position: relative;
}
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
+ document.addEventListener("DOMContentLoaded", function () {
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
<body>
@@ -49,7 +50,7 @@
<!-- <option value=""></option> -->
<!-- JC24 -->
<option value="0" selected>鎴愬搧鍏ュ簱</option>
- <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
<option value="2">涓棿鍝佸叆搴�</option>
<option value="3">閫�璐у叆搴�</option>
<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
@@ -63,7 +64,9 @@
</select>
</div>
- <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">瀹㈡埛</p></label>
+ <label class="layui-form-label" style="width: 70px;">
+ <p id="CustomerNamep">瀹㈡埛</p>
+ </label>
<div class="layui-input-inline">
<select name="CustomerName" id="CustomerName" lay-verify="" lay-search>
<option value=""></option>
@@ -80,8 +83,10 @@
<div class="layui-form-item" style="margin-bottom: 0;">
<div class="layui-card">
<div class="layui-card-body">
- <div class="position-relative" style="width: 100%;right: 0;"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
- <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
+ <div class="position-relative" style="width: 100%;right: 0;">
+ <!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
+ <table id="LAY-app-content-list" name="LAY-app-content-list" lay-filter="LAY-app-content-list">
+ </table>
<!-- #region 鑷畾涔夎〃澶� -->
<div class="headerSetIcon">
<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols">
@@ -91,7 +96,7 @@
<!-- #endregion -->
<!-- #region 鑷畾涔夎〃澶�-->
- <script type="text/html" id="templetUDF5">
+ <script type="text/html" id="templetUDF5">
{{# function GetBtn(d){
var html = '';
html+= '<select name="UDF5" lay-filter="SelctUDF5" data-value="'+d.UDF5+'">'+
@@ -107,7 +112,7 @@
</script>
<!-- #endregion -->
- </div>
+ </div>
<script type="text/html" id="switchTpl">
<input type="checkbox" name="IsBale" value="{{d.SkuNo}}" lay-skin="switch" lay-text="鏄瘄鍚�" lay-filter="IsBaleDemo" {{ d.IsBale == "1" ? 'checked' : '' }}>
</script>
@@ -151,35 +156,35 @@
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
var arr = [];
- var TypeValue=$("#Type").val();
+ var TypeValue = $("#Type").val();
// 鍔犺浇涓嬫媺淇℃伅
getCustomerList();
// table 鍩烘湰璁剧疆
//#region 鑷畾涔夎〃澶�
- var TotalColsArr = [[
- {field: '',title: '搴忓彿',type:'numbers',width: 50,align: 'center',fixed: 'left', "disabled": true},
- {field: 'Id',title: '鍏ュ簱鍗曟槑缁咺D',width: 120,align: 'center',fixed: 'left',hide: true, "disabled": true},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',minWidth: 100,align: 'center',fixed: 'left', "disabled": true},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',minWidth: 180,align: 'center',fixed: 'left', "disabled": true},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',edit: 'text',minWidth: 130,fixed: 'left', "disabled": true},
- {field: 'SupplierLot',title: '渚涜揣鎵规',width: 130,edit: 'text',event: 'setSign',fixed: 'left', "disabled": true},
- {field: 'Qty',title: '鏁伴噺',align: 'center',width: 80,edit: 'number',event: 'dataNumber',fixed: 'left', "disabled": true},
- {field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 70},
- {field: 'Standard',title: '瑙勬牸',width: 160,align: 'center'},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',edit: 'text',width: 160},
- {field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160, templet: "#table-content-Packlist"},
- {field: 'Price',title: '鍗曚环',align: 'center',width: 80},
- {field: 'Money',title: '閲戦',align: 'center',width: 100},
- {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',edit: 'text',width: 140},
- {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',edit: 'text',width: 140},
- {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',edit: 'text',width: 140},
- {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',edit: 'text',width: 140},
- {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',templet: '#table-content-list', "disabled": true}
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ var TotalColsArr = [[
+ { field: '', title: '搴忓彿', type: 'numbers', width: 50, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'Id', title: '鍏ュ簱鍗曟槑缁咺D', width: 120, align: 'center', fixed: 'left', hide: true, "disabled": true },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', minWidth: 100, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', minWidth: 180, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', edit: 'text', minWidth: 130, fixed: 'left', "disabled": true },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', width: 130, edit: 'text', event: 'setSign', fixed: 'left', "disabled": true },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 80, edit: 'number', event: 'dataNumber', fixed: 'left', "disabled": true },
+ { field: 'UnitName', title: '璁￠噺鍗曚綅', align: 'center', width: 70 },
+ { field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', edit: 'text', width: 160 },
+ { field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
+ { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
+ { field: 'Money', title: '閲戦', align: 'center', width: 100 },
+ { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
+ { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
+ { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
+ { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
+ { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', templet: '#table-content-list', "disabled": true }
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -337,20 +342,20 @@
//#region 鑷畾涔夎〃澶�
var infoOptions;
var colsJson;
- var param1={
- Href:'BllAsn/GetArrivalNoticeDetailList2'
+ var param1 = {
+ Href: 'BllAsn/GetArrivalNoticeDetailList2'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
- infoOptions={
+ infoOptions = {
elem: '#LAY-app-content-list',
height: 'full-110',
id: 'LAY-app-content-list',
@@ -358,26 +363,26 @@
limit: pageCnt,
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- done: function(){
+ done: function () {
//閫変腑涓嬫媺妗嗙殑鍊�
layui.each($('select'), function (index, item) {
var elem = $(item);
- if(elem.data('value')!='' && elem.data('value')!=undefined){
+ if (elem.data('value') != '' && elem.data('value') != undefined) {
elem.val(elem.data('value')).parents('table.layui-table-cell').css('overflow', 'visible');
- }
+ }
});
- form.render();
+ form.render();
//鑷畾涔夊垪瀹�
- SetTableColW('LAY-app-content-list','BllAsn/GetArrivalNoticeDetailList2',TotalColsSysArr);
- },
- cols:colsJson
+ SetTableColW('LAY-app-content-list', 'BllAsn/GetArrivalNoticeDetailList2', TotalColsSysArr);
+ },
+ cols: colsJson
};
// 娓叉煋Table
refreshTable(null);
});
//#endregion
-
+
// 娣诲姞缂栬緫鏄庣粏
var id = getQueryString('id');
@@ -392,8 +397,8 @@
console.log(res)
$("input[name='ASNNo']").val(res.data[0].ASNNo);
$("#Type option[value = '" + res.data[0].Type + "']").prop("selected", true);
- $("#CustomerName option[value = '" + res.data[0].CustomerNo + "']").prop("selected", true);
$("#Type").attr("disabled", "disabled");
+ getCustomerList(res.data[0].CustomerNo); // 鏍规嵁鍗曟嵁绫诲瀷鍔犺浇瀹㈡埛淇℃伅
var paramDetail = {
ASNNo: id,
@@ -413,7 +418,9 @@
curr: 1
}
table.render(infoOptions);
- form.render('select');
+
+
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -449,11 +456,11 @@
fixed: false,
});
},
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList2&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetArrivalNoticeDetailList2&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
@@ -469,16 +476,16 @@
};
//鍗曟嵁绫诲瀷鍙樻洿鏃舵竻绌簍able鍒楄〃淇℃伅
- form.on('select(Type)',function(data){
+ form.on('select(Type)', function (data) {
var value = data.value;
- if(value!=TypeValue){
+ if (value != TypeValue) {
console.log(value);
getCustomerList();
arr = [];
// 娓叉煋Table
refreshTable(null);
- TypeValue=value;
- }
+ TypeValue = value;
+ }
});
//鐩戝惉淇敼UDF5涓嬫媺妗唘pdate鍒拌〃鏍间腑
@@ -491,21 +498,21 @@
});
//鐩戝惉鏁伴噺鍊煎彉鍖栬嚜鍔ㄨ绠楅噾棰�
- table.on('edit(LAY-app-content-list)', function(obj){
- if(obj.field=='Qty'){
- var data=obj.data;
- if(data.Qty!=undefined && data.Qty !=''){
- data.Money=data.Qty*data.Price
-
+ table.on('edit(LAY-app-content-list)', function (obj) {
+ if (obj.field == 'Qty') {
+ var data = obj.data;
+ if (data.Qty != undefined && data.Qty != '') {
+ data.Money = data.Qty * data.Price
+
var menu = layui.table.cache["LAY-app-content-list"];
- for(var i =0;i<menu.length;i++){
- if(menu[i].Id==data.Id){
- menu[i].Money=data.Money
+ for (var i = 0; i < menu.length; i++) {
+ if (menu[i].Id == data.Id) {
+ menu[i].Money = data.Money
break;
}
}
$.extend(infoOptions, {
- data: menu,
+ data: menu,
});
table.render(infoOptions);
}
@@ -567,10 +574,10 @@
});
return;
}
- var type= $("#Type").val();
- if(type=='6'){
- var customerName=$("#CustomerName").val();
- if(customerName==''){
+ var type = $("#Type").val();
+ if (type == '6') {
+ var customerName = $("#CustomerName").val();
+ if (customerName == '') {
layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -607,7 +614,7 @@
}
// 缁戝畾涓嬫媺淇℃伅
- function getCustomerList() {
+ function getCustomerList(CustomerNo) {
/*
0锛氬鎴�
閫�璐у叆搴�
@@ -623,58 +630,56 @@
if (res.code == 0) { //鎴愬姛
$("#CustomerName").empty();
$("#CustomerName").append('<option value =""></option>');
+
+ // 鏍规嵁鍗曟嵁绫诲瀷纭鍔犺浇鏄鎴穙r渚涘簲鍟唎r璐т富涓嬫媺淇℃伅
+ var TypeNum = 0;
+ switch ($("#Type").val()) {
+ case "3": //閫�璐у叆搴�
+ TypeNum = 0;
+ console.log(TypeNum)
+ break;
+ case "1": //閲囪喘鍏ュ簱
+ case "5": //鍏跺畠鍏ュ簱
+ TypeNum = 1;
+ console.log(TypeNum)
+ break;
+ case "0": //鎴愬搧鍏ュ簱
+ case "2": //涓棿鍝佸叆搴�
+ case "4": //杞﹂棿浣欐枡鍏ュ簱
+ case "6": //浠ｅ偍鍏ュ簱
+ case "7": //瀵勫瓨鍏ュ簱
+ TypeNum = 2;
+ console.log(TypeNum)
+ break;
+ }
+
for (var i = 0; i < res.data.length; i++) {
- var TypeNum = 0;
-
- switch($("#Type").val())
- {
- case "3": //閫�璐у叆搴�
- TypeNum = 0;
- console.log(TypeNum)
- break;
- case "1": //閲囪喘鍏ュ簱
- case "5": //鍏跺畠鍏ュ簱
- TypeNum = 1;
- console.log(TypeNum)
- break;
- case "0": //鎴愬搧鍏ュ簱
- case "2": //涓棿鍝佸叆搴�
- case "4": //杞﹂棿浣欐枡鍏ュ簱
- case "6": //浠ｅ偍鍏ュ簱
- case "7": //瀵勫瓨鍏ュ簱
- TypeNum = 2;
- console.log(TypeNum)
- break;
- }
+
//鍒ゆ柇鍗曟嵁绫诲瀷
- if (TypeNum == 0)
- {
- if (res.data[i].Type == 0)
- {
+ if (TypeNum == 0) {
+ if (res.data[i].Type == 0) {
$("#CustomerNamep").html("瀹㈡埛");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
+ res.data[i].CustomerName + '</option>');
}
}
- else if (TypeNum == 1)
- {
- if (res.data[i].Type == 1)
- {
+ else if (TypeNum == 1) {
+ if (res.data[i].Type == 1) {
$("#CustomerNamep").html("渚涘簲鍟�");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
+ res.data[i].CustomerName + '</option>');
}
}
- else if (TypeNum == 2)
- {
- if (res.data[i].Type == 2)
- {
+ else if (TypeNum == 2) {
+ if (res.data[i].Type == 2) {
$("#CustomerNamep").html("璐т富");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
- res.data[i].CustomerName + '</option>');
+ res.data[i].CustomerName + '</option>');
}
}
}
+ // 鏍规嵁瀹㈡埛鍚嶇О鍔犺浇閫変腑鍊�
+ $("#CustomerName option[value = '" + CustomerNo + "']").prop("selected", true);
form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -703,7 +708,7 @@
}
arr.push(data[i]); //灞炴��
}
-
+
$.extend(infoOptions, {
data: arr
});
@@ -713,13 +718,13 @@
console.log(infoOptions)
table.render(infoOptions);
}
-
+
// 娣诲姞鍏ュ簱鍗�
function SetArrivalNotice(data) {
var item2 = getAsnOrderInfo();
- if (item2 !=-1) {
-
-
+ if (item2 != -1) {
+
+
if (doing) {
doing = false;
if (id == null) {
@@ -771,7 +776,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { doing = true });
}
- }
+ }
}
// 鎻愪氦鑾峰彇鍏ュ簱鍗曚俊鎭�
@@ -782,42 +787,40 @@
for (var i in arr) {
console.log(arr[i].LotNo);
console.log(arr[i].Qty);
- if (arr[i].Qty == "" || arr[i].Qty ==undefined) {
+ if (arr[i].Qty == "" || arr[i].Qty == undefined) {
layer.msg("璇疯緭鍏ュ叆搴撴暟閲忥紒", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
return -1;
}
- if (arr[i].LotNo == "" || arr[i].LotNo ==undefined) {
+ if (arr[i].LotNo == "" || arr[i].LotNo == undefined) {
//鍒ゆ柇鏄惁涓哄搴斾笉闇�瑕佹壒娆＄殑鍗曟嵁
var TypeNum = 0;
-
- switch($("#Type").val())
- {
+
+ switch ($("#Type").val()) {
//1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
- case "1" :
- case "2" :
- case "5" :
- case "6" :
- case "7" :
+ case "1":
+ case "2":
+ case "5":
+ case "6":
+ case "7":
console.log($("#Type").val())
TypeNum = 1;
break;
}
console.log(TypeNum)
- if (TypeNum == 0)
- {
+ if (TypeNum == 0) {
layer.msg("璇疯緭鍏ユ壒娆★紒1", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
return -1;
}
-
+
}
-
+
if (!reg.test(arr[i].Qty)) {
layer.msg("鍏ュ簱鏁伴噺蹇呴』鏄ぇ浜�0鐨勬暣鏁�", {
icon: 2,
@@ -839,16 +842,16 @@
IsBale: arr[i].IsBale,
IsBelt: arr[i].IsBelt,
SupplierLot: arr[i].SupplierLot,
- UDF1:arr[i].UDF1,
- UDF2:arr[i].UDF2,
- UDF3:arr[i].UDF3,
- UDF4:arr[i].UDF4,
- UDF5:arr[i].UDF5,
+ UDF1: arr[i].UDF1,
+ UDF2: arr[i].UDF2,
+ UDF3: arr[i].UDF3,
+ UDF4: arr[i].UDF4,
+ UDF5: arr[i].UDF5,
};
DataList.push(item); //灞炴��
}
console.log($("#CustomerName").find('option:selected').text());
-
+
var item2 = {
ASNNo: $("#ASNNo").val(),
Type: $("#Type").val(),
diff --git a/HTML/views/ASNSetting/BoxInfo.html b/HTML/views/ASNSetting/BoxInfo.html
index 88a34e5..b930e6b 100644
--- a/HTML/views/ASNSetting/BoxInfo.html
+++ b/HTML/views/ASNSetting/BoxInfo.html
@@ -36,14 +36,14 @@
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
-
+ document.addEventListener("DOMContentLoaded", function () {
+
//鑾峰彇table榛樿鏄剧ず鏁�
pageCntFirst();
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
@@ -213,7 +213,7 @@
{{ GetBtn7(d) }}
</script>
<!-- #endregion -->
- </div>
+ </div>
<script type="text/html" id="toolbarDemo">
<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
@@ -271,14 +271,14 @@
// 鎼滅储鏂规硶
form.on('submit(LAY-app-contlist-search)', function (data) {
- bindTable();
-
- });
+ bindTable();
+
+ });
// 椤甸潰鍔犺浇缁戝畾Table
bindTable();
-
+
// 娣诲姞瀵煎叆鎸夐挳鍗曟満浜嬩欢
table.on('toolbar(Box-list)', function (obj) {
switch (obj.event) {
@@ -300,11 +300,11 @@
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { doing = true });
- }
+ }
});
}
break;
-
+
default: break;
}
});
@@ -349,25 +349,25 @@
// 鏌ヨ褰曞叆鐨勭鏀叧绯�
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- {field: 'BoxNo',title: '绠卞彿',align: 'center',fixed: 'left',width: 220, "disabled": true},
- {field: 'BoxNo2',title: '鐩掑彿',align: 'center',fixed: 'left'},
- {field: 'BoxNo3',title: '鏀彿',align: 'center',fixed: 'left',width: 220, "disabled": true},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',fixed: 'left',width: 140, "disabled": true},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',fixed: 'left',width: 240, "disabled": true},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 155,},
- {field: 'Qty',title: '鏁伴噺',align: 'center',width: 100,},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 165},
- {field: 'ProductionTime',title: '鐢熶骇鏃ユ湡',align: 'center',width: 160,templet: '#templetProductionTime'},
- {field: 'ExpirationTime',title: '杩囨湡鏃ユ湡',align: 'center',width: 160,templet: '#templetExpirationTime'},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 155},
- {field: 'InspectMark',title: '鎶芥鏍囪',align: 'center',templet: '#templetInspectMark',width: 90},
- {field: 'BitBoxMark',title: '闆剁鏍囪',align: 'center',templet: '#templetBitBoxMark',width: 90},
- {field: 'Origin',title: '鏉ユ簮',align: 'center',},
- {field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime'},
- {field:'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',toolbar: '#toolbarDemoList', "disabled": true}
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: 'BoxNo', title: '绠卞彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'BoxNo2', title: '鐩掑彿', align: 'center', fixed: 'left' },
+ { field: 'BoxNo3', title: '鏀彿', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', fixed: 'left', width: 240, "disabled": true },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155, },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
+ { field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 160, templet: '#templetExpirationTime' },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 155 },
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', templet: '#templetInspectMark', width: 90 },
+ { field: 'BitBoxMark', title: '闆剁鏍囪', align: 'center', templet: '#templetBitBoxMark', width: 90 },
+ { field: 'Origin', title: '鏉ユ簮', align: 'center', },
+ { field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function bindTable() {
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -526,18 +526,18 @@
//#region 鑷畾涔夎〃澶�
var colsJson
- var param1={
- Href:'BllAsn/GetBllBoxInfoList'
+ var param1 = {
+ Href: 'BllAsn/GetBllBoxInfoList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
var param = {
BoxNo: $("#BoxNo").val(),
@@ -549,7 +549,7 @@
ProductionTime: $("#ProductionTime").val(),
InspectMark: $("#InspectMark").val(),
BitBoxMark: $("#BitBoxMark").val(),
- // Origin: "褰曞叆",
+ Origin: "褰曞叆;瀵煎叆;璧嬬爜",
};
table.render({
elem: '#Box-list',
@@ -570,7 +570,7 @@
done: function (res) {
setRight();
//鑷畾涔夊垪瀹�
- SetTableColW('Box-list','BllAsn/GetBllBoxInfoList',TotalColsSysArr);
+ SetTableColW('Box-list', 'BllAsn/GetBllBoxInfoList', TotalColsSysArr);
},
cols: colsJson
});
@@ -616,7 +616,7 @@
$(function () {
$(".addClass").hide();
$(".DaoRuClass").hide();
- $(".delClass").hide();
+ $(".delClass").hide();
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -633,7 +633,7 @@
}
if (res.data[k].MenuName == "鍒犻櫎绠辨敮褰曞叆") {
$(function () {
- $(".delClass").show();
+ $(".delClass").show();
});
}
}
@@ -782,17 +782,17 @@
doing = true
});
} else { //涓嶆垚鍔�
- if(res.msg==undefined){
+ if (res.msg == undefined) {
layer.msg("鍚庡彴姝ｅ湪瀵煎叆涓紝璇风◢鍚庢煡鐪嬬粨鏋�", {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable();doing = true });
- }else{
+ }, function () { bindTable(); doing = true });
+ } else {
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { bindTable();doing = true });
- }
+ }, function () { bindTable(); doing = true });
+ }
}
});
});
@@ -806,18 +806,18 @@
//#region 鑷畾涔夎〃澶�
//鑷畾涔夎〃澶�
active = {
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetBllBoxInfoList&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetBllBoxInfoList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
});
},
};
- $('.layui-btn').on('click', function() {
+ $('.layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index ea693af..27cd3e6 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -25,13 +25,13 @@
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
- document.addEventListener("DOMContentLoaded", function() {
+ document.addEventListener("DOMContentLoaded", function () {
//鑾峰彇table榛樿鏄剧ず鏁�
pageCntFirst();
//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
GetIsSetColW();
});
- </script>
+ </script>
</head>
<body id="body">
@@ -64,7 +64,7 @@
<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>
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
<option value=""></option>
</select>
</div>
@@ -130,7 +130,7 @@
<label class="layui-form-label">鎾ら攢鍘熷洜</label>
<div class="layui-input-inline">
<textarea id="Reason" name="Reason" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
-
+
</div>
</div>
<div class="layui-inline">
@@ -142,13 +142,13 @@
</div>
</div>
</div>
-
+
<div class="layui-card-body">
<div style="position: relative;">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title" id="tab">
- <li class="layui-this">鎵樼洏淇℃伅</li>
- <li >绠辩爜淇℃伅</li>
+ <li class="layui-this">鎵樼洏淇℃伅</li>
+ <li>绠辩爜淇℃伅</li>
</ul>
<div id="center"></div>
@@ -164,28 +164,30 @@
</button>
</div>
<!-- #endregion -->
- </div>
+ </div>
</div>
<div class="layui-tab-item">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
<table id="BoxInfo" lay-filter="BoxInfo"></table>
<!-- #region 鑷畾涔夎〃澶� -->
<div class="headerSetIcon">
- <button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
+ <button class="layui-btn layui-btn-primary layui-btn-sm"
+ data-type="customCols2">
<i class="layui-icon"></i>
</button>
</div>
<!-- #endregion -->
</div>
-
+
</div>
</div>
</div>
- <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;" class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" data-type="add">
+ <button style="margin-right: 5px;position: absolute; top: 5px; right: 10px;"
+ class="layui-btn layuiadmin-btn-list layui-btn-sm addClass" data-type="add">
<i class="layui-icon"></i>娣诲姞
</button>
</div>
-
+
<script type="text/html" id="PalletBindDemoList">
{{# function GetPalletBindBtn(d){
var html = '';
@@ -227,8 +229,8 @@
{{ GetBoxInfoBtn(d) }}
</script>
- <!-- #region 鑷畾涔夎〃澶� -->
- <script type="text/html" id="templetStatus">
+ <!-- #region 鑷畾涔夎〃澶� -->
+ <script type="text/html" id="templetStatus">
{{# function GetBtn3(d){
switch (d.Status) {
case "0": return '<button class="layui-btn layui-btn-radius layui-btn-xs">绛夊緟鍏ュ簱</button>';
@@ -370,11 +372,11 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage','element', 'layer', 'laydate'], function () {
+ }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate'], function () {
var table = layui.table,
form = layui.form,
element = layui.element;
- laypage = layui.laypage,
+ laypage = layui.laypage,
layer = layui.layer;
laydate = layui.laydate;
var h1 = GetTableTabHeight();
@@ -387,7 +389,7 @@
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
//tab鍒囨崲鍒ゆ柇鍊�
- var yemianid =0;
+ var yemianid = 0;
//鎺ュ彈鍏ㄥ眬鍙橀噺
let quanSkuNo = 0;
// 鑾峰彇table楂樺害
@@ -420,8 +422,7 @@
// 鏌ヨ浜嬩欢
form.on('select(getWareHouseNo)', function (data) {
- if($("#WareHouseNo").val() == "W01")
- {
+ if ($("#WareHouseNo").val() == "W01") {
//鑾峰彇宸烽亾涓嬫媺妗嗕俊鎭�
synData(IP + "/Sys/GetRoadwayList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -440,38 +441,37 @@
}
});
}
- else
- {
+ else {
$("#RoadwayNo").html('');
$("#RoadwayNo").append('<option value=""></option>');
form.render('select');
}
-
+
});
// 娓叉煋鎬昏〃
//#region 鑷畾涔夎〃澶�
var TotalColsArr = [[
- {field:'',title: '搴忓彿',type: 'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true},
- {field: 'ASNNo',title: '鍏ュ簱鍗曞彿',align: 'center',width: 180, "disabled": true},
- {field: 'ASNDetailNo',title: '鍏ュ簱鏄庣粏鍙�',align: 'center'},
- {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 100},
- {field: 'PalletNo2',title: '鎵樼洏鍙稬V2',align: 'center'},
- {field: 'PalletNo3',title: '鎵樼洏鍙稬V3',align: 'center'},
- {field: 'LocatNo',title: '鍌ㄤ綅鍦板潃',align: 'center',width: 90},
- {field: 'RoadwayNo',title: '鎵�灞炲贩閬�',align: 'center',width: 90,templet: '#RoadwayButton'},
- {field: 'WareHouseNo',title: '鎵�灞炰粨搴�',align: 'center',width: 90,templet: '#WareHouseButton'},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 110},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'},
- {field: 'Qty',title: '鏁伴噺',align: 'center',width: 90},
- {field: 'FullQty',title: '鏁存墭鏁伴噺',align: 'center',width: 90},
- {field: 'Status',title: '鎵ц鐘舵��',align: 'center',width: 90,templet: '#templetStatus'},
- {field: 'BitPalletMark',title: '闆舵墭鏍囪',align: 'center',width: 90,templet: '#templetBitPalletMark'},
- {field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center',width: 165,templet: '#templetCompleteTime'},
- {field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 165,templet: '#templetCreateTime'},
- {field:'caozuo',title: '鎿嶄綔',fixed: 'right',width: 180,align: 'center',toolbar: '#PalletBindDemoList', "disabled": true}
- ]];
- var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'ASNNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 180, "disabled": true },
+ { field: 'ASNDetailNo', title: '鍏ュ簱鏄庣粏鍙�', align: 'center' },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 100 },
+ { field: 'PalletNo2', title: '鎵樼洏鍙稬V2', align: 'center' },
+ { field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
+ { field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
+ { field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center', width: 90, templet: '#WareHouseButton' },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 90 },
+ { field: 'FullQty', title: '鏁存墭鏁伴噺', align: 'center', width: 90 },
+ { field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' },
+ { field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', width: 90, templet: '#templetBitPalletMark' },
+ { field: 'CompleteTime', title: '瀹屾垚鏃堕棿', align: 'center', width: 165, templet: '#templetCompleteTime' },
+ { field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 165, templet: '#templetCreateTime' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 180, align: 'center', toolbar: '#PalletBindDemoList', "disabled": true }
+ ]];
+ var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function bindPalletBind() {
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -659,18 +659,18 @@
//#region 鑷畾涔夎〃澶�
var colsJson
- var param1={
- Href:'BllAsn/GetPalletBindList'
+ var param1 = {
+ Href: 'BllAsn/GetPalletBindList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson=TotalColsArr
- }else{
- colsJson= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson = TotalColsArr
+ } else {
+ colsJson = eval(res.data);
}
- }else{
- colsJson=TotalColsArr
+ } else {
+ colsJson = TotalColsArr
}
var param = {
ASNNo: $("#ASNNo").val(),
@@ -703,7 +703,7 @@
setRight()
//bindBoxInfo(res.data[0].BindNo);
//鑷畾涔夊垪瀹�
- SetTableColW('PalletBind','BllAsn/GetPalletBindList',TotalColsSysArr);
+ SetTableColW('PalletBind', 'BllAsn/GetPalletBindList', TotalColsSysArr);
},
cols: colsJson
});
@@ -717,28 +717,28 @@
// 娓叉煋鏄庣粏琛�
//#region 鑷畾涔夎〃澶�
var DetailColsArr = [[
- {field: '',title: '搴忓彿',type: 'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true},
- {field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 95},
- {field: 'PalletNo2',title: '鎵樼洏缂栧彿LV2',align: 'center',width: 120},
- {field: 'PalletNo3',title: '鎵樼洏缂栧彿LV3',align: 'center',width: 120},
- {field: 'BoxNo',title: '绠卞彿',align: 'center',width: 220},
- {field: 'BoxNo2',title: '鐩掑彿',align: 'center',width: 220},
- {field: 'BoxNo3',title: '鏀彿',align: 'center',width: 220},
- {field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 150},
- {field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',align: 'center',width: 226},
- {field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 150,},
- {field: 'Qty',title: '鏁伴噺',align: 'center',width: 105,},
- {field: 'FullQty',title: '鏁寸鏁伴噺',align: 'center',width: 105,},
- {field: 'ProductionTime',title: '鐢熶骇鏃ユ湡',align: 'center',width: 160,templet: '#templetProductionTime'},
- {field: 'ExpirationTime',title: '杩囨湡鏃ユ湡',align: 'center',width: 180,templet: '#templetExpirationTime'},
- {field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150,},
- {field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 150,},
- {field: 'InspectMark',title: '鎶芥鏍囪',align: 'center',width:95,templet: '#templetInspectMark'},
- {field: 'BitBoxMark',title: '闆剁鏍囪',align: 'center',width:95,templet: '#templetBitBoxMark'},
- {field: 'InspectStatus',title: '璐ㄩ噺鐘舵��',align: 'center',width:95,templet: '#templetInspectStatus'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 155,align: 'center',toolbar: '#BoxInfoDemoList', "disabled": true}
- ]];
- var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+ { field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95 },
+ { field: 'PalletNo2', title: '鎵樼洏缂栧彿LV2', align: 'center', width: 120 },
+ { field: 'PalletNo3', title: '鎵樼洏缂栧彿LV3', align: 'center', width: 120 },
+ { field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 },
+ { field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
+ { field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 150 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', align: 'center', width: 226 },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150, },
+ { field: 'Qty', title: '鏁伴噺', align: 'center', width: 105, },
+ { field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 105, },
+ { field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
+ { field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 180, templet: '#templetExpirationTime' },
+ { field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
+ { field: 'SupplierLot', title: '渚涜揣鎵规', align: 'center', width: 150, },
+ { field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', width: 95, templet: '#templetInspectMark' },
+ { field: 'BitBoxMark', title: '闆剁鏍囪', align: 'center', width: 95, templet: '#templetBitBoxMark' },
+ { field: 'InspectStatus', title: '璐ㄩ噺鐘舵��', align: 'center', width: 95, templet: '#templetInspectStatus' },
+ { field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 155, align: 'center', toolbar: '#BoxInfoDemoList', "disabled": true }
+ ]];
+ var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
function bindBoxInfo(BindNo) {
//#region 鍘熷闈炶嚜瀹氫箟鍒�
@@ -915,44 +915,44 @@
//#region 鑷畾涔夎〃澶�
var colsJson2
- var param1={
- Href:'BllAsn/GetBoxInfoList'
+ var param1 = {
+ Href: 'BllAsn/GetBoxInfoList'
};
- sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
- if (res.code == 0){
- if(res.data=='' || res.data==undefined || res.data==null){
- colsJson2=DetailColsArr
- }else{
- colsJson2= eval(res.data);
+ sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+ if (res.code == 0) {
+ if (res.data == '' || res.data == undefined || res.data == null) {
+ colsJson2 = DetailColsArr
+ } else {
+ colsJson2 = eval(res.data);
+ }
+ } else {
+ colsJson2 = DetailColsArr
}
- }else{
- colsJson2=DetailColsArr
- }
- var param = {
- BindNo: parseInt(BindNo)
- };
- table.render({
- id: 'BoxInfo',
- elem: '#BoxInfo',
- height: h1,
- url: IP + "/BllAsn/GetBoxInfoList",
- method: 'post',
- contentType: 'application/json',
- headers: { ToKen: $.cookie('token') },
- where: param,
- // toolbar: '#BoxInfoDemo',
- // defaultToolbar: ['filter'], //'print', 'exports'
- page: true,
- limit: pageCnt, // 榛樿澶氬皯椤�
- limits: pageLimits, // 榛樿鏁扮粍[10,20,30,40,50]
- cellMinWidth: 60, // 鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
- even: true,
- done: function () {
- setRight()
- //鑷畾涔夊垪瀹�
- SetTableColW('BoxInfo','BllAsn/GetBoxInfoList',DetailColsSysArr);
- },
- cols: colsJson2
+ var param = {
+ BindNo: parseInt(BindNo)
+ };
+ table.render({
+ id: 'BoxInfo',
+ elem: '#BoxInfo',
+ height: h1,
+ url: IP + "/BllAsn/GetBoxInfoList",
+ method: 'post',
+ contentType: 'application/json',
+ headers: { ToKen: $.cookie('token') },
+ where: param,
+ // toolbar: '#BoxInfoDemo',
+ // defaultToolbar: ['filter'], //'print', 'exports'
+ page: true,
+ limit: pageCnt, // 榛樿澶氬皯椤�
+ limits: pageLimits, // 榛樿鏁扮粍[10,20,30,40,50]
+ cellMinWidth: 60, // 鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+ even: true,
+ done: function () {
+ setRight()
+ //鑷畾涔夊垪瀹�
+ SetTableColW('BoxInfo', 'BllAsn/GetBoxInfoList', DetailColsSysArr);
+ },
+ cols: colsJson2
});
});
//#endregion
@@ -960,10 +960,10 @@
// 椤甸潰鐩戞帶锛岀偣鍑绘煡璇㈠姞杞藉叆搴撴�诲崟
form.on('submit(LAY-app-contlist-search)', function (data) {
-
- if(yemianid == 0){
+
+ if (yemianid == 0) {
bindPalletBind();
- }else if(yemianid == 1){
+ } else if (yemianid == 1) {
bindBoxInfo(quanSkuNo);
}
});
@@ -973,20 +973,20 @@
// bindBoxInfo(parseInt(obj.data.Id));
// });
//瑙﹀彂琛屽弻鍑讳簨浠�
- table.on('rowDouble(PalletBind)', function(obj) {
+ table.on('rowDouble(PalletBind)', function (obj) {
$(".layui-tab-title>li").attr("class", "");
$('.layui-tab-title>li').eq(1).attr('class', 'layui-this');
$('.layui-tab-content .layui-tab-item').attr('class', 'layui-tab-item')
$('.layui-tab-content .layui-tab-item').eq(1).attr('class', 'layui-tab-item layui-show')
-
+
quanSkuNo = parseInt(obj.data.Id);
bindBoxInfo(parseInt(obj.data.Id));
- yemianid=1;
+ yemianid = 1;
});
// 娣诲姞鎵樼洏缁戝畾淇℃伅
var doing = true;
- //娣诲姞
+ //娣诲姞
var active = {
add: function () {
layer.open({
@@ -998,21 +998,21 @@
});
},
//#region 鑷畾涔夎〃澶�
- customCols: function(){
+ customCols: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetPalletBindList&ColsSysArr='+TotalColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetPalletBindList&ColsSysArr=' + TotalColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
});
},
- customCols2: function(){
+ customCols2: function () {
layer.open({
type: 2,
title: '鑷畾涔夊垪',
- content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetBoxInfoList&ColsSysArr='+DetailColsSysArr,
+ content: '../SystemSettings/HeaderSetting.html?Href=BllAsn/GetBoxInfoList&ColsSysArr=' + DetailColsSysArr,
maxmin: false,
resize: false,
area: ['970px', '650px']
@@ -1042,7 +1042,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
bindPalletBind();
- bindBoxInfo("0");
+ bindBoxInfo(quanSkuNo);
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -1064,57 +1064,57 @@
});
break;
- case "chexiao" :
+ case "chexiao":
layer.open({
type: 1,
title: '鎾ら攢鐢宠',
content: $('#divReason'),
maxmin: true,
- area: ['300px','265px'],
+ area: ['300px', '265px'],
btn: ['纭畾', '鍙栨秷'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var pa = $('#Reason').val();
- if (doing== true) {
- doing= false;
-
+ if (doing == true) {
+ doing = false;
+
var param = {
- Id: data.Id,
+ Id: data.Id,
Reason: pa,
};
console.log(param);
- sendData(IP + "/BllAsn/CancelPalletBind", param, 'get', function(res) {
+ sendData(IP + "/BllAsn/CancelPalletBind", param, 'get', function (res) {
console.log(res);
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 3000 //1绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
bindPalletBind();
- bindBoxInfo("0");
- doing= true;
+ bindBoxInfo("0");
+ doing = true;
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
time: 3000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
+ }, function () {
bindPalletBind();
- bindBoxInfo("0");
- doing= true;
+ bindBoxInfo("0");
+ doing = true;
});
}
layer.close(index);
});
- }else{
+ } else {
layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
}
-
+
}
- });
-
+ });
+
break;
default: break;
}
@@ -1144,7 +1144,7 @@
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {});
+ }, function () { });
}
});
});
@@ -1159,19 +1159,18 @@
maxmin: true,
area: ['80%', '85%'],
btn: ['鍏抽棴'],
- yes: function(index, layero) {
+ yes: function (index, layero) {
var iframeWindow = window['layui-layer-iframe' + index],
- submitID = 'layuiadmin-app-form-edit',
- submit = layero.find('iframe').contents().find('#' + submitID);
- if(doing)
- {
+ submitID = 'layuiadmin-app-form-edit',
+ submit = layero.find('iframe').contents().find('#' + submitID);
+ if (doing) {
doing = false;
-
+
layer.close(index); //鍏抽棴寮瑰眰
// refreshTable();
doing = true;
-
-
+
+
}
}
});
@@ -1224,14 +1223,14 @@
}
//鐩戝惉Tab鍒囨崲锛屼互鏀瑰彉鍦板潃hash鍊�
- element.on('tab(docDemoTabBrief)', function(data){
+ element.on('tab(docDemoTabBrief)', function (data) {
yemianid = data.index
- if(yemianid == 0){
- bindPalletBind( );
- }else if(yemianid == 1){
+ if (yemianid == 0) {
+ bindPalletBind();
+ } else if (yemianid == 1) {
bindBoxInfo(quanSkuNo);
}
- });
+ });
});
</script>
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 9c244e2..98b3578 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -1,32 +1,37 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <title>鐗╂枡缂栫爜缁存姢</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
- </head>
- <body>
- <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 0px 0 0;">
- <div class="layui-form-item" id="uptshow">
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍙�</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
+
+<head>
+ <meta charset="utf-8">
+ <title>鐗╂枡缂栫爜缁存姢</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+</head>
+
+<body>
+ <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list"
+ style="padding: 20px 0px 0 0;">
+ <div class="layui-form-item" id="uptshow">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍙�</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="SkuNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" lay-verify="required" autocomplete="off"
+ class="layui-input">
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡绫诲埆</label>
- <div class="layui-input-block" style="width:182px">
- <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
- <option value=""></option>
- </select>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡绫诲埆</label>
+ <div class="layui-input-block" style="width:182px">
+ <select name="CategoryNo" id="CategoryNo" lay-verify="required" lay-search>
+ <option value=""></option>
+ </select>
</div>
- </div>
- <!-- <div class="layui-form-item" id="uptshow">
+ </div>
+ </div>
+ <!-- <div class="layui-form-item" id="uptshow">
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
@@ -34,321 +39,324 @@
</div>
</div>
</div> -->
- <div class="layui-form-item" id="uptshow">
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="upttext" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" lay-verify="required" autocomplete="off" class="layui-input">
- </div>
- </div>
- <!-- 娣诲姞涓嶆樉绀� -->
- <div class="layui-inline" id="Auditishow">
- <label class="layui-form-label">瀹℃牳鐘舵��</label>
- <div class="layui-input-block" style="width:182px">
- <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0" selected>寰呭鏍�</option>
- <option value="9">宸查�氳繃</option>
- <option value="1">鑷畾涔�</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">绫诲瀷</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">鍘熸枡</option>
- <option value="1">鍖呮潗</option>
- <option value="2">鎴愬搧</option>
- <option value="3">鑰楁潗</option>
- <option value="4">涓棿鍝�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline" id="IsControlledshow">
- <label class="layui-form-label">鏄惁鍙楁帶</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
- <!-- <option value=""></option> -->
- <option value="0">鍙楁帶</option>
- <option value="1">闈炲彈鎺�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline" id="IsInspectshow">
- <label class="layui-form-label">鏄惁鍏嶆</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
- <!-- <option value=""></option> -->
- <option value="1">鏄�</option>
- <option value="0">鍚�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瑙勬牸/鍨嬪彿</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�/鍨嬪彿" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <!-- 鍗曚綅 -->
- <div class="layui-inline">
- <label class="layui-form-label">鍗曚綅</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div>
- <!-- 鍖呰 -->
- <div class="layui-inline">
- <label class="layui-form-label">鍖呰</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="PackagNo" id="PackagNo" lay-verify="" lay-search>
- <option value=""></option>
- </select>
- </div>
+ <div class="layui-form-item" id="uptshow">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="upttext" name="SkuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" lay-verify="required" autocomplete="off"
+ class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">瀛樺偍鐜</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
- <option value=""></option>
- <option value="0">甯告俯</option>
- <option value="1">浣庢俯</option>
- <!-- <option value="3">骞茬嚗閫氶</option> -->
- </select>
- </div>
+ <!-- 娣诲姞涓嶆樉绀� -->
+ <div class="layui-inline" id="Auditishow">
+ <label class="layui-form-label">瀹℃牳鐘舵��</label>
+ <div class="layui-input-block" style="width:182px">
+ <select name="AuditStatusNo" id="AuditStatusNo" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0" selected>寰呭鏍�</option>
+ <option value="9">宸查�氳繃</option>
+ <option value="1">鑷畾涔�</option>
+ </select>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鐞嗚閲嶉噺</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" name="Weight" placeholder="璇疯緭鍏ョ悊璁洪噸閲�" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">淇濊川鏈�(澶�)</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="Warranty" placeholder="璇疯緭鍏ヤ繚璐ㄦ湡" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐞嗚鍗曚环</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="Price" placeholder="璇疯緭鍏ョ悊璁哄崟浠�" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 70px;">涓存湡(澶�)</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="AdventTime" placeholder="璇疯緭鍏ヤ复鏈�" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浣庡簱瀛�</label>
- <div class="layui-input-block" style="width: 182px;">
- <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="LowInventory" placeholder="璇疯緭鍏ヤ綆搴撳瓨" lay-verify="" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block" style="width: 487px;">
- <textarea placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" name="Demo" class="layui-textarea"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item layui-hide">
- <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
- <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="纭缂栬緫">
</div>
</div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">绫诲瀷</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">鍘熸枡</option>
+ <option value="1">鍖呮潗</option>
+ <option value="2">鎴愬搧</option>
+ <option value="3">鑰楁潗</option>
+ <option value="4">涓棿鍝�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" id="IsControlledshow">
+ <label class="layui-form-label">鏄惁鍙楁帶</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="IsControlled" id="IsControlled" lay-verify="" lay-verify="" lay-search>
+ <!-- <option value=""></option> -->
+ <option value="0">鍙楁帶</option>
+ <option value="1">闈炲彈鎺�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" id="IsInspectshow">
+ <label class="layui-form-label">鏄惁鍏嶆</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="IsInspect" id="IsInspect" lay-verify="" lay-verify="" lay-search>
+ <!-- <option value=""></option> -->
+ <option value="0">鍚�</option>
+ <option value="1">鏄�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸/鍨嬪彿</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�/鍨嬪彿" lay-verify="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <!-- 鍗曚綅 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曚綅</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <!-- 鍖呰 -->
+ <div class="layui-inline">
+ <label class="layui-form-label">鍖呰</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="PackagNo" id="PackagNo" lay-verify="" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">瀛樺偍鐜</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <select name="Environment" id="Environment" lay-verify="" lay-verify="" lay-search>
+ <option value=""></option>
+ <option value="0">甯告俯</option>
+ <option value="1">浣庢俯</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐞嗚閲嶉噺</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" onkeyup="value=value.replace(/[^\d.]/g,'')" name="Weight" placeholder="璇疯緭鍏ョ悊璁洪噸閲�"
+ lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">淇濊川鏈�(澶�)</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="Warranty" placeholder="璇疯緭鍏ヤ繚璐ㄦ湡"
+ lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐞嗚鍗曚环</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="Price" placeholder="璇疯緭鍏ョ悊璁哄崟浠�"
+ lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 70px;">涓存湡(澶�)</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" onkeyup="value=value.replace(/[^\d]/g,'')" name="AdventTime" placeholder="璇疯緭鍏ヤ复鏈�"
+ lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浣庡簱瀛�</label>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" onkeyup="value=value.replace(/[^\d.?]/g,'')" name="LowInventory"
+ placeholder="璇疯緭鍏ヤ綆搴撳瓨" lay-verify="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block" style="width: 487px;">
+ <textarea placeholder="璇疯緭鍏ュ娉ㄥ唴瀹�" name="Demo" class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item layui-hide">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit"
+ value="纭娣诲姞">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit"
+ value="纭缂栬緫">
+ </div>
+ </div>
- <script src="../../layuiadmin/layui/layui.js"></script>
- <script src="../../js/public.js"></script>
- <script src="../../js/jquery-3.5.1.min.js"></script>
- <script src="../../js/jquery.cookie.js"></script>
- <script>
- layui.config({
- base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'layer'], function() {
- var $ = layui.$,
- form = layui.form,
- layer = layui.layer;
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer'], function () {
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
- // var sel3 = false;
- // //鑾峰彇绫诲埆淇℃伅 CategoryNo
- // sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
- // console.log(res)
- // if (res.code == 1) //鎴愬姛
- // {
- // Categoryhtml = '<option value =""></option>';
- // for (var i = 0; i < res.data.length; i++) {
- // $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
- // }
- // form.render('select');
- // sel3 = true;
- // }
- // else
- // {
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {sel3 = true;});
- // }
- // })
- var sel3 = false;
- //鑾峰彇绫诲埆淇℃伅 CategoryNo
- synData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
- console.log(res)
- if(res.code == 1) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++)
- {
- $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
- }
- form.render('select');
- sel3 = true;
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {sel3 = true;});
- }
-
- });
-
-
- var sel1 = false;
- //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
- synData(IP + "/Basis/GetUnitList",{},'get',function(res){
- if(res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++)
- {
- $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
- }
- form.render('select');
- sel1 = true;
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {sel1 = true;});
- }
-
- });
- var sel2 = false;
- //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
- synData(IP + "/Basis/GetPackagList",{},'get',function(res){
- if(res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++)
- {
- $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
- }
- form.render('select');
- sel2 = true;
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {sel2 = true;});
- }
-
- });
-
- var id = getQueryString('id');
- if (!id)
- {
- id = 0;
- $("#AuditStatusNo").attr("disabled","true")
- }
- else
- {
- if (sel1 && sel2 && sel3) {
- var param = {
- UserId: id,
- };
- synData(IP + "/Basis/GetMateById?Id= " +getQueryString('id')+ "", {}, 'get', function(res) {
- if (res.code == 0) //鎴愬姛
- {
- // console.log(res.data.CategoryNo)
- //瀹℃壒鐘舵�佺紪杈戞樉绀�
- if(res.data.AuditStatusNo != "")
- {
- $('#Auditishow').show();
- // $('#IsControlledshow').show();
- // $('#IsInspectshow').show();
- }
- //鐗╂枡鍙�
- if(res.data.SkuNo != "")
- {
- $("input[name='SkuNo']").attr("disabled","disabled")
- }
- //椤甸潰璧嬪��
- $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
- $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
- $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
- $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected","selected"); // 瀹℃牳鐘舵��
- $("#Type option[value='" + res.data.Type + "']").attr("selected","selected"); // 绫诲瀷
- $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
- // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
- $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected","selected"); // 鏄惁鍙楁帶
- $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected","selected"); // 鏄惁鍏嶆
- $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected","selected");// 鍗曚綅
- $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected","selected"); // 鍖呰
- $("#Environment option[value='" + res.data.Environment + "']").attr("selected","selected"); // 瀛樺偍鐜
- $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
- $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
- $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
- $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
- $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
- $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
- form.render();
- form.render('select');
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {});
- }
- });
- }
-
- }
- form.render('select');
- });
-
- //鑾峰彇娴忚鍣ㄥ弬鏁�
- function getQueryString(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
+ // var sel3 = false;
+ // //鑾峰彇绫诲埆淇℃伅 CategoryNo
+ // sendData(IP + "/sys/GetMaterialCategories1",{},'get',function(res){
+ // console.log(res)
+ // if (res.code == 1) //鎴愬姛
+ // {
+ // Categoryhtml = '<option value =""></option>';
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
+ // }
+ // form.render('select');
+ // sel3 = true;
+ // }
+ // else
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {sel3 = true;});
+ // }
+ // })
+ var sel3 = false;
+ //鑾峰彇绫诲埆淇℃伅 CategoryNo
+ synData(IP + "/sys/GetMaterialCategories1", {}, 'get', function (res) {
+ console.log(res)
+ if (res.code == 1) //鎴愬姛
+ {
+ for (var i = 0; i < res.data.length; i++) {
+ $("#CategoryNo").append('<option value =' + res.data[i].CategoryNo + '>' + res.data[i].CategoryName + '</option>');
+ }
+ form.render('select');
+ sel3 = true;
}
- </script>
- </body>
-</html>
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { sel3 = true; });
+ }
+
+ });
+
+
+ var sel1 = false;
+ //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
+ synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var i = 0; i < res.data.length; i++) {
+ $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
+ }
+ form.render('select');
+ sel1 = true;
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { sel1 = true; });
+ }
+
+ });
+ var sel2 = false;
+ //鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
+ synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var i = 0; i < res.data.length; i++) {
+ $("#PackagNo").append('<option value =' + res.data[i].PackagNo + '>' + res.data[i].PackagName + '</option>');
+ }
+ form.render('select');
+ sel2 = true;
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { sel2 = true; });
+ }
+
+ });
+
+ var id = getQueryString('id');
+ if (!id) {
+ id = 0;
+ $("#AuditStatusNo").attr("disabled", "true")
+ }
+ else {
+ if (sel1 && sel2 && sel3) {
+ var param = {
+ UserId: id,
+ };
+ synData(IP + "/Basis/GetMateById?Id= " + getQueryString('id') + "", {}, 'get', function (res) {
+ if (res.code == 0) //鎴愬姛
+ {
+ // console.log(res.data.CategoryNo)
+ //瀹℃壒鐘舵�佺紪杈戞樉绀�
+ if (res.data.AuditStatusNo != "") {
+ $('#Auditishow').show();
+ // $('#IsControlledshow').show();
+ // $('#IsInspectshow').show();
+ }
+ //鐗╂枡鍙�
+ if (res.data.SkuNo != "") {
+ $("input[name='SkuNo']").attr("disabled", "disabled")
+ }
+ //椤甸潰璧嬪��
+ $("input[name='SkuNo']").val(res.data.SkuNo); // 鐗╂枡鍙�
+ $("input[name='SkuName']").val(res.data.SkuName); // 鐗╂枡鍚嶇О
+ $("input[name='Standard']").val(res.data.Standard); // 瑙勬牸
+ $("#AuditStatusNo option[value='" + res.data.AuditStatusNo + "']").attr("selected", "selected"); // 瀹℃牳鐘舵��
+ $("#Type option[value='" + res.data.Type + "']").attr("selected", "selected"); // 绫诲瀷
+ $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected", "selected"); // 绫诲埆
+ // $("#CategoryNo option[value='" + res.data.CategoryNo + "']").attr("selected","selected"); // 绫诲埆
+ $("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 鏄惁鍙楁帶
+ $("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
+ $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 鍗曚綅
+ $("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
+ $("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
+ $("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
+ $("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
+ $("input[name='Price']").val(res.data.Price); // 鐞嗚鍗曚环
+ $("input[name='AdventTime']").val(res.data.AdventTime); // 涓存湡
+ $("input[name='LowInventory']").val(res.data.LowInventory); // 浣庡簱瀛�
+ $("textarea[name='Demo']").val(res.data.Demo); //澶囨敞
+ form.render();
+ form.render('select');
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ }
+ form.render('select');
+ });
+
+ //鑾峰彇娴忚鍣ㄥ弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 90b0e4b..26c7d4e 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -264,7 +264,7 @@
.AndIF(!string.IsNullOrWhiteSpace(model.ProductionTime), it => it.ProductionTime >= Convert.ToDateTime(model.ProductionTime))
.AndIF(!string.IsNullOrWhiteSpace(model.InspectMark), it => it.InspectMark == model.InspectMark.Trim())
.AndIF(!string.IsNullOrWhiteSpace(model.BitBoxMark), it => it.BitBoxMark == model.BitBoxMark.Trim())
- .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => it.Origin == model.Origin.Trim())
+ .AndIF(!string.IsNullOrWhiteSpace(model.Origin), it => model.Origin.Trim().Contains(it.Origin))
.And(m => m.SkuNo != "100099" && m.IsDel == "0" && m.Status == "0")
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
--
Gitblit v1.8.0