forked from kidgrow-microservices-platform

zhaoxiaohao
2020-12-29 468f42f39f8e5df5d9d8c8982ac3a3c87859c97b
部门添加两个字段
5 files modified
64 ■■■■■ changed files
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java 11 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java 9 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml 2 ●●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html 12 ●●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html 30 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -102,4 +102,15 @@
     */
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    private Date healthEndTime;
    /**
     * 部门联系人
     */
    private String departmentLink;
    /**
     * 部门联系人
     */
    private String departmentTel;
}
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/HospitalListVo.java
@@ -114,4 +114,13 @@
     * 是否试用,true正式,false试用
     */
    private Boolean OrderType;
    /**
     * 部门联系人
     */
    private String departmentLink;
    /**
     * 部门联系人
     */
    private String departmentTel;
}
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -265,6 +265,8 @@
        DEP.is_del,
        DEP.is_pay,
        DEP.enabled,
        DEP.department_link,
        DEP.department_tel,
        hospitals.*
        FROM
        sys_department DEP
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html
@@ -106,7 +106,7 @@
                    },
                    {
                        field: 'hospitalLink',
                        width: "6%",
                        width: "7%",
                        title: '联系人'
                    },
                    {
@@ -115,6 +115,16 @@
                        title: '联系方式'
                    },
                    {
                        field: 'departmentLink',
                        width: "6%",
                        title: '科室联系人'
                    },
                    {
                        field: 'departmentTel',
                        width: "8%",
                        title: '科室联系方式'
                    },
                    {
                        field: 'orderType', width: 80,  title: '状态', templet: function (d) {
                            if(d.orderType==null){
                                return "";
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -19,6 +19,22 @@
    </div>
    <div class="layui-form-item">
        <div class="layui-row">
            <div class="layui-col-sm5">
                <label class="layui-form-label">医院联系人</label>
                <div class="layui-input-block">
                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
                </div>
            </div>
            <div class="layui-col-sm5">
                <label class="layui-form-label">医院电话</label>
                <div class="layui-input-block">
                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
                </div>
            </div>
        </div>
    </div>
    <div class="layui-form-item">
        <div class="layui-row">
            <div class="layui-col-sm4">
                <label class="layui-form-label">科室名称</label>
                <div class="layui-input-block">
@@ -27,15 +43,15 @@
                    &emsp;</div>
            </div>
            <div class="layui-col-sm3">
                <label class="layui-form-label">联系电话</label>
                <label class="layui-form-label">科室电话</label>
                <div class="layui-input-block">
                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
                    <input name="departmentTel" id="departmentTel" type="text" class="layui-input" maxlength="20" />
                </div>
            </div>
            <div class="layui-col-sm3">
                <label class="layui-form-label">联系人</label>
                <label class="layui-form-label">科室联系人</label>
                <div class="layui-input-block">
                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
                    <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
                </div>
            </div>
        </div>
@@ -343,7 +359,9 @@
                            saleUserId: '' + $("#saleUserName").val(),
                            saleUserName: $("#saleUserName option:selected").text(),
                            saleUserTel: $("#saleUserTel").val(),
                            accountsCount: $("#accountsCount").val()
                            accountsCount: $("#accountsCount").val(),
                            departmentTel: $("#departmentTel").val(),
                            departmentLink: $("#departmentLink").val(),
                        };
                        admin.req('api-user/sysdepartment/'+data.data.id, JSON.stringify(departmentData),
                            function (data) {
@@ -469,6 +487,8 @@
                                        $("#accountsCount").val(departData[0]
                                            .accountsCount);
                                        $('#saleUserName').val(departData[0].saleUserId);
                                        $('#departmentLink').val(departData[0].departmentLink);
                                        $('#departmentTel').val(departData[0].departmentTel);
                                        if (hosIdForEdit != "") {
                                            $("#serverUserTel").val(departData[0]