Bläddra i källkod

质量管理,大项目优化

MaiXinRong 3 veckor sedan
förälder
incheckning
af833996f0
2 ändrade filer med 5 tillägg och 4 borttagningar
  1. 3 2
      app/public/js/path_tree.js
  2. 2 2
      app/public/js/quality_info.js

+ 3 - 2
app/public/js/path_tree.js

@@ -1743,9 +1743,10 @@ const createNewPathTree = function (type, setting) {
             return this._maxId;
         }
 
-        addNode(data, parent) {
+        addNode(data, parent, checkSame = true) {
             data[this.setting.pid] = parent ? parent[this.setting.id] : this.setting.rootId;
-            let item = _.find(this.items, data);
+            // let item = _.find(this.items, data);
+            let item = checkSame ? _.find(parent ? parent.children : this.children, data): null;
             if (item) return item;
 
             item = data;

+ 2 - 2
app/public/js/quality_info.js

@@ -27,7 +27,7 @@ $(document).ready(() => {
 
         const recursiveLoad = function (node, parent, type = 'xmj') {
             if (type === 'xmj') {
-                const cur = !node.b_code ? xmjTree.addNode({ id: node.id, tender_id: node.tender_id, code: node.code, name: node.name, rela_type: type, rela_id: node.id, rela_name: '', }, parent) : parent;
+                const cur = !node.b_code ? xmjTree.addNode({ id: node.id, tender_id: node.tender_id, code: node.code, name: node.name, rela_type: type, rela_id: node.id, rela_name: '', }, parent, false) : parent;
                 if (node.children && node.children.length > 0) {
                     for (const child of node.children) {
                         recursiveLoad(child, cur);
@@ -43,7 +43,7 @@ $(document).ready(() => {
                 if (!parent) return;
                 const cur = parent.children ? parent.children.find(x => { return x.name === node.name }) : null;
                 if (!cur) {
-                    xmjTree.addNode({ id: node.id, tender_id: node.tid, rela_id: parent.id, code: '', code: parent.code + '-' + (parent.children.length + 1), name: node.name, rela_type: 'pos', rela_name: node.name, pid: [node.id]}, parent);
+                    xmjTree.addNode({ id: node.id, tender_id: node.tid, rela_id: parent.id, code: '', code: parent.code + '-' + (parent.children.length + 1), name: node.name, rela_type: 'pos', rela_name: node.name, pid: [node.id]}, parent, false);
                 } else {
                     cur.pid.push(node.id);
                 }