|
@@ -241,6 +241,10 @@ $(document).ready(function() {
|
|
|
$("#feature-area").show();
|
|
|
$("#add-compilation-title").text('添加工程特征');
|
|
|
break;
|
|
|
+ case 'progressive':
|
|
|
+ $("#progressive-area").show();
|
|
|
+ $("#add-compilation-title").text('添加累进区间');
|
|
|
+ break;
|
|
|
}
|
|
|
$("#addcompilation").modal('show');
|
|
|
});
|
|
@@ -257,7 +261,7 @@ $(document).ready(function() {
|
|
|
});
|
|
|
|
|
|
// 移除操作
|
|
|
- $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list").on("click", ".remove-lib", function() {
|
|
|
+ $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.progressive-list").on("click", ".remove-lib", function() {
|
|
|
$(this).parent().remove();
|
|
|
});
|
|
|
|
|
@@ -448,6 +452,7 @@ function initCompilation() {
|
|
|
let billTemplateData = billTemplateList == undefined ? [] : JSON.parse(billTemplateList);
|
|
|
let mainTreeColData= mainTreeColList == undefined ? [] : JSON.parse(mainTreeColList);
|
|
|
let featureData = featureList == undefined?[]: JSON.parse(featureList);
|
|
|
+ let progressiveData = progressiveList == undefined?[]: JSON.parse(progressiveList);
|
|
|
/*mainTreeCol = mainTreeCol !== '' ? mainTreeCol.replace(/\n/g, '\\n') : mainTreeCol;
|
|
|
billsTemplateData = billsTemplateData.replace(/\n/g, '\\n');
|
|
|
|
|
@@ -545,7 +550,15 @@ function initCompilation() {
|
|
|
let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
|
|
|
html += tmpHtml;
|
|
|
}
|
|
|
- $("select[name='feature_lib']").children("option").first().after(html);
|
|
|
+ $("select[name='feature_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);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -564,6 +577,7 @@ function getAndValidData(model) {
|
|
|
let programLib = $("select[name='program_lib']").children("option:selected").val();
|
|
|
let billsGuidanceLib = $("select[name='billsGuidance_lib']").children("option:selected").val();
|
|
|
let featureLib = $("select[name='feature_lib']").children("option:selected").val();
|
|
|
+ let progressiveLib = $("select[name='progressive_lib']").children("option:selected").val();
|
|
|
|
|
|
|
|
|
if (name === '' && model === 'all') {
|
|
@@ -580,6 +594,9 @@ function getAndValidData(model) {
|
|
|
if (model === 'feature' && (featureLib === '' || featureLib === undefined)) {
|
|
|
throw '请选择工程特征库';
|
|
|
}
|
|
|
+ if (model === 'progressive' && (progressiveLib === '' || progressiveLib === undefined)) {
|
|
|
+ throw '请选择累进区间库';
|
|
|
+ }
|
|
|
|
|
|
if (model === 'glj' && (gljLib === '' || gljLib === undefined)) {
|
|
|
throw '请选择人材机库';
|
|
@@ -605,6 +622,7 @@ function getAndValidData(model) {
|
|
|
let programString = $("select[name='program_lib']").children("option:selected").text();
|
|
|
let billsGuidanceString = $("select[name='billsGuidance_lib']").children("option:selected").text();
|
|
|
let featrueString = $("select[name='feature_lib']").children("option:selected").text();
|
|
|
+ let progressiveString = $("select[name='progressive_lib']").children("option:selected").text();
|
|
|
|
|
|
|
|
|
let result = {
|
|
@@ -640,6 +658,10 @@ function getAndValidData(model) {
|
|
|
feature:{
|
|
|
id:featureLib,
|
|
|
name:featrueString
|
|
|
+ },
|
|
|
+ progressive:{
|
|
|
+ id:progressiveLib,
|
|
|
+ name:progressiveString
|
|
|
}
|
|
|
};
|
|
|
return result;
|