Merge branch 'yyk'

yuyou_x

2024-02-01 46110c2ac4776dc7106edfa49ba8449d518f7d90

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -180,6 +180,9 @@
                        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 +206,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 +221,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;
@@ -250,6 +265,14 @@
                     }   
                  }}
                  {{ GetBtn7(d) }}
               </script>

               <script type="text/html" id="templetCheckTime">
                  {{# function GetBtn11(d){
                        return formatDate(d.CheckTime);
                     }	
                  }}
                  {{ GetBtn11(d) }}
               </script>
               <!-- #endregion -->
            </div>
@@ -381,6 +404,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编码
@@ -851,6 +876,7 @@
               $(".cheXiaoClass").hide(); 
               $(".clossClass").hide(); 
               $(".editDemoClass").hide();//备注
               $(".checkClass").hide(); //复核
            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
               if (res.code == 0) { //成功 
@@ -883,6 +909,11 @@
                     if (res.data[k].MenuName == "维护入库单备注") {
                        $(function() {
                           $(".editDemoClass").show(); 
                        });
                     }
                     if (res.data[k].MenuName == "复核入库单") {
                        $(function() {
                           $(".checkClass").show(); 
                        });
                     }
                  }
@@ -962,6 +993,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 +1035,7 @@
                           }, function () { doing = true });
                        }
                     });
                  });		
                  });
                  
                  break;
               case "chexiao" :