|
@@ -352,6 +352,10 @@ $(document).ready(function() {
|
|
|
$('#info-area').show();
|
|
|
$('#add-compilation-title').text('添加基本信息');
|
|
|
break;
|
|
|
+ case 'progressive':
|
|
|
+ $("#progressive-area").show();
|
|
|
+ $("#add-compilation-title").text('添加累进区间');
|
|
|
+ break;
|
|
|
case 'engineer_info':
|
|
|
$('#engineer-info-area').show();
|
|
|
$('#add-compilation-title').text('添加工程信息');
|
|
@@ -395,7 +399,7 @@ $(document).ready(function() {
|
|
|
/*$(".remove-lib").on("click", function() {
|
|
|
$(this).parent().remove();
|
|
|
})*/
|
|
|
- $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list,.engineer_info-list,.engineer_feature-list,.material-list,.main_quantity-list,.economic-list,.over_height-list").on("click", ".remove-lib", function() {
|
|
|
+ $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list,.progressive-list,.engineer_info-list,.engineer_feature-list,.material-list,.main_quantity-list,.economic-list,.over_height-list").on("click", ".remove-lib", function() {
|
|
|
$(this).parent().remove();
|
|
|
});
|
|
|
|
|
@@ -587,6 +591,7 @@ function initCompilation() {
|
|
|
let mainTreeColData= mainTreeColList == undefined ? [] : JSON.parse(mainTreeColList);
|
|
|
let featureData = featureList == undefined?[]: JSON.parse(featureList);
|
|
|
let infoData = infoList == undefined ? [] : JSON.parse(infoList);
|
|
|
+ let progressiveData = progressiveList == undefined?[]: JSON.parse(progressiveList);
|
|
|
let engineerInfoData = engineerInfoList == undefined ? [] : JSON.parse(engineerInfoList);
|
|
|
let engineerFeatureData = engineerFeatureList == undefined ? [] : JSON.parse(engineerFeatureList);
|
|
|
let materialData = materialList == undefined ? [] : JSON.parse(materialList);
|
|
@@ -700,6 +705,15 @@ function initCompilation() {
|
|
|
html += tmpHtml;
|
|
|
}
|
|
|
$("select[name='info_lib']").children("option").first().after(html);
|
|
|
+
|
|
|
+ //累进区间库
|
|
|
+ html = '';
|
|
|
+ for(let tmp of progressiveData){
|
|
|
+ let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
|
|
|
+ html += tmpHtml;
|
|
|
+ }
|
|
|
+ $("select[name='progressive_lib']").children("option").first().after(html);
|
|
|
+
|
|
|
//工程信息库
|
|
|
html = '';
|
|
|
for(let tmp of engineerInfoData){
|
|
@@ -765,6 +779,7 @@ function getAndValidData(model) {
|
|
|
let billsGuidanceLib = $("select[name='billsGuidance_lib']").children("option:selected").val();
|
|
|
let featureLib = $("select[name='feature_lib']").children("option:selected").val();
|
|
|
let infoLib = $("select[name='info_lib']").children("option:selected").val();
|
|
|
+ let progressiveLib = $("select[name='progressive_lib']").children("option:selected").val();
|
|
|
let engineerInfoLib = $("select[name='engineer_info_lib']").children("option:selected").val();
|
|
|
let engineerFeatureLib = $("select[name='engineer_feature_lib']").children("option:selected").val();
|
|
|
let materialLib = $("select[name='material_lib']").children("option:selected").val();
|
|
@@ -812,6 +827,7 @@ function getAndValidData(model) {
|
|
|
let billsGuidanceString = $("select[name='billsGuidance_lib']").children("option:selected").text();
|
|
|
let featrueString = $("select[name='feature_lib']").children("option:selected").text();
|
|
|
let infoString = $("select[name='info_lib']").children("option:selected").text();
|
|
|
+ let progressiveString = $("select[name='progressive_lib']").children("option:selected").text();
|
|
|
let engineerInfoString = $("select[name='engineer_info_lib']").children("option:selected").text();
|
|
|
let engineerFeatureString = $("select[name='engineer_feature_lib']").children("option:selected").text();
|
|
|
let materialString = $("select[name='material_lib']").children("option:selected").text();
|
|
@@ -858,6 +874,10 @@ function getAndValidData(model) {
|
|
|
id: infoLib,
|
|
|
name: infoString
|
|
|
},
|
|
|
+ progressive:{
|
|
|
+ id:progressiveLib,
|
|
|
+ name:progressiveString
|
|
|
+ },
|
|
|
engineer_info:{
|
|
|
id:engineerInfoLib,
|
|
|
name:engineerInfoString
|