订单搜索条件优化

src/i18n/languages/en_US.json

@@ -4690,6 +4690,8 @@
   "财务资料": "Finance Information",
   "特殊设置": "Special setting",
   "已卸柜/已到仓时间": "Unloaded/arrived Time",
+  "动态": "Dynamics",
+  "增值服务": "Added services",
   "开启会员积分系统":"Enable member points system",
   "是否确认{val}会员积分系统":"Confirm whether to {val} the member points system"
 }

src/views/ecw/order/index.vue

@@ -5,7 +5,6 @@
       ref="queryForm"
       size="small"
       :inline="true"
-      v-show="showSearch"
     >
       <el-form-item :label="$t('编号')" prop="orderNo">
         <el-input
@@ -29,22 +28,22 @@
         <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('发货人')" prop="consignorKey">
+      <el-form-item :label="$t('发货人')" prop="consignorKey" v-show="showSearch">
         <el-input
           v-model="queryParams.consignorKey"
           :placeholder="$t('发货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/\s+/g, '')"
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
-      <el-form-item :label="$t('收货人')" prop="consigneeKey">
+      <el-form-item :label="$t('收货人')" prop="consigneeKey" v-show="showSearch">
         <el-input
           v-model="queryParams.consigneeKey"
           :placeholder="$t('收货人')"
           clearable
           @keyup.enter.native="handleQuery"
-          onkeyup="this.value=this.value.replace(/\s+/g, '')"
+          onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
         />
       </el-form-item>
       <el-form-item label="">
@@ -102,12 +101,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('目的城市')" prop="objectiveId">
           <el-select
             v-model="objectiveId"
             multiple
-            :placeholder="$t('请根据目的国选择目的城市')"
+            :placeholder="$t('请选择目的城市')"
             style="width: 200px"
             clearable
             @change="handleQuery"
@@ -120,12 +118,11 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
           <el-select
             v-model="destWarehouseId"
             multiple
-            :placeholder="$t('请根据目的城市选择目的仓')"
+            :placeholder="$t('请选择目的仓')"
             style="width: 200px"
             clearable
             @change="handleQuery"
@@ -153,10 +150,11 @@
         />
       </el-form-item>
 
-      <!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
+      <el-form-item :label="$t('商品类型')" prop="goodsType" v-show="showSearch">
         <selector v-model="queryParams.goodsType" :options="productAttrList" label-field="attrName" value-field="id">
         </selector>
       </el-form-item>
+      <!--
       <el-form-item :label="$t('品名')" prop="prodId">
         <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -165,7 +163,7 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('商品')" prop="tidanNo">
+      <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
         <el-input
           v-model.trim="prodParam.value"
           :placeholder="$t('请输入商品类型、品名或品牌')"
@@ -184,7 +182,7 @@
         </el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('控货')" prop="isCargoControl">
+      <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
         <dict-selector
           v-model="queryParams.isCargoControl"
           :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
@@ -193,7 +191,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('入仓类型')" prop="warehouseType">
+      <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
           v-model="queryParams.warehouseTypes"
@@ -205,13 +203,14 @@
       <el-form-item :label="$t('客户经理')">
         <user-selector
           manage
-          v-model="queryParams.salesmanId"
+          v-model="queryParams.salesmanIds"
+          multiple
           clearable
           @change="handleQuery"
           :prepend="{ id: 0, nickname: $t('未分配客户经理') }"
         />
       </el-form-item>
-      <el-form-item :label="$t('订单状态')" prop="statusList">
+      <el-form-item :label="$t('动态')" prop="statusList">
         <dict-selector
           :type="DICT_TYPE.ORDER_STATUS"
           multiple
@@ -222,7 +221,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('报关方式')" prop="customsTypes">
+      <el-form-item :label="$t('报关方式')" prop="customsTypes" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
           multiple
@@ -231,7 +230,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('是否齐货')">
+      <el-form-item :label="$t('是否齐货')" v-show="showSearch">
         <!--//字段存疑-->
         <dict-selector
           v-model="queryParams.isNeat"
@@ -248,16 +247,16 @@
         <el-input style="width: 100px;" v-model="denominator" placeholder="" clearable @change="denominatorChange"
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
-      <el-form-item :label="$t('备案属性')" prop="productRecord">
+      <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
           multiple
-          v-model="queryParams.productRecord"
+          v-model="queryParams.productRecords"
           clearable
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('快递单号')" prop="number">
+      <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
         <el-input
           v-model="queryParams.number"
           :placeholder="$t('快递单号')"
@@ -266,7 +265,7 @@
           onkeyup="this.value=this.value.replace(/\s+/g, '')"
         />
       </el-form-item>
