清单工料数据增删改bug

app/public/js/material_list.js

@@ -350,9 +350,10 @@ $(document).ready(() => {
         const leafXmjs = gcl && gcl.leafXmjs ? gcl.leafXmjs.filter(item => {
             return item.qc_qty || item.contract_qty
         }) : null;
-        // console.log(iLXmjRow, leafXmjs, materialListData);
+        console.log(gcl, leafXmjs);
         if (leafXmjs) {
             const xmj = leafXmjs[iLXmjRow];
+            console.log(xmj, iLXmjRow);
             materialList = [];
             for (const m of materialListData) {
                 if (m.gcl_id === xmj.gcl_id && m.xmj_id === xmj.id && ((xmj.mx_id !==undefined && m.mx_id === xmj.mx_id) || xmj.mx_id === undefined)) {
@@ -429,7 +430,7 @@ $(document).ready(() => {
         const leafXmjSheet = leafXmjSpread.getActiveSheet();
         const leafXmjSelect = SpreadJsObj.getSelectObject(leafXmjSheet);
         const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
-        // const leafXmjIndex = gcl.indexOf(leafXmjSelect);
+        const leafXmjIndex = gcl.indexOf(leafXmjSelect);
         // const xmj = gcl[leafXmjIndex];
         // const data = {
         //     xmj_id: xmj.id,
@@ -460,10 +461,10 @@ $(document).ready(() => {
             calculateJiaCha(gclGatherData);
             // const index = gclGatherData.indexOf(ledgerSelect);
             loadLeafXmjData(index);
-            const xmjSheet = leafXmjSpread.getActiveSheet();
-            const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
-            const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
-            loadMaterialData(index, xmjIndex);
+            // const xmjSheet = leafXmjSpread.getActiveSheet();
+            // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+            // const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
+            loadMaterialData(index, leafXmjIndex);
             SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), index);
             $('#addgl').modal('hide');
         });
@@ -577,7 +578,10 @@ $(document).ready(() => {
                 const sheet = ledgerSpread.getActiveSheet();
                 const select = SpreadJsObj.getSelectObject(sheet);
                 const index = gclGatherData.indexOf(select);
+                const leafXmjSheet = leafXmjSpread.getActiveSheet();
+                const leafXmjSelect = SpreadJsObj.getSelectObject(leafXmjSheet);
                 const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const leafXmjIndex = gcl.indexOf(leafXmjSelect);
                 const datas = [];
                 for (const xmj of gcl) {
                     const data = {
@@ -593,10 +597,10 @@ $(document).ready(() => {
                     calculateJiaCha(gclGatherData);
                     // const index = gclGatherData.indexOf(ledgerSelect);
                     loadLeafXmjData(index);
-                    const xmjSheet = leafXmjSpread.getActiveSheet();
-                    const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
-                    const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
-                    loadMaterialData(index, xmjIndex);
+                    // const xmjSheet = leafXmjSpread.getActiveSheet();
+                    // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+                    // const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
+                    loadMaterialData(index, leafXmjIndex);
                     SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), index);
                 });
                 // postData(window.location.pathname + '/save', {type: 'del', id: select.id, mb_id: select.mb_id}, function (result) {
@@ -676,6 +680,9 @@ $(document).ready(() => {
                     const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                     const index = gclGatherData.indexOf(ledgerSelect);
                     const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                    const xmjSheet = leafXmjSpread.getActiveSheet();
+                    const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+                    const xmjIndex = gcl.indexOf(xmjSelect);
                     const datas = [];
                     for (const xmj of gcl) {
                         const data = {
@@ -691,9 +698,9 @@ $(document).ready(() => {
                         calculateJiaCha(gclGatherData);
                         // const index = gclGatherData.indexOf(ledgerSelect);
                         loadLeafXmjData(index);
-                        const xmjSheet = leafXmjSpread.getActiveSheet();
-                        const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
-                        const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
+                        // const xmjSheet = leafXmjSpread.getActiveSheet();
+                        // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+                        // const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
                         loadMaterialData(index, xmjIndex);
                         SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), index);
                         materialSpread.getActiveSheet().setSelection(info.row + 1, info.col, 1, 1);
@@ -801,6 +808,9 @@ $(document).ready(() => {
                 const ledgerSelect = SpreadJsObj.getSelectObject(ledgerSheet);
                 const index = gclGatherData.indexOf(ledgerSelect);
                 const gcl = gclGatherData[index].leafXmjs.filter(item => item.gather_qty !== null && item.gather_qty !== undefined);
+                const xmjSheet = leafXmjSpread.getActiveSheet();
+                const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+                const xmjIndex = gcl.indexOf(xmjSelect);
                 const datas = [];
                 for (const xmj of gcl) {
                     const data2 = {
@@ -817,9 +827,9 @@ $(document).ready(() => {
                     calculateJiaCha(gclGatherData);
                     // const index = gclGatherData.indexOf(ledgerSelect);
                     loadLeafXmjData(index);
-                    const xmjSheet = leafXmjSpread.getActiveSheet();
-                    const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
-                    const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
+                    // const xmjSheet = leafXmjSpread.getActiveSheet();
+                    // const xmjSelect = SpreadJsObj.getSelectObject(xmjSheet);
+                    // const xmjIndex = gclGatherData[index].leafXmjs.indexOf(xmjSelect);
                     loadMaterialData(index, xmjIndex);
                     SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), index);
                     materialSpread.getActiveSheet().setSelection(info.cellRange.row, info.cellRange.col, info.cellRange.rowCount, info.cellRange.colCount);