修改

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

@@ -118,7 +118,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="500px"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
         class="table"

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

@@ -607,7 +607,8 @@ export default {
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].wagonNo === data[i - 1].wagonNo
+          if (data[i].orderId === data[i - 1].orderId
+          &&  data[i].wagonNo === data[i - 1].wagonNo
           && data[i].OutStation === data[i - 1].OutStation) {
             this.spanArr[this.pos] += 1;
             data[i].group = data[i - 1].group;

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

@@ -67,7 +67,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="800px"
+        max-height="500px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -83,6 +83,13 @@
         >
           <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
         </el-table-column>
+        <el-table-column
+          prop="saleOrderNo"
+          label="单据编号"
+          width="200px"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="收货单位"
@@ -132,12 +139,12 @@
               :fetch-suggestions="querySearch"
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
-              :disabled="scope.row.isCapacityShow != 1"
+              :disabled="scope.row.isCapacityShow != 1 || scope.row.orderStatus == 2"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"
               type="primary"
-              v-if="scope.row.isCapacityShow == 1"
+              v-if="scope.row.isCapacityShow == 1 && scope.row.orderStatus != 2"
               >提交</el-button
             >
           </template>
@@ -351,6 +358,7 @@ export default {
       isCellClick: 0,
       //需要合并的行
       mergeList: [
+        "saleOrderNo",
         "shipperName",
         "capacityTel",
         "orderNo",
@@ -802,6 +810,7 @@ export default {
       });
       if (row.capacityTel == null || row.capacityTel == "") {
         this.$message.error("电话号码不能为空");
+        loading.close();
         return;
       }
       this.axios
@@ -1196,7 +1205,8 @@ export default {
           selection.find(
             item =>
               item.lineId != selection[0].lineId ||
-              item.saleOrderId != selection[0].saleOrderId
+              item.saleOrderId != selection[0].saleOrderId ||
+              item.sendStation != selection[0].sendStation
           )
         ) {
           this.$message({