fxi: 重置&多选

src/views/ecw/box/indexAir.vue

@@ -34,7 +34,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('状态')" prop="shipmentStatusAir">
-        <el-select v-model="queryParams.shipmentStatusAir" :placeholder="$t('请选择状态')" clearable size="small">
+        <el-select v-model="queryParams.shipmentStatusAir" :placeholder="$t('请选择状态')" clearable size="small" multiple collapse-tags>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_AIR_SHIPMENT_STATE)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -66,7 +66,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('发货方式')" prop="deliveryType" v-show="showSearch">
-          <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small">
+          <el-select v-model="queryParams.deliveryType" :placeholder="$t('请选择发货方式')" clearable size="small" multiple collapse-tags>
             <el-option v-for="item in deliveryTypeData" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
@@ -750,6 +750,26 @@ export default {
         }
       });
     },
+    formatQuery() {
+      let obj = {}
+      //始发仓
+      // if (this.startWarehouseId != null && this.startWarehouseId != "") {
+      //   obj.startWarehouseIds = this.startWarehouseId
+      // }
+      //目的国
+      if (this.countryIdList != null && this.countryIdList != "") {
+        obj.countryIdLists = this.countryIdList
+      }
+      //目的城市
+      if (this.destCityIdList != null && this.destCityIdList != "") {
+        obj.destCityIdLists = this.destCityIdList
+      }
+      //目的仓
+      if (this.destWarehouseIdList != null && this.destWarehouseIdList != "") {
+        obj.destWarehouseIdList = this.destWarehouseIdList
+      }
+      return obj
+    },
     /** 查询列表 */
     getList() {
       this.loading = true
@@ -760,7 +780,7 @@ export default {
       this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
       this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行查询
-      getboxPage(params).then((response) => {
+      getboxPage({...params, ...this.formatQuery()}).then((response) => {
         this.list = response.data.list
         this.total = response.data.total
         // var lineParams = []
@@ -795,6 +815,9 @@ export default {
         destWarehouseIdList: undefined,
         transportType: undefined
       }
+      this.countryIdList = null;
+      this.destCityIdList = null;
+      this.destWarehouseIdList = null;
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -863,7 +886,7 @@ export default {
         .confirm(this.$t('是否确认导出所有出货数据项?'))
         .then(() => {
           this.exportLoading = true
-          return exportboxExcel(params)
+          return exportboxExcel({...params, ...this.formatQuery()})
         })
         .then((response) => {
           this.$download.excel(response, this.$t("空运管理") + ".xls");

src/views/ecw/box/indexSea.vue

@@ -961,6 +961,26 @@ export default {
         this.countryList = response.data;
       });
     },
+    formatQuery() {
+      let obj = {}
+      //始发仓
+      // if (this.startWarehouseId != null && this.startWarehouseId != "") {
+      //   obj.startWarehouseIds = this.startWarehouseId
+      // }
+      //目的国
+      if (this.countryIdList != null && this.countryIdList != "") {
+        obj.countryIdLists = this.countryIdList
+      }
+      //目的城市
+      if (this.destCityIdList != null && this.destCityIdList != "") {
+        obj.destCityIdLists = this.destCityIdList
+      }
+      //目的仓
+      if (this.destWarehouseIdList != null && this.destWarehouseIdList != "") {
+        obj.destWarehouseIdList = this.destWarehouseIdList
+      }
+      return obj
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -978,7 +998,7 @@ export default {
       this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
       this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行查询
-      getboxPage(params).then((response) => {
+      getboxPage({...params, ...this.formatQuery()}).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -993,6 +1013,9 @@ export default {
     resetQuery() {
       this.queryParams = {};
       this.dateRangeCreateTime = [];
+      this.countryIdList = null;
+      this.destCityIdList = null;
+      this.destWarehouseIdList = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -1058,7 +1081,7 @@ export default {
         .confirm(this.$t("是否确认导出所有出货数据项?"))
         .then(() => {
           this.exportLoading = true;
-          return exportboxExcel(params);
+          return exportboxExcel({...params, ...this.formatQuery()});
         })
         .then((response) => {
           this.$download.excel(response, this.$t("海运管理") + ".xls");