Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

luliqiang

2020-08-11 88b335cf1352479a5ffdb6305ce42b32e0122622

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

@@ -8,9 +8,9 @@
    </div>
    <div class="layui-card-body">
        <div class="layui-form toolbar">
            <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" />&emsp;
            <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
                class="layui-input search-input" id="test2"> &emsp;
            <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按医生姓名" />&emsp;
            <input type="text" class="layui-input search-input" id="test1" placeholder="开始时间" > 至 <input type="text"
                class="layui-input search-input" id="test2" placeholder="结束时间" > &emsp;
            <button id="app-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get"><i class="layui-icon">&#xe615;</i>搜索</button>
            <!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button> -->
            <button id="app-btn-export" class="layui-btn icon-btn permissions"  permissions="dataneed-export"><i class="layui-icon">&#xe654;</i>导出</button>
@@ -150,8 +150,8 @@
                { field: 'needTags', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
                { field: 'enabled', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
                { field: 'downTime', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
            ]],done:function(){
                permissionsInput();
            ]],done:function(res){
                permissionsInput(res,config);
            }
        });

@@ -196,8 +196,6 @@
        });
        //更新上传的状态
        var updateEnabled = function (dataFile, enabled) {
            console.log($("#upload-id").val())

            admin.req('api-opration/dataneed/updateEnabled', {
                id: $("#upload-id").val(),
                enabled: enabled,
@@ -208,7 +206,7 @@
                    layer.closeAll();
                    table.reload('app-table', { where: {} });
                } else {
                    layer.msg(data.msg, { icon: 2, time: 500 });
                    layer.msg(data.msg, { icon: 2, time: 2000 });
                }
            }, 'GET');
        }
@@ -245,10 +243,27 @@
        }
        // 导出
        $('#app-btn-export').click(function () {
            var key = $('#app-edit-search').val();
            var needBegintime = $('#test1').val();
            var needEndtime = $('#test2').val();
            if (needBegintime != null && needEndtime != null) {
                var flag = compareDate(needBegintime, needEndtime);
                if (!flag) {
                    layer.msg('结束时间不得小于开始时间');
                    return;
                }
            }
            //获取
            var url = config.base_server + 'api-opration/dataneed/export';
            var xhr = new XMLHttpRequest();
            xhr.open('POST', url, true);
            xhr.responseType = "blob";
             var form = new FormData();
            // Add selected file to form
            form.append("doctor_name", key);
            form.append('need_begintime',needBegintime);
            form.append('need_endtime',needEndtime);

            xhr.setRequestHeader("client_type", "DESKTOP_WEB");
            xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
            xhr.onload = function () {
@@ -267,7 +282,7 @@
                    document.body.removeChild(a);
                }
            }
            xhr.send();
            xhr.send(form);
        });

        // 显示编辑弹窗