Преглед изворни кода

安全生产费、动态投资,添加标准清单、项目节相关

MaiXinRong пре 11 месеци
родитељ
комит
4fa3ff8851
3 измењених фајлова са 11 додато и 18 уклоњено
  1. 6 11
      app/public/js/budget_detail.js
  2. 2 1
      app/public/js/ledger.js
  3. 3 6
      app/public/js/payment_safe.js

+ 6 - 11
app/public/js/budget_detail.js

@@ -593,18 +593,12 @@ $(document).ready(() => {
         budgetTreeOpr.refreshOperationValid(budgetSheet);
     });
 
-    const stdLibCellDoubleClick = function (e, info) {
-        const stdSheet = info.sheet;
-        if (!stdSheet.zh_setting || !stdSheet.zh_tree || !budgetSheet.zh_tree) return;
-
-        const stdTree = stdSheet.zh_tree;
-        const stdNode = stdTree.nodes[info.row];
+    const stdLibCellDoubleClick = function (updateData, stdNode, stdTree) {
+        if (!stdTree || !budgetSheet.zh_tree) return;
         if (!stdNode) return;
 
-        const budgetTree = budgetSheet.zh_tree;
-        const sel = budgetSheet.getSelections()[0];
-        const mainNode = budgetTree.nodes[sel.row];
-        if (info.sheet.zh_setting.stdType === 'gcl') {
+        const mainNode = SpreadJsObj.getSelectObject(budgetSheet);
+        if (updateData.postData.stdType === 'gcl') {
             if (mainNode.code && mainNode.code !== '' && !budgetTree.isLeafXmj(mainNode)) {
                 toastr.warning('非最底层项目下,不应添加清单');
                 return;
@@ -616,11 +610,12 @@ $(document).ready(() => {
             postData: {
                 id: budgetTree.getNodeKey(mainNode),
                 tender_id: mainNode.tender_id,
-                stdType: info.sheet.zh_setting.stdType,
+                stdType: updateData.postData.stdType,
                 stdLibId: stdNode.list_id,
                 stdNode: stdTree.getNodeKey(stdNode)
             }
         }, function (result) {
+            const sel = budgetSheet.getSelections()[0];
             const refreshNode = budgetTree.loadPostData(result);
             budgetTreeOpr.refreshTree(budgetSheet, refreshNode);
             if (refreshNode.create && refreshNode.create.length > 0) {

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

@@ -2216,7 +2216,8 @@ $(document).ready(function() {
                 const data = [];
                 const sortData = info.sheet.zh_data || [];
                 if (sortData.length === 0 || info.cellRange.row + info.cellRange.rowCount > sortData.length) {
-                    if (info.cellRange.col !== 0) {
+                    const nameCol = info.sheet.zh_setting.cols.findIndex(x => { return x.field === 'name'; });
+                    if (info.cellRange.col > nameCol || info.cellRange.col + info.cellRange.colCount < nameCol) {
                         toastr.warning('新增计量单元请先输入名称');
                         posOperationObj.loadCurPosData();
                         return;

+ 3 - 6
app/public/js/payment_safe.js

@@ -892,14 +892,11 @@ $(document).ready(function() {
         },
         page: 'paymentSafe',
         tid: getTenderId(),
-        cellDoubleClick: function (e, info) {
-            const stdSheet = info.sheet;
-            const stdTree = stdSheet.zh_tree;
-            const stdNode = stdTree.nodes[info.row];
-            if (!stdNode || !stdNode.b_code) return;
+        cellDoubleClick: function (updateData, stdNode, stdTree) {
+            if (!stdTree || !stdNode || !stdNode.b_code) return;
 
             const mainSheet = billsObj.sheet;
-            if (!stdSheet.zh_setting || !stdSheet.zh_tree || !mainSheet.zh_tree) return;
+            if ( !mainSheet.zh_tree) return;
             const mainTree = mainSheet.zh_tree;
             const sel = mainSheet.getSelections()[0];