查询统计与KPI仓库权限添加，库存汇总修改

ruoyi-ui/src/views/search/StockSummary/index.vue

@@ -1,6 +1,35 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="分组选项">
+        <el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
+          <el-checkbox label="productId">物料编码</el-checkbox>
+          <el-checkbox label="productName">物料名称</el-checkbox>
+          <el-checkbox label="spec">规格</el-checkbox>
+          <el-checkbox label="unit">单位</el-checkbox>
+          <el-checkbox label="lotNo">批号</el-checkbox>
+          <el-checkbox label="warehouseId">仓库</el-checkbox>
+          <el-checkbox label="roadwayId">巷道</el-checkbox>
+          <el-checkbox label="price">价格</el-checkbox>
+          <el-checkbox label="spare1">英文名称</el-checkbox>
+          <el-checkbox label="spare2">单件净重</el-checkbox>
+          <el-checkbox label="spare5">长度</el-checkbox>
+          <el-checkbox label="spare6">宽度</el-checkbox>
+          <el-checkbox label="spare7">高度</el-checkbox>
+          <el-checkbox label="spare8">体积</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <br>
+      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId">
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" 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="$t('searchStockSummary.productId')" prop="productId"> <!-- 物料编码 -->
         <el-input
           v-model="queryParams.productId"
@@ -33,14 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchStockSummary.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
-        <el-input
-          v-model="queryParams.warehouseId"
-          :placeholder="$t('searchStockSummary.inputWarehouseId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('searchStockSummary.roadwayId')" prop="roadwayId"> <!-- 巷道 -->
         <el-input
           v-model="queryParams.roadwayId"
@@ -75,21 +96,21 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" /> <!-- 物料编码 -->
-      <el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
-      <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" /> <!-- 规格 -->
-      <el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" /> <!-- 单位 -->
-      <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
-      <el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
-      <el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道 -->
+      <el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
+      <el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
+      <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" v-if="queryParams.groupFields.includes('spec')" /> <!-- 规格 -->
+      <el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
+      <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" v-if="queryParams.groupFields.includes('lotNo')" /> <!-- 批号 -->
+      <el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
+      <el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" v-if="queryParams.groupFields.includes('roadwayId')" /> <!-- 巷道 -->
       <el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
-      <el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
-      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
-      <el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
-      <el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
-      <el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
-      <el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
-      <el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
+      <el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
+      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
+      <el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
+      <el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
+      <el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
+      <el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
+      <el-table-column :label="$t('basproduct1.price')" align="center" prop="price" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
       <el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
     </el-table>
 
@@ -104,28 +125,31 @@
 </template>
 
 <script>
-  import { listStockSummary, getStockSummary } from "@/api/search/StockSummary";
+import { listStockSummary, getStockSummary } from "@/api/search/StockSummary";
+import {warehouseList} from "@/api/search/ViewInJobFlow";
 
-  export default {
-    name: "StockSummary",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 库存汇总表格数据
-        stockSummaryList: [],
-        // 查询参数
-        queryParams: {
+export default {
+  name: "StockSummary",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 仓库选项
+      warehouseOptions: [],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库存汇总表格数据
+      stockSummaryList: [],
+      // 查询参数
+      queryParams: {
         pageNum: 1,
         pageSize: 10,
         productId: null,
@@ -137,45 +161,90 @@
         roadwayId: null,
         quantity: null,
         //分组字段
-        groupFields: ['productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId']
+        groupFields: []
       }
-      };
+    };
+  },
+  created() {
+    // 初始化时全选分组选项
+    this.queryParams.groupFields = [
+      'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
+      'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
+    ];
+    this.getList();
+    this.getWarehouseList()
+  },
+  methods: {
+    /** 查询仓库列表 */
+    getWarehouseList() {
+      var quaryParam = {
+        pageNum:1,
+        pageSize:99
+      }
+      warehouseList(quaryParam).then(response => {
+        this.warehouseOptions = response.rows;
+      });
     },
-    created() {
+    /** 查询库存汇总列表 */
+    getList() {
+      this.loading = true;
+      // 将选中的分组字段转换为后端需要的格式
+      const params = {};
+      // 先设置查询条件
+      Object.keys(this.queryParams).forEach(key => {
+        if (key !== 'groupFields' && this.queryParams[key] !== null) {
+          params[key] = this.queryParams[key];
+        }
+      });
+      // 再设置分组字段
+      this.queryParams.groupFields.forEach(field => {
+        params[`groupBy${field.charAt(0).toUpperCase() + field.slice(1)}`] = true;
+      });
+
+      listStockSummary(params).then(response => {
+        this.stockSummaryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    methods: {
-      /** 查询库存汇总列表 */
-      getList() {
-        this.loading = true;
-        listStockSummary(this.queryParams).then(response => {
-          this.stockSummaryList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('search/StockSummary/export', {
-          ...this.queryParams
-        }, `库存汇总_${new Date().getTime()}.xlsx`)
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.onlyIdentity)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      }
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      // 重置时恢复全选状态
+      this.queryParams.groupFields = [
+        'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
+        'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
+      ];
+      this.handleQuery();
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 将选中的分组字段转换为后端需要的格式
+      const params = {};
+      // 先设置查询条件
+      Object.keys(this.queryParams).forEach(key => {
+        if (key !== 'groupFields' && this.queryParams[key] !== null) {
+          params[key] = this.queryParams[key];
+        }
+      });
+      // 再设置分组字段
+      this.queryParams.groupFields.forEach(field => {
+        params[`groupBy${field.charAt(0).toUpperCase() + field.slice(1)}`] = true;
+      });
+
+      this.download('search/StockSummary/export', params, `库存汇总_${new Date().getTime()}.xlsx`)
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.onlyIdentity)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
     }
-  };
+  }
+};
 </script>