From 99185f80296a5bf22e7aed76e56f63624d6e9a58 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期日, 04 二月 2024 08:58:54 +0800
Subject: [PATCH] 合并代码

---
 HTML/views/ASNSetting/ArrivalNotice.html |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 8a9d0db..7ba93ca 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -92,9 +92,17 @@
 						<div class="layui-input-inline">
 							<select name="Type" id="Type" lay-filter="Type" lay-search>
 								<option value=""></option>
+								<!-- JC24 -->
+								<option value="0">鎴愬搧鍏ュ簱</option>
+								<option value="1">閲囪喘鍏ュ簱</option>
+								<option value="2">涓棿鍝佸叆搴�</option>
+								<option value="3">閫�璐у叆搴�</option>
+								<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+								<option value="5">鍏跺畠鍏ュ簱</option>
+								<option value="6">浠e偍鍏ュ簱</option>
 								<!-- JC09 -->
-								<option value="0">鏍囧噯浜у搧鍏ュ簱</option>
-								<option value="1">闈炴爣浜у搧鍏ュ簱</option>
+								<!-- <option value="0">鏍囧噯浜у搧鍏ュ簱</option>
+								<option value="1">闈炴爣浜у搧鍏ュ簱</option> -->
 								<!-- JC08 -->
 								<!-- <option value="0">鎴愬搧鍏ュ簱</option>
 								<option value="1">鍘熸枡鍏ュ簱</option>
@@ -170,8 +178,6 @@
 										<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>`;
 									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>

--
Gitblit v1.8.0