Merge branch 'master' into wxw

Administrator

2024-02-04 415c17f207966603c4c60c408f0e0bfdc3763ca7

 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: ['确定','取消'],