fix:bug

src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -227,10 +227,10 @@ export default {
     this.getHeightData();
     this.getSujectList();
   },
-  watch:{
-    tableData(val){
-      this.merage()
-    }
+  watch: {
+    tableData(val) {
+      this.merage();
+    },
   },
   computed: {
     compay: function () {
@@ -366,8 +366,33 @@ export default {
     },
     uploadDatas(lists) {
       if (!lists.length) return;
-      let list = lists.sort((a, b) => {
-        return a.goodsType - b.goodsType;
+      let arrays = [];
+      for (let i = 0; i < lists.length; i++) {
+        if (arrays.length) {
+          let aIndex = arrays.findIndex((item) => {
+            return item.subjectId === lists[i].subjectId;
+          });
+          if (aIndex !== -1) {
+            arrays[aIndex].list.push(lists[i]);
+          } else {
+            arrays.push({
+              subjectId: lists[i].subjectId,
+              list: [lists[i]],
+            });
+          }
+        } else {
+          arrays.push({
+            subjectId: lists[i].subjectId,
+            list: [lists[i]],
+          });
+        }
+      }
+      let list = []
+      arrays.forEach((item) => {
+        item.list = item.list.sort((a, b) => {
+          return a.goodsType - b.goodsType;
+        });
+        list.push(...item.list)
       });
       const index = this.tableData.findIndex((item) => {
         return item.realname === list[0].realname;
@@ -491,9 +516,9 @@ export default {
           }
           // 第三列
           if (
-           arys[i].telphone === arys[i - 1].telphone &&
-           arys[i].idCard === arys[i - 1].idCard &&
-           arys[i].realname === arys[i - 1].realname
+            arys[i].telphone === arys[i - 1].telphone &&
+            arys[i].idCard === arys[i - 1].idCard &&
+            arys[i].realname === arys[i - 1].realname
           ) {
             this.feeArr[this.feePos] += 1;
             this.feeArr.push(0);