Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -106,13 +106,23 @@
                    },
                    {
                        field: 'hospitalLink',
                        width: "6%",
                        width: "7%",
                        title: '联系人'
                    },
                    {
                        field: 'hospitalTel',
                        width: "8%",
                        title: '联系方式'
                    },
                    {
                        field: 'departmentLink',
                        width: "6%",
                        title: '科室联系人'
                    },
                    {
                        field: 'departmentTel',
                        width: "8%",
                        title: '科室联系方式'
                    },
                    {
                        field: 'orderType', width: 80,  title: '状态', templet: function (d) {
@@ -340,7 +350,8 @@
                        method: 'GET',
                        where: {
                            'hospitalId': data.hospitalId,
                            'departmentId': data.departmentId
                            'departmentId': data.departmentId,
                            'enabled': true
                        },
                        headers: {
                            'Authorization': 'Bearer ' + config.getToken().access_token