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

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

@@ -16,7 +16,7 @@
        {{$t('过机重量异常')}}: {{$t('过机放行-未找到重货订单')}}
       </p>
       <p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.weightMisreport==4">
-       {{$t('过机重量异常')}}: {{$t('过机放行-已找到重货订单')}}:{{pageData.boxCustomsBackVO.overOrders}}
+       {{$t('过机重量异常')}}: {{$t('过机放行-已找到重货订单')}}:<span v-for="order in strToArray(pageData.boxCustomsBackVO.overOrders)" :key="order">{{ getOrders(order) }}</span>
       </p>
     </el-row>
     <el-row class="number-area">
@@ -153,6 +153,7 @@ import {
   approvalCancel,
   getSectionList,
   singleUnload,
+  boxGoodsDetail
 } from "@/api/ecw/boxSea";
 import { serviceMsg, getTotlContent, toReviewDetail } from "../../utils";
 import WorkFlow from "@/components/WorkFlow";
@@ -192,6 +193,7 @@ export default {
         totalStatistics: {},
       },
       selectedUsers: [],
+      sectionOrderList: []
     };
   },
   created() {
@@ -205,9 +207,29 @@ export default {
         };
       });
     });
+    boxGoodsDetail({
+      shipmentId: this.$attrs.shipmentObj.id,
+      secId: 0
+    }).then((res) => {
+      this.sectionOrderList = res.data.sectionOrderList
+    })
   },
   methods: {
     getTotlContent,
+    getOrders(id) {
+      let order = this.sectionOrderList.find((item) => item.orderId == id)
+      if (order) {
+        return order.orderNo
+      }
+      return ''
+    },
+    strToArray(str) {
+      if (!str) return []
+      let array = str?.split(',') ?? []
+      return array.map((item) => {
+        return Number(item)
+      })
+    },
     /* 获取卸柜数据 */
     getLoadGoodsList() {
       this.loading = true;