-      <el-form-item :label="$t('外部仓')" prop="number">
+      <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
         <el-select
           v-model="queryParams.isExternalWarehouse"
           multiple
@@ -279,7 +278,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('异常状态')" prop="abnormalStateList">
+      <el-form-item :label="$t('异常状态')" prop="abnormalStateList" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ORDER_ABNORMAL_STATE"
           multiple
@@ -289,7 +288,7 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('审核状态')" prop="auditTypeList">
+      <el-form-item :label="$t('审核状态')" prop="auditTypeList" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
           multiple
@@ -299,9 +298,9 @@
           @change="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('订单类型')" prop="number">
+      <el-form-item :label="$t('增值服务')" prop="number">
         <el-select
-          v-model="queryParams.type"
+          v-model="queryParams.types"
           multiple
           :placeholder="$t('请选择')"
           clearable
@@ -315,7 +314,7 @@
       <!--空运多一个出货渠道筛选-->
       <el-form-item
         :label="$t('出货渠道')"
-        prop="channelId"
+        prop="channelIds"
         v-if="channelList.length"
       >
         <selector
@@ -323,10 +322,10 @@
           :options="channelList"
           :label-field="$l('name')"
           value-field="channelId"
-          v-model="queryParams.channelId"
+          v-model="queryParams.channelIds"
         ></selector>
       </el-form-item>
-      <el-form-item :label="$t('特需')" prop="packageType">
+      <el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch">
         <el-select
           v-model="queryParams.packageTypeArr"
           multiple

src/views/ecw/order/penddingList.vue

@@ -8,10 +8,10 @@
       </el-form-item>
 
       <el-form-item :label="$t('发货人')" prop="consignorKey">
-        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
       </el-form-item>
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
-        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
       </el-form-item>
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
@@ -23,80 +23,128 @@
           >
           </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" :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>
-      <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
-        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的仓')" clearable @change="handleQuery">
-          <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
-        </el-select>
-      </el-form-item>
+      <div>
+        <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
+          <el-select v-model="queryParams.startWarehouseIds" :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>
+        <el-form-item :label="$t('目的国')" prop="destCountryId">
+          <el-select
+            v-model="destCountryId"
+            multiple
+            :label="destCountryId"
+            :placeholder="$t('请选择目的国')"
+            clearable
+            @change="handleQuery"
+          >
+            <el-option
+              v-for="item in AddressProvince"
+              :key="item.guojia"
+              :label="item.guojiaName"
+              :value="item.guojia"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('目的城市')" prop="objectiveId">
+          <el-select
+            v-model="objectiveId"
+            multiple
+            :placeholder="$t('请选择目的城市')"
+            style="width: 200px"
+            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"
+            multiple
+            :placeholder="$t('请选择目的仓')"
+            style="width: 200px"
+            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>
+      </div>
 
       <!--<el-form-item :label="$t('运输方式')" prop="transportId">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
       </el-form-item>-->
 
-      <el-form-item :label="$t('商品')" prop="tidanNo">
-        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
+      <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
+        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')" />
       </el-form-item>
-      <!--根据需求文档 lanbm 2024-06-23 隐藏
-      <el-form-item :label="$t('控货')" prop="isCargoControl">
+      <!--根据需求文档 lanbm 2024-06-23-->
+      <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
         <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable />
-      </el-form-item>-->
-      <!--根据需求文档 lanbm 2024-06-23 隐藏
-      <el-form-item :label="$t('入仓类型')" prop="warehouseType">
+      </el-form-item>
+      <!--根据需求文档 lanbm 2024-06-23 隐藏-->
+      <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"
+        <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery"
                        :prepend="{ id: 0, nickname: $t('未分配客户经理')}"/>
       </el-form-item>
-      <!--根据需求文档 lanbm 2024-06-23 隐藏
+      <!--根据需求文档 lanbm 2024-06-23 隐藏-->
       <el-form-item :label="$t('订单状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.statusList"
           @keyup.enter.native="handleQuery" clearable />
-      </el-form-item>-->
-      <el-form-item :label="$t('报关方式')" prop="customsType">
+      </el-form-item>
+      <el-form-item :label="$t('报关方式')" prop="customsType" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('是否齐货')" >
+      <el-form-item :label="$t('是否齐货')" v-show="showSearch">
         <!--// 字段存疑-->
         <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool"  clearable @change="handleQuery"/>
       </el-form-item>
 
-      <el-form-item :label="$t('备案属性')" prop="productRecord">
-        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable @change="handleQuery" />
+      <el-form-item :label="$t('备案属性')" prop="productRecord" v-show="showSearch">
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" multiple clearable @change="handleQuery" />
       </el-form-item>
