From 89b2a1e44a4c4a244eb885c5f8dd802147dd03ee Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期五, 02 二月 2024 11:18:26 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/ASNSetting/ArrivalNotice.html | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 3ddf22a..f6fbcab 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1144,6 +1144,7 @@
//鏄庣粏琛ㄦ搷浣滄爮浜嬩欢
table.on('tool(LAY-app-content-list2)', function (obj) {
var data = obj.data;
+ var id = data.Id;
switch(obj.event)
{
case "del" :
@@ -1179,7 +1180,7 @@
title: '鐢熸垚鏍囩',
content: 'LabelPrintSelect.html',
maxmin: true,
- area: ['460px', '460px'],
+ area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1190,20 +1191,13 @@
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
console.log(field);
//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
- var param = {
- Id: data.Id,
- Reset: field.reset, //閲嶇疆鎵瑰彿
- Level: field.level, //鏍囩绾у埆 1/2绾�
- Type:field.type, //鍏崇郴灞傜骇 鏈�/鏃犲眰绾�
- ArriveQty:field.arriveQty, //鍒拌揣鏁伴噺
- BoxType:field.boxType ,// 绠辨敮绫诲瀷 绠�/鏀�
- Qty:field.qty //绠�/鏀暟閲�
- };
- console.log(param);
+ //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
+ var str = "Id="+id+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
+
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrint.html',
+ content: 'LabelPrint.html?'+str,
maxmin: true,
area: ['660px', '660px'],
btn: ['鍙栨秷'],
--
Gitblit v1.8.0