Merge branch 'master' into wxw

Administrator

2024-01-31 a7e2f8fa6c29b536af890bcab03335fb6d881ea4

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -206,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 {
                           
                        }