1
yuyou_x
2024-02-02 ae54631947c3554a8e4e4f2622d6d39e7e24922c
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,17 @@
                  <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>
                        <!-- 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>
@@ -181,7 +190,7 @@
                              <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 clossClass" lay-event="check">  <i class="layui-icon layui-icon-ok"></i>复核</a>`;
                        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; 
@@ -221,10 +230,20 @@
                  {{# 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 {
                           
                        }
                        return html;
@@ -255,6 +274,14 @@
                     }   
                  }}
                  {{ GetBtn7(d) }}
               </script>
               <script type="text/html" id="templetCheckTime">
                  {{# function GetBtn11(d){
                        return formatDate(d.CheckTime);
                     }
                  }}
                  {{ GetBtn11(d) }}
               </script>
               <!-- #endregion -->
            </div>
@@ -390,6 +417,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编码
@@ -860,6 +889,7 @@
               $(".cheXiaoClass").hide(); 
               $(".clossClass").hide(); 
               $(".editDemoClass").hide();//备注
               $(".checkClass").hide(); //复核
            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
               if (res.code == 0) { //成功 
@@ -892,6 +922,11 @@
                     if (res.data[k].MenuName == "维护入库单备注") {
                        $(function() {
                           $(".editDemoClass").show(); 
                        });
                     }
                     if (res.data[k].MenuName == "复核入库单") {
                        $(function() {
                           $(".checkClass").show();
                        });
                     }
                  }
@@ -1109,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" :
@@ -1144,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]
@@ -1155,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: ['取消'],