Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -52,7 +52,7 @@
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
        <input name="id" type="hidden" />
        <div style="display:flex">
            <div class="layui-form-item">
@@ -410,7 +410,7 @@
                        },
                        {
                            field: 'doctorName',
                            width: "150",
                            width: "100",
                            title: '医生姓名',
                            fixed: 'left'
                        },
@@ -431,7 +431,7 @@
                        },
                        {
                            field: 'isAnswer',
                            width: "100",
                            width: "75",
                            title: '医答',
                            templet: function (d) {
                                return d.isAnswer ? "是" : "否"
@@ -439,10 +439,18 @@
                        },
                        {
                            field: 'isSigning',
                            width: "100",
                            width: "75",
                            title: '签约',
                            templet: function (d) {
                                return d.isSigning ? "是" : "否"
                            }
                        },
                        {
                            field: 'isAdminUser',
                            width: "100",
                            title: '是否管理员',
                            templet: function (d) {
                                return d.isAdminUser ? "管理员" : "普通医生"
                            }
                        },
                        {
@@ -586,13 +594,18 @@
                var hospitalName = $("#hospitalName-seach").val();
                var doctorTel = $('#doctorTel').val();
                var doctorName = $('#doctorName').val();
                var hospitalId=$("#hospitalId").val();
                table.reload('app-table', {
                    where: {
                        doctorState: doctorState,
                        hospitalName: hospitalName,
                        hospitalId,
                        doctorTel: doctorTel,
                        doctorName: doctorName
                    }
                    },
                    page: {
                        curr: 1 
                    } 
                });
            });