Przeglądaj źródła

1. 允许台账复制多单元格数据
2. 非最底层项目节,应不允许从标准清单中添加工程量清单

MaiXinRong 5 lat temu
rodzic
commit
a40127f012
2 zmienionych plików z 11 dodań i 4 usunięć
  1. 8 1
      app/public/js/ledger.js
  2. 3 3
      app/public/js/path_tree.js

+ 8 - 1
app/public/js/ledger.js

@@ -504,7 +504,6 @@ $(document).ready(function() {
     };
     // 绑定事件
     ledgerSpread.bind(GC.Spread.Sheets.Events.SelectionChanged, treeOperationObj.selectionChanged);
-    ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardChanging, treeOperationObj.clipboardChanging);
     ledgerSpread.bind(spreadNS.Events.TopRowChanged, treeOperationObj.topRowChanged);
     if (!ledgerSpreadSetting.readOnly) {
         ledgerSpread.bind(GC.Spread.Sheets.Events.SelectionChanged, function (e, info) {
@@ -514,6 +513,7 @@ $(document).ready(function() {
         ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardPasted, treeOperationObj.clipboardPasted);
         SpreadJsObj.addDeleteBind(ledgerSpread, treeOperationObj.deletePress);
         ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardChanging, function (e, info) {
+            console.log(info);
             const copyText = SpreadJsObj.getFilterCopyText(info.sheet);
         });
         ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardChanged, function (e, info) {
@@ -1187,10 +1187,17 @@ $(document).ready(function() {
 
                 const stdTree = stdSheet.zh_tree;
                 const stdNode = stdTree.nodes[info.row];
+
                 const mainTree = mainSheet.zh_tree;
                 const sel = mainSheet.getSelections()[0];
                 const mainNode = mainTree.nodes[sel.row];
                 if (!stdNode) { return; }
+                if (stdType === 'bills') {
+                    if (!mainTree.isLeafXmj(mainNode)) {
+                        toast('非最底层项目下,不应添加清单', 'warning');
+                        return;
+                    }
+                }
 
                 mainTree.postData('/tender/' + getTenderId() + '/ledger/add-by-std', mainNode, {
                     tender_id: mainNode.tender_id,

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

@@ -697,14 +697,14 @@ const createNewPathTree = function (type, setting) {
                 let node = this.getItems(data[this.setting.id]);
                 if (node) {
                     for (const prop in node) {
-                        if (prop === this.setting.pid && data[prop] !== node[prop]) {
-
-                        }
                         if (data[prop] !== undefined && data[prop] !== node[prop]) {
                             if (prop === this.setting.pid) {
                                 loadedData.push(this.getItems(node[this.setting.pid]));
                                 loadedData.push(this.getItems(data[this.setting.pid]));
                             }
+                            if (prop === this.setting.order) {
+                                loadedData = loadedData.concat(this.getPosterity(node));
+                            }
                             node[prop] = data[prop];
                         }
                     }