-      <!--lanbm 2024-06-23 根据需求文档隐藏
-      <el-form-item :label="$t('快递单号')" prop="number">
+      <!--lanbm 2024-06-23 根据需求文档隐藏-->
+      <el-form-item :label="$t('快递单号')" prop="number" v-show="showSearch">
         <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>-->
-      <el-form-item :label="$t('外部仓')" prop="number">
+      </el-form-item>
+      <el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
         <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
           <el-option :label="$t('外部仓')" :value="1"></el-option>
           <el-option :label="$t('自有仓')" :value="0"></el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('异常状态')" prop="status">
+      <el-form-item :label="$t('异常状态')" prop="status" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ORDER_ABNORMAL_STATE" v-model="queryParams.abnormalState"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
-      <el-form-item :label="$t('审核状态')" prop="status">
+      <el-form-item :label="$t('审核状态')" prop="status" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
-      <el-form-item :label="$t('订单类型')" prop="number">
-        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable >
+      <el-form-item :label="$t('增值服务')" prop="number">
+        <el-select v-model="queryParams.types" :placeholder="$t('请选择')" multiple clearable>
           <el-option :label="$t('普通订单')" :value="0"></el-option>
           <el-option :label="$t('集运服务')" :value="1"></el-option>
           <el-option :label="$t('海外仓')" :value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('出货渠道')" prop="number">
-        <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector>
+        <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector>
       </el-form-item>
       <el-form-item :label="$t('特需')" prop="packageType">
         <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
@@ -260,6 +308,8 @@ import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
 import {getChannelList} from "@/api/ecw/channel";
 import ImageAndVideoUpload from "@/components/ImageAndVideoUpload";
 import Template from "@/views/cms/template/index.vue";
