一磅过

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -495,7 +495,7 @@ export default {
       operateName: '编辑',
       unloadPointList: [],
       spanArr: [],
-      mergeList: ['wagonNo', 'wagonBillWeight', 'OutStation'],
+      mergeList: ['wagonNo', 'wagonBillWeight', 'OutStation','weightBatchId'],
       filterMap: {},
       filterConsigneeList: [],
       filterEnStationList: [],

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -3333,7 +3333,7 @@ export default {
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
             this.spanArr[this.pos] += 1
 
             this.spanArr.push(0)
@@ -3354,7 +3354,7 @@ export default {
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
             this.spanArr1[this.pos] += 1
 
             this.spanArr1.push(0)

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -4870,7 +4870,7 @@ export default {
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
             this.spanArr[this.pos] += 1
             // data[i].group = data[i - 1].group
             this.spanArr.push(0)

src/views/statisticalReport/components/salesLogisticsStatistics/unloadingSteelReports.vue

@@ -578,7 +578,7 @@ export default {
           this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId || ( data[i].weightBatchId && data[i].weightBatchId ===data[i - 1].weightBatchId)) {
             this.spanArr[this.pos] += 1
             data[i].group = data[i - 1].group
             this.spanArr.push(0)