Forráskód Böngészése

fix create feerate fail

zhangweicheng 7 éve
szülő
commit
2f8da55915

+ 10 - 4
modules/fee_rates/facade/fee_rates_facade.js

@@ -191,6 +191,7 @@ async function getFeeRateData(projectID) {
         //
         let project =  await projectsModel.findOne({ID:projectID});
         if (project&&project.property&&project.property.feeFile){
+            console.info(project.property.feeFile);
             let feeRateData = await feeRateFileModel.findOne({'ID':project.property.feeFile,deleteInfo:null});
             if(feeRateData===null){
                 result.datas=[];
@@ -269,12 +270,15 @@ async function newFeeRateFile(updateData){
         let feeFile = property.feeFile;
         let rootProjectID = property.rootProjectID;
         let name = updateData.name;
-        if(feeFile.indexOf("newFeeRate")!=-1){
+        let newFeeRate = {};
+        if(feeFile.id.indexOf("newFeeRate")!=-1){
             let temFee = await feeRateFileModel.findOne({rootProjectID:rootProjectID,name:name,deleteInfo:null});
             if(temFee){
-                return temFee.ID;
+                newFeeRate.id=temFee.ID;
+                newFeeRate.name = temFee.name;
+                return newFeeRate;
             }
-            let temA = feeFile.split("-");
+            let temA = feeFile.id.split("-");
             let libID = temA[1];
             let doc={
                 rootProjectID:rootProjectID,
@@ -292,7 +296,9 @@ async function newFeeRateFile(updateData){
             }
             doc.ID = uuidV1();
             await feeRateFileModel.create(doc);
-            return doc.ID;
+            newFeeRate.id = doc.ID;
+            newFeeRate.name =doc.name;
+            return newFeeRate;
         }else {
             return feeFile
         }

+ 0 - 1
web/building_saas/pm/js/pm_main.js

@@ -841,7 +841,6 @@ function GetUpdateData(parent, next, name, property, newId, type) {
         updateData['updateData']['name'] = name;
     }
     if (property !== null && property !== undefined) {
-        property.rootProjectID = rootProjectID;
         updateData['updateData']['property'] = property;
     }
     if (type !== null && type.projectType !== null) {