空运待出订单列表和空运待备货订单列表的查询条件排版格式调整

src/views/ecw/order/penddingList.vue

@@ -13,15 +13,9 @@
       <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*)|(\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" />
-        <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>
+      <!--根据需求文档 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>
       <div>
         <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
@@ -94,10 +88,7 @@
       <el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
         <el-input v-model.trim="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <!--根据需求文档 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" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehouseType"  clearable/>
@@ -158,6 +149,16 @@
           </template>
         </el-select>
       </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" />
+        <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-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>

src/views/ecw/order/stockingList.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
       <el-form-item :label="$t('编号')" prop="orderNo">
         <el-input
           v-model.trim="queryParams.numberKey"
@@ -31,24 +31,14 @@
           @input="replaceSpace(queryParams, 'consigneeKey')"
         />
       </el-form-item>
-      <el-form-item label="">
+
+      <el-form-item :label="$t('控货')" prop="isCargoControl" v-show="showSearch">
         <dict-selector
-          :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
-          :filter="(item) => item.value != 'PickTime'"
-          v-model="dateFilterType"
-          defaultable
-          style="width: 150px; margin-right: 5px"
+          v-model="queryParams.isCargoControl"
+          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          fomatter="bool"
+          clearable
         />
-        <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>
       <div>
         <el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
@@ -128,14 +118,6 @@
         />
       </el-form-item>
 
-      <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>
       <el-form-item :label="$t('入仓类型')" prop="warehouseType" v-show="showSearch">
         <dict-selector
           :type="DICT_TYPE.ECW_WAREHOUSING_TYPE"
@@ -262,6 +244,25 @@
           </template>
         </el-select>
       </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"
+        />
+        <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("搜索")