Your ROOT_URL in app.ini is http://git.zky.com/ but you are visiting http://61.178.84.89:8998/luoluo/ry_zhky/commit/dddd99d102ba35de77928dd5cc4427810dfca984?style=unified&whitespace=ignore-change You should set ROOT_URL correctly, otherwise the web may not work correctly.
luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
kingbase
dshclm 10 months ago
parent c12da9555b
commit dddd99d102
4 changed files with 26 additions and 26 deletions

16
ruoyi-admin/src/main/resources/templates/system/dept/add.html
Unescape View File

@ -1,14 +1,14 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增部门')" />
<th:block th:include="include :: header('新增单位')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-dept-add">
<input id="treeId" name="parentId" type="hidden" th:value="${dept?.deptId}" />
<div class="form-group">
<label class="col-sm-3 control-label is-required">上级部门：</label>
<label class="col-sm-3 control-label is-required">上级单位：</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" onclick="selectDeptTree()" id="treeName" readonly="true" th:value="${dept?.deptName}" required>
@ -39,7 +39,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">部门名称：</label>
<label class="col-sm-3 control-label is-required">单位名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="deptName" id="deptName" required>
</div>
@ -69,7 +69,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">部门状态：</label>
<label class="col-sm-3 control-label is-required">单位状态：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" required th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}">
@ -154,7 +154,7 @@
},
messages: {
"deptName": {
remote: "部门已经存在"
remote: "单位已经存在"
}
},
focusCleanup: true
@ -166,15 +166,15 @@
}
}
/*部门管理-新增-选择父部门树*/
/*单位管理-新增-选择父单位树*/
function selectDeptTree() {
var treeId = $("#treeId").val();
if ($.common.isEmpty(treeId)) {
$.modal.alertWarning("请先添加用户所属的部门！");
$.modal.alertWarning("请先添加用户所属的单位！");
return;
}
var options = {
title: '部门选择',
title: '单位选择',
width: "380",
url: prefix + "/selectDeptTree/" + treeId + "/0",
callBack: doSubmit

10
ruoyi-admin/src/main/resources/templates/system/dept/dept.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('部门列表')" />
<th:block th:include="include :: header('单位列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
@ -11,10 +11,10 @@
<div class="select-list">
<ul>
<li>
部门名称：<input type="text" name="deptName"/>
单位名称：<input type="text" name="deptName"/>
</li>
<li>
部门状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
单位状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
@ -61,14 +61,14 @@
createUrl: prefix + "/add/{id}",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove/{id}",
modalName: "部门",
modalName: "单位",
columns: [{
field: 'selectItem',
radio: true
},
{
field: 'deptName',
title: '部门名称',
title: '单位名称',
align: "left"
},
{

16
ruoyi-admin/src/main/resources/templates/system/dept/edit.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改部门')" />
<th:block th:include="include :: header('修改单位')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
@ -9,7 +9,7 @@
<input name="deptId" type="hidden" th:field="*{deptId}" />
<input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
<div class="form-group">
<label class="col-sm-3 control-label">上级部门：</label>
<label class="col-sm-3 control-label">上级单位：</label>
<div class="col-sm-8">
<div class="input-group">
<input class="form-control" type="text" id="treeName" onclick="selectDeptTree()" readonly="true" th:field="*{parentName}">
@ -40,7 +40,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">部门名称：</label>
<label class="col-sm-3 control-label is-required">单位名称：</label>
<div class="col-sm-8">
<input class="form-control" type="text" name="deptName" th:field="*{deptName}" id="deptName" required>
</div>
@ -70,7 +70,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label>
<label class="col-sm-3 control-label">单位状态：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:field="*{status}">
@ -116,7 +116,7 @@
},
messages: {
"deptName": {
remote: "部门已经存在"
remote: "单位已经存在"
}
},
focusCleanup: true
@ -128,20 +128,20 @@
}
}
/*部门管理-修改-选择部门树*/
/*单位管理-修改-选择单位树*/
function selectDeptTree() {
var deptId = $("#treeId").val();
var excludeId = $("input[name='deptId']").val();
if(deptId > 0) {
var options = {
title: '部门选择',
title: '单位选择',
width: "380",
url: prefix + "/selectDeptTree/" + $("#treeId").val() + "/" + excludeId,
callBack: doSubmit
};
$.modal.openOptions(options);
} else {
$.modal.alertError("父部门不能选择");
$.modal.alertError("父单位不能选择");
}
}

2
ruoyi-admin/src/main/resources/templates/system/dept/tree.html
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('部门树选择')" />
<th:block th:include="include :: header('单位树选择')" />
<th:block th:include="include :: ztree-css" />
</head>
<style>

Write Preview
Loading…
Cancel
Save