From 06bc1ebcdbc217a7f53be2926ee4c25eb2990903 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 29 八月 2024 09:07:25 +0800
Subject: [PATCH] 修改组托收货箱码关联，和平库出库单页面
---
HTML/views/ASNSetting/ArrivalNotice.html | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 5de5a3c..67fc0aa 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -291,7 +291,10 @@
<i class="layui-icon"></i>娣诲姞
</button>
</script>
-
+ <!-- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
+ } -->
<script type="text/html" id="toolbarDemoList">
{{# function GetBtn2(d){
console.log(d);
@@ -300,10 +303,7 @@
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
}
- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
- <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
- }
+
return html;
}
@@ -401,7 +401,7 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'laypage', 'layer', 'laydate'], function () {
var doing = true;
@@ -486,7 +486,6 @@
height: h1,
id: 'LAY-app-content-list',
where: param,
-
contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
@@ -531,13 +530,15 @@
// {field: 'Money',title: '閲戦',align: 'center',width: 65},
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 120 },
{ field: 'PackagName', title: '鍖呰鍚嶇О', align: 'center', width: 110, },
- { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', width: 150 },
- { field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', width: 150 },
- { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', width: 140 },
- { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', width: 140 },
- { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', width: 140 },
- { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', width: 140 },
- { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+ { field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', width: 140 },
+ { field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', width: 140 },
+ // { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', width: 150 },
+ // { field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', width: 150 },
+ // { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', width: 140 },
+ // { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', width: 140 },
+ // { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', width: 140 },
+ // { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', width: 140 },
+ // { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime2' },
{ field: 'UpdateUserName', title: '淇敼浜�', align: 'center', width: 150, },
@@ -601,7 +602,7 @@
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
$(".checkClass").hide(); //澶嶆牳
- $(".addLabelClass").hide(); //澶嶆牳
+ //$(".addLabelClass").hide(); //鐢熸垚鏍囩
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
@@ -642,11 +643,11 @@
$(".checkClass").show();
});
}
- if (res.data[k].MenuName == "鐢熸垚鏍囩") {
- $(function () {
- $(".addLabelClass").show();
- });
- }
+ // if (res.data[k].MenuName == "鐢熸垚鏍囩") {
+ // $(function () {
+ // $(".addLabelClass").show();
+ // });
+ // }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
--
Gitblit v1.8.0