|
|
@@ -284,21 +284,45 @@ var projectObj = {
|
|
|
let libId = projectInfoObj.projectInfo.engineeringInfo.bill_lib[0].id;
|
|
|
CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
|
|
|
if (data) {
|
|
|
- //data.itemCharacter = pageCCOprObj.safeItemCharater(data.itemCharacter);
|
|
|
- node.data.name = data.name;
|
|
|
- if(node.data.type == billType.BX){//从清单库中找到标准清单的话，要把补项改成分项
|
|
|
- node.data.type = billType.FX;
|
|
|
+ function sortItems(serialItems, items){
|
|
|
+ for(let item of items){
|
|
|
+ for(let serialItem of serialItems){
|
|
|
+ if(item.id === serialItem.id){
|
|
|
+ item.serialNo = serialItem.serialNo;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ items.sort(function (a, b) {
|
|
|
+ let rst = 0;
|
|
|
+ if(a.serialNo > b.serialNo){
|
|
|
+ rst = 1;
|
|
|
+ }
|
|
|
+ else if(a.serialNo < b.serialNo){
|
|
|
+ rst = -1;
|
|
|
+ }
|
|
|
+ return rst;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ function updateBeforeInsert(node, data) {
|
|
|
+ node.data.name = data.name;
|
|
|
+ if(node.data.type == billType.BX){//从清单库中找到标准清单的话，要把补项改成分项
|
|
|
+ node.data.type = billType.FX;
|
|
|
+ }
|
|
|
+ sortItems(data.items, data.itemCharacter);
|
|
|
+ sortItems(data.jobs, data.jobContent);
|
|
|
+ pageCCOprObj.setItemContentNode(node, data.jobContent, data.itemCharacter, node.data.name);
|
|
|
+ pageCCOprObj.setCacheAndShow(node);
|
|
|
}
|
|
|
- pageCCOprObj.setItemContentNode(node, data.jobContent, data.itemCharacter, node.data.name);
|
|
|
if (/\//.test(data.unit)) {
|
|
|
let existB = projectObj.project.Bills.sameStdCodeBillsData(data.code);
|
|
|
if (existB) {
|
|
|
+ updateBeforeInsert(node, data);
|
|
|
data.unit = existB.unit;
|
|
|
- //
|
|
|
project.Bills.replaceBills(node.source, data, formatCode);
|
|
|
projectObj.mainController.refreshTreeNode([node], false);
|
|
|
} else {
|
|
|
ConfirmModal.stdBillsUnit.check(data, function (std) {
|
|
|
+ updateBeforeInsert(node, data);
|
|
|
project.Bills.replaceBills(node.source, std, formatCode);
|
|
|
projectObj.mainController.refreshTreeNode([node], false);
|
|
|
}, function () {
|
|
|
@@ -306,6 +330,7 @@ var projectObj = {
|
|
|
});
|
|
|
}
|
|
|
} else {
|
|
|
+ updateBeforeInsert(node, data);
|
|
|
project.Bills.replaceBills(node.source, data, formatCode);
|
|
|
projectObj.mainController.refreshTreeNode([node], false);
|
|
|
}
|
|
|
@@ -2666,7 +2691,6 @@ function doAfterImport(resData){
|
|
|
}
|
|
|
//如果清单未锁定，导入后锁定清单
|
|
|
if(!projectInfoObj.projectInfo.property.lockBills){
|
|
|
- console.log('enterLockBillsClick');
|
|
|
$("a[name='lockBills']").click();
|
|
|
}
|
|
|
$.bootstrapLoading.end();
|
