发货

src/views/oms/order/components/deliveryDetail.vue

@@ -160,10 +160,10 @@ export default class DeliveryDetail extends Vue {
   }
   cancelDelivery(){
     let msg = '';
-    if(this.value.shippingType == 'ONE'){
+    if(this.value.shippingType == 'MORE'){
       msg='此操作将导致整车订单的发货被取消，是否继续？'
     }
-    if(this.value.shippingType == 'MORE'){
+    if(this.value.shippingType == 'ONE'){
       msg = '此操作将导致该订单的发货被取消，是否继续？'
     }
     if(msg){

src/views/oms/order/components/deliveryGoodsInfo.vue

@@ -220,7 +220,7 @@ export default class DeliveryGoodsInfo extends Vue {
         tmsUnloadingAddress:[{
           required: true, message: '收货地址不能为空！', trigger: 'blur'
         }],
-        storeHouse:[{
+        storeHouseId:[{
           required: true, message: '请选择仓库！', trigger: 'change'
         }],
         tmsArrivalDate:[{

src/views/oms/order/index.vue

@@ -187,7 +187,7 @@
       <!-- 整车/拼单发货 -->
       <carpoolModal ref="carpoolModal" @handleSuccess="handleSuccess" />
       <!-- 发货单详情 -->
-      <deliveryDetail ref="deliveryDetail" />
+      <deliveryDetail ref="deliveryDetail" @handleSuccess="handleSuccess" />
     </div>
   </div>
 </template>