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

src/views/ecw/cons/index.vue

@@ -170,6 +170,7 @@
           <el-button size="mini" type="text" icon="el-icon-edit" @click="transmutation(scope.row)">{{$t('转异')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="specialNeedsCons(scope.row)">{{$t('特需')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="specialNeedsConsLook(scope.row)">{{$t('特需查看')}}</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="feeApplication(scope.row)">{{$t('费用申请')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -253,6 +254,7 @@
     <Transmutation :showException.sync="showException" :id="id" @determine="getList"></Transmutation>
     <SpecialNeedsCons :showSpecialNeedsCons.sync="showSpecialNeedsCons" :currency="JSON.stringify(currencyList)" :consId="id" :consNum="consNum" @determine="getList"></SpecialNeedsCons>
     <SpecialNeedsConsLook :showSpecialNeedsConsLook.sync="showSpecialNeedsConsLook" :consNum="consNum" :consId="id"></SpecialNeedsConsLook>
+    <fee-application-cons v-if="feeApplicationBol" :order-id="id" :currencys="JSON.stringify(currencyList)" :dialog-visible.sync="feeApplicationBol "@refresh="getList"></fee-application-cons>
 
   </div>
 </template>
@@ -263,12 +265,13 @@ import Transmutation from "@/views/ecw/cons/components/Transmutation.vue"
 import Template from "@/views/cms/template/index.vue";
 import UserSelector from "@/components/UserSelector/index.vue";
 import { getWarehouseList } from "@/api/ecw/warehouse";
-import {getTradeCountryList} from "@/api/ecw/region";
 import {getRegionList} from "@/api/ecw/order";
 import SpecialNeedsCons from "@/views/ecw/cons/components/SpecialNeedsCons.vue"
 import SpecialNeedsConsLook from "@/views/ecw/cons/components/SpecialNeedsConsLook.vue"
 
 import { getCurrencyList } from "@/api/ecw/currency"
+import FeeApplicationCons from "@/views/ecw/cons/components/FeeApplicationCons.vue"
+import FeeApplication from "@/views/ecw/order/feeApplication.vue"
 
 export default {
   name: "Cons",
@@ -276,6 +279,7 @@ export default {
     UserSelector,
     Transmutation,
     Template,
+    FeeApplicationCons,
     SpecialNeedsConsLook,
     SpecialNeedsCons
   },
@@ -343,6 +347,7 @@ export default {
       id: null,
       currencyList: [],
       consNum: null,
+      feeApplicationBol: false
     };
   },
   created() {
@@ -566,6 +571,12 @@ export default {
       this.id = row.id
       this.consNum = row.consNum
       this.showSpecialNeedsConsLook = true
+    },
+    //费用申请
+    feeApplication(row) {
+      this.id = row.id
+      this.consNum = row.consNum
+      this.feeApplicationBol = true
     }
   }
 };

src/views/ecw/customer/query.vue

@@ -426,6 +426,10 @@
           <el-tab-pane name="follow" :label="$t('跟进')">
             <log-list-customer-common ref="logListCustomerCommon" :customerService="customer.customerService" :customerNumber="customer.number" v-if="activeName === 'follow'" :customerId="id" />
           </el-tab-pane>
+          <!-- 客户集运订单 -->
+          <el-tab-pane name="consOrder" :label="$t('集运')">
+            <customer-cons-order v-if="activeName === 'consOrder'" ref="CustomerConsOrder" :customerId="id"></customer-cons-order>
+          </el-tab-pane>
           <el-tab-pane name="special" :label="$t('特殊设置')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('是否显示提单价格')">
@@ -723,6 +727,7 @@ import { getNodeList } from "@/api/ecw/node"
 import CustomerFollow from "./components/customerFollow"
 import { parseTime } from "@/utils/ruoyi"
 import CustomerComplaint from "@/views/ecw/customerComplaint"
+import CustomerConsOrder from "@/views/ecw/customer/components/customerConsOrder"
 import { listServiceUser, getUserProfile } from "@/api/system/user"
 import { getCustomerContactsListByCustomer } from "@/api/ecw/customerContacts"
 import { getOrderPage, getRegionList } from "@/api/ecw/order"
@@ -749,7 +754,8 @@ export default {
     Template,
     CustomerFollow,
     CustomerComplaint,
-    customerLog
+    customerLog,
+    CustomerConsOrder,
   },
   created() {
     // 获取币种