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/api/ecw/order.js

@@ -557,6 +557,7 @@ export function orderExportSearch(params){
   return request({
     url: '/ecw/order/export/search',
     method: 'GET',
+    timeout: 5 * 60000,
     responseType: 'arraybuffer',
     params
   })
@@ -568,6 +569,7 @@ export function orderExportMySearch(params){
     url: '/ecw/order/export/my/search',
     responseType: 'arraybuffer',
     method: 'GET',
+    timeout: 5 * 60000,
     params
   })
 }
@@ -578,6 +580,7 @@ export function orderExportDeptSearch(params){
     url: '/ecw/order/export/dept/search',
     method: 'GET',
     responseType: 'arraybuffer',
+    timeout: 5 * 60000,
     params
   })
 }
@@ -588,6 +591,7 @@ export function exportAbnormal(params){
     url: '/ecw/order/export/export-exception',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -599,6 +603,7 @@ export function exportHeavyOrder(params){
     url: '/ecw/order/export/export-heavyOrder',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -609,6 +614,7 @@ export function exportReturnOrder(params){
     url: '/ecw/order/export/export-returnOrder',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -619,6 +625,7 @@ export function exportSaleRepay(params){
     url: '/ecw/order/export/export-saleRepay',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -630,6 +637,7 @@ export function exportCustomsDatas(params){
     url: '/ecw/order/export/export-customDatas',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -641,6 +649,7 @@ export function exportShippingDatas(params){
     url: '/ecw/order/export/export-shipDatas',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -652,6 +661,7 @@ export function exportShipFee(params){
     url: '/ecw/order/export/export-shipFee',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }
@@ -663,6 +673,7 @@ export function exportUnload(params){
     url: '/ecw/order/export/export-excel',
     method: 'get',
     params: params,
+    timeout: 5 * 60000,
     responseType: 'blob'
   })
 }

src/views/ecw/box/indexSea.vue

@@ -297,7 +297,7 @@ export default {
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == "1" || item.value == "2");
     getWarehouseList().then((res) => (this.warehouseList = res.data));
-    getCabinetPage(null).then((response) => {
+    getCabinetPage({status:0}).then((response) => {
       this.cabinetList = response.data.list;
     });
     this.getList();

src/views/ecw/box/indexSeaAir.vue

@@ -301,7 +301,7 @@ export default {
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == "4");
     getWarehouseList().then((res) => (this.warehouseList = res.data));
-    getCabinetPage(null).then((response) => {
+    getCabinetPage({status:0}).then((response) => {
       this.cabinetList = response.data.list;
     });
     this.getList();

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -50,6 +50,7 @@ import html2canvas from 'html2canvas';
 import { jsPDF } from "jspdf";
 import {uploadFile} from '@/api/infra/file'
 import FileSaver from 'file-saver'
+import {getOrder, getOrderDetail} from "@/api/ecw/order";
 window.html2canvas = html2canvas
 export default {
   name: "makeLadingBill",
@@ -175,7 +176,13 @@ export default {
     showLoaingTemplate() {
       this.visible = true;
     },
+    // 先获取订单信息，pdf用 订单号+唛头命名
     createPdf(){
+      getOrder(this.currRow.orderId).then(res => {
+        this.afterCreatePdf(res.data)
+      })
+    },
+    afterCreatePdf(orderData){
       let loading = this.$loading()
       html2canvas(document.querySelector("#html2canvas-container"), {dpi:144, useCORS: true}).then(canvas => {
         const doc = new jsPDF('p','pt','a4',true);
@@ -194,13 +201,13 @@ export default {
         /* doc.save("a4.pdf");
         return Promise.reject() */
         let form = new FormData()
-        let file = this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
+        let file = this.currRow.orderNo + '-' + orderData.marks + '.pdf' //this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
 
         form.append('file', new File([doc.output('arraybuffer')], file, {type: 'application/pdf'}))
         form.append('path', `admin/shipment/${this.selfNo}/pdf/${file}`) // 最前面不能有/，否则返回的url会有两个/
 
         /* let blob = new Blob([doc.output('arraybuffer')], {type: "application/pdf"})
-        FileSaver.saveAs(blob, file); 
+        FileSaver.saveAs(blob, file);
         return */
         return uploadFile(form)
       }).then(res => {

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/box/shippingSea/nodePage/tally/index.vue

@@ -178,7 +178,7 @@ export default {
             list.push({
               ...oItem,
               warehouseInInfo,
-              // multiSpecification: item.multiSpecification,
+              multiSpecification: item.multiSpecification,
               positionNo: oItem.positionNo,
               tallyStatus: item.tallyStatus,
               tallyTime: item.tallyTime,

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -105,6 +105,7 @@ export default {
       currNode: {},
       // 数据
       processData: this.seaBaseData,
+      errorMsg: this.$t('请先完成上一步')
     };
   },
   created() {},
@@ -137,7 +138,7 @@ export default {
         return;
       }
       if (currIndex > this.currIndex) {
-        this.$message.error(this.$t("请先完成上一步"));
+        this.$message.error(this.errorMsg);
         return;
       }
       this.currNode = node;
@@ -247,6 +248,7 @@ export default {
               (type === "departure" && val.shippingHasAbnormal) ||
               (type === "arrival" && val.arrivalHasAbnormal)
             ) {
+              this.errorMsg = this.$t('请先处理完出货异常，再进行操作')
               continue;
             }
             // 报关

src/views/ecw/order/splitApply.vue

@@ -391,6 +391,12 @@ export default {
           });
         },
       },
+      // 关闭放入弹层的时候清理弹层表单内容
+      shopOpen(show){
+          if(!show){
+            this.shopForm = {}
+          }
+      }
     },
   computed:{
     getDictData(){

src/views/ecw/order/success.vue

@@ -8,14 +8,14 @@
                 <div class="title">{{$t('新增订单生成成功')}}</div>
                 <div class="line">{{$t('订单号')}}：{{order.orderNo}}</div>
                 <div class="line">{{$t('运输方式')}}：<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /></div>
-                <div class="line">{{$t('路线')}}：{{order.logisticsInfoDto.startTitleZh}} >> {{order.logisticsInfoDto.destTitleZh}}</div>
+                <div class="line">{{$t('路线')}}：{{$l(order.logisticsInfoDto, 'startTitle')}} >> {{$l(order.logisticsInfoDto, 'destTitle')}}</div>
                 <div class="line">{{$t('商品列表')}}：
                     <span v-for="(item, index) in order.orderItemVOList" :key="index">
-                        {{item.prodTitleZh}}
+                        {{$l(item, 'prodTitle')}}
                         <template v-if="index < order.orderItemVOList.length - 1">{{ $t('、') }}</template>
                     </span>
                 </div>
-                <div class="line">{{$t('仓库地址')}}：{{order.logisticsInfoDto.startAddressZh}}</div>
+                <div class="line">{{$t('仓库地址')}}：{{$l(order.logisticsInfoDto, 'startAddress')}}</div>
                 <div class="line">{{$t('仓库电话')}}： {{order.logisticsInfoDto.startTell}}</div>
                 <!-- v1.7新增 -->
                 <div class="line">{{$t('为保证入仓数据准确性，入仓请带上一份装箱单（品名，件数，毛重，尺寸方数，是否有牌）')}}</div>
@@ -94,4 +94,4 @@ export default {
     display: flex;
     justify-content: center;
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -43,7 +43,7 @@
         :label="$t('入库货物属性')">
         <template v-slot="{row}">
           <template v-if="row.warehouseInInfoVO">
-            {{$t('品牌')}}：{{ [$t('无牌'), $t('有牌'), $t('中性')][row.feeType] }}<br>
+            {{$t('品牌')}}：{{ row.brandName }}<br>
             {{$t('箱数')}}：{{ row.warehouseInInfoVO.cartonsNum }}<br>
             {{$t('体积')}}：{{ row.warehouseInInfoVO.volume }}m³<br>
             {{$t('重量')}}：{{ row.warehouseInInfoVO.weight }}Kg