Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-27 614b0106f079e67bb674a37ede2bd0fe3df2a430

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html

@@ -2,10 +2,9 @@
<div class="ibox float-e-margins">
    <div class="ibox-content">
        <div class="form-horizontal" id="deptInfoForm">
            <input hidden id="language" value="${language}">

            <input type="hidden" id="id" value="${dept.id}">
            <input type="hidden" id="pid" value="${dept.pid}">
            @if(language==1){

            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
@@ -31,80 +30,14 @@
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==2){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Name of a department" underline="true" value="${dept.simplename}"/>

                    <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>

                    <#input id="tips" name="Remarks" underline="true" value="${dept.tips}"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Sort" underline="true" value="${dept.num}"/>

                    <#input id="pName" name="Superior department" readonly="readonly" hidden="pid"
                    hiddenValue="${dept.pid}" value="${pName}"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}
            @if(language==3){
            <div class="row">
                <div class="col-sm-6 b-r">
                    <#input id="simplename" name="Nama departemen" underline="true" value="${dept.simplename}"/>

                    <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>

                    <#input id="tips" name="Catatan" underline="true" value="${dept.tips}"/>
                </div>
                <div class="col-sm-6">
                    <#input id="num" name="Urutkan" underline="true" value="${dept.num}"/>

                    <#input id="pName" name="Departemen Tinggi" readonly="readonly" hidden="pid"
                    hiddenValue="${dept.pid}" value="${pName}"
                    clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
                    style="background-color: #ffffff !important;"/>
                </div>
            </div>

            <!-- 父级部门的选择框 -->
            <div id="parentDeptMenu" class="menuContent"
                 style="display: none; position: absolute; z-index: 200;">
                <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
            </div>

            <div class="row btn-group-m-t">
                <div class="col-sm-10 col-sm-offset-5">
                    <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
                    <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
                </div>
            </div>
            @}

        </div>

    </div>
</div>
<script src="${ctxPath}/modular/system/dept/dept_info.js"></script>
<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
@}