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

src/api/ecw/boxSea.js

@@ -536,12 +536,27 @@ export function deleteGoods(id) {
  */
 export function createGoods(data) {
   return request({
-    url: "/ecw/box-preload-goods/create",
+    url: "/ecw/box-preload-goods/v2/create",
     method: "post",
     data,
   });
 }
 
+/**
+ * 获得订单所有关联列表
+ *
+ * @export
+ * @param {*} params
+ * @return {*}
+ */
+export function getAllRelateOrderList(params) {
+  return request({
+    url: "/order/guanlian/getAllRelateOrderList",
+    method: "get",
+    params,
+  });
+}
+
 /**
  * 预装关联订单
  *

src/i18n/languages/en_US.json

@@ -3845,5 +3845,36 @@
     "CTN NO": "",
     "请输入CTN NO": "请输入CTN NO",
     "境内外类型": "Internal and external types",
-    "为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）":"To ensure the accuracy of warehousing information, please bring a packing list with goods when entrying the warehouse. (Packing list should contain: Product name, Number of cartons, Gross weight, Measurements, Branded or not)"
-}
+    "为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）": "To ensure the accuracy of warehousing information, please bring a packing list with goods when entrying the warehouse. (Packing list should contain: Product name, Number of cartons, Gross weight, Measurements, Branded or not)",
+    "姓名(英文)": "Name (English)",
+    "公司(英文)": "Company (English)",
+    "入仓体积": "",
+    "收费体积": "",
+    "入仓重量": "",
+    "收费重量": "",
+    "数据无效": "",
+    "客户英文名称": "the customer's English name",
+    "请输入客户英文名称": "Please enter the customer's English name",
+    "付款人姓名": "The sender's name",
+    "请输入付款人姓名": "Please enter the name of the payer",
+    "公司英文名称": "Company English Name",
+    "联系人英文名称": "Contact's English name",
+    "请输入联系人英文名称": "Please enter the contact's name in English",
+    "入仓修改时间": "",
+    "退仓图片": "",
+    "发货人中文名称": "The sender's Chinese name",
+    "发货人英文名称": "The sender's English name",
+    "发货人公司中文名称": "Sender Company's Chinese name",
+    "发货人公司英文名称": "Sender Company's English name",
+    "收货人中文名称": "Consignee's Chinese name",
+    "收货人英文名称": "Consignee's English name",
+    "收货人公司中文名称": "Consignee company Chinese name",
+    "收货人公司英文名称": "Consignee company English name",
+    "显示更多": "Show more",
+    "订单包含不接受货物，请检查": "The order contains goods that are not accepted. Please check.",
+    "撤销拆单": "Cancel split order",
+    "新增品名中文": "New product name in Chinese",
+    "新增品名英文": "New product name in English",
+    "{prods}等商品拆单总数据跟主单不匹配": "The total data for the split order of {prods} products does not match the main order.",
+    "入仓特性": ""
+}
\ No newline at end of file

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -319,9 +319,15 @@
     </el-row>
     <!-- 关联订单弹窗 -->
     <el-dialog :title="relationOrderListDialog.title" :visible.sync="relationOrderListDialog.visible" width="30%" append-to-body>
-      <el-row v-for="(item,index) in relationOrderListDialog.data" :key="item.id">
-        {{index+1}}. {{item.orderNo}}
-      </el-row>
+      <el-tree
+      :data="relationOrderListDialog.data"
+      node-key="id"
+      default-expand-all
+      :expand-on-click-node="false">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span>{{ data.order.orderNo }}</span>
+      </span>
+    </el-tree>
       <el-row style="margin-top: 10px;text-align: center;">
         <el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
       </el-row>
@@ -343,6 +349,7 @@ import {
   approvalCreate,
   approvalCancel,
   loadRelationOrder,
+  getAllRelateOrderList
 } from "@/api/ecw/boxSea";
 import userSelect from "./common/userSelect.vue";
 import {
@@ -516,10 +523,12 @@ export default {
     },
     /**查看关联订单 */
     getRelationOrder(item) {
-      console.log(item)
-      this.relationOrderListDialog.title = item.orderNo+'关联订单'
-      this.relationOrderListDialog.visible = true
-      this.relationOrderListDialog.data = item.relateOrderList
+      getAllRelateOrderList({orderId:item.orderId,orderNo:item.orderNo}).then(res=>{
+        this.relationOrderListDialog.title = item.orderNo+'关联订单'
+        this.relationOrderListDialog.visible = true
+        this.relationOrderListDialog.data = [res.data]
+      })
+      
     },
     /** 搜索按钮操作 */
     handleQuery(type) {

src/views/ecw/order/cargoControl.vue

@@ -57,6 +57,13 @@
           <el-option :label="$t('自有仓')" :value="0"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('订单类型')" prop="number">
+        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable >
+          <el-option :label="$t('普通订单')" :value="0"></el-option>
+          <el-option :label="$t('集运服务')" :value="1"></el-option>
+          <el-option :label="$t('海外仓')" :value="2"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"

src/views/ecw/order/detail.vue

@@ -9,7 +9,7 @@
       <el-row :gutter="24">
         <el-col :span="10" v-if="order.consignorVO">
           <el-descriptions class="margin-top" border :title="$t('发货人')" :column="2" :labelStyle="{width:'150px'}">
-            <el-descriptions-item :label="$t('发货人Z中文名称')">{{order.consignorVO.name}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('发货人中文名称')">{{order.consignorVO.name}}</el-descriptions-item>
              <!-- v1.7新增 -->
              <el-descriptions-item :label="$t('发货人英文名称')">{{order.consignorVO.nameEn}}</el-descriptions-item>
             <el-descriptions-item :label="$t('发货人电话')">

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

@@ -85,6 +85,13 @@
             <el-option :label="$t('自有仓')" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('订单类型')" prop="number">
+          <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable >
+            <el-option :label="$t('普通订单')" :value="0"></el-option>
+            <el-option :label="$t('集运服务')" :value="1"></el-option>
+            <el-option :label="$t('海外仓')" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
           <!-- <el-button icon="el-icon-refresh" @click="reset">{{ $t('重置') }}</el-button> -->

src/views/ecw/order/index.vue

@@ -105,7 +105,13 @@
         <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
-
+      <el-form-item :label="$t('订单类型')" prop="number">
+        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable >
+          <el-option :label="$t('普通订单')" :value="0"></el-option>
+          <el-option :label="$t('集运服务')" :value="1"></el-option>
+          <el-option :label="$t('海外仓')" :value="2"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>