控货订单列表重置按钮修复

src/views/ecw/order/cargoControl.vue

@@ -132,6 +132,7 @@
         <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{ $t("导出") }}</el-button>
       </div>
     </el-form>
 
@@ -504,9 +505,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")
-      this.prodParam.value = ""
-      this.releaseRatio.value = ""
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        packageTypeArr: [],
+        channelId: null,
+        channelIds: null,
+        customsTypes: null,
+        productRecords: null,
+        goodsTypes: null
+      }
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
       this.pickRatio.value = ""
+      this.noParam.value = ""
+      this.prodParam.value = ""
+      this.dateFilter = []
       this.handleQuery()
     },
 

src/views/ecw/order/warningCargoControl.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" class="search-z">
       <el-form-item :label="$t('订单编号')" prop="orderNo">
-        <el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" />
+        <el-input v-model.trim="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'orderNo')" class="w-200"/>
       </el-form-item>
       <el-form-item :label="$t('发货人')" prop="consignorKey">
-        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery"  />
+        <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery"  class="w-200"/>
       </el-form-item>
 
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
-        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" class="w-200"/>
       </el-form-item>
       <el-form-item :label="$t('控货状态')" prop="isCargoControl">
-        <dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" />
+        <dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
       <div>
         <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
-          <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+          <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery" class="w-200">
             <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :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-select v-model="destCountryId" multiple :label="destCountryId" :placeholder="$t('请选择目的国')" clearable @change="handleQuery" class="w-200">
             <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-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery" class="w-200">
             <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-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery" class="w-200">
             <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('客户经理')">
-        <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" />
+        <user-selector manage v-model="queryParams.salesmanIds" multiple clearable @change="handleQuery" :prepend="{ id: 0, nickname: $t('未分配客户经理') }" class="w-200"/>
       </el-form-item>
 
       <el-form-item :label="$t('出货渠道')" prop="channelIds">
-        <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple></selector>
+        <selector clearable :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelIds" multiple class="w-200"></selector>
       </el-form-item>
 
       <el-form-item :label="$t('商品')" prop="prodId" v-show="showSearch">
-        <product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" />
+        <product-selector v-model.trim="queryParams.prodId" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
 
       <el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
-        <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
       <el-form-item :label="$t('提单号')" prop="tidanNo">
-        <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
+        <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
       </el-form-item>
 
       <el-form-item :label="$t('报关方式')" prop="customsTypes">
-        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
 
       <el-form-item :label="$t('唛头')" prop="marks">
-        <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
+        <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" class="w-200"/>
       </el-form-item>
       <el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
-        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" multiple v-model="queryParams.productRecords" clearable @change="handleQuery" class="w-200"/>
       </el-form-item>
       <el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
-        <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery">
+        <el-select v-model="queryParams.isExternalWarehouse" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
           <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="type" v-show="showSearch">
-        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable @change="handleQuery">
+        <el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable @change="handleQuery" class="w-200">
           <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('日期筛选')">
-        <dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" />
-        <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
-      </el-form-item>
+      <div class="flex pb-20">
+        <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" />
+        <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery" class="w-200"> </el-date-picker>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
+      </div>
     </el-form>
 
     <!-- 操作工具栏 -->
@@ -363,6 +362,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")
+      this.queryParams = {
+        page: 1,
+        rows: 10,
+        packageTypeArr: [],
+        channelId: null,
+        channelIds: null,
+        customsTypes: null,
+        productRecords: null,
+        goodsTypes: null
+      }
+      this.destCountryId = null
+      this.destWarehouseId = null
+      this.objectiveId = null
+      this.pickRatio.value = ""
+      this.noParam.value = ""
+      this.prodParam.value = ""
+      this.dateFilter = []
       this.handleQuery()
     },