|
|
@@ -86,7 +86,7 @@ const projTreeObj = {
|
|
|
allowContextMenu: false,
|
|
|
allowCopyPasteExcelStyle : false,
|
|
|
allowExtendPasteRange: false,
|
|
|
- allowUserDragDrop : true,
|
|
|
+ allowUserDragDrop : false,
|
|
|
allowUserDragFill: false,
|
|
|
scrollbarMaxAlign : true,
|
|
|
showDragDropTip:false
|
|
|
@@ -607,6 +607,17 @@ const projTreeObj = {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ openTender: function (node, timeoutTime) {
|
|
|
+ setTimeout(function () {
|
|
|
+ let newTab = window.open('about:blank');
|
|
|
+ BeforeOpenProject(node.data.ID, {'fullFolder': GetFullFolder(node.parent)}, function () {
|
|
|
+ let mainUrl = `/main?project=${node.data.ID}`;
|
|
|
+ CommonAjax.get(mainUrl, [], function () {
|
|
|
+ newTab.location.replace(mainUrl); //不能后退
|
|
|
+ });
|
|
|
+ });
|
|
|
+ }, timeoutTime);
|
|
|
+ },
|
|
|
getTreeNodeCell: function (tree) {
|
|
|
let me = projTreeObj;
|
|
|
let indent = 20;
|
|
|
@@ -784,20 +795,19 @@ const projTreeObj = {
|
|
|
}
|
|
|
if(hitinfo.sheet.name() === "projectSheet"){//只有项目管理界面才执行
|
|
|
//单项文件，进入造价书界面
|
|
|
- if(node.data.projType === projectType.tender && withingClickArea()){
|
|
|
- let timeoutTime = 200;
|
|
|
- if($('.slide-sidebar').hasClass('open')){
|
|
|
- timeoutTime = 500;
|
|
|
- }
|
|
|
- setTimeout(function () {
|
|
|
- let newTab = window.open('about:blank');
|
|
|
- BeforeOpenProject(node.data.ID, {'fullFolder': GetFullFolder(node.parent)}, function () {
|
|
|
- let mainUrl = `/main?project=${node.data.ID}`;
|
|
|
- CommonAjax.get(mainUrl, [], function () {
|
|
|
- newTab.location.replace(mainUrl); //不能后退
|
|
|
- });
|
|
|
- });
|
|
|
- }, timeoutTime);
|
|
|
+ if(node.data.projType === projectType.tender && withingClickArea()){
|
|
|
+ /*let thisClick = Date.now(),
|
|
|
+ open = false;
|
|
|
+ if (this.preNode === node && this.preClick && thisClick - this.preClick <= 300) {
|
|
|
+ open = true;*/
|
|
|
+ let timeoutTime = 200;
|
|
|
+ if($('.slide-sidebar').hasClass('open')){
|
|
|
+ timeoutTime = 500;
|
|
|
+ }
|
|
|
+ projTreeObj.openTender(node, timeoutTime);
|
|
|
+ /*}
|
|
|
+ this.preClick = open ? null : thisClick;
|
|
|
+ this.preNode = open ? null : node;*/
|
|
|
}
|
|
|
if (!node || node.children.length === 0) { return; }
|
|
|
}
|
|
|
@@ -2039,7 +2049,7 @@ function AddTenderItems(selected, projName, tenderName, property, callback){
|
|
|
}
|
|
|
});
|
|
|
let pojNode = projTreeObj.insert(projData, parent, next);
|
|
|
- projTreeObj.insert(tenderData, pojNode, null);
|
|
|
+ let tenderNode = projTreeObj.insert(tenderData, pojNode, null);
|
|
|
callback();
|
|
|
});
|
|
|
});
|
|
|
@@ -2056,12 +2066,13 @@ function AddTenderItems(selected, projName, tenderName, property, callback){
|
|
|
updateDatas.push({updateType: 'update', updateData: {ID: pre.id(), NextSiblingID: tenderID}});
|
|
|
}
|
|
|
UpdateProjectData(updateDatas, function (datas) {
|
|
|
+ let tenderNode = null;
|
|
|
datas.forEach(function (data) {
|
|
|
if(data.updateType === 'new') {
|
|
|
setInitSummaryData(data.updateData);
|
|
|
data.updateData.feeStandardName = data.updateData.property.feeStandardName || '';
|
|
|
data.updateData.valuationType = data.updateData.property.valuationType === 'bill' ? '预算' : '工程量清单';
|
|
|
- projTreeObj.insert(data.updateData, tempProj, null);
|
|
|
+ tenderNode = projTreeObj.insert(data.updateData, tempProj, null);
|
|
|
}
|
|
|
});
|
|
|
callback();
|
|
|
@@ -2444,8 +2455,8 @@ function AddTender() {
|
|
|
|
|
|
|
|
|
let calcProgramName = $('#tender-calcProgram').children("option:selected").text();
|
|
|
-
|
|
|
- let callback = function() {
|
|
|
+ //let newTab = window.open('about:blank');
|
|
|
+ let callback = function(tenderNode) {
|
|
|
$('#add-tender-confirm').removeClass('disabled');
|
|
|
$("#add-tender-dialog").modal("hide");
|
|
|
$('#tender-name').val('');
|
|
|
@@ -2454,7 +2465,6 @@ function AddTender() {
|
|
|
$("#tender-calcProgram").children("option").removeAttr("selected");
|
|
|
$("#poj-name").val('');
|
|
|
$("#poj-name-info").hide();
|
|
|
-
|
|
|
};
|
|
|
let selectedItem = projTreeObj.tree.selected;
|
|
|
//地区
|
