客户详情订单tag增加查询条件

src/i18n/languages/en_US.json

@@ -4527,8 +4527,6 @@
     "控制无收货人": "Control not consignee",
     "默认付款": "Default payment",
     "默认开票": "Default Billing",
-    "请选择获取方式": "Please select customer get method",
-    "请选择创建入口": "Please select customer create from",
     "请选择业务国家": "Please select customer operating country",
     "装柜/出仓时间": "Loading/Exit Time",
     "卸柜/到仓时间": "Unloading/Arrival Time",

src/i18n/languages/zh_CN.json

@@ -312,8 +312,6 @@
     "控制无收货人": "控制无收货人",
     "默认付款": "默认付款",
     "默认开票": "默认开票",
-		"请选择获取方式": "请选择获取方式",
-    "请选择创建入口": "请选择创建入口",
 		"请选择业务国家": "请选择业务国家",
 		"装柜/出仓时间": "装柜/出仓时间",
     "卸柜/到仓时间": "卸柜/到仓时间",

src/views/ecw/customer/query.vue

@@ -60,7 +60,7 @@
           <el-tab-pane name="order" :label="$t('订单')">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
-                <el-form :inline="true">
+                <el-form :inline="true" size="small">
                   <el-form-item :label="$t('运输方式：')">
                     <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" />
                   </el-form-item>
@@ -88,6 +88,42 @@
                                     range-separator="-"
                                     :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
                   </el-form-item>
+                  <el-form-item :label="$t('目的国')" prop="destCountryId">
+                    <el-select
+                      v-model="destCountryId"
+                      :label="destCountryId"
+                      clearable
+                      @change="handleQuery"
+                    >
+                      <el-option
+                        v-for="item in countryList"
+                        :key="item.id"
+                        :label="$l(item, 'title')"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item :label="$t('目的地')" prop="destCityId">
+                    <el-select v-model="destCityId" clearable @change="handleQuery">
+                      <el-option
+                        v-for="item in AddressCity"
+                        :key="item.shi"
+                        :label="item.shiName"
+                        :value="item.shi"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
+                    <el-select v-model="destWarehouseId" clearable @change="handleQuery">
+                      <el-option
+                        v-for="item in AddressTown"
+                        :key="item.id"
+                        :label="item.titleZh"
+                        :value="item.id"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
                   <el-form-item>
                     <el-button type="primary" @click="getorderList">{{$t('搜索')}}</el-button>
                     <el-button type="primary" @click="()=>{
@@ -610,7 +646,7 @@ import { parseTime } from '@/utils/ruoyi'
 import CustomerComplaint from '@/views/ecw/customerComplaint'
 import { listServiceUser } from '@/api/system/user'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
-import {getOrderPage} from "@/api/ecw/order";
+import {getOrderPage, getRegionList} from "@/api/ecw/order";
 import Template from "@/views/cms/template";
 import {getCreditRulePage} from "@/api/customer/creditRule";
 import {getCountry} from "@/api/ecw/country"
@@ -618,7 +654,7 @@ import {getCurrencyList} from "@/api/ecw/currency";
 import customerLog from "@/views/ecw/customer/customerLog.vue";
 import {checkPermi} from "@/utils/permission";
 import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
