Merge branch 'csc'

Demo

2024-02-02 89b2a1e44a4c4a244eb885c5f8dd802147dd03ee

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -1144,6 +1144,7 @@
         //明细表操作栏事件
         table.on('tool(LAY-app-content-list2)', function (obj) {
            var data = obj.data;
            var id = data.Id;
            switch(obj.event)
            {
               case "del" :
@@ -1179,7 +1180,7 @@
                     title: '生成标签',
                     content: 'LabelPrintSelect.html',
                     maxmin: true,
                     area: ['460px', '460px'],
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],
                     yes: function(index, layero){
                        var iframeWindow = window['layui-layer-iframe'+ index]
@@ -1190,20 +1191,13 @@
                           var field = data.field; //获取提交的字段
                           console.log(field);
                           //提交 Ajax 成功后，静态更新表格中的数据
                           var param = {
                              Id: data.Id,
                              Reset: field.reset, //重置批号
                              Level: field.level,  //标签级别  1/2级
                              Type:field.type,  //关系层级  有/无层级
                              ArriveQty:field.arriveQty, //到货数量
                              BoxType:field.boxType ,// 箱支类型  箱/支
                              Qty:field.qty //箱/支数量
                           };
                           console.log(param);
                           //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                           var str = "Id="+id+"&Reset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
									
                           layer.open({
                              type: 2,
                              title: '生成标签',
                              content: 'LabelPrint.html',
                              content: 'LabelPrint.html?'+str,
                              maxmin: true,
                              area: ['660px', '660px'],
                              btn: ['取消'],