luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改提交

Browse Source
master
dshclm 10 months ago
parent 219f185421
commit f93df26625
11 changed files with 207 additions and 133 deletions
Show Stats Download Patch File Download Diff File

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

@ -21,7 +21,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="destoryCount" required th:field="*{destoryCount}" class="form-control" type="text"> <input name="destoryCount" digits="true" required th:field="*{destoryCount}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

2
ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
Unescape View File

@ -45,7 +45,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="provideCount" class="form-control" type="text"> <input name="provideCount" digits="true" class="form-control" type="text">
</div> </div>
</div> </div>

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

@ -42,9 +42,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:fileprovide:add"> <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:fileprovide:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:fileprovide:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:fileprovide:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:fileprovide:remove">
<i class="fa fa-remove"></i> 删除 <i class="fa fa-remove"></i> 删除
</a> </a>

2
ruoyi-admin/src/main/resources/templates/system/network/network/add.html
Unescape View File

@ -57,7 +57,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="terminalNum" class="form-control" type="text"> <input name="terminalNum" digits="true" class="form-control" type="text">
</div> </div>
</div> </div>
</form> </form>

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

@ -58,7 +58,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="terminalNum" th:field="*{terminalNum}" class="form-control" type="text"> <input name="terminalNum" digits="true" th:field="*{terminalNum}" class="form-control" type="text">
</div> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/property/property/add.html
Unescape View File

@ -70,7 +70,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="propertyNum" class="form-control" type="text"> <input name="propertyNum" digits="true" class="form-control" type="text">
</div> </div>
</div> </div>
</form> </form>

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

@ -77,7 +77,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="propertyNum" th:field="*{propertyNum}" class="form-control" type="text"> <input name="propertyNum" digits="true" th:field="*{propertyNum}" class="form-control" type="text">
</div> </div>
</div> </div>
</form> </form>

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

@ -54,20 +54,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <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="col-sm-8">
<div class="input-group date"> <div class="input-daterange input-group">
<input name="trainDate" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input type="text" class="input-sm form-control" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon">到</span>
</div> <input type="text" class="input-sm form-control" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">培训结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="trainTimeend" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
</div> </div>
@ -109,18 +101,60 @@
$("#form-train-add").validate({ $("#form-train-add").validate({
focusCleanup: true focusCleanup: true
}); });
layui.use('laydate', function(){
var laydate = layui.laydate;
var startDate = laydate.render({
elem: '#laydate-startTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endDate.config.min.year = date.year;
endDate.config.min.month = date.month - 1;
endDate.config.min.date = date.date;
} else {
endDate.config.min.year = '';
endDate.config.min.month = '';
endDate.config.min.date = '';
}
}
});
var endDate = laydate.render({
elem: '#laydate-endTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// Start date cannot be after end date
if (value !== '') {
startDate.config.max = {
year: date.year,
month: date.month - 1,
date: date.date
};
} else {
startDate.config.max = {
year: '',
month: '',
date: ''
};
}
}
});
});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-train-add').serialize()); $.operate.save(prefix + "/add", $('#form-train-add').serialize());
} }
} }
$("input[name='trainDate']").datetimepicker({ // $("input[name='trainDate']").datetimepicker({
format: "yyyy-mm-dd", // format: "yyyy-mm-dd",
minView: "month", // minView: "month",
autoclose: true // autoclose: true
}); // });
$("input[name='createDate']").datetimepicker({ $("input[name='createDate']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
@ -134,11 +168,11 @@
autoclose: true autoclose: true
}); });
$("input[name='trainTimeend']").datetimepicker({ // $("input[name='trainTimeend']").datetimepicker({
format: "yyyy-mm-dd", // format: "yyyy-mm-dd",
minView: "month", // minView: "month",
autoclose: true // autoclose: true
}); // });
</script> </script>
</body> </body>
</html> </html>

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

@ -55,11 +55,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <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="col-sm-8">
<div class="input-group date"> <div class="input-daterange input-group">
<input name="trainDate" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon">到</span>
<input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
</div> </div>
</div> </div>
</div> </div>
@ -69,15 +70,6 @@
<input name="trainName" th:field="*{trainName}" class="form-control" type="text"> <input name="trainName" th:field="*{trainName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">培训结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="trainTimeend" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
@ -87,19 +79,54 @@
$("#form-train-edit").validate({ $("#form-train-edit").validate({
focusCleanup: true focusCleanup: true
}); });
layui.use('laydate', function(){
var laydate = layui.laydate;
var startDate = laydate.render({
elem: '#laydate-startTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endDate.config.min.year = date.year;
endDate.config.min.month = date.month - 1;
endDate.config.min.date = date.date;
} else {
endDate.config.min.year = '';
endDate.config.min.month = '';
endDate.config.min.date = '';
}
}
});
var endDate = laydate.render({
elem: '#laydate-endTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// Start date cannot be after end date
if (value !== '') {
startDate.config.max = {
year: date.year,
month: date.month - 1,
date: date.date
};
} else {
startDate.config.max = {
year: '',
month: '',
date: ''
};
}
}
});
});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-train-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-train-edit').serialize());
} }
} }
$("input[name='trainDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='createDate']").datetimepicker({ $("input[name='createDate']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",
@ -111,12 +138,6 @@
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
$("input[name='trainTimeend']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script> </script>
</body> </body>
</html> </html>

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

@ -56,11 +56,12 @@
</div> </div>
</div> </div>
<div class="form-group"> <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="col-sm-8">
<div class="input-group date"> <div class="input-daterange input-group">
<input name="trainDate" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon">到</span>
<input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
</div> </div>
</div> </div>
</div> </div>
@ -70,15 +71,6 @@
<input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text"> <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">培训结束时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="trainTimeend" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group"> <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="col-sm-8">
@ -117,19 +109,55 @@
$("#form-train-examine").validate({ $("#form-train-examine").validate({
focusCleanup: true focusCleanup: true
}); });
layui.use('laydate', function(){
var laydate = layui.laydate;
var startDate = laydate.render({
elem: '#laydate-startTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// 结束时间大于开始时间
if (value !== '') {
endDate.config.min.year = date.year;
endDate.config.min.month = date.month - 1;
endDate.config.min.date = date.date;
} else {
endDate.config.min.year = '';
endDate.config.min.month = '';
endDate.config.min.date = '';
}
}
});
var endDate = laydate.render({
elem: '#laydate-endTime',
theme: 'molv',
trigger: 'click',
done: function(value, date) {
// Start date cannot be after end date
if (value !== '') {
startDate.config.max = {
year: date.year,
month: date.month - 1,
date: date.date
};
} else {
startDate.config.max = {
year: '',
month: '',
date: ''
};
}
}
});
});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/examine", $('#form-train-examine').serialize()); $.operate.save(prefix + "/examine", $('#form-train-examine').serialize());
} }
} }
$("input[name='updateStaffid']").val([[${user.userName}]]) $("input[name='updateStaffid']").val([[${user.userName}]])
$("input[name='trainDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
$("input[name='createDate']").datetimepicker({ $("input[name='createDate']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",
@ -141,12 +169,6 @@
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
$("input[name='trainTimeend']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script> </script>
</body> </body>
</html> </html>

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

@ -135,7 +135,7 @@
}, },
{ {
field: 'trainTimeend', field: 'trainTimeend',
title: '培训结束时间' title: '培训结束日期'
}, },
{ {
field: 'createStaffid', field: 'createStaffid',

Write Preview
Loading…
Cancel
Save