-
+import { getListTree } from "@/api/ecw/region";
 export default {
   name: 'query',
   components: {
@@ -669,7 +705,9 @@ export default {
     // this.creditScoreStatisticFn() //信用日志
     // this.infoListReceiptFn()//账单
 
-
+    this.getData();
+    //获取城市列表
+    this.getCountryList();
   },
   watch:{
     activeName(val){
@@ -699,7 +737,166 @@ export default {
           break
 
       }
-    }
+    },
+    
+    destCountryId: {
+      //监听当前地区值的变化，于与上方地区值进行了双向绑定
+      deep: true, //深度监听
+      handler() {
+        //每当值省份值改变时其下地区值进行清空
+        this.AddressCity = [];
+        this.AddressTown = [];
+        this.destWarehouseId = "";
+        this.destCityId = "";
+        this.findByprovinceCode();
+        if (this.destCountryId == "") {
+          //1 是所有区域，2 国家，3是市，
+          getRegionList(4, 4)
+            .then(({ data }) => {
+              this.AddressCity = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+
+          getRegionList(5, 5)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId != "" &&
+          this.objectiveId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          getRegionList(2, this.destCountryId)
+            .then(({ data }) => {
+              this.AddressCity = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+          getRegionList(5, 5)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        }
+      },
+    },
+    destCityId: {
+      deep: true, //深度监听 目的仓
+      handler() {
+        this.AddressTown = [];
+        this.destWarehouseId = "";
+        this.findBycityCode();
+        if (
+          this.destCityId != "" &&
+          this.destCountryId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          //获取当前城市值id，获取该城市下区域
+          getRegionList(3, this.destCityId)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId == "" &&
+          this.destCityId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          getRegionList(5, 5)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId != "" &&
+          this.destCityId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          getRegionList(2, this.destCountryId)
+            .then(({ data }) => {
+              this.AddressCity = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+          getRegionList(5, 5)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId == "" &&
+          this.destCityId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          //获取当前城市值id，获取该城市下区域
+          getRegionList(3, this.destCityId)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        }
+      },
+    },
+    destWarehouseId: {
+      deep: true, //深度监听
+      handler() {
+        if (
+          this.destCountryId != "" &&
+          this.destCityId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          //获取当前城市值id，获取该城市下区域
+          getRegionList(3, this.destCityId)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId != "" &&
+          this.destCityId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          getRegionList(5, 5)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        } else if (
+          this.destCountryId == "" &&
+          this.destCityId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          getRegionList(3, this.destCityId)
+            .then(({ data }) => {
+              this.AddressTown = data;
+            })
+            .catch((error) => {
+              console.log(error);
+            });
+        }
+      },
+    },
   },
   data() {
     return {
@@ -805,7 +1002,15 @@ export default {
       },
       infoListReceiptTotal:0,
       country: '',
-      showMore: true
+      showMore: true,
+      countryList: [],
+      AddressCity: [], //目的城市
+      AddressProvince: [], //省份
+      AddressTown: [], //目的仓
+      destCountryId: [],
+      objectiveId: [],
+      destCityId: null,
+      destWarehouseId: "",
     }
   },
   computed: {
@@ -963,12 +1168,72 @@ export default {
           this.$router.back()
         })
       })
-    }
+    },
+    findByprovinceCode() {
+      //获取当前省份值id，获取该省份下城市 destCountryId provinceCode
+      getRegionList(2, this.destCountryId)
+        .then(({ data }) => {
+          this.AddressCity = data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
+    findBycityCode() {
+      //获取当前城市值id，获取该城市下区域
+      getRegionList(3, this.objectiveId)
+        .then(({ data }) => {
+          this.AddressTown = data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
+    getData() {
+      //加载时发起请求获取所有省份值
+      /*getRegionList(1, 1)
+        .then(({ data }) => {
+          this.AddressProvince = data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });*/
+      //目的城市
+      getRegionList(4, 4)
+        .then(({ data }) => {
+          this.AddressCity = data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+      //目的仓
+      getRegionList(5, 5)
+        .then(({ data }) => {
+          this.AddressTown = data;
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+    },
+    /* 国家 */
+    getCountryList() {
+      getListTree({ treeType: 1 }).then((response) => {
+        this.countryList = response.data;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      //目的城市
+      this.queryParams.destCityId = this.destCityId;
+      //目的国
+      this.queryParams.destCountryId = this.destCountryId;
+      //目的仓
+      this.queryParams.destWarehouseId = this.destWarehouseId;
+      
+      this.getorderList()
+    },
   },
 
 }
 </script>
-
-<style scoped>
-
-</style>