瀏覽代碼

1. 计量单元,选中行底色标识相关
2. 计量台账,计量单元,允许复制粘贴现场实际数量

MaiXinRong 5 年之前
父節點
當前提交
ce71250c5b

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

@@ -814,6 +814,7 @@ $(document).ready(function() {
         },
         selectionChanged: function (e, info) {
             if (!info.oldSelections || !info.oldSelections[0] || info.newSelections[0].row !== info.oldSelections[0].row) {
+                SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
                 posOperationObj.loadCurPosData();
                 posSearch.search($('#pos-keyword').val());
             }
@@ -1525,7 +1526,6 @@ $(document).ready(function() {
         loadCurPosData: function () {
             //spreadJsObj.reinitSheet(posSpread.getActiveSheet());
             const node = treeOperationObj.getSelectNode(ledgerSpread.getActiveSheet());
-            SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
             if (node) {
                 const posData = pos.ledgerPos[itemsPre + node.id] || [];
                 SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), 'data', posData);

+ 1 - 1
app/public/js/measure_compare.js

@@ -160,7 +160,6 @@ $(document).ready(() => {
     }, null, true);
     function loadPosData(iRow) {
         const node = iRow ? billsSheet.zh_tree.nodes[iRow] : SpreadJsObj.getSelectObject(billsSheet);
-        SpreadJsObj.resetTopAndSelect(posSheet);
         if (node) {
             SpreadJsObj.loadSheetData(posSheet, SpreadJsObj.DataType.Data, cPos.getLedgerPos(node.id));
         } else {
@@ -174,6 +173,7 @@ $(document).ready(() => {
             if (info.oldSelections) {
                 const iOldRow = info.oldSelections[0].row;
                 if (iNewRow !== iOldRow) {
+                    SpreadJsObj.resetTopAndSelect(posSheet);
                     loadPosData(iNewRow);
                 }
             } else {

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

@@ -262,6 +262,7 @@ $(document).ready(() => {
             if (info.newSelections) {
                 if (!info.oldSelections || info.newSelections[0].row !== info.oldSelections[0].row) {
                     billsTreeSpreadObj.refreshOperationValid(info.sheet);
+                    SpreadJsObj.resetTopAndSelect(posSheet);
                     posSpreadObj.loadCurPosData();
                     SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
                     posSearch.search($('#pos-keyword').val());
@@ -1166,7 +1167,6 @@ $(document).ready(() => {
          */
         loadCurPosData: function () {
             const node = SpreadJsObj.getSelectObject(billsSheet);
-            SpreadJsObj.resetTopAndSelect(posSheet);
             if (node) {
                 const posData = pos.getLedgerPos(node.id) || [];
                 SpreadJsObj.loadSheetData(posSheet, 'data', posData);

+ 1 - 1
app/public/js/revise_history.js

@@ -124,6 +124,7 @@ $(document).ready(() => {
                 if (!info.oldSelections || info.newSelections[0].row !== info.oldSelections[0].row) {
                     SpreadJsObj.saveTopAndSelect(billsSheet, ckBillsSpread);
                     if (isTz) {
+                        SpreadJsObj.resetTopAndSelect(posSheet);
                         posSpreadObj.loadCurPosData();
                         posSearch.search($('#pos-keyword').val());
                     }
@@ -143,7 +144,6 @@ $(document).ready(() => {
          */
         loadCurPosData: function () {
             const node = SpreadJsObj.getSelectObject(billsSheet);
-            SpreadJsObj.resetTopAndSelect(posSheet);
             if (node) {
                 const posData = pos.getLedgerPos(node.id) || [];
                 SpreadJsObj.loadSheetData(posSheet, 'data', posData);

+ 3 - 4
app/public/js/stage.js

@@ -661,8 +661,8 @@ $(document).ready(() => {
         },
         selectionChanged: function (e, info) {
             if (!info.oldSelections || !info.oldSelections[0] || info.newSelections[0].row !== info.oldSelections[0].row) {
-                stagePosSpreadObj.loadCurPosData();
                 SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
+                stagePosSpreadObj.loadCurPosData();
                 if (posSearch) {
                     posSearch.search();
                 }
@@ -1117,7 +1117,6 @@ $(document).ready(() => {
          */
         loadCurPosData: function () {
             const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
-            SpreadJsObj.resetTopAndSelect(spSpread.getActiveSheet());
             if (node) {
                 const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
                 SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData);
@@ -1254,9 +1253,9 @@ $(document).ready(() => {
             if (info.sheet.zh_setting) {
                 const sortData = info.sheet.zh_data;
                 const range = info.cellRange;
-                const validField = ['contract_qty', 'qc_qty', 'postil'];
+                const validField = ['contract_qty', 'qc_qty', 'postil', 'real_qty'];
                 if (!checkTzMeasureType()) {
-                    validField.push('name', 'sgfh_qty', 'sjcl_qty', 'qtcl_qty', 'real_qty', 'position', 'drawing_code');
+                    validField.push('name', 'sgfh_qty', 'sjcl_qty', 'qtcl_qty', 'position', 'drawing_code');
                 }
                 for (let iCol = range.col; iCol < range.col + range.colCount; iCol++) {
                     const col = info.sheet.zh_setting.cols[iCol];

+ 1 - 1
app/public/js/stage_compare.js

@@ -169,7 +169,6 @@ $(document).ready(function () {
     // 获取部位明细数据
     function loadPosData(iRow) {
         const node = ledgerSpread.getActiveSheet().zh_tree.nodes[iRow];
-        SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
         if (node) {
             SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), SpreadJsObj.DataType.Data, scPos.getLedgerPos(node.id) || []);
         } else {
@@ -184,6 +183,7 @@ $(document).ready(function () {
             if (info.oldSelections) {
                 const iOldRow = info.oldSelections[0].row;
                 if (iNewRow !== iOldRow) {
+                    SpreadJsObj.resetTopAndSelect(posSpread.getActiveSheet());
                     loadPosData(iNewRow);
                 }
             } else {