解决包名冲突问题
This commit is contained in:
cuibaocheng
parent
8156267eac
commit
3ce2719a6c
@ -24,26 +24,41 @@
|
|||||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||||
<input type="hidden" readonly id="stationId" name="stationId" class="layui-input" value="" maxlength="36">
|
<input type="hidden" readonly id="stationId" name="stationId" class="layui-input" value="" maxlength="36">
|
||||||
<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
||||||
<b>考试计划申请</b>
|
<b>考试安排</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-input-block layui-form" id="distributionClassPlansBox" lay-filter="distributionClassPlansBox" pane="" style="margin-left: 0px !important;" ></div>
|
<div class="layui-input-block layui-form" id="distributionClassPlansBox" lay-filter="distributionClassPlansBox" pane="" style="margin-left: 0px !important;" ></div>
|
||||||
<script id="distributionClassPlansBoxTemplate" type="text/html">
|
<script id="distributionClassPlansBoxTemplate" type="text/html">
|
||||||
{{# for(var j = 0, classPlan; classPlan = d[j++];) { }}
|
{{# for(var j = 0, classPlan; classPlan = d[j++];) { }}
|
||||||
<div class="layui-form-item layui-row ">
|
<div class="layui-form-item layui-row ">
|
||||||
<div class="layui-col-lg3" >
|
<div class="layui-col-lg6" >
|
||||||
<label class="layui-form-label">培训机构</label>
|
<label class="layui-form-label">培训机构</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="text" readonly class="layui-input" value="{{classPlan.orgName}}" placeholder="" lay-verify="required">
|
<input type="text" readonly class="layui-input" value="{{classPlan.orgName}}" placeholder="" lay-verify="required">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-col-lg4" >
|
<div class="layui-col-lg6" >
|
||||||
<label class="layui-form-label">申请名称</label>
|
<label class="layui-form-label">班次及名称</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="text" readonly class="layui-input" value="{{classPlan.planName}}" placeholder="" lay-verify="required">
|
<input type="text" readonly class="layui-input" value="[{{classPlan.planType == '1' ? '初训' : '复训'}}][{{classPlan.planNumber}}]{{classPlan.planName}}" placeholder="" lay-verify="required">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="layui-form-item layui-row ">
|
||||||
|
<div class="layui-col-lg3" >
|
||||||
|
<label class="layui-form-label">负责人</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" readonly class="layui-input" value="{{classPlan.chargePerson}}" placeholder="" lay-verify="required">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="layui-col-lg3" >
|
<div class="layui-col-lg3" >
|
||||||
<label class="layui-form-label">培训科目</label>
|
<label class="layui-form-label">联系方式</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" readonly class="layui-input" value="{{classPlan.chargePersonTel}}" placeholder="" lay-verify="required">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="layui-col-lg4" >
|
||||||
|
<label class="layui-form-label">考试科目</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
<input type="text" readonly class="layui-input" value="{{classPlan.workerCatalogName}}" placeholder="" lay-verify="required">
|
<input type="text" readonly class="layui-input" value="{{classPlan.workerCatalogName}}" placeholder="" lay-verify="required">
|
||||||
</div>
|
</div>
|
||||||
@ -57,36 +72,13 @@
|
|||||||
</div>
|
</div>
|
||||||
{{# } }}
|
{{# } }}
|
||||||
</script>
|
</script>
|
||||||
<div class="layui-input-block layui-form" id="distributionFieldsBox" lay-filter="distributionFieldsBox" pane="" style="margin-left: 0px !important;" ></div>
|
|
||||||
<script id="distributionFieldsBoxTemplate" type="text/html">
|
|
||||||
{{# if(d.length == 0) { }}
|
|
||||||
<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
|
||||||
<b>暂无考试机构可以分配</b>
|
|
||||||
</div>
|
|
||||||
{{# } }}
|
|
||||||
{{# if(d.length > 0) { }}
|
|
||||||
<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
|
||||||
<b>考试考场分配</b>
|
|
||||||
</div>
|
|
||||||
{{# } }}
|
|
||||||
{{# for(var j = 0, station; station = d[j++];) { }}
|
|
||||||
<div class="layui-form-item" pane="">
|
|
||||||
<label class="layui-form-label">{{ station.stationName }}</label>
|
|
||||||
<div class="layui-input-block">
|
|
||||||
{{# for(var i = 0, item; item = station.fieldArray[i++];) { }}
|
|
||||||
<input type="checkbox" {{item.checked}} name="distributionFields[{{item.organizationId}}]" value="{{item.organizationId}}" title="{{item.organizationName}}【 {{item.organizationDesc == 1 ? '理论考场' : item.organizationDesc == 2 ? '实操考场' : '混合考场'}}】(可容纳{{item.organizationUserNum}}人)" lay-verify="required">
|
|
||||||
{{# } }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{# } }}
|
|
||||||
</script>
|
|
||||||
<div class="layui-form-item layui-row ">
|
<div class="layui-form-item layui-row ">
|
||||||
<!-- <div class="layui-col-lg2" >-->
|
<!-- <div class="layui-col-lg2" >-->
|
||||||
<!-- <label class="layui-form-label">考试总人数</label>-->
|
<!-- <label class="layui-form-label">考试总人数</label>-->
|
||||||
<!-- <div class="layui-input-block">-->
|
<!-- <div class="layui-input-block">-->
|
||||||
<!-- <input type="text" readonly id="distributionNumber" name="distributionNumber" class="layui-input" value="" placeholder="请输入考试总人数" lay-verify="required">-->
|
<!-- <input type="text" readonly id="distributionNumber" name="distributionNumber" class="layui-input" value="" placeholder="请输入考试总人数" lay-verify="required">-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
<div class="layui-col-lg6" >
|
<div class="layui-col-lg6" >
|
||||||
<label class="layui-form-label">考试开始<span style="color:red">*</span></label>
|
<label class="layui-form-label">考试开始<span style="color:red">*</span></label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
@ -100,6 +92,40 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="layui-input-block layui-form" id="distributionFieldsBox" lay-filter="distributionFieldsBox" pane="" style="margin-left: 0px !important;" ></div>
|
||||||
|
<script id="distributionFieldsBoxTemplate" type="text/html">
|
||||||
|
|
||||||
|
<div class="layui-form-item layui-row ">
|
||||||
|
<div class="layui-col-lg12" >
|
||||||
|
<label class="layui-form-label">考试地点</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
<input type="text" readonly class="layui-input" value="{{d.address}}" placeholder="" lay-verify="required">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{# if(d.stationArray.length == 0) { }}
|
||||||
|
<!--<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
||||||
|
<b>暂无考试机构可以分配</b>
|
||||||
|
</div>-->
|
||||||
|
{{# } }}
|
||||||
|
{{# if(d.stationArray.length > 0) { }}
|
||||||
|
<!--<div class="layui-form-item" style="text-align: center;width:100% !important;font-size: 17px">
|
||||||
|
<b>考试考场分配</b>
|
||||||
|
</div>-->
|
||||||
|
{{# } }}
|
||||||
|
{{# for(var j = 0, station; station = d.stationArray[j++];) { }}
|
||||||
|
<div class="layui-form-item" pane="">
|
||||||
|
<label class="layui-form-label">{{ station.stationName }}</label>
|
||||||
|
<div class="layui-input-block">
|
||||||
|
{{# for(var i = 0, item; item = station.fieldArray[i++];) { }}
|
||||||
|
{{# if(item.checked) {
|
||||||
|
<input type="checkbox" {{item.checked}} name="distributionFields[{{item.organizationId}}]" value="{{item.organizationId}}" title="{{item.organizationName}}【 {{item.organizationDesc == 1 ? '理论考场' : item.organizationDesc == 2 ? '实操考场' : '混合考场'}}】(可容纳{{item.organizationUserNum}}人)" lay-verify="required">
|
||||||
|
} }}
|
||||||
|
{{# } }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{# } }}
|
||||||
|
</script>
|
||||||
<div class="layui-form-item layui-form-text">
|
<div class="layui-form-item layui-form-text">
|
||||||
<label class="layui-form-label">备注信息</label>
|
<label class="layui-form-label">备注信息</label>
|
||||||
<div class="layui-input-block">
|
<div class="layui-input-block">
|
||||||
@ -187,6 +213,7 @@
|
|||||||
type:'get',
|
type:'get',
|
||||||
dataType:'json',
|
dataType:'json',
|
||||||
success: function (data) {
|
success: function (data) {
|
||||||
|
var institutionAddress = data.institutionAddress;
|
||||||
for (var i = 0; i < data.length; i++) {
|
for (var i = 0; i < data.length; i++) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'api/organization/list?organizationType=' + data[i].institutionId,
|
url: 'api/organization/list?organizationType=' + data[i].institutionId,
|
||||||
@ -209,6 +236,7 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
var inData = {address: institutionAddress , stationArray: stationArray}
|
||||||
laytpl(document.getElementById('distributionFieldsBoxTemplate').innerHTML).render(stationArray, function (html) {
|
laytpl(document.getElementById('distributionFieldsBoxTemplate').innerHTML).render(stationArray, function (html) {
|
||||||
console.log(stationArray);
|
console.log(stationArray);
|
||||||
document.getElementById('distributionFieldsBox').innerHTML = html;
|
document.getElementById('distributionFieldsBox').innerHTML = html;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user