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

src/api/ecw/boxSea.js

@@ -870,6 +870,22 @@ export function extraCostList(params) {
   });
 }
 
+/**
+ * 获得额外报关费用列表
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function customsOrderList(data) {
+  return request({
+    url: "/shipment/box/customsOrderList",
+    method: "post",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    data: jsonToFormData(data),
+  });
+}
+
 /*****************************  报关费用 end **********************************/
 
 /*****************************  理货 start **********************************/

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

@@ -25,7 +25,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('正常报关订单')">
-        <div v-for="item in shipmentObj.normalOrderList" :key="item.orderId">
+        <div v-for="item in normalOrderList" :key="item.orderId">
           <a href="javascript:void(0)" @click="jumpOrderDetail(item)">{{ item.orderNo }}</a>
         </div>
       </el-form-item>
@@ -164,6 +164,7 @@ import {
   approvalCancel,
   resetById,
   resetByShipmentId,
+  customsOrderList,
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -229,6 +230,7 @@ export default {
         this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
       )[0].value,
       isDownload: false,
+      normalOrderList: [],
     };
   },
   created() {
@@ -258,8 +260,17 @@ export default {
     ]);
 
     this.cusDeclarationObj = oldData;
+    // this.getCustomsOrderList(oldData.dcCustomsType);
   },
   methods: {
+    getCustomsOrderList(dcCustomsType) {
+      customsOrderList({
+        shipmentId: this.shipmentObj.id,
+        customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,
+      }).then((res) => {
+        this.normalOrderList = res.data ?? [];
+      });
+    },
     regCloseDialog(type) {
       this.regDialogVisible = false;
       if (type === "error") {
@@ -534,6 +545,9 @@ export default {
     },
   },
   watch: {
+    "cusDeclarationObj.dcCustomsType"(val) {
+      this.getCustomsOrderList(val);
+    },
     "cusDeclarationObj.documentInfo"(val) {
       this.isDownload = false;
       if (val.includes("2")) {