Merge remote-tracking branch 'origin/kingbase' into kingbase

kingbase
dshclm 10 months ago
commit 1c3af23c92

@ -91,20 +91,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">培训状态:</label>
<div class="col-sm-8">
<select name="trainState" required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
<option th:value="''" th:text="'请选择'"></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<!-- <input name="trainState" th:field="*{trainState}" class="form-control" type="text">-->
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">审核人员:</label> <label class="col-sm-4 control-label is-required">审核人员:</label>
@ -113,14 +99,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">培训评价:</label>
<div class="col-sm-8">
<textarea name="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea>
</div>
</div>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
@ -146,6 +124,30 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">培训状态:</label>
<div class="col-sm-8">
<select name="trainState" required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
<option value="">---请选择---</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<!-- <input name="trainState" th:field="*{trainState}" class="form-control" type="text">-->
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-sm-2 control-label is-required">培训评价:</label>
<div class="col-sm-10">
<textarea name="TRAININFO" required class="form-control">[[*{TRAININFO}]]</textarea>
</div>
</div>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />

Loading…
Cancel
Save