+import {getRegionList} from "@/api/ecw/order"
+
 export default {
   name: "EcwOrderPenddinglist",
   components: {
@@ -275,8 +325,10 @@ export default {
   },
   data() {
     return {
-        // 导出中
-        exporting: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 导出中
+      exporting: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -328,13 +380,90 @@ export default {
             }, trigger: 'change'
           }
         ]
-      }
+      },
+      AddressProvince: [],
+      AddressCity: [],
+      AddressTown: [],
+      destCountryId: null,
+      objectiveId: null,
+      destWarehouseId: null,
     };
   },
   watch:{
     isChinese(){
       this.getList()
-    }
+    },
+    destCountryId: {
+      //监听当前地区值的变化，于与上方地区值进行了双向绑定
+      deep: true, //深度监听
+      handler() {
+        //每当值省份值改变时其下地区值进行清空
+        this.AddressCity = [];
+        this.AddressTown = [];
+        this.objectiveId = "";
+        this.destWarehouseId = "";
+        this.findByprovinceCode();
+        if (this.destCountryId == "") {
+          this.getAddressCity()
+          this.getAddressTown()
+        } else if (
+          this.destCountryId != "" &&
+          this.objectiveId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          this.getAddressTown()
+        }
+      },
+    },
+    objectiveId: {
+      deep: true, //深度监听
+      handler() {
+        this.AddressTown = [];
+        this.destWarehouseId = "";
+        this.findBycityCode();
+
+        if (
+          this.objectiveId != "" &&
+          this.destCountryId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          //获取当前城市值id，获取该城市下区域
+          
+        } else if (
+          this.destCountryId == "" &&
+          this.objectiveId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          this.getAddressTown()
+        } else if (
+          this.destCountryId != "" &&
+          this.objectiveId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          this.findByprovinceCode();
+          this.getAddressTown()
+        }
+      },
+    },
+    destWarehouseId: {
+      deep: true, //深度监听
+      handler() {
+        if (
+          this.objectiveId != "" &&
+          this.destCountryId != "" &&
+          this.destWarehouseId == ""
+        ) {
+          //获取当前城市值id，获取该城市下区域
+          this.findBycityCode();
+        } else if (
+          this.destCountryId != "" &&
+          this.objectiveId == "" &&
+          this.destWarehouseId == ""
+        ) {
+          this.getAddressTown()
+        }
+      },
+    },
   },
   computed: {
     isChinese(){
@@ -348,13 +477,25 @@ export default {
       return this.warehouseList.filter(item => item.tradeType == 1 || item.tradeType == 3)
     },
     combinedQueryParams(){
-        let timeParams = {}
-        if(this.dateFilterType && this.dateFilter){
-          timeParams['begin' + this.dateFilterType] = this.dateFilter[0]
-          timeParams['end' + this.dateFilterType] = this.dateFilter[1]
-        }
-        let queryParams = Object.assign({}, this.queryParams, timeParams)
-        return queryParams
+      let timeParams = {}
+      if(this.dateFilterType && this.dateFilter){
+        timeParams['begin' + this.dateFilterType] = this.dateFilter[0]
+        timeParams['end' + this.dateFilterType] = this.dateFilter[1]
+      }
+      let queryParams = {}
+      //目的国
+      if (this.destCountryId != null && this.destCountryId != "") {
+        queryParams.destCountryIds = this.destCountryId;
+      }
+      //目的城市
+      if (this.objectiveId != null && this.objectiveId != "") {
+        queryParams.objectiveIds = this.objectiveId;
+      }
+      //目的仓
+      if (this.destWarehouseId != null && this.destWarehouseId != "") {
+        queryParams.destWarehouseIds = this.destWarehouseId;
+      }
+      return Object.assign({}, this.queryParams, timeParams, queryParams)
     },
     currencyMap(){
       let map = {}
@@ -367,6 +508,7 @@ export default {
   activated(){
     this.getList()
     this.$store.dispatch('getBadgeData')
+
   },
   created() {
     this.getList();
@@ -377,6 +519,9 @@ export default {
     getChannelList().then(res => this.channelList = res.data)
 
     this.$store.dispatch('getBadgeData')
+    this.getAddressProvince()
+    this.getAddressCity()
+    this.getAddressTown()
   },
   methods: {
     /** 查询列表 */
@@ -409,7 +554,7 @@ export default {
         rows: 10
       }
       this.dateFilter = []
-      this.queryParams.channelId = ''
+      // this.queryParams.channelId = ''
       this.handleQuery();
     },
     /** 新增按钮操作 */
@@ -468,35 +613,66 @@ export default {
         }
       })
     },
-      specialRendering(val){
-          console.log('val', val)
-          if(val !== undefined){
-              let i = val.split(',')
-              return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
-                  return i.indexOf(e.value) > -1
-              }).map(item => {
-                  // 打字开头的用最后一个字，否则取第一个字
-                  item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
-                  return item
-              })
-          }
-      },
-      deleteSpecial(id,orderId){
-          this.$confirm(this.$t('确定删除此特需么?')).then(() => {
-              return orderSpecialNeed({orderId:orderId,advanceType:id})
-          }).then(() => {
-              this.getList()
-          })
-      },
-      exportXls(params){
-          this.exporting = true
-          const exportParams = Array.isArray(params) ? {orderIdList: params} : {...params}
-          exportWaitingShipment(exportParams).then(res => {
-              this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
-          }).finally(() => {
-              this.exporting = false
-          })
+    specialRendering(val){
+        console.log('val', val)
+        if(val !== undefined){
+            let i = val.split(',')
+            return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
+                return i.indexOf(e.value) > -1
+            }).map(item => {
+                // 打字开头的用最后一个字，否则取第一个字
+                item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
+                return item
+            })
+        }
+    },
+    deleteSpecial(id,orderId){
+        this.$confirm(this.$t('确定删除此特需么?')).then(() => {
+            return orderSpecialNeed({orderId:orderId,advanceType:id})
+        }).then(() => {
+            this.getList()
+        })
+    },
+    exportXls(params){
+        this.exporting = true
+        const exportParams = Array.isArray(params) ? {orderIdList: params} : {...params}
+        exportWaitingShipment(exportParams).then(res => {
+            this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
+        }).finally(() => {
+            this.exporting = false
+        })
+    },
+    getAddressProvince() {
+      getRegionList(1, 1).then(({ data }) => {
+        this.AddressProvince = data;
+      })
+    },
+    getAddressCity() {
+      getRegionList(4, 4).then(({ data }) => {
+        this.AddressCity = data;
+      })
+    },
+    getAddressTown() {
+      getRegionList(5, 5).then(({ data }) => {
+        this.AddressTown = data;
+      })
+    },
+    findByprovinceCode() {
+      if (this.destCountryId != null && this.destCountryId != '') {
+        //获取当前省份值id，获取该省份下城市 destCountryId provinceCode
+        getRegionList(2, this.destCountryId).then(({ data }) => {
+          this.AddressCity = data;
+        })
       }
+    },
+    findBycityCode() {
+      if (this.objectiveId != null && this.objectiveId != '') {
+        //获取当前城市值id，获取该城市下区域
+        getRegionList(3, this.objectiveId).then(({ data }) => {
+          this.AddressTown = data;
+        })
+      }
+    }
   }
 };
 </script>