Merge branch 'wxw' into csc

Demo

2024-01-31 fd3d16522e131cc20e82bec2c197409f6dcd80ab

 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 clossClass" 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 {
                           
                        }
@@ -962,6 +967,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 +1009,7 @@
                           }, function () { doing = true });
                        }
                     });
                  });		
                  });
                  
                  break;
               case "chexiao" :