Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-07 6f3344a6bd18ba6a188aa694478ebcdbfef56b87

 src/main/webapp/static/js/plan/plan.js

@@ -248,7 +248,7 @@
                var tr = $(['<tr id="upload-'+ index +'">'
                    ,'<td>'+ file.name +'</td>'
                    ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
                    ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                    ,'<td><div class="layui-progress" id="progress-id-'+ index +'" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                    ,'<td>'
                    ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
                    ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
@@ -273,15 +273,24 @@
            });
        }
        ,done: function(res, index, upload){ //成功的回调
            if (res.code == 200) {
                element.progress('progress-demo-'+ index, '100%'); //执行进度条。n 即为返回的进度百分比
                layer.msg('上传成功', {icon: 1});
                $("#progress-id-" + index).html("已完成")
            }else {
                element.progress('progress-demo-'+ index, '100%'); //执行进度条。n 即为返回的进度百分比
                layer.msg('上传失败', {icon: 2});
                $("#progress-id-" + index).html("上传失败")
            }
            var that = this;
            //if(res.code == 0){ //上传成功
            var tr = that.elemList.find('tr#upload-'+ index)
                ,tds = tr.children();
            tds.eq(3).html(''); //清空操作
            delete this.files[index]; //删除文件队列已经上传成功的文件
            return;
            // return;
            //}
            this.error(index, upload);
            // this.error(index, upload);
        }
        ,allDone: function(obj){ //多文件上传完毕后的状态回调
            console.log(obj)
@@ -293,7 +302,7 @@
            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示重传
        }
        ,progress: function(n, elem, e, index){
            element.progress('progress-demo-'+ index, n + '%'); //执行进度条。n 即为返回的进度百分比
            element.progress('progress-demo-'+ index, '90%'); //执行进度条。n 即为返回的进度百分比
        }
    });