From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/ASNSetting/ArrivalNotice.html | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 52a48ab..5383c31 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -320,6 +320,10 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel2">
<i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
}
+ if(d.AsnType == "5"&& (d.Status == "0" || d.Status == "1") && (d.PackagNo != ""|| d.PackagNo!=null)){
+ 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;
}
}}
@@ -1210,7 +1214,9 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
- var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+ +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
+ +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
layer.open({
type: 2,
@@ -1233,7 +1239,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
+ content: 'LabelPrintSelect.html?Id='+id+'&Type=4'+'&SupplierLot='+data.SupplierLot,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
@@ -1247,7 +1253,9 @@
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
- var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+ var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+ +"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
+ +"&StoreTime="+field.storeTime+'&SupplierLot='+field.SupplierLot;
layer.open({
type: 2,
--
Gitblit v1.8.0