Browse Source

取消跨层次粘贴判断

MaiXinRong 2 years ago
parent
commit
30411cb98c
3 changed files with 18 additions and 18 deletions
  1. 6 6
      app/public/js/change_revise.js
  2. 6 6
      app/public/js/ledger.js
  3. 6 6
      app/public/js/revise.js

+ 6 - 6
app/public/js/change_revise.js

@@ -641,7 +641,7 @@ $(document).ready(() => {
                 parent: {type: 'warning', msg: '含有子项的清单,不可粘贴数量、单价、金额'},
                 gcl: {type: 'warning', msg: '工程量清单,不可粘贴项目节数量'},
                 posXmj: {type: 'warning', msg: '清单含有计量单元,不可粘贴项目节编号'},
-                sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
+                // sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
             };
             const datas = [], filterNodes = [];
 
@@ -652,11 +652,11 @@ $(document).ready(() => {
                 if (!node) continue;
                 if (!pid) pid = node.ledger_pid;
                 if (!level) level = node.level;
-                if (node.ledger_pid !== pid) {
-                    toastMessageUniq(hint.sameParent);
-                    filterRow+=1;
-                    continue;
-                }
+                // if (node.ledger_pid !== pid) {
+                //     toastMessageUniq(hint.sameParent);
+                //     filterRow+=1;
+                //     continue;
+                // }
                 if (node.level < level) break;
 
                 let bPaste = false;

+ 6 - 6
app/public/js/ledger.js

@@ -708,7 +708,7 @@ $(document).ready(function() {
                 parent: {type: 'warning', msg: '含有子项的清单,不可粘贴数量、单价、金额'},
                 gcl: {type: 'warning', msg: '工程量清单,不可粘贴项目节数量'},
                 posXmj: {type: 'warning', msg: '清单含有计量单元,不可粘贴项目节编号'},
-                sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
+                // sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
             };
             const datas = [], filterNodes = [];
             let pid, level, filterRow = 0;
@@ -718,11 +718,11 @@ $(document).ready(function() {
                 if (!node) continue;
                 if (!pid) pid = node.ledger_pid;
                 if (!level) level = node.level;
-                if (node.ledger_pid !== pid) {
-                    toastMessageUniq(hint.sameParent);
-                    filterRow+=1;
-                    continue;
-                }
+                // if (node.ledger_pid !== pid) {
+                //     toastMessageUniq(hint.sameParent);
+                //     filterRow+=1;
+                //     continue;
+                // }
                 if (node.level < level) break;
 
                 let bPaste = false;

+ 6 - 6
app/public/js/revise.js

@@ -600,7 +600,7 @@ $(document).ready(() => {
                 parent: {type: 'warning', msg: '含有子项的清单,不可粘贴数量、单价、金额'},
                 gcl: {type: 'warning', msg: '工程量清单,不可粘贴项目节数量'},
                 posXmj: {type: 'warning', msg: '清单含有计量单元,不可粘贴项目节编号'},
-                sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
+                // sameParent: {type: 'warning', msg: '仅可粘贴同层节点'},
             };
             const datas = [], filterNodes = [];
 
@@ -611,11 +611,11 @@ $(document).ready(() => {
                 if (!node) continue;
                 if (!pid) pid = node.ledger_pid;
                 if (!level) level = node.level;
-                if (node.ledger_pid !== pid) {
-                    toastMessageUniq(hint.sameParent);
-                    filterRow+=1;
-                    continue;
-                }
+                // if (node.ledger_pid !== pid) {
+                //     toastMessageUniq(hint.sameParent);
+                //     filterRow+=1;
+                //     continue;
+                // }
                 if (node.level < level) break;
 
                 let bPaste = false;