Merge branch 'yyk'

yuyou_x

2024-03-07 e701bbb0b83037cb945cdd66d7f943b68c88f004

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -62,6 +62,7 @@
                        <option value="1">正在执行</option>
                        <option value="2">执行完成</option>
                        <option value="3">订单关闭</option>
                        <option value="4">上传完毕</option>
                     </select>
                  </div>
               </div>
@@ -91,9 +92,18 @@
                  <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">代储入库</option>
                        <option value="7">寄存入库</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>
@@ -168,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>
@@ -179,6 +187,9 @@
                        case "2" : 
                        html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs">  <i class="layui-icon layui-icon-ok"></i>订单关闭</a>
                              <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>撤销</a>`; 
                           break;
                        case "3" : 
                        html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check">  <i class="layui-icon layui-icon-ok"></i>复核</a>`; 
                           break;
                        default : 
                        break; 
@@ -203,6 +214,8 @@
                           html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">执行完毕</button>`; 
                        } else if(d.Status=='3') { 
                           html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">订单关闭</button>`; 
                        } else if(d.Status=='4') { 
                           html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">上传完毕</button>`; 
                        } else {
                           
                        }
@@ -216,10 +229,22 @@
                  {{# function GetBtn4(d){
                        var html = ``;
                        if(d.Type=='0'){ 
                           html = `标准产品入库`; 
                           html = `成品入库`; 
                        } else if(d.Type=='1') { 
                           html = `非标产品入库`; 
                        } else {
                           html = `采购入库`; 
                        } else if(d.Type=='2') { 
                           html = `中间品入库`; 
                        }else if(d.Type=='3') { 
                           html = `退货入库`; 
                        }else if(d.Type=='4') { 
                           html = `车间余料退回入库`; 
                        }else if(d.Type=='5') { 
                           html = `其它入库`; 
                        }else if(d.Type=='6') { 
                           html = `代储入库`; 
                        }else if(d.Type=='7') { 
                           html = `寄存入库`; 
                        }else {
                           
                        }
                        return html;
@@ -251,6 +276,14 @@
                  }}
                  {{ GetBtn7(d) }}
               </script>

               <script type="text/html" id="templetCheckTime">
                  {{# function GetBtn11(d){
                        return formatDate(d.CheckTime);
                     }	
                  }}
                  {{ GetBtn11(d) }}
               </script>
               <!-- #endregion -->
            </div>
            <div class="position-relative"><!-- class="position-relative" --><!-- 自定义表头加上 -->
