Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
cc2b8c4d2a
|
@ -64,12 +64,12 @@
|
|||
<input required name="score" class="form-control" type="number"/>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="form-group dy" style="display: none">-->
|
||||
<!-- <label class="col-sm-3 control-label" id="unit">考核类别:</label>-->
|
||||
<!-- <div class="col-sm-8">-->
|
||||
<!-- <input required name="unit" class="form-control" />-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<div class="form-group dy" style="display: none">
|
||||
<label class="col-sm-3 control-label" id="examineType">考核类别:</label>
|
||||
<div class="col-sm-8">
|
||||
<input required name="examineType" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-12 col-md-12" id="dw" style="display: none">
|
||||
<label class="col-sm-3 control-label" >考核方式:</label>
|
||||
<div class="col-sm-8">
|
||||
|
|
|
@ -213,7 +213,7 @@
|
|||
title: '当前得分'
|
||||
},
|
||||
{
|
||||
field: 'unit',
|
||||
field: 'examineType',
|
||||
title: '考核类别'
|
||||
},
|
||||
{
|
||||
|
|
|
@ -76,6 +76,12 @@
|
|||
<textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea>
|
||||
</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">
|
||||
<label class="col-sm-3 control-label">负责人:</label>
|
||||
<div class="col-sm-8">
|
||||
|
|
|
@ -207,7 +207,7 @@
|
|||
title: '当前得分'
|
||||
},
|
||||
{
|
||||
field: 'unit',
|
||||
field: 'examineType',
|
||||
title: '考核类别'
|
||||
},
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue