Merge branch 'main' of http://106.13.86.63:10082/lhq/FT542-WMS

ruoyi-ui/src/views/kpi/inAnalysis/indexByTime.vue

@@ -1,20 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true">
-      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable> <!-- 请选择仓库 -->
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable> &lt;!&ndash; 请选择仓库 &ndash;&gt;-->
+<!--          <el-option-->
+<!--            v-for="item in warehouseOptions"-->
+<!--            :key="item.warehouseId"-->
+<!--            :label="item.warehouseName"-->
+<!--            :value="item.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="时间范围" prop="dateRange"> <!-- 时间范围 -->
         <el-date-picker
           v-model="dateRange"
           type="daterange"
+          unlink-panels
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"

ruoyi-ui/src/views/kpi/outAnalysis/indexByTime.vue

@@ -1,20 +1,21 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true">
-      <el-form-item label="仓库" prop="warehouseId"> <!-- 仓库 -->
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable> <!-- 请选择仓库 -->
-          <el-option
-            v-for="item in warehouseOptions"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable> &lt;!&ndash; 请选择仓库 &ndash;&gt;-->
+<!--          <el-option-->
+<!--            v-for="item in warehouseOptions"-->
+<!--            :key="item.warehouseId"-->
+<!--            :label="item.warehouseName"-->
+<!--            :value="item.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="时间范围" prop="dateRange"> <!-- 时间范围 -->
         <el-date-picker
           v-model="dateRange"
           type="daterange"
+          unlink-panels
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"

ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue

@@ -2,16 +2,16 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <!-- 仓库 -->
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId">-->
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in warehouseOptions"-->
+<!--            :key="dict.warehouseId"-->
+<!--            :label="dict.warehouseName"-->
+<!--            :value="dict.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <!-- 开始时间 -->
       <el-form-item label="开始时间" prop="startTime">
         <el-date-picker

ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue

@@ -2,16 +2,16 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <!-- 仓库 -->
-      <el-form-item label="仓库" prop="warehouseId">
-        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable @change="onWarehouseChange">
-          <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="仓库" prop="warehouseId">-->
+<!--        <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable @change="onWarehouseChange">-->
+<!--          <el-option-->
+<!--            v-for="dict in warehouseOptions"-->
+<!--            :key="dict.warehouseId"-->
+<!--            :label="dict.warehouseName"-->
+<!--            :value="dict.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <!-- 巷道 -->
 <!--      <el-form-item label="巷道" prop="roadwayId">
         <el-select v-model="queryParams.roadwayId" placeholder="请选择巷道" clearable @change="handleQuery">
@@ -23,12 +23,12 @@
           />
         </el-select>
       </el-form-item>-->
-      <el-form-item>
-        <!-- 【搜索】按钮 -->
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <!-- 【重置】按钮 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+<!--      <el-form-item>-->
+<!--        &lt;!&ndash; 【搜索】按钮 &ndash;&gt;-->
+<!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+<!--        &lt;!&ndash; 【重置】按钮 &ndash;&gt;-->
+<!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
+<!--      </el-form-item>-->
     </el-form>
 
     <!-- 饼状图容器 -->

ruoyi-ui/src/views/kpi/spacePlan/index.vue

@@ -3,16 +3,16 @@
     <div class="search-box">
       <el-form :model="queryParams" ref="queryForm" :inline="true">
         <!-- 仓库 -->
-        <el-form-item label="仓库" prop="warehouseId">
-          <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库"  @change="handleWarehouseChange">
-            <el-option
-              v-for="dict in warehouseOptions"
-              :key="dict.warehouseId"
-              :label="dict.warehouseName"
-              :value="dict.warehouseId"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="仓库" prop="warehouseId">-->
+<!--          <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库"  @change="handleWarehouseChange">-->
+<!--            <el-option-->
+<!--              v-for="dict in warehouseOptions"-->
+<!--              :key="dict.warehouseId"-->
+<!--              :label="dict.warehouseName"-->
+<!--              :value="dict.warehouseId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <!-- 层数 -->
         <el-form-item label="层数">
           <el-select v-model="queryParams.theFloor" style="width: 150px" @change="handleFloorChange">