Merge branch 'yyk'

yuyou_x

2024-02-05 eb7405f413c3102533b5640cbdc6b1d33772207e

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -100,6 +100,7 @@
                        <option value="4">车间余料退回入库</option>
                        <option value="5">其它入库</option>
                        <option value="6">代储入库</option>
                        <option value="7">寄存入库</option>
                        <!-- JC09 -->
                        <!-- <option value="0">标准产品入库</option>
                        <option value="1">非标产品入库</option> -->
@@ -177,9 +178,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>
@@ -243,6 +242,8 @@
                           html = `其它入库`; 
                        }else if(d.Type=='6') { 
                           html = `代储入库`; 
                        }else if(d.Type=='7') { 
                           html = `寄存入库`; 
                        }else {
                           
                        }
@@ -303,13 +304,14 @@
 
               <script type="text/html" id="toolbarDemoList">
                  {{# function GetBtn2(d){ 
                     console.log(d);
                        var html = ``;
                        if(d.Status == "0"){ 
                           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.Status == "0" || d.Status == "1"){  
                           html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel"> 
                        if((d.AsnType =="1" || d.AsnType == "4") && (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;
@@ -890,6 +892,8 @@
               $(".clossClass").hide(); 
               $(".editDemoClass").hide();//备注
               $(".checkClass").hide(); //复核
               $(".addLabelClass").hide(); //复核
					
            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
               if (res.code == 0) { //成功 
@@ -927,6 +931,11 @@
                     if (res.data[k].MenuName == "复核入库单") {
                        $(function() {
                           $(".checkClass").show(); 
                        });
                     }
                     if (res.data[k].MenuName == "生成标签") {
                        $(function() {
                           $(".addLabelClass").show(); 
                        });
                     }
                  }
@@ -1178,7 +1187,7 @@
                  layer.open({
                     type: 2,
                     title: '生成标签',
                     content: 'LabelPrintSelect.html',
                     content: 'LabelPrintSelect.html?Id='+id,
                     maxmin: true,
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],