|
|
@@ -78,7 +78,7 @@ let counter = require('../../../public/counter/counter');
|
|
|
import SectionTreeDao from '../../complementary_ration_lib/models/sectionTreeModel';
|
|
|
let sectionTreeDao = new SectionTreeDao();
|
|
|
import CounterModel from "../../glj/models/counter_model";
|
|
|
-import moment from 'moment';
|
|
|
+import moment from 'moment-timezone';
|
|
|
import billsFlags from '../../common/const/bills_fixed';
|
|
|
const notDeleted = [{deleteInfo: null}, {'deleteInfo.deleted': false}];
|
|
|
let cipher = require('../../../public/cipher');
|
|
|
@@ -198,13 +198,13 @@ async function copyProject(userID, compilationID,data,newProjectID = null) {
|
|
|
//费率文件、单价文件重名检查
|
|
|
let feeRate = await feeRateFileModel.findOne({rootProjectID:originalProperty.rootProjectID,name:originalProperty.feeFile.name,deleteInfo:null});
|
|
|
if(feeRate){//存在重名的文件
|
|
|
- newFeeName = originalProperty.feeFile.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '复制)';
|
|
|
+ newFeeName = originalProperty.feeFile.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制)';
|
|
|
projectMap['copy'].document.property.feeFile.name = newFeeName;
|
|
|
}
|
|
|
|
|
|
let unitPriceFile = await unitPriceFileModel.findOne({root_project_id: originalProperty.rootProjectID,name:originalProperty.unitPriceFile.name,deleteInfo: null});
|
|
|
if(unitPriceFile){//存在重名的文件
|
|
|
- newUnitName = originalProperty.unitPriceFile.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '复制)';
|
|
|
+ newUnitName = originalProperty.unitPriceFile.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制)';
|
|
|
projectMap['copy'].document.property.unitPriceFile.name = newUnitName;
|
|
|
}
|
|
|
|
|
|
@@ -1360,7 +1360,7 @@ async function handleMainProjectDatas(mainData,updateData,userID) {
|
|
|
}
|
|
|
//查看是否重名;
|
|
|
let temp = await projectModel.findOne({userID:userID,ParentID:p.ParentID,name:p.name});
|
|
|
- if(temp) p.name = p.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '导入)';
|
|
|
+ if(temp) p.name = p.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '导入)';
|
|
|
}else {
|
|
|
p.ParentID = projectIDMap[p.ParentID];
|
|
|
p.NextSiblingID = projectIDMap[p.NextSiblingID];
|