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/b82de922f1919d953ac8c99ade9537f45cb642fc?style=split&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 11 months ago
parent 415b66370a
commit b82de922f1
8 changed files with 103 additions and 39 deletions

58
ruoyi-admin/src/main/resources/templates/system/train/add.html
Unescape View File

@ -40,7 +40,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">人员姓名：</label> <label class="col-sm-4 control-label is-required">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="User" name="USERNAME" required class="form-control m-b"> <select id="User" name="USERNAME" required @change="getDept()" v-model="dept" class="form-control m-b">
<option value="">---请选择---</option> <option value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -51,19 +51,29 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required ">单位名称：</label> <label class="col-sm-4 control-label is-required ">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptName" placeholder="请输入单位名称" required class="form-control m-b" type="text"> <input placeholder="请输入单位名称" v-model="deptObj.deptName" required class="form-control m-b" type="text">
<input name="deptName" v-model="deptObj.deptId" type=hidden>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<!-- <div class="form-group">-->
<!-- <label class="col-sm-4 control-label is-required">部门：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="PART" required placeholder="请输入部门" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">部门：</label> <label class="col-sm-4 control-label is-required">培训对象：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PART" required placeholder="请输入部门" class="form-control" type="text"> <select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
<option value="">---请选择---</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div> </div>
</div> </div>
</div> </div>
@ -81,17 +91,6 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">培训对象：</label>
<div class="col-sm-8">
<select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
<option value="">---请选择---</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">培训人员：</label> <label class="col-sm-4 control-label">培训人员：</label>
@ -100,12 +99,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div class="col-sm-6">
<div class="row">
<div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label is-required">培训日期：</label> <label class="col-sm-4 control-label is-required">培训日期：</label>
<div class="col-sm-10"> <div class="col-sm-8">
<div class="input-daterange input-group "> <div class="input-daterange input-group ">
<input type="text" class="input-sm form-control" required name="trainDate" id="laydate-startTime" placeholder="开始日期"/> <input type="text" class="input-sm form-control" required name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<span class="input-group-addon">到</span> <span class="input-group-addon">到</span>
@ -142,10 +139,12 @@
userList:[], userList:[],
City:'', City:'',
Area:'', Area:'',
dept:'',
params:{ params:{
parentId:'', parentId:'',
}, },
userPost:"system/user/list" userPost:"system/user/list",
deptObj:{}
}, },
mounted(){ mounted(){
// 初始化地市列表 // 初始化地市列表
@ -156,6 +155,21 @@
this.getUserList() this.getUserList()
}, },
methods:{ methods:{
getDept(){
if (this.dept !== ''){
$.ajax({
url: ctx + this.userPost,
data:{userId:this.dept},
type: 'POST',
success:((res)=>{
this.deptObj = res.rows[0].dept
}) ,
});
}else{
this.deptObj ={}
}
},
getUserList(){ getUserList(){
$.ajax({ $.ajax({
url: ctx + this.userPost, url: ctx + this.userPost,

24
ruoyi-admin/src/main/resources/templates/system/train/detail.html
Unescape View File

@ -43,7 +43,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">人员姓名：</label> <label class="col-sm-4 control-label">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b"> <select id="User" name="USERNAME" disabled required @change="getDept()" v-model="userName" class="form-control m-b">
<option value="">---请选择---</option> <option value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -54,9 +54,9 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">单位名称：</label> <label class="col-sm-4 control-label is-required ">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptName" disabled th:field="*{deptName}" class="form-control m-b" type="text"> <input placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
</div> </div>
</div> </div>
</div> </div>
@ -170,7 +170,8 @@
params:{ params:{
parentId:'', parentId:'',
}, },
userPost:"system/user/list" userPost:"system/user/list",
deptObj:{}
}, },
mounted(){ mounted(){
// 初始化地市列表 // 初始化地市列表
@ -179,8 +180,23 @@
this.getAreaList() this.getAreaList()
} }
this.getUserList() this.getUserList()
this.getDept()
}, },
methods:{ methods:{
getDept(){
if (this.userName !== ''){
$.ajax({
url: ctx + this.userPost,
data:{userId:this.userName},
type: 'POST',
success:((res)=>{
this.deptObj = res.rows[0].dept
}) ,
});
}else{
this.deptObj ={}
}
},
getUserList(){ getUserList(){
$.ajax({ $.ajax({
url: ctx + this.userPost, url: ctx + this.userPost,

25
ruoyi-admin/src/main/resources/templates/system/train/edit.html
Unescape View File

@ -41,7 +41,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">人员姓名：</label> <label class="col-sm-4 control-label is-required">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="User" name="USERNAME" required v-model="userName" class="form-control m-b"> <select id="User" name="USERNAME" required @change="getDept()" v-model="userName" class="form-control m-b">
<option value="">---请选择---</option> <option value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -52,9 +52,10 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">单位名称：</label> <label class="col-sm-4 control-label is-required ">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptName" required th:field="*{deptName}" class="form-control m-b" type="text"> <input placeholder="请输入单位名称" v-model="deptObj.deptName" required class="form-control m-b" type="text">
<input name="deptName" v-model="deptObj.deptId" type=hidden>
</div> </div>
</div> </div>
</div> </div>
@ -142,7 +143,8 @@
params:{ params:{
parentId:'', parentId:'',
}, },
userPost:"system/user/list" userPost:"system/user/list",
deptObj:{}
}, },
mounted(){ mounted(){
// 初始化地市列表 // 初始化地市列表
@ -151,8 +153,23 @@
this.getAreaList() this.getAreaList()
} }
this.getUserList() this.getUserList()
this.getDept()
}, },
methods:{ methods:{
getDept(){
if (this.userName !== ''){
$.ajax({
url: ctx + this.userPost,
data:{userId:this.userName},
type: 'POST',
success:((res)=>{
this.deptObj = res.rows[0].dept
}) ,
});
}else{
this.deptObj ={}
}
},
getUserList(){ getUserList(){
$.ajax({ $.ajax({
url: ctx + this.userPost, url: ctx + this.userPost,

24
ruoyi-admin/src/main/resources/templates/system/train/examine.html
Unescape View File

@ -42,7 +42,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">人员姓名：</label> <label class="col-sm-4 control-label">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b"> <select id="User" name="USERNAME" disabled required @change="getDept()" v-model="userName" class="form-control m-b">
<option value="">---请选择---</option> <option value="">---请选择---</option>
<option v-for="option in userList" :value="option.userId" :key="option.userId"> <option v-for="option in userList" :value="option.userId" :key="option.userId">
{{ option.userName }} {{ option.userName }}
@ -53,9 +53,9 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">单位名称：</label> <label class="col-sm-4 control-label is-required ">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptName" disabled th:field="*{deptName}" class="form-control m-b" type="text"> <input placeholder="请输入单位名称" disabled v-model="deptObj.deptName" required class="form-control m-b" type="text">
</div> </div>
</div> </div>
</div> </div>
@ -171,7 +171,8 @@
params:{ params:{
parentId:'', parentId:'',
}, },
userPost:"system/user/list" userPost:"system/user/list",
deptObj:{}
}, },
mounted(){ mounted(){
// 初始化地市列表 // 初始化地市列表
@ -180,8 +181,23 @@
this.getAreaList() this.getAreaList()
} }
this.getUserList() this.getUserList()
this.getDept()
}, },
methods:{ methods:{
getDept(){
if (this.userName !== ''){
$.ajax({
url: ctx + this.userPost,
data:{userId:this.userName},
type: 'POST',
success:((res)=>{
this.deptObj = res.rows[0].dept
}) ,
});
}else{
this.deptObj ={}
}
},
getUserList(){ getUserList(){
$.ajax({ $.ajax({
url: ctx + this.userPost, url: ctx + this.userPost,

3
ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html
Unescape View File

@ -48,7 +48,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">单位名称：</label> <label class="col-sm-4 control-label">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="deptName" disabled th:field="*{deptName}" class="form-control" type="text"> <input name="deptName" disabled th:field="*{deptName}" class="form-control" type="text">
</div> </div>
@ -181,6 +181,7 @@
} }
}, },
methods:{ methods:{
getCityList(){ getCityList(){
$.ajax({ $.ajax({
url: ctx + "system/area/getSysAreaList", url: ctx + "system/area/getSysAreaList",

4
ruoyi-admin/src/main/resources/templates/system/user/add.html
Unescape View File

@ -21,10 +21,10 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required" >归属部门：</label> <label class="col-sm-4 control-label is-required" >所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input name="deptName" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择归属部门" class="form-control"> <input name="deptName" required onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择所属单位" class="form-control">
<span class="input-group-addon"><i class="fa fa-search"></i></span> <span class="input-group-addon"><i class="fa fa-search"></i></span>
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/user/edit.html
Unescape View File

@ -22,7 +22,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">归属部门：</label> <label class="col-sm-4 control-label is-required">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" required type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}"> <input class="form-control" required type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">

2
ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
Unescape View File

@ -37,7 +37,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">归属部门：</label> <label class="col-sm-4 control-label">所属单位：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group"> <div class="input-group">
<input class="form-control" disabled type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}"> <input class="form-control" disabled type="text" name="deptName" onclick="selectDeptTree()" id="treeName" th:field="*{dept.deptName}">

Write Preview
Loading…
Cancel
Save