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

luliqiang

2020-12-31 6fb14149d62199cfcc0448c82eb2f51f9c5181de

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

@@ -136,24 +136,26 @@
                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", "");
                //     }
                // });
                // console.log("vvvvvvvvvvvvv")
                window.open(config.base_server + "ReportRecord/operation/pdfname")
                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
            }
        });
    });