From 415c17f207966603c4c60c408f0e0bfdc3763ca7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 04 二月 2024 16:07:23 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
HTML/views/ASNSetting/ArrivalNotice.html | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index ce15fdb..938ca98 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -177,9 +177,7 @@
html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
<i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- <a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs">
- <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>`;
+ <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
break;
case "1" :
html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
@@ -1186,7 +1184,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
--
Gitblit v1.8.0