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

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

@@ -303,7 +303,8 @@ export default {
       });
     },
     // 获取异常类型
-    getUnloadError(exceptionList = []) {
+    getUnloadError(exceptionList) {
+      if (!exceptionList) return exceptionList;
       const codes = this.getDictDatas(this.DICT_TYPE.ORDER_ERROR_TYPE);
       let errorLabels = [];
       exceptionList.forEach((item) => {

src/views/ecw/customer/index.vue

@@ -113,8 +113,8 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
+        <template  v-slot = {row}>
+          <span>{{ parseTime(row.enterOpenSeaTime ? row.enterOpenSeaTime : row.estimateEnterOpenSeaTime )  }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName">

src/views/ecw/oceanCustomer/index.vue

@@ -104,6 +104,11 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" >
       </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>

src/views/ecw/order/detail.vue

@@ -196,7 +196,7 @@
         <el-tab-pane :label="$t('运单资料/提货单')" name="three">
           <!--inWarehouseState 1待入库，2多了，3少了，4到齐-->
           <el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState <= 1">{{$t('查看入仓单')}}</el-button>
-          <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.tidanNo">{{$t('查看提货单')}}</el-button>
+          <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.ladingState">{{$t('查看提货单')}}</el-button>
           <el-button :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button>
         </el-tab-pane>
         <el-tab-pane :label="$t('费用明细')" name="four">