Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/weightDeal.vue

@@ -128,6 +128,7 @@
         <div v-if="list.orderExceptionStatus!=2">
           <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
           <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
+          <el-button v-if="type!='order_heavy_cargo_exception'" plain type="primary" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
         </div>
         <div v-else>
           <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>