Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -131,24 +131,31 @@
                    endTime: dateend
                };
                table.reload('diagnostic-table', { where: whereData,page: {curr: 1  }});
            }else{
                layer.msg('请输入医院');
                return false;
            }
        });
        //获取软件的服务周期
        var getCycleTime = function (departmentId) {
            
        }
        // 工具条点击事件
        table.on('tool(diagnostic-table)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === "select") {
                //查看报告  报告列数据缓存起来
                admin.putTempData("t_diagnosis", data);
                admin.popupCenter({
                    title: '查看报告',
                    path: 'pages/opration/recordNote.html',
                    area: '1200px',
                    offset: '10px',
                    finish: function () {
                        admin.putTempData("t_diagnosis", "");
                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
                function (data) {
                    if (data.code == 0) {
                        //打开新的窗口
                       window.open(data.data)
                    }else{
                        layer.msg("查询报告失败")
                    }
                });

                }, "post")
                admin.re
            }
        });
    });