Merge branch 'fix' into dev

src/router/index.js

@@ -441,7 +441,13 @@ export const constantRoutes = [
         component: (resolve) => import('@/views/ecw/box/query'),
         props: true,
         name: 'shippingDetail',
-        meta: {titleZh: '出货详情', titleEn: "Shipping Details",  icon: '', activeMenu: '/shipment/boxDetail'}
+        meta: {
+          titleZh: '出货详情',
+          titleEn: "Shipping Details",
+          icon: '',
+          activeMenu: '/shipment/boxDetail',
+          componentPath: 'ecw/box/query'
+        }
       },
       {
         path: 'shippingSea/:shipmentId(\\d+)',
@@ -485,7 +491,13 @@ export const constantRoutes = [
         component: (resolve) => import('@/views/ecw/box/queryAir'),
         props: true,
         name: 'shippingDetail',
-        meta: {titleZh: '出货详情', titleEn: "Shipping Details", icon: '', activeMenu: '/shipment/boxDetail'}
+        meta: {
+          titleZh: '出货详情',
+          titleEn: "Shipping Details",
+          icon: '',
+          activeMenu: '/shipment/boxDetail',
+          componentPath: 'ecw/box/queryAir'
+        }
       },
       {
         path: 'shippingAir/:shipmentId(\\d+)',

src/views/ecw/box/queryAir.vue

@@ -291,7 +291,7 @@
                   >
                 </template>
               </el-table-column>-->
-              
+
               <el-table-column
                 prop=""
                 :label="$t('操作')"
@@ -690,7 +690,7 @@ import { listUser } from "@/api/system/user";
 import unloadingError from "./shippingAir/nodePage/unloading/openError.vue";
 
 export default {
-  name: "EcwBoxBoxQueryAir",
+  name: "EcwBoxQueryair",
   props: {
     shipmentId: String,
   },

src/views/ecw/financial/receiptDetail.vue

@@ -1470,7 +1470,7 @@ export default {
       setTimeout(() => {
         this.addForm = { ...row };
         let bank = this.bankData.find(
-          (v) => v.baAccountNum == this.addForm.accountNo
+          (v) => v.baAccountNum == this.addForm.accountNo &&  v.baAccountName == this.addForm.accountName
         );
         if (bank) this.addForm.accountId = bank.id;
         this.setWriteOffAmount();

src/views/ecw/order/index.vue

@@ -1998,6 +1998,10 @@ export default {
         rows: 10,
         packageTypeArr: [],
       };
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+
       this.queryParams.channelId = "";
       this.noParam.value = "";
       this.prodParam.value = "";

src/views/report/customer_analysis/index.vue

@@ -546,8 +546,8 @@ export default {
         edate4: undefined, //客户创建时间
         sdate5: undefined, //首次成交时间
         edate5: undefined, //首次成交时间
-        orderfield:undefined,//排序字段
-        ordertype:undefined,//排序方式
+        orderfield:null,//排序字段
+        ordertype:null,//排序方式
       },
       // 表单参数
       form: {},