@@ -270,11 +303,20 @@
               </script>
 
               <script type="text/html" id="toolbarDemoList">
                  {{# function GetBtn2(d){
                  {{# 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.AsnType =="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>`; 
                        }
                        if(d.AsnType == "4"&& (d.Status == "0" || d.Status == "1")){
                           html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel2"> 
                              <i class="layui-icon layui-icon-edit"></i>生成标签</a>`;
                        }
                        return html;
                     } 
@@ -359,7 +401,7 @@
            elem: '#EndTime'
            , format: 'yyyy-MM-dd' //可任意组合
         });

			
         var h1 = GetTableTopHeight();
         var h2 = GetTableBottomHeight();

@@ -381,6 +423,8 @@
                  {field: 'CreateTime',title: '创建时间',align: 'center',templet: '#templetCreateTime'},
                  {field: 'UpdateUserName',title: '修改人',align: 'center',width: 110},
                  {field: 'UpdateTime',title: '修改时间',align: 'center',templet: '#templetUpdateTime'}, 
                  {field: 'CheckUserName',title: '复核人',align: 'center',width: 110},
                  {field: 'CheckTime',title: '复核时间',align: 'center',templet: '#templetCheckTime'}, 
                  {field: 'caozuo',title: '操作',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
               ]];
         var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
@@ -612,7 +656,7 @@
                  {field: 'CreateTime',title: '创建时间',align: 'center',width: 160,templet: '#templetCreateTime2'},
                  {field: 'UpdateUserName',title: '修改人',align: 'center',width: 150,},
                  {field: 'UpdateTime',title: '修改时间',align: 'center',width: 150,templet: '#templetUpdateTime3'},  
                  {field: 'caozuo',title: '操作',fixed: 'right',width: 100,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
                  {field: 'caozuo',title: '操作',fixed: 'right',width: 150,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
               ]];
         var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
         //#endregion
@@ -851,6 +895,9 @@
               $(".cheXiaoClass").hide(); 
               $(".clossClass").hide(); 
               $(".editDemoClass").hide();//备注
               $(".checkClass").hide(); //复核
               $(".addLabelClass").hide(); //复核
					
            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
               if (res.code == 0) { //成功 
@@ -883,6 +930,16 @@
                     if (res.data[k].MenuName == "维护入库单备注") {
                        $(function() {
                           $(".editDemoClass").show(); 
                        });
                     }
                     if (res.data[k].MenuName == "复核入库单") {
                        $(function() {
                           $(".checkClass").show(); 
                        });
                     }
                     if (res.data[k].MenuName == "生成标签") {
                        $(function() {
                           $(".addLabelClass").show(); 
                        });
                     }
                  }
@@ -962,6 +1019,32 @@
                     var param = {
                        Id:data.Id,
                     };
                     sendData(IP + "/UpApi/CloseAsn", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
                              icon: 1,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () {
                              refreshTable();
                              doing = true
                           });
                        } else { //不成功
                           layer.msg(res.msg, {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () { doing = true });
                        }
                     });
                  });

                  break;
               case "check" :
                  // 代码区域
                  layer.confirm('确定复核此单据吗？', function(index) { 	
                     // 代码区域
                     var param = {
                        Id:data.Id,
                     };
                     sendData(IP + "/UpApi/FinishAsn", param, 'post', function (res) {
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
@@ -978,7 +1061,7 @@
                           }, function () { doing = true });
                        }
                     });
                  });		
                  });
                  
                  break;
               case "chexiao" :
@@ -1074,6 +1157,7 @@
         //明细表操作栏事件
         table.on('tool(LAY-app-content-list2)', function (obj) {
            var data = obj.data;
            var id = data.Id;
            switch(obj.event)
            {
               case "del" :
@@ -1103,6 +1187,80 @@
                  });   

                  break;
               case "Addlabel" :
                  layer.open({
                     type: 2,
                     title: '生成标签',
                     content: 'LabelPrintSelect.html?Id='+id,
                     maxmin: true,
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],
                     yes: function(index, layero){
                        var iframeWindow = window['layui-layer-iframe'+ index]
                        ,submitID = 'layuiadmin-app-form-edit'
                        ,submit = layero.find('iframe').contents().find('#'+ submitID);
                        //监听提交
                        iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
                           var field = data.field; //获取提交的字段
                           console.log(field);
                           //提交 Ajax 成功后，静态更新表格中的数据
                           //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                           var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
									
                           layer.open({
                              type: 2,
                              title: '生成标签',
                              content: 'LabelPrint.html?'+str,
                              maxmin: true,
                              area: ['660px', '660px'],
                              btn: ['取消'],
										

                           });
                        });  
                        submit.trigger('click');
                     }

                  });

                  break;
               case "Addlabel2" :
                  layer.open({
                     type: 2,
                     title: '生成标签',
                     content: 'LabelPrintSelect.html?Id='+id+'&Type=4',
                     maxmin: true,
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],
                     yes: function(index, layero){
                        var iframeWindow = window['layui-layer-iframe'+ index]
                        ,submitID = 'layuiadmin-app-form-edit'
                        ,submit = layero.find('iframe').contents().find('#'+ submitID);
                        //监听提交
                        iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
                           var field = data.field; //获取提交的字段
                           console.log(field);
                           //提交 Ajax 成功后，静态更新表格中的数据
                           //"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
                           var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime+"&StoreTime="+field.storeTime;
									
                           layer.open({
                              type: 2,
                              title: '生成标签',
                              content: 'LabelPrint.html?'+str,
                              maxmin: true,
                              area: ['660px', '660px'],
                              btn: ['取消'],
										

                           });
                        });  
                        submit.trigger('click');
                     }

                  });

                  break;
               default:break;
            }
         });