|
@@ -300,14 +300,6 @@ var projectObj = {
|
|
let libId = projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id;
|
|
let libId = projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id;
|
|
CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
|
|
CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
|
|
if (data) {
|
|
if (data) {
|
|
- 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) {
|
|
items.sort(function (a, b) {
|
|
let rst = 0;
|
|
let rst = 0;
|
|
if(a.serialNo > b.serialNo){
|
|
if(a.serialNo > b.serialNo){
|
|
@@ -318,7 +310,7 @@ var projectObj = {
|
|
}
|
|
}
|
|
return rst;
|
|
return rst;
|
|
});
|
|
});
|
|
- }
|
|
|
|
|
|
+
|
|
function updateBeforeInsert(node, data) {
|
|
function updateBeforeInsert(node, data) {
|
|
node.data.name = data.name;
|
|
node.data.name = data.name;
|
|
if(node.data.type == billType.BX){//从清单库中找到标准清单的话,要把补项改成分项
|
|
if(node.data.type == billType.BX){//从清单库中找到标准清单的话,要把补项改成分项
|