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

src/views/ecw/box/shippingAir/nodePage/cusDeclaration.vue

@@ -110,6 +110,11 @@
       <el-form-item :label="$t('超重订单')" prop="overOrders"  v-show="cusDeclarationObj.overMachineStatus == 2&&cusDeclarationObj.weightMisreport == 4">
         <ordersSelect v-model="cusDeclarationObj.overOrders" :placeholder="$t('请选择超重订单')" :shipmentId="shipmentObj.id" />
       </el-form-item>
+      <el-form-item prop="overOrders"  v-show="cusDeclarationObj.overOrders.length > 0">
+        <div v-for="order in cusDeclarationObj.overOrders" :key="order">
+          {{getOrders(order)}} <el-button type="text" @click="$router.push('/order/warehousing-update?id='+order)">{{$t('入仓修改')}}</el-button>
+        </div>
+      </el-form-item>
 
       <!-- <el-form-item :label="$t('装箱单')">
         <el-button type="primary">{{$t('下载装箱单')}}</el-button>
@@ -206,7 +211,8 @@ import {
   resetById,
   resetByShipmentId,
   customsOrderList,
-  approvalCreate
+  approvalCreate,
+  boxGoodsDetail
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -278,6 +284,7 @@ export default {
       isDownload: false,
       normalOrderList: [],
       isShowNormal: false,
+      sectionOrderList: []
     };
   },
   created() {
@@ -320,6 +327,12 @@ export default {
         this.$set(this.cusDeclarationObj, "deleteExitTime", details.deleteExitTime)
       }
     }
+    boxGoodsDetail({
+                shipmentId: this.shipmentObj.id,
+                secId: 0
+            }).then((res) => {
+                this.sectionOrderList = res.data.sectionOrderList;
+            });
   },
   methods: {
     strToArray(str) {
@@ -340,6 +353,13 @@ export default {
         }
       });
     },
+    getOrders(id) {
+      let order = this.sectionOrderList.find(item=>item.orderId==id)
+      if(order){
+        return order.orderNo
+      }
+      return ''
+    },
     regCloseDialog(type) {
       this.regDialogVisible = false;
       if (type === "error") {