public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
duxp 2023-09-26 15:44:11 +08:00
parent 45e74e0e24 13f1998323
commit 524f9b1ecf
2 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cyx-admin/src/main/resources/templates/base/affairs/add.html
View File

@ -10,7 +10,7 @@
<input name="method" type="hidden" id="method" class="form-control" /> <input name="method" type="hidden" id="method" class="form-control" />
<div class="row"> <div class="row">
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label">类型：</label> <label class="col-sm-3 control-label is-required">类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select required name="type" id="type-selector" class="form-control m-b"> <select required name="type" id="type-selector" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
@ -22,31 +22,31 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="target">目标项：</label> <label class="col-sm-3 control-label is-required" id="target">目标项：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea required name="target" class="form-control"></textarea> <textarea required name="target" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="shotName">简写：</label> <label class="col-sm-3 control-label is-required" id="shotName">简写：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input required name="shotName" class="form-control" /> <input required name="shotName" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="demand">目标要求：</label> <label class="col-sm-3 control-label is-required" id="demand">目标要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea> <textarea name="demand" required class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12 dy " style="display: none"> <div class="form-group col-sm-12 col-md-12 dy " style="display: none">
<label class="col-sm-3 control-label" >标准要求：</label> <label class="col-sm-3 control-label is-required" >标准要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="method1" id="method1" class="form-control"></textarea> <textarea required name="method1" id="method1" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="detailed">工作任务：</label> <label class="col-sm-3 control-label is-required" id="detailed">工作任务：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea required name="detailed" class="form-control"></textarea> <textarea required name="detailed" class="form-control"></textarea>
</div> </div>
@ -59,7 +59,7 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="score">达标分：</label> <label class="col-sm-3 control-label is-required" id="score">达标分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input required name="score" class="form-control" type="number"/> <input required name="score" class="form-control" type="number"/>
</div> </div>
@ -71,14 +71,14 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12" id="dw" style="display: none"> <div class="form-group col-sm-12 col-md-12" id="dw" style="display: none">
<label class="col-sm-3 control-label" >考核方式：</label> <label class="col-sm-3 control-label is-required" >考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="method2" id="method2" class="form-control" /> <input required name="method2" id="method2" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12 row"> <div class="form-group col-sm-12 col-md-12 row">
<div class="col-sm-6 col-md-6"> <div class="col-sm-6 col-md-6">
<label class="col-sm-6 control-label">负责人：</label> <label class="col-sm-6 control-label is-required">负责人：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select required name="head" id="head" class="form-control m-b"> <select required name="head" id="head" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
@ -88,7 +88,7 @@
<div class="col-sm-6 col-md-6"> <div class="col-sm-6 col-md-6">
<label class="col-sm-4 control-label">审核人：</label> <label class="col-sm-4 control-label">审核人：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<select required name="reviewed" id="reviewed" class="form-control m-b"> <select name="reviewed" id="reviewed" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
</select> </select>
</div> </div>
@ -99,7 +99,7 @@
<label class="col-sm-6 control-label">完成截止时间：</label> <label class="col-sm-6 control-label">完成截止时间：</label>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="input-group date"> <div class="input-group date">
<input required name="finishDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="finishDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -117,22 +117,24 @@
</div> </div>
</div> </div>
<div class="form-group col-sm-12 col-md-12 dy" style="display: none"> <!-- <div class="form-group col-sm-12 col-md-12 dy" style="display: none">-->
<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">-->
<select name="deptId" disabled id="deptId" class="form-control m-b"> <!-- <select name="deptId" disabled id="deptId" class="form-control m-b">-->
<option value="">请选择</option> <!-- <option value="">请选择</option>-->
</select> <!-- </select>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group col-sm-12 col-md-12"> <input type="hidden" name="deptId" id="deptId">
<label class="col-sm-3 control-label">支部：</label> <input type="hidden" name="branchId" id="branchId">
<div class="col-sm-8"> <!-- <div class="form-group col-sm-12 col-md-12">-->
<select name="branchId" disabled id="branchId" class="form-control m-b"> <!-- <label class="col-sm-3 control-label">支部：</label>-->
<option value="">请选择</option> <!-- <div class="col-sm-8">-->
</select> <!-- <select name="branchId" disabled id="branchId" class="form-control m-b">-->
</div> <!-- <option value="">请选择</option>-->
</div> <!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group col-sm-12 col-md-12"> <div class="form-group col-sm-12 col-md-12">
<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">

49
cyx-admin/src/main/resources/templates/base/affairs/edit.html
View File

@ -30,25 +30,25 @@
<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="target" readonly="true" th:field="*{target}" class="form-control" type="text"> <input name="target" required th:field="*{target}" class="form-control" type="text">
</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">
<input name="shotName" th:field="*{shotName}" class="form-control" type="text"> <input name="shotName" required th:field="*{shotName}" class="form-control" type="text">
</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">
<textarea name="demand" readonly="true" class="form-control">[[*{demand}]]</textarea> <textarea name="demand" required class="form-control">[[*{demand}]]</textarea>
</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">
<textarea name="detailed" rows="10" readonly="true" class="form-control">[[*{detailed}]]</textarea> <textarea name="detailed" required rows="3" class="form-control">[[*{detailed}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -73,7 +73,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">
<textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea> <textarea name="method" rows="3" class="form-control">[[*{method}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group" th:if="*{type == '日常考核指标' || type == '季度考核指标'}"> <div class="form-group" th:if="*{type == '日常考核指标' || type == '季度考核指标'}">
@ -134,24 +134,26 @@
<!--&lt;!&ndash; <input name="perId" th:field="*{perId}" class="form-control" type="text">&ndash;&gt;--> <!--&lt;!&ndash; <input name="perId" th:field="*{perId}" class="form-control" type="text">&ndash;&gt;-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <input name="deptId" id="deptId" th:field="*{deptId}" type="hidden"/>
<label class="col-sm-3 control-label">部门：</label> <input name="branchId" id="branchId" th:field="*{branchId}" type="hidden"/>
<div class="col-sm-8"> <!-- <div class="form-group"> -->
<select name="deptId" th:field="*{deptId}" disabled id="deptId" class="form-control m-b"> <!-- <label class="col-sm-3 control-label">部门：</label>-->
<option value="">请选择</option> <!-- <div class="col-sm-8">-->
<option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option> <!-- <select name="deptId" th:field="*{deptId}" id="deptId" class="form-control m-b">-->
</select> <!-- <option value="">请选择</option>-->
</div> <!-- <option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>-->
</div> <!-- </select>-->
<div class="form-group"> <!-- </div>-->
<label class="col-sm-3 control-label">支部：</label> <!-- </div>-->
<div class="col-sm-8"> <!-- <div class="form-group"> -->
<select name="branchId" th:field="*{branchId}" disabled id="branchId" class="form-control m-b"> <!-- <label class="col-sm-3 control-label">支部：</label>-->
<option value="">请选择</option> <!-- <div class="col-sm-8">-->
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option> <!-- <select name="branchId" th:field="*{branchId}" id="branchId" class="form-control m-b">-->
</select> <!-- <option value="">请选择</option>-->
</div> <!-- <option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>-->
</div> <!-- </select>-->
<!-- </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">
@ -178,6 +180,7 @@
success: function(res) { success: function(res) {
$('#deptId').val(res.data.deptId) $('#deptId').val(res.data.deptId)
$('#branchId').val(res.data.branchId) $('#branchId').val(res.data.branchId)
console.log($('#form-affairs-edit').serialize())
} }
}); });
} }