Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1412,6 +1412,7 @@
           <el-table-column type="selection" width="55" />
           <el-table-column prop="mblno" label="提单号" />
           <el-table-column prop="orderNo" label="运单号" />
+          <el-table-column prop="carregNo" label="车牌号" />
           <el-table-column prop="loadAddr" label="提箱地点" />
           <el-table-column prop="loadDate" label="提箱时间" />
         </el-table>
@@ -1638,8 +1639,9 @@ export default {
       revokeStowage(row.id).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("配载撤销成功");
-          this.$set(row, "mBillNo", null);
-          this.$set(row, "billKind", response.data.billKind);
+          response.data.map((e,index)=>{
+            this.$set(this.vehicleList,index,e)
+          })
         }
       });
     },
@@ -1664,11 +1666,10 @@ export default {
             this.msgSuccess("配载成功");
             this.stowageDialog = false;
             let row = response.data;
-            this.vehicleList.map((e) => {
-              if (e.id == row.id) {
-                e.mBillNo = row.mBillNo;
-              }
-            });
+
+            response.data.map((e,index)=>{
+              this.$set(this.vehicleList,index,e)
+            })
             this.addStowagData = "";
           }
         });
@@ -1973,6 +1974,8 @@ export default {
               response.data.plan.carQty
             );
             this.$set(row, "orderStatus", response.data.cars.orderStatus);
+            this.$set(row, "billKind", response.data.cars.billKind);
+            this.$set(row, "mBillNo", response.data.cars.mBillNo);
             this.$set(row, "orderNo", response.data.cars.orderNo);
             this.$set(row, "orgId", response.data.cars.orgId);
             this.$set(row, "id", response.data.cars.id);
@@ -1990,6 +1993,8 @@ export default {
               response.data.plan.carQty
             );
             this.$set(row, "orderStatus", response.data.cars.orderStatus);
+            this.$set(row, "billKind", response.data.cars.billKind);
+            this.$set(row, "mBillNo", response.data.cars.mBillNo);
             this.$set(row, "orderNo", response.data.cars.orderNo);
             this.$set(row, "orgId", response.data.cars.orgId);
             this.$set(row, "id", response.data.cars.id);