Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -36,7 +36,7 @@

<!-- 表单弹窗 -->
<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 class="layui-form-item">
            <label class="layui-form-label" style="width: 75px;">所在医院</label>
@@ -256,7 +256,7 @@
            var departId = $('#departmentId-serch').val();
            var hospitalId = $('#hospitalId-serch').val();
            var templeteTitle = $('#templeteTitle').val();
            table.reload('app-table', { where: { hospitalId: hospitalId, departId: departId } });
            table.reload('app-table', { where: { hospitalId: hospitalId, departId: departId },page: {curr: 1} });
        });

        // 修改user状态
@@ -315,7 +315,6 @@
                            $('#sure').hide();
                        }
                        form.val('app-form', data);
                        console.log(data,"1111111111111")
                         //重新装载科室
                        getdepartment(data.hospitalId);
                        form.render();