Browse Source

台账修订,复制整块问题

MaiXinRong 5 years ago
parent
commit
6a7b0038b6
2 changed files with 4 additions and 7 deletions
  1. 2 4
      app/public/js/ledger.js
  2. 2 3
      app/public/js/revise.js

+ 2 - 4
app/public/js/ledger.js

@@ -1193,15 +1193,13 @@ $(document).ready(function() {
                 posterity.unshift(node);
                 copyBlockList.push(sheet.zh_tree.getDefaultData(posterity));
             }
-            const tenderId = _.toInteger(getTenderId());
             for (const cbl of copyBlockList) {
                 for (b of cbl) {
                     const posRange = pos.getLedgerPos(b.id);
                     if (posRange && posRange.length > 0) b.pos = posRange;
                 }
             }
-            setLocalCache(copyBlockTag, JSON.stringify({tid: tenderId, block: copyBlockList}));
-            //treeOperationObj.block = copyBlockList;
+            setLocalCache(copyBlockTag, JSON.stringify({block: copyBlockList}));
         },
         visible: function (key, opt) {
             const sheet = ledgerSpread.getActiveSheet();
@@ -1225,7 +1223,7 @@ $(document).ready(function() {
             disabled: function (key, opt) {
                 //const block = treeOperationObj.block || [];
                 const copyInfo = JSON.parse(getLocalCache(copyBlockTag));
-                return !(copyInfo && copyInfo.tid && copyInfo.tid > 0 && copyInfo.block && copyInfo.block.length > 0);
+                return !(copyInfo && copyInfo.block && copyInfo.block.length > 0);
             },
             callback: function (key, opt) {
                 //const block = treeOperationObj.block || [];

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

@@ -1031,12 +1031,11 @@ $(document).ready(() => {
                 posterity.unshift(node);
                 copyBlockList.push(sheet.zh_tree.getDefaultData(posterity));
             }
-            const tenderId = _.toInteger(getTenderId());
             for (const cbl of copyBlockList) {
                 const posRange = pos.getLedgerPos(cbl.id);
                 if (posRange && posRange.length > 0) cbl.pos = posRange;
             }
-            setLocalCache(copyBlockTag, JSON.stringify({tid: tenderId, block: copyBlockList}));
+            setLocalCache(copyBlockTag, JSON.stringify({ block: copyBlockList }));
         },
         visible: function (key, opt) {
             const sheet = billsSheet;
@@ -1060,7 +1059,7 @@ $(document).ready(() => {
             disabled: function (key, opt) {
                 //const block = treeOperationObj.block || [];
                 const copyInfo = JSON.parse(getLocalCache(copyBlockTag));
-                return !(copyInfo && copyInfo.tid && copyInfo.tid > 0 && copyInfo.block && copyInfo.block.length > 0);
+                return !(copyInfo && copyInfo.block && copyInfo.block.length > 0);
             },
             callback: function (key, opt) {
                 //const block = treeOperationObj.block || [];