Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -291,7 +291,10 @@
                     <i class="layui-icon">&#xe654;</i>添加
                  </button>
               </script>

               <!-- if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){  
                     html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel"> 
                        <i class="layui-icon layui-icon-edit"></i>生成标签</a>`; 
                  } -->
               <script type="text/html" id="toolbarDemoList">
                  {{# function GetBtn2(d){ 
                     console.log(d);
@@ -300,10 +303,7 @@
                           html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del"> 
                              <i class="layui-icon layui-icon-delete"></i>删除</a>`; 
                        }
                        if((d.AsnType =="1" || d.AsnType == "4" || d.AsnType == "5" || d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" || d.Status == "1")){  
                           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;
                     } 
@@ -401,7 +401,7 @@
         base: '../../layuiadmin/' //静态资源所在路径
      }).extend({
         index: 'lib/index' //主入口模块
      }).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
      }).use(['index', 'form','table', 'laypage', 'layer', 'laydate'], function () {

         var doing = true;

@@ -600,7 +600,7 @@
               $(".clossClass").hide();
               $(".editDemoClass").hide();//备注
               $(".checkClass").hide(); //复核
               $(".addLabelClass").hide(); //复核
               //$(".addLabelClass").hide(); //生成标签

            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
@@ -641,11 +641,11 @@
                           $(".checkClass").show();
                        });
                     }
                     if (res.data[k].MenuName == "生成标签") {
                        $(function () {
                           $(".addLabelClass").show();
                        });
                     }
                     // if (res.data[k].MenuName == "生成标签") {
                     //    $(function () {
                     //       $(".addLabelClass").show();
                     //    });
                     // }
                  }
               } else { //不成功
                  layer.msg('获取权限信息失败', {