|
@@ -1317,8 +1317,8 @@ const XMLStandard = (function () {
|
|
|
let bills = new FXbills(source);
|
|
|
//清单项目项目编码要在建设项目中唯一
|
|
|
_util.checkUnique(curProjectEle.constraints.billsCode, source.code, `第${source.row}行`,`清单项目编码${source.code}`);
|
|
|
- //加载特征及内容
|
|
|
- function loadFeatureContent() {
|
|
|
+ //加载特征及内容 --- 进接用项目特征及内容可编辑的字符串拆分版本, 导出后格式检查不通过
|
|
|
+ function loadFeatureContentV1() {
|
|
|
let job = [],
|
|
|
feature = [];
|
|
|
let jobText = node.data.jobContentText || '';
|
|
@@ -1384,6 +1384,37 @@ const XMLStandard = (function () {
|
|
|
bills.children.push(jobContent);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ function loadFeatureContent(){
|
|
|
+ let itemCharacter = node.data.itemCharacter || [];
|
|
|
+ let jobContentArr = node.data.jobContent || [];
|
|
|
+ let itemChac = new ItemCharacter();
|
|
|
+ for (let f of itemCharacter) {
|
|
|
+ if(f.isChecked === true){
|
|
|
+ let cValue = '';
|
|
|
+ for(let ei of f.eigenvalue){
|
|
|
+ if(ei.isSelected === true) {
|
|
|
+ cValue += ei.value ;
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let source = {name: f.character, value: cValue};
|
|
|
+ let featureEle = new Feature(source);
|
|
|
+ itemChac.children.push(featureEle);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(itemChac.children.length > 0) bills.children.push(itemChac);
|
|
|
+
|
|
|
+ let jobContent = new JobContent();
|
|
|
+ for (let job of jobContentArr) {
|
|
|
+ if(job.isChecked === true){
|
|
|
+ let content = new Content(job.content);
|
|
|
+ jobContent.children.push(content);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(jobContent.children.length > 0) bills.children.push(jobContent);
|
|
|
+
|
|
|
+ }
|
|
|
loadFeatureContent();
|
|
|
//解析工程量计算式
|
|
|
function parseQuantityExp(rationData) {
|