1.复制到新增同级同名判断

2.修复工料机页面ajax出错

modules/pm/controllers/pm_controller.js

@@ -77,11 +77,13 @@ module.exports = {
         ProjectsData.getUserProject(req.session.sessionUser.ssoId, data.proj_id, async function(err, message, data){
             if (err === 0) {
                 let engineeringLibModel = new EngineeringLibModel();
-                let engineeringInfo = data.property !== null && data.property.engineering_id !== undefined ?
-                    await engineeringLibModel.getEngineering(data.property.engineering_id) : [];
+                let engineeringInfo = data !== null && data.property.engineering_id !== undefined ?
+                    await engineeringLibModel.getEngineering(data.property.engineering_id) : null;
                 let strData = JSON.stringify(data);
                 let projInfo = JSON.parse(strData);
-                projInfo.engineeringInfo = engineeringInfo;
+                if (engineeringInfo !== null) {
+                    projInfo.engineeringInfo = engineeringInfo;
+                }
                 callback(req, res, err, message, projInfo);
             } else {
                 callback(req, res, err, message, null);

web/building_saas/pm/js/pm_main.js

@@ -462,6 +462,19 @@ $(document).ready(function() {
             dialog.modal('hide');
         }
 
+        // 判断同级是否有同名
+        if (target.children.length > 0) {
+            for (let tmp in target.children) {
+                if (tmp === 0) {
+                    continue;
+                }
+                if (target.children[tmp].data.name === cur.data.name) {
+                    alert("对应单项工程中存在同名数据!");
+                    return false;
+                }
+            }
+        }
+
         if (target.data.projType === projectType.tender) {
             parent = target.parent;
             next = target.nextSibling;
@@ -1093,39 +1106,33 @@ function setDataToSideBar() {
     $(target).show();
     $(target + '-name').html(name);
 
-    // if (selectedItem.data.projType === projectType.project) {
-        if (selectedItem.children.length <= 0) {
-            return;
-        }
-        // 建设项目相关
-        let counter = 1;
-        let html = '';
-        for(let tmp of selectedItem.children) {
-            html += '<tr>' +
-                '<td>'+ counter +'</td>' +
-                '<td>'+ counter +'</td>' +
-                '<td>'+ tmp.data.name +'</td>' +
-                '<td></td>' +
-                '<td></td>' +
-                '<td></td>' +
-                '<td></td>' +
-                '</tr>';
-
-        }
+    if (selectedItem.children.length <= 0) {
+        return;
+    }
+    // 建设项目相关
+    let counter = 1;
+    let html = '';
+    for(let tmp of selectedItem.children) {
         html += '<tr>' +
-            '<td>'+ (counter + 1) +'</td>' +
-            '<td> </td>' +
-            '<td>合计</td>' +
+            '<td>'+ counter +'</td>' +
+            '<td>'+ counter +'</td>' +
+            '<td>'+ tmp.data.name +'</td>' +
             '<td></td>' +
             '<td></td>' +
             '<td></td>' +
             '<td></td>' +
             '</tr>';
-        $(target + '-table tbody').html(html);
-    // } else {
-        // 单项工程相关
-
-    // }
 
+    }
+    html += '<tr>' +
+        '<td>'+ (counter + 1) +'</td>' +
+        '<td> </td>' +
+        '<td>合计</td>' +
+        '<td></td>' +
+        '<td></td>' +
+        '<td></td>' +
+        '<td></td>' +
+        '</tr>';
+    $(target + '-table tbody').html(html);
 
 }