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

src/views/ecw/order/index.vue

@@ -343,9 +343,17 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
+								<!--可出后不显示拆单（经确认合单也不显示） https://zentao.test.jdshangmen.com/bug-view-5322.html-->
+                <template
+                  v-if=" ([3,4].indexOf(scope.row.transportId) < 0 || scope.row.airShipment < 2) &&
+                  (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314))
+                  && !scope.row.abnormalState && scope.row.status > 3
+                  && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
-                  <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
+
+                  <el-dropdown-item
+                    @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"
+                    v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
 
                 <!--撤销拆单，拆单的子订单,预装前显示，预装后变灰不可点击-->

src/views/ecw/order/stocking/components/Package.vue

@@ -242,7 +242,6 @@ import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue";
 
 export default {
   name: "Package",
-
   components: {
     ImageAndVideoUpload,
     WarehouseRecordDetail,

src/views/ecw/order/stocking/index.vue

@@ -5,7 +5,11 @@
 
     <order-base-info :order="order" stocking></order-base-info>
 
-    <h2>{{$t('货物信息')}}</h2>
+    <div class="flex items-center">
+			<div class="flex-1 page-title">{{$t('货物信息')}}</div>
+      <el-button type="primary" @click="showNewProductDialog=true">{{$t('添加新品名')}}</el-button>
+    </div>
+
     <!--
     未入仓的不显示 https://zentao.test.jdshangmen.com/bug-view-5292.html
     -->
@@ -234,6 +238,11 @@
       v-if="!!packageOrderItem"
       @close="onPackageClose"
     ></package>
+		<new-product
+			:order="order"
+			v-if="showNewProductDialog"
+			@close="onPackageClose"
+		></new-product>
     <media-dialog v-if="curPictrues" :value="curPictrues" @close="curPictrues=null"></media-dialog>
   </div>
 </template>
@@ -277,7 +286,8 @@ export default {
     PrintWarehouseReceipt,
     imageUpload,
     ImageAndVideoUpload,
-    Package
+    Package,
+    NewProduct: () => import('@/views/ecw/order/stocking/components/NewProduct.vue')
   },
 
   mounted() {
@@ -346,7 +356,9 @@ export default {
       packageWarehouseItem: null,
       productAttrList: [],
       // 当前查看的影像
-      curPictrues: null
+      curPictrues: null,
+      // 是否显示添加新品弹窗
+      showNewProductDialog: false
     }
   },
 
@@ -437,6 +449,7 @@ export default {
     onPackageClose(){
       this.packageOrderItem=null;
       this.packageOrderItem=null;
+      this.showNewProductDialog = false
       this.getList()
     },
     showMedia(orderItem){

src/views/ecw/productPrice/edit.vue

@@ -715,7 +715,7 @@ export default {
     }
 
     // 显示渠道（修改或者从异常处理等进入携带了渠道参数）
-    if(this.form.shippingChannelId){
+    if(this.form.shippingChannelId && this.type == 'air'){
       getChannel(this.form.shippingChannelId).then(res => {
         this.channel = res.data
       })

src/views/ecw/productPrice/index.vue

@@ -157,12 +157,15 @@
                 {{ getCurrencyTitle(scope.row.priceStepList[0].transportPriceUnit) + '/' + getUnitTitle(scope.row.priceStepList[0].transportVolumeUnit)}}
                 <br />
                 <template v-if="[3,4].indexOf(+scope.row.warehouseLineDO.transportType) > -1">
-                  <!--空运的清关费-->
-                  <template v-if="scope.row.clearPriceStepList.length">
+                  <!--
+                  空运的清关费
+                  根据要求隐藏列表的空运清关费 https://zentao.test.jdshangmen.com/bug-view-5298.html
+                  -->
+                  <!--<template v-if="scope.row.clearPriceStepList.length">
                     {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearPriceStepList[0].clearancePriceUnit) + scope.row.clearPriceStepList[0].clearancePrice}}&nbsp;
                     {{ getCurrencyTitle(scope.row.clearPriceStepList[0].clearancePriceUnit) + '/' + getUnitTitle(scope.row.clearPriceStepList[0].clearanceVolumeUnit)}}
                   </template>
-                  <template v-else>{{$t('暂无清关费设置')}}</template>
+                  <template v-else>{{$t('暂无清关费设置')}}</template>-->
                 </template>
                 <template v-else>
                   <!--海运的清关费-->