报价单补充始发仓查询

src/views/ecw/customer/query.vue

@@ -240,9 +240,9 @@
                     <el-input v-model.trim="queryOfferParams.relationAreaCode" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery" @input="queryOfferParams.relationAreaCode = queryOfferParams.relationAreaCode.replace(/\s+/g, '')" />
                   </el-form-item>
 
-                  <el-form-item :label="$t('始发地')" prop="departureId">
-                    <el-select v-model="queryOfferParams.departureId" :placeholder="$t('请选择始发地')" clearable>
-                      <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+                  <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
+                    <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+                      <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
                     </el-select>
                   </el-form-item>
 
@@ -695,7 +695,11 @@ export default {
     getCurrencyList().then((response) => {
       this.currecyList = response.data
     })
-    getTradeCityList().then((res) => (this.tradeCityList = res.data))
+    getWarehouseList().then((res) => {
+      this.tradeCityList = res.data
+      this.warehouseList = res.data
+    })
+    // getTradeCityList().then((res) => (this.tradeCityList = res.data))
     //获取信用类型
     getCreditRulePage({ page: 1, rows: 999, type: 2 }).then((r) => {
       this.creditTypeList = r.data.list
@@ -829,6 +833,7 @@ export default {
   data() {
     return {
       tradeCityList: [],
+      warehouseList: [],
       queryTmp: {
         createTime: ["", ""]
       },
@@ -957,6 +962,10 @@ export default {
     exportCityList() {
       return this.tradeCityList.filter((item) => item.type == 2)
     },
+    exportWarehouseList() {
+      /* tradeType 1 进口，2出口，3进出口 */
+      return this.warehouseList.filter((item) => item.tradeType == 2 || item.tradeType == 3)
+    },
     permissions() {
       return this.$store.state.user.permissions
     },

src/views/ecw/offer/index.vue

@@ -18,9 +18,9 @@
         <el-input v-model.trim="queryParams.relationAreaCode" :placeholder="$t('请输入客户')" clearable @keyup.enter.native="handleQuery" @input="queryParams.relationAreaCode = queryParams.relationAreaCode.replace(/\s+/g, '')" />
       </el-form-item>
 
-      <el-form-item :label="$t('始发地')" prop="departureId">
-        <el-select v-model="queryParams.departureId" :placeholder="$t('请选择始发地')" clearable>
-          <el-option v-for="item in exportCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+      <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+        <el-select v-model="queryParams.startWarehouseId" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+          <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
@@ -202,6 +202,7 @@ import { getChannelList } from "@/api/ecw/channel"
 import { getRegionList } from "@/api/ecw/order"
 import { getCurrencyList } from "@/api/ecw/currency"
 import { getTradeCityList } from "@/api/ecw/region"
+import { getWarehouseList } from "@/api/ecw/warehouse"
 import UserSelector from "@/components/UserSelector"
 import Selector from "@/components/Selector"
 import Template from "@/views/cms/template/index.vue";
@@ -240,6 +241,7 @@ export default {
         startTime: ["", ""],
         endTime: ["", ""]
       },
+      warehouseList: [],
       currencyList: [],
       tradeCityList: [],
       channelList: [],
@@ -268,6 +270,10 @@ export default {
       })
       return map
     },
+    exportWarehouseList() {
+      /* tradeType 1 进口，2出口，3进出口 */
+      return this.warehouseList.filter((item) => item.tradeType == 2 || item.tradeType == 3)
+    },
     exportCityList() {
       return this.tradeCityList.filter((item) => item.type == 2)
     },
@@ -293,8 +299,11 @@ export default {
     if (this.$route.fullPath.indexOf("dept") > -1) {
       this.dept = true
     }
-    getTradeCityList().then((res) => (this.tradeCityList = res.data))
-
+    // getTradeCityList().then((res) => (this.tradeCityList = res.data))
+    getWarehouseList().then((res) => {
+      this.tradeCityList = res.data
+      this.warehouseList = res.data
+    })
     getCurrencyList().then((res) => {
       this.currencyList = res.data
     })
@@ -493,6 +502,10 @@ export default {
     formatQuery() {
       let obj = {}
       //目的国
+      if (this.startWarehouseId != null && this.startWarehouseId != "") {
+        obj.startWarehouseIds = this.startWarehouseId
+      }
+      //目的国
       if (this.destCountryId != null && this.destCountryId != "") {
         obj.destCountryIds = this.destCountryId
       }