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:
liuwu 2023-09-26 09:43:34 +08:00
parent 5fff7a0f22 ec695b4fbb
commit cc2b8c4d2a
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,12 +64,12 @@
<input required name="score" class="form-control" type="number"/> <input required name="score" class="form-control" type="number"/>
</div> </div>
</div> </div>
<!-- <div class="form-group dy" style="display: none">--> <div class="form-group dy" style="display: none">
<!-- <label class="col-sm-3 control-label" id="unit">考核类别：</label>--> <label class="col-sm-3 control-label" id="examineType">考核类别：</label>
<!-- <div class="col-sm-8">--> <div class="col-sm-8">
<!-- <input required name="unit" class="form-control" />--> <input required name="examineType" class="form-control" />
<!-- </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" >考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">

2
cyx-admin/src/main/resources/templates/base/affairs/day.html
View File

@ -213,7 +213,7 @@
title: '当前得分' title: '当前得分'
}, },
{ {
field: 'unit', field: 'examineType',
title: '考核类别' title: '考核类别'
}, },
{ {

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

@ -76,6 +76,12 @@
<textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea> <textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea>
</div> </div>
</div> </div>
<div class="form-group" th:if="*{type == '日常考核指标' || type == '季度考核指标'}">
<label class="col-sm-3 control-label">考核类别：</label>
<div class="col-sm-8">
<input name="score" th:field="*{examineType}" class="form-control">
</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">

2
cyx-admin/src/main/resources/templates/base/affairs/year.html
View File

@ -207,7 +207,7 @@
title: '当前得分' title: '当前得分'
}, },
{ {
field: 'unit', field: 'examineType',
title: '考核类别' title: '考核类别'
}, },
{ {