Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/channel/componrnts/packaging-type.vue

@@ -4,7 +4,7 @@
     <el-row type="flex" align="align" :gutter="10" >
       <el-col :span="6">{{$t('空运订单重量上限')}}(kg)</el-col>
       <el-col :span="6" >
-        <el-input-number v-model="value1.airWeightLimit"  controls-position="right"   :max="screenCom"></el-input-number>
+        <el-input-number v-model="value1.airWeightLimit"  controls-position="right"  ></el-input-number>
 <!--        <el-input type="number" :max="2000"   v-model="value1.airWeightLimit"></el-input>-->
       </el-col>
       <el-col :span="6">