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

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source 
# Conflicts:
#	ruoyi-admin/src/main/resources/templates/system/case/add.html
#	ruoyi-admin/src/main/resources/templates/system/case/edit.html
pg_adapter
20918 8 months ago
parent 6209b29141 ed2654c934
commit 751baf45c2
10 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
Unescape View File

@ -330,7 +330,7 @@
label.error {
position: absolute;
right: 18px;
top: 6px;
top: 30px;
color: #ef392b;
font-size: 12px;
z-index:99;

28
ruoyi-admin/src/main/resources/templates/system/case/add.html
Unescape View File

@ -14,7 +14,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">案件名称：</label>
<div class="col-sm-8">
<input name="caseName" required placeholder="请输入案件名称" class="form-control" type="text">
<input name="caseName" maxlength="50" required placeholder="请输入案件名称" class="form-control" type="text">
</div>
</div>
</div>
@ -22,7 +22,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">案件编号：</label>
<div class="col-sm-8">
<input name="caseAssum" placeholder="请输入案件编号" class="form-control" type="text">
<input name="caseAssum" maxlength="50" placeholder="请输入案件编号" class="form-control" type="text">
</div>
</div>
</div>
@ -43,7 +43,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">发生地点：</label>
<div class="col-sm-8">
<input name="caseAddress" required placeholder="请输入案件发生地点" class="form-control"></input>
<input name="caseAddress" maxlength="50" required placeholder="请输入案件发生地点" class="form-control"></input>
</div>
</div>
</div>
@ -77,7 +77,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉案人员名称：</label>
<div class="col-sm-8">
<input name="involvedName" required placeholder="请输入涉案人员名称" class="form-control"></input>
<input name="involvedName" maxlength="25" required placeholder="请输入涉案人员名称" class="form-control"></input>
</div>
</div>
</div>
@ -85,7 +85,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉案人员联系方式：</label>
<div class="col-sm-8">
<input name="involvedTel" required placeholder="请输入涉案人员联系方式" class="form-control" type="text" maxlength="11"></input>
<input name="involvedTel" id="involvedTel" maxlength="11" required placeholder="请输入涉案人员联系方式" class="form-control"></input>
</div>
</div>
</div>
@ -131,8 +131,24 @@
<th:block th:include="include :: bootstrap-select-js" />
<script th:inline="javascript">
var prefix = ctx + "system/tdCase"
$.validator.addMethod("phone", function(value, element) {
return this.optional(element) || /^1[3-9]\d{9}$/.test(value);
}, "请输入有效的手机号码");
$("#form-tdCase-add").validate({
focusCleanup: true
focusCleanup: true,
rules: {
involvedTel: {
isPhone:true,
required: true,
phone: true
}
},
messages: {
involvedTel: {
required: "手机号码不能为空",
phone: "请输入有效的手机号码"
}
}
});
$("input[name='caseTime']").datetimepicker({
format: "yyyy-mm-dd hh:ii",

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

@ -94,7 +94,7 @@
{
field: 'caseType',
title: '案件类型',
width: '15',
width: '10',
widthUnit: '%',
formatter: function(value, row, index) {
return $.table.selectDictLabel(caseType, value);

30
ruoyi-admin/src/main/resources/templates/system/case/edit.html
Unescape View File

@ -15,7 +15,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">案件名称：</label>
<div class="col-sm-8">
<input name="caseName" th:field="*{caseName}" required placeholder="请输入案件名称" class="form-control" type="text">
<input name="caseName" maxlength="50" th:field="*{caseName}" required placeholder="请输入案件名称" class="form-control" type="text">
</div>
</div>
</div>
@ -23,7 +23,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">案件编号：</label>
<div class="col-sm-8">
<input name="caseAssum" th:field="*{caseAssum}" placeholder="请输入案件编号" class="form-control" type="text">
<input name="caseAssum" maxlength="50" th:field="*{caseAssum}" placeholder="请输入案件编号" class="form-control" type="text">
</div>
</div>
</div>
@ -44,7 +44,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">发生地点：</label>
<div class="col-sm-8">
<input name="caseAddress" th:field="*{caseAddress}" required placeholder="请输入案件发生地点" class="form-control"></input>
<input name="caseAddress" maxlength="50" th:field="*{caseAddress}" required placeholder="请输入案件发生地点" class="form-control"></input>
</div>
</div>
</div>
@ -78,7 +78,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉案人员名称：</label>
<div class="col-sm-8">
<input name="involvedName" required placeholder="请输入涉案人员名称" class="form-control" th:field="*{involvedName}"></input>
<input name="involvedName" maxlength="25" required placeholder="请输入涉案人员名称" class="form-control" th:field="*{involvedName}"></input>
</div>
</div>
</div>
@ -86,7 +86,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">涉案人员联系方式：</label>
<div class="col-sm-8">
<input name="involvedTel" required placeholder="请输入涉案人员联系方式" class="form-control" th:field="*{involvedTel}" maxlength="11"></input>
<input name="involvedTel" id="involvedTel" maxlength="11" required placeholder="请输入涉案人员联系方式" class="form-control" th:field="*{involvedTel}"></input>
</div>
</div>
</div>
@ -132,8 +132,24 @@
<th:block th:include="include :: bootstrap-select-js" />
<script th:inline="javascript">
var prefix = ctx + "system/tdCase"
$("#form-tdCase-edit").validate({
focusCleanup: true
$.validator.addMethod("phone", function(value, element) {
return this.optional(element) || /^1[3-9]\d{9}$/.test(value);
}, "请输入有效的手机号码");
$("#form-tdCase-add").validate({
focusCleanup: true,
rules: {
involvedTel: {
isPhone:true,
required: true,
phone: true
}
},
messages: {
involvedTel: {
required: "手机号码不能为空",
phone: "请输入有效的手机号码"
}
}
});
$("input[name='caseTime']").datetimepicker({
format: "yyyy-mm-dd hh:ii",

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

@ -13,7 +13,7 @@
<div class="form-group">
<label class="col-sm-2 control-label is-required">场所名称：</label>
<div class="col-sm-10">
<input name="placeName" required placeholder="请输入场所名称" class="form-control m-b" type="text">
<input name="placeName" maxlength="50" required placeholder="请输入场所名称" class="form-control m-b" type="text">
</div>
</div>
</div>

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

@ -14,7 +14,7 @@
<div class="form-group">
<label class="col-sm-2 control-label is-required">场所名称：</label>
<div class="col-sm-10">
<input name="meetingTitle" required placeholder="请输入场所名称" th:field="*{placeName}" class="form-control m-b" type="text">
<input name="meetingTitle" maxlength="50" required placeholder="请输入场所名称" th:field="*{placeName}" class="form-control m-b" type="text">
</div>
</div>
</div>

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

@ -26,7 +26,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">登记人员：</label>
<div class="col-sm-8">
<input name="registName" required placeholder="请输入登记人员" class="form-control" type="text">
<input name="registName" maxlength="25" required placeholder="请输入登记人员" class="form-control" type="text">
</div>
</div>
</div>
@ -47,7 +47,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">陪同人员：</label>
<div class="col-sm-8">
<input name="entourageName" required placeholder="请输入陪同人员" class="form-control"></input>
<input name="entourageName" maxlength="25" required placeholder="请输入陪同人员" class="form-control"></input>
</div>
</div>
</div>

4
ruoyi-admin/src/main/resources/templates/system/placeRegist/edit.html
Unescape View File

@ -27,7 +27,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">登记人员：</label>
<div class="col-sm-8">
<input name="registName" th:field="*{registName}" required placeholder="请输入登记人员" class="form-control" type="text">
<input name="registName" maxlength="25" th:field="*{registName}" required placeholder="请输入登记人员" class="form-control" type="text">
</div>
</div>
</div>
@ -48,7 +48,7 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">陪同人员：</label>
<div class="col-sm-8">
<input name="entourageName" th:field="*{entourageName}" required placeholder="请输入陪同人员" class="form-control"></input>
<input name="entourageName" maxlength="25" th:field="*{entourageName}" required placeholder="请输入陪同人员" class="form-control"></input>
</div>
</div>
</div>

8
ruoyi-admin/src/main/resources/templates/system/tdmeeting/add.html
Unescape View File

@ -13,7 +13,7 @@
<div class="form-group">
<label class="col-sm-2 control-label is-required">会议主题：</label>
<div class="col-sm-10">
<input name="meetingTitle" required placeholder="请输入会议主题" class="form-control m-b" type="text">
<input name="meetingTitle" maxlength="50" required placeholder="请输入会议主题" class="form-control m-b" type="text">
</div>
</div>
</div>
@ -31,7 +31,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">会议地点：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" placeholder="请输入会议地点" name="meetingAddress"></input>
<input type="text" maxlength="25" class="form-control m-b" placeholder="请输入会议地点" name="meetingAddress"></input>
</div>
</div>
</div>
@ -41,7 +41,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">参会人数：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" digits="true" placeholder="请输入参会人数" name="meetingUsernum"></input>
<input type="text" maxlength="5" class="form-control m-b" digits="true" placeholder="请输入参会人数" name="meetingUsernum"></input>
</div>
</div>
</div>
@ -49,7 +49,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">主办方：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" placeholder="请输入主办方" name="meetingHost"></input>
<input type="text" maxlength="25" class="form-control m-b" placeholder="请输入主办方" name="meetingHost"></input>
</div>
</div>
</div>

8
ruoyi-admin/src/main/resources/templates/system/tdmeeting/edit.html
Unescape View File

@ -14,7 +14,7 @@
<div class="form-group">
<label class="col-sm-2 control-label is-required">会议主题：</label>
<div class="col-sm-10">
<input name="meetingTitle" required placeholder="请输入会议主题" th:field="*{meetingTitle}" class="form-control m-b" type="text">
<input name="meetingTitle" maxlength="50" required placeholder="请输入会议主题" th:field="*{meetingTitle}" class="form-control m-b" type="text">
</div>
</div>
</div>
@ -32,7 +32,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">会议地点：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" placeholder="请输入会议地点" th:field="*{meetingAddress}" name="meetingAddress"></input>
<input type="text" maxlength="25" class="form-control m-b" placeholder="请输入会议地点" th:field="*{meetingAddress}" name="meetingAddress"></input>
</div>
</div>
</div>
@ -42,7 +42,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">参会人数：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" digits="true" placeholder="请输入参会人数" th:field="*{meetingUsernum}" name="meetingUsernum"></input>
<input type="text" maxlength="5" class="form-control m-b" digits="true" placeholder="请输入参会人数" th:field="*{meetingUsernum}" name="meetingUsernum"></input>
</div>
</div>
</div>
@ -50,7 +50,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">主办方：</label>
<div class="col-sm-8">
<input type="text" class="form-control m-b" placeholder="请输入主办方" th:field="*{meetingHost}" name="meetingHost"></input>
<input type="text" maxlength="25" class="form-control m-b" placeholder="请输入主办方" th:field="*{meetingHost}" name="meetingHost"></input>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save