|
@@ -8,6 +8,7 @@
|
|
|
let Tree = null;
|
|
|
let movetoZTree = null;
|
|
|
let copytoZTree = null;
|
|
|
+let engineering = [];
|
|
|
let projectType = {
|
|
|
folder: 'Folder',
|
|
|
tender: 'Tender',
|
|
@@ -170,7 +171,7 @@ $(document).ready(function() {
|
|
|
if (valuation === null) {
|
|
|
continue;
|
|
|
}
|
|
|
- html += '<option value="'+ valuation._id +'">'+ valuation.name +'</option>';
|
|
|
+ html += '<option value="'+ valuation._id +'" data-engineering="'+ valuation.engineering +'">'+ valuation.name +'</option>';
|
|
|
}
|
|
|
$("#valuation").html(html);
|
|
|
});
|
|
@@ -228,12 +229,19 @@ $(document).ready(function() {
|
|
|
if (projectInfo !== null) {
|
|
|
let savedProjectData = localStorage.getItem(projectInfo.data.name);
|
|
|
savedProjectData = JSON.parse(savedProjectData);
|
|
|
+ // 填入计价规则
|
|
|
let valuationHtml = '<option value="'+ savedProjectData.valuation +'">'+ savedProjectData.valuationName +'</option>';
|
|
|
$("#tender-valuation").html(valuationHtml);
|
|
|
|
|
|
+ // 填入工程专业
|
|
|
+ let engineeringString = getEngineeringName(savedProjectData.engineering);
|
|
|
+ let engineeringHtml = '<option value="'+ savedProjectData.engineering +'">'+ engineeringString +'</option>';
|
|
|
+ $("#tender-engineering").html(engineeringHtml);
|
|
|
+
|
|
|
$("input[name='tender_valuation_type']").attr('disabled', 'disabled').removeAttr('checked', 'checked');
|
|
|
$("input[name='tender_valuation_type'][value='"+ savedProjectData.valuationType +"']")
|
|
|
.attr("checked", "checked").removeAttr('disabled', 'disabled');
|
|
|
+
|
|
|
}
|
|
|
|
|
|
});
|
|
@@ -493,6 +501,8 @@ function init() {
|
|
|
$(".tools-btn > a").not(".disabled").addClass("disabled");
|
|
|
$("#add-folder-btn").removeClass("disabled");
|
|
|
$("#add-project-btn").removeClass("disabled");
|
|
|
+
|
|
|
+ engineering = engineeringList !== null && engineeringList !== undefined ? JSON.parse(engineeringList) : [];
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -513,13 +523,15 @@ function AddProject() {
|
|
|
}
|
|
|
let valuationName = $("#valuation").children("option:selected").text();
|
|
|
let valuationType = $("input[name='valuation_type']:checked").val();
|
|
|
+ let engineering = $("#valuation").children("option:selected").data("engineering");
|
|
|
let callback = function() {
|
|
|
$("#add-project-dialog").modal("hide");
|
|
|
// 记录选择后的信息
|
|
|
let projectInfo = {
|
|
|
valuation: valuation,
|
|
|
valuationType: valuationType,
|
|
|
- valuationName: valuationName
|
|
|
+ valuationName: valuationName,
|
|
|
+ engineering: engineering
|
|
|
};
|
|
|
localStorage.setItem(name, JSON.stringify(projectInfo));
|
|
|
};
|
|
@@ -860,34 +872,24 @@ function GetTargetTreeNode(zTreeObj) {
|
|
|
return ztree_selected ? Tree.findNode(ztree_selected.id) : null;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-var GetNextChangeUpdateData = function (datas, node, next) {
|
|
|
- var data = null;
|
|
|
- if (node && node.id() !== -1) {
|
|
|
- data = {};
|
|
|
- data['updateType'] = 'update';
|
|
|
- data['updateData'] = {};
|
|
|
- data['updateData'][Tree.setting.tree.id] = node.id();
|
|
|
- data['updateData'][Tree.setting.tree.nid] = next ? next.id() : -1;
|
|
|
- datas.push(data);
|
|
|
+/**
|
|
|
+ * 根据指定id获取对应的工程专业
|
|
|
+ *
|
|
|
+ * @param {Number} id
|
|
|
+ * @return {String}
|
|
|
+ */
|
|
|
+function getEngineeringName(id) {
|
|
|
+ let result = '';
|
|
|
+ if (engineering.length <= 0) {
|
|
|
+ return result;
|
|
|
}
|
|
|
- return data;
|
|
|
-}
|
|
|
|
|
|
-var GetMoveUpdateData = function (node, parent, next) {
|
|
|
- var datas = [], updateData;
|
|
|
- updateData = GetNextChangeUpdateData(datas, node.preSibling(), node.nextSibling);
|
|
|
- if (next) {
|
|
|
- updateData = GetNextChangeUpdateData(datas, next.preSibling(), node);
|
|
|
+ for(let tmp of engineering) {
|
|
|
+ if (tmp.value === id) {
|
|
|
+ result = tmp.name;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
- console.log(updateData);
|
|
|
- return false;
|
|
|
- updateData = {};
|
|
|
- updateData['updateType'] = 'update';
|
|
|
- updateData['updateData'] = {};
|
|
|
- updateData['updateData'][Tree.setting.tree.id] = node.id();
|
|
|
- updateData['updateData'][Tree.setting.tree.pid] = parent ? parent.id() : -1;
|
|
|
- updateData['updateData'][Tree.setting.tree.nid] = next ? next.id() : -1;
|
|
|
- datas.push(updateData);
|
|
|
- return datas;
|
|
|
-};
|
|
|
+
|
|
|
+ return result;
|
|
|
+}
|