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

src/views/ecw/box/shippingAir/nodePage/cabinet/index.vue

 <template>
   <div>
     <el-form ref="cabinetForm" :rules="rules" :model="cabinetObj" label-width="80px">
-      <el-form-item :label="$t('到仓时间')">
+      <el-form-item :label="$t('到仓时间1')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('仓库')">

src/views/ecw/box/shippingAir/nodePage/unloading/index.vue

@@ -9,20 +9,20 @@
       <el-form-item :label="$t('到仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('卸柜时间')">
+<!--      <el-form-item :label="$t('卸柜时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
       <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
-      <el-button type="danger" @click="startUnloading" :disabled="isStartUnloading">{{$t('开始卸柜')}}</el-button>
+      <el-button type="danger" @click="startUnloading" :disabled="isStartUnloading">{{$t('到仓')}}</el-button>
     </el-row>
 
     <!-- 开始卸柜 -->
-    <el-dialog :title="$t('开始卸柜')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
+    <el-dialog :title="$t('到仓')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
       <startUnloading v-if="dialogVisible" v-bind="$attrs" @closeStart="closeStart" />
     </el-dialog>
   </div>

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -2,14 +2,17 @@
   <div class="app-startUnloading">
 
     <!-- 自编号 -->
+    <el-row>
+      <p style="color:#D9001B;">{{$t('过机重量异常')}}:机场误差3%以内/我司误差超10kg/超过机场重量《N》kg</p>
+    </el-row>
     <el-row class="number-area">
       <p class="label-font">{{$t('自编号')}}：</p>
       <p class="label-font">{{selfNo}}</p>
       <el-input v-model="labelNo" :placeholder="$t('请输入')"></el-input>
       <div>
-        <el-button type="primary" @click="modifyUnload">{{$t('提交')}}</el-button>
+        <!-- <el-button type="primary" @click="modifyUnload">{{$t('提交')}}</el-button> -->
         <el-button type="primary" @click="modifyBatchUnload">{{$t('批量输入')}}</el-button>
-        <el-button type="primary" @click="modifyAllUnload">{{$t('一键卸柜')}}</el-button>
+        <el-button type="primary" @click="modifyAllUnload">{{$t('全部到仓')}}</el-button>
       </div>
     </el-row>
 
@@ -74,9 +77,12 @@
             {{getUnloadError(scope.row.exceptionList)}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button type="danger" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
+        <el-table-column :label="$t('操作')" align="center" width="170" class-name="small-padding fixed-width">
+          <template slot-scope="scope"  >
+            <div class="number-area">
+              <el-button type="danger" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
+              <el-button plain type="primary" size="small" @click="openError(scope.row)">{{$t('出仓修改 ')}}</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -106,7 +112,7 @@
       </div>
       <!-- 操作 -->
       <div v-if="!isUnderReview">
-        <el-button type="success" @click="onSubmit">{{$t('卸柜完成')}}</el-button>
+        <el-button type="success" @click="onSubmit">{{$t('完成到仓')}}</el-button>
         <el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button>
       </div>
       <div v-if="isUnderReview">

src/views/ecw/order/pending.vue

@@ -278,43 +278,46 @@ export default {
         if(row.orderItemId){
           var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
           if(productData){
-            getProduct(productData.prodId).then(res=>{
-                let params = {
-                  product_id: productData.prodId,
-                  product_type: res.data.typeId,
-                  transportId: this.orderData.transportId,
-                  exportCity: this.orderData.logisticsInfoDto.startCityId,
-                  importCity: this.orderData.logisticsInfoDto.destCityId,
-                  startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
-                  destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
-                  lineId: this.orderData.logisticsInfoDto.lineId,
-                  channelId: this.orderData.logisticsInfoDto.channelId
-                }
-                let queryParams = {
-                  productId: productData.prodId,
-                  lineId: this.orderData.logisticsInfoDto.lineId,
-                  channelId: this.orderData.logisticsInfoDto.channelId
-                }
-                let url = ''
-                if([3,4].indexOf(this.orderData.transportId) > -1){
-                  url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
-                }else{
-                  url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
-                }
-
-                getProductPriceGetPrice(queryParams).then(res=>{
-                  console.log(res)
-                  if(res.data){
-                     if([3,4].indexOf(+this.orderData.transportId) > -1){
-                        url =  '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
-                     }else{
-                        url =  '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
-                     }
-
+            if(row.orderExceptionType=='customs_fee_not_quote_exception'&&productData.prodId){
+              this.$router.push('/product/product-list?prodId=' + productData.prodId)
+              return
+            }else{
+              getProduct(productData.prodId).then(res=>{
+                  let params = {
+                    product_id: productData.prodId,
+                    product_type: res.data.typeId,
+                    transportId: this.orderData.transportId,
+                    exportCity: this.orderData.logisticsInfoDto.startCityId,
+                    importCity: this.orderData.logisticsInfoDto.destCityId,
+                    startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
+                    destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
+                    lineId: this.orderData.logisticsInfoDto.lineId,
+                    channelId: this.orderData.logisticsInfoDto.channelId
+                  }
+                  let queryParams = {
+                    productId: productData.prodId,
+                    lineId: this.orderData.logisticsInfoDto.lineId,
+                    channelId: this.orderData.logisticsInfoDto.channelId
                   }
-                  return this.$router.push(url)
-                })
+                  let url = ''
+                  if([3,4].indexOf(this.orderData.transportId) > -1){
+                    url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
+                  }else{
+                    url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
+                  }
+
+                  getProductPriceGetPrice(queryParams).then(res=>{
+                    console.log(res)
+                    if(res.data){
+                       if([3,4].indexOf(+this.orderData.transportId) > -1){
+                          url =  '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
+                       }else{
+                          url =  '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
+                       }
 
+                    }
+                    return this.$router.push(url)
+                  })
                 /* +productData.prodId
                 +'&product_type='+res.data.typeId
                 +'&transportId='+this.orderData.transportId
@@ -322,6 +325,7 @@ export default {
 
             })
           }
+          }
         }else{
           return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
               let url = ''

src/views/ecw/productBrank/index.vue

@@ -63,7 +63,7 @@
       </el-table-column>
       <el-table-column :label="$t('创建人')" align="center" prop="creator" width="180">
         <template v-slot="{row}">
-          {{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}}
+          {{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator) && allSimplList.find(i => i.id == row.creator).nickname}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
@@ -73,7 +73,7 @@
       </el-table-column>
       <el-table-column :label="$t('修改人')" align="center" prop="updater" width="180">
         <template v-slot="{row}">
-          {{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}}
+          {{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater) && allSimplList.find(i => i.id == row.updater).nickname}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180">