MaiXinRong 1 هفته پیش
والد
کامیت
1a83a0bf3d
4فایلهای تغییر یافته به همراه21 افزوده شده و 12 حذف شده
  1. 6 3
      app/public/js/se_jgcl.js
  2. 6 3
      app/public/js/se_other.js
  3. 6 3
      app/public/js/se_safe_prod.js
  4. 3 3
      app/public/js/se_temp_land.js

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

@@ -97,6 +97,9 @@ $(document).ready(() => {
             this.calculateAll();
             this.resortData();
         }
+        getMaxOrder() {
+            return this.data.length > 0 ? this.data[this.data.length - 1].order : 0;
+        }
         loadUpdateData(updateData) {
             if (updateData.add) {
                 for (const a of updateData.add) {
@@ -282,7 +285,7 @@ $(document).ready(() => {
                         return;
                     }
                     data.add = {};
-                    data.add.order = info.row + 1;
+                    data.add.order = jgclObj.getMaxOrder() + 1;
                     data.add.name = trimInvalidChar(info.editingText);
                 }
 
@@ -329,7 +332,7 @@ $(document).ready(() => {
                     reduce_qty: {type: 'warning', msg: '输入的 本期扣回-数量 非法,已过滤'},
                 };
 
-                const uDatas = [], iDatas = [];
+                const uDatas = [], iDatas = [], maxOrder = jgclObj.getMaxOrder();
                 for (let iRow = 0; iRow < info.cellRange.rowCount; iRow++) {
                     const curRow = info.cellRange.row + iRow;
                     const node = sortData[curRow];
@@ -361,7 +364,7 @@ $(document).ready(() => {
                             data.id = node.id;
                             uDatas.push(data);
                         } else {
-                            data.order = curRow + 1;
+                            data.order = maxOrder + 1 + iRow;
                             iDatas.push(data);
                         }
                     }

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

@@ -131,6 +131,9 @@ $(document).ready(() => {
                 d.end_tp = ZhCalc.add(d.pre_tp, d.tp);
             }
         }
+        getMaxOrder() {
+            return this.data.length > 0 ? this.data[this.data.length - 1].order : 0;
+        }
         loadDatas(datas) {
             this.data = datas;
             this.calculateAll();
@@ -314,7 +317,7 @@ $(document).ready(() => {
                         return;
                     }
                     data.add = {};
-                    data.add.order = info.row + 1;
+                    data.add.order = seOtherObj.getMaxOrder() + 1;
                     data.add.name = trimInvalidChar(info.editingText);
                 }
 
@@ -358,7 +361,7 @@ $(document).ready(() => {
                     tp: {type: 'warning', msg: '输入的 金额 非法,已过滤'},
                 };
 
-                const uDatas = [], iDatas = [];
+                const uDatas = [], iDatas = [], maxOrder = seOtherObj.getMaxOrder();
                 for (let iRow = 0; iRow < info.cellRange.rowCount; iRow++) {
                     const curRow = info.cellRange.row + iRow;
                     const node = sortData[curRow];
@@ -390,7 +393,7 @@ $(document).ready(() => {
                             data.id = node.id;
                             uDatas.push(data);
                         } else {
-                            data.order = curRow + 1;
+                            data.order = maxOrder + iRow + 1;
                             iDatas.push(data);
                         }
                     }

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

@@ -82,6 +82,9 @@ $(document).ready(() => {
                 d.end_tp = ZhCalc.add(d.pre_tp, d.tp);
             }
         }
+        getMaxOrder() {
+            return this.data.length > 0 ? this.data[this.data.length - 1].order : 0;
+        }
         loadDatas(datas) {
             this.data = datas;
             this.calculateAll();
@@ -265,7 +268,7 @@ $(document).ready(() => {
                         return;
                     }
                     data.add = {};
-                    data.add.order = info.row + 1;
+                    data.add.order = seSafeObj.getMaxOrder() + 1;
                     data.add.name = trimInvalidChar(info.editingText);
                 }
 
@@ -309,7 +312,7 @@ $(document).ready(() => {
                     name: {type: 'warning', msg: '名称不可为空,已过滤'},
                 };
 
-                const uDatas = [], iDatas = [];
+                const uDatas = [], iDatas = [], maxOrder = seSafeObj.getMaxOrder();
                 for (let iRow = 0; iRow < info.cellRange.rowCount; iRow++) {
                     const curRow = info.cellRange.row + iRow;
                     const node = sortData[curRow];
@@ -341,7 +344,7 @@ $(document).ready(() => {
                             data.id = node.id;
                             uDatas.push(data);
                         } else {
-                            data.order = curRow + 1;
+                            data.order = maxOrder + iRow + 1;
                             iDatas.push(data);
                         }
                     }

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

@@ -255,7 +255,7 @@ $(document).ready(() => {
                         return;
                     }
                     data.add = {};
-                    data.add.order = info.row + 1;
+                    data.add.order = seTempObj.getMaxOrder() + 1;
                     data.add.name = trimInvalidChar(info.editingText);
                 }
 
@@ -298,7 +298,7 @@ $(document).ready(() => {
                     name: {type: 'warning', msg: '名称不可为空,已过滤'},
                 };
 
-                const uDatas = [], iDatas = [];
+                const uDatas = [], iDatas = [], maxOrder = seTempObj.getMaxOrder();
                 for (let iRow = 0; iRow < info.cellRange.rowCount; iRow++) {
                     const curRow = info.cellRange.row + iRow;
                     const node = sortData[curRow];
@@ -330,7 +330,7 @@ $(document).ready(() => {
                             data.id = node.id;
                             uDatas.push(data);
                         } else {
-                            data.order = curRow + 1;
+                            data.order = maxOrder + iRow + 1;
                             iDatas.push(data);
                         }
                     }