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

src/views/ecw/financial/payable.vue

@@ -40,8 +40,8 @@
               clearable
             >
               <el-option
-                v-for="item in expoerCityList"
-                :label="item.titleZh"
+                v-for="item in exportWarehouseList"
+                :label="$l(item, 'title')"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
@@ -54,8 +54,8 @@
               clearable
             >
               <el-option
-                v-for="item in importCityList"
-                :label="item.titleZh"
+                v-for="item in importWarehouseList"
+                :label="$l(item, 'title')"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
@@ -228,6 +228,7 @@ import { getTradeCityList } from "@/api/ecw/region";
 import { getPayableList, deletePayable, updatePayable } from "@/api/ecw/financial"
 import { getSupplierPage } from "@/api/ecw/supplier";
 import { getCurrencyPage } from "@/api/ecw/currency";
+import {getWarehouseList} from '@/api/ecw/warehouse'
 
 export default {
   name: "EcwFinancialPayable",
@@ -253,7 +254,8 @@ export default {
         rows: 20,
       },
       allSupplier: [],
-      currencyList:[]
+      currencyList:[],
+        warehouseList:[],
     };
   },
   computed: {
@@ -263,9 +265,17 @@ export default {
     importCityList() {
       return this.tradeCityList.filter((item) => item.type == 1);
     },
+    exportWarehouseList(){
+      /* tradeType 1 进口，2出口，3进出口 */
+      return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)
+    },
+    importWarehouseList(){
+      return this.warehouseList.filter(item => item.tradeType == 1 || item.tradeType == 3)
+    },
   },
   created() {
     let that = this;
+    getWarehouseList().then(res => this.warehouseList = res.data)
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     userList("salesman").then((res) => (that.creatorData = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));

src/views/ecw/financial/receivable.vue

@@ -39,29 +39,29 @@
         class="card"
       >
         <el-row>
-          <el-form-item :label="$t('始发城市')">
+          <el-form-item :label="$t('始发地')">
             <el-select
               v-model="queryParams.departureId"
-              :placeholder="$t('请选择始发城市')"
+              :placeholder="$t('请选择始发地')"
               clearable
             >
               <el-option
-                v-for="item in expoerCityList"
-                :label="item.titleZh"
+                v-for="item in exportWarehouseList"
+                :label="$l(item, 'title')"
                 :value="item.id"
                 :key="item.id"
               ></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('请选择目的城市')"
+              :placeholder="$t('请选择目的地')"
               clearable
             >
               <el-option
-                v-for="item in importCityList"
-                :label="item.titleZh"
+                v-for="item in importWarehouseList"
+                :label="$l(item, 'title')"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
@@ -256,6 +256,7 @@ import CustomerSelector from "@/components/CustomerSelector";
 import { getTradeCityList } from "@/api/ecw/region";
 import { getReceivableList } from "@/api/ecw/financial";
 import { getCurrencyPage } from "@/api/ecw/currency";
+import {getWarehouseList} from '@/api/ecw/warehouse'
 
 export default {
   name: "EcwFinancialReceivable",
@@ -285,7 +286,8 @@ export default {
 	    page: 1,
 	    rows: 20,
 	  },
-	  currencyList:[]
+	  currencyList:[],
+    warehouseList:[],
     };
   },
   created() {
@@ -294,6 +296,7 @@ export default {
     userList("salesman").then((res) => (that.creatorData = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));
     this.getList();
+     getWarehouseList().then(res => this.warehouseList = res.data)
   },
   computed: {
     expoerCityList() {
@@ -302,6 +305,13 @@ export default {
     importCityList() {
       return this.tradeCityList.filter((item) => item.type == 1);
     },
+    exportWarehouseList(){
+      /* tradeType 1 进口，2出口，3进出口 */
+      return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)
+    },
+    importWarehouseList(){
+      return this.warehouseList.filter(item => item.tradeType == 1 || item.tradeType == 3)
+    },
   },
   methods: {
 	  getCurrencyLabel(id){