收款单修复

src/views/ecw/financial/creatCollection.vue

@@ -419,7 +419,7 @@
           label-width="80px"
         >
           <el-row>
-            <el-form-item :label="$t('始发城市')">
+            <el-form-item :label="$t('始发仓')">
               <el-select
                 v-model="queryParams.departureId"
                 :placeholder="$t('请选择始发地')"
@@ -432,7 +432,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label="$t('目的城市')">
+            <el-form-item :label="$t('目的仓')">
               <el-select
                 v-model="queryParams.objectiveId"
                 :placeholder="$t('请选择始发地')"
@@ -666,6 +666,7 @@ import { getCurrencyPage } from "@/api/ecw/currency";
 import ret from "bluebird/js/release/util";
 import dayjs from "dayjs";
 import { getUserProfile } from "@/api/system/user";
+import {getWarehouseList} from '@/api/ecw/warehouse'
 
 export default {
   name: "CreatCollection",
@@ -717,6 +718,7 @@ export default {
       selectListRow: {},
       selectListIndex: 0,
       flag: false,
+      warehouseList:[]
     };
   },
   async created() {
@@ -725,7 +727,7 @@ export default {
     })
     // 获取汇率
     await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
-
+    getWarehouseList().then(res => this.warehouseList = res.data)
     let that = this;
     if (that.$route.query.id) {
       this.flag = true
@@ -816,10 +818,12 @@ export default {
   },
   computed: {
     expoerCityList() {
-      return this.tradeCityList.filter((item) => item.type == 2);
+      // return this.tradeCityList.filter((item) => item.type == 2);
+      return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)
     },
     importCityList() {
-      return this.tradeCityList.filter((item) => item.type == 1);
+      // return this.tradeCityList.filter((item) => item.type == 1);
+      return this.warehouseList.filter(item => item.tradeType == 1 || item.tradeType == 3)
     },
     showCurrencyId() {
       let fieldList = [];