优化资产报表excel导出

ruoyi-admin/src/main/java/com/ruoyi/inventory/controller/TbAssetInventoryController.java

@@ -180,16 +180,13 @@ public class TbAssetInventoryController extends BaseController
     @GetMapping("/getDepAssetLossTb")
     public AjaxResult getDepAssetLossTb(String depId){
         List<DepAssetLossResultDto> results = tbAssetInventoryService.inventoryDepAssetById(depId);
-
         return success(results);
     }
 
-    @GetMapping("/exportDepAssetLossTb")
-    public void exportDepAssetLossTb(HttpServletResponse response, String depId){
-
+    @PostMapping("/exportDepAssetLossTb/{deptId}")
+    public void exportDepAssetLossTb(HttpServletResponse response, @PathVariable("deptId") String depId){
         List<DepAssetLossResultDto> results = tbAssetInventoryService.inventoryDepAssetById(depId);
         ExcelUtil<DepAssetLossResultDto> util = new ExcelUtil<DepAssetLossResultDto>(DepAssetLossResultDto.class);
         util.exportExcel(response, results, "近两次资产盘点损耗统计");
-
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/dto/DepAssetLossDto.java

@@ -1,5 +1,6 @@
 package com.ruoyi.inventory.domain.dto;
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,21 +16,27 @@ import java.util.List;
 public class DepAssetLossDto  {
 
     /** 资产名称 */
+    @Excel(name = "资产名称")
     private String assetName;
 
     /** 位置 */
+    @Excel(name = "位置")
     private List<String> locations;
 
     /** 类别 */
+    @Excel(name = "类别")
     private String category;
 
     /** 现存数量 */
+    @Excel(name = "现存数量")
     private int nowQuantity;
 
     /** 损耗数量 */
+    @Excel(name = "损耗数量")
     private int lossQuantity;
 
     /** 损耗值 */
+    @Excel(name = "损耗值")
     private double lossVal;
 
 

ruoyi-admin/src/main/java/com/ruoyi/inventory/domain/dto/DepAssetLossResultDto.java

@@ -1,5 +1,6 @@
 package com.ruoyi.inventory.domain.dto;
 
+import com.ruoyi.common.annotation.Excel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,16 +15,19 @@ public class DepAssetLossResultDto {
     /**
      * 此次盘点计算出的损耗总值
      */
-    private double totalLossVal;
+    @Excel(name = "损耗总值")
+    private double su;
 
     /**
      * 盘点时间
      */
+    @Excel(name = "盘点时间")
     private String date;
 
     /**
      * 资产盘点结果集
      */
+    @Excel(name = "资产盘点结果集")
     private List<DepAssetLossDto> assetResultList;
 
 

ruoyi-ui/src/api/inventory/inventory.js

@@ -55,3 +55,12 @@ export function delInventory(id) {
 export function selectQrCode(number, v) {
   return `/inventory/inventory/code/${number}?v=${v}`
 }
+
+
+// 删除资产盘点记录
+export function getDepAssetLossTb(id) {
+  return request({
+    url: '/inventory/inventory/getDepAssetLossTb?depId=' + id,
+    method: 'get'
+  })
+}

ruoyi-ui/src/views/inventory/inventory/index.vue

@@ -134,6 +134,16 @@
           v-hasPermi="['inventory:inventory:export']"
         >导出报表</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="onOpenLoss"
+          v-hasPermi="['inventory:inventory:export']"
+        >资产报表</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -278,6 +288,51 @@
       <UserSearch @submit="onSelectUser" @cancel="() => {openUserSearch = false}" v-if="openUserSearch"></UserSearch>
     </el-dialog>
 
+    <el-dialog :visible.sync="openLoss" title="资产报表查看">
+      <el-row>
+        <el-form>
+          <el-form-item label="盘点部门" prop="inventoryDepartment">
+            <treeselect
+              v-model="deptId"
+              :options="deptOptions"
+              placeholder="选择盘点部门"
+              @keyup.enter.native="onQueryLoss"
+            />
+          </el-form-item>
+        </el-form>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="onQueryLoss">搜索</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="onLossExport"
+          v-hasPermi="['inventory:inventory:export']"
+        >导出</el-button>
+      </el-row>
+      <el-row>
+        <el-table :data="lossData">
+          <el-table-column
+            prop="totalLossVal"
+            label="损耗总额"
+            width="100">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="盘点时间"
+            width="100">
+          </el-table-column>
+          <el-table-column label="资产盘点结果集">
+            <el-table-column
+              prop="date"
+              label="盘点时间"
+              width="100">
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+      </el-row>
+    </el-dialog>
+
     <el-dialog title="导出报表" :visible.sync="openExport" width="360px">
       <el-form ref="form" :model="exportParams" label-width="80px">
         <el-form-item label="盘点部门" prop="inventoryDepartment">
@@ -310,7 +365,7 @@
 
 <script>
 import { deptTreeSelect } from '@/api/system/user.js'
-import { listInventory, getInventory, delInventory, addInventory, updateInventory,selectQrCode } from "@/api/inventory/inventory";
+import { listInventory, getInventory, delInventory, addInventory, updateInventory,selectQrCode,getDepAssetLossTb } from "@/api/inventory/inventory";
 import { treeSelect } from "@/api/asset/location";
 import { listDept } from "@/api/system/dept";
 import UserSearch from '@/components/SysUserSearch/index.vue'
@@ -371,6 +426,23 @@ export default {
         inventoryLocation: null,
         recordStatus: 1,
       },
+      openLoss: false,
+      deptId: null,
+      lossData: [
+        {
+          totalLossVal: null,
+          date: null,
+          assetResultList: [
+            {
+              assetName: null,
+              category: null,
+              nowQuantity: null,
+              lossQuantity: null,
+              lossVal: null
+            }
+          ]
+        }
+      ],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;
@@ -430,6 +502,29 @@ export default {
       }, `资产盘点报表_${new Date().getTime()}.xlsx`)
       this.openExport = false
     },
+    onOpenLoss() {
+      this.openLoss = true
+    },
+    onQueryLoss() {
+      if (this.deptId === null) {
+        this.$modal.msgWarning("部门不能为空");
+        return
+      }
+      getDepAssetLossTb(this.deptId).then(res => {
+        this.lossData = res.data
+        console.log('资产报表', this.lossData)
+      })
+    },
+    onLossExport() {
+      if (this.deptId === null) {
+        this.$modal.msgWarning("部门不能为空");
+        return
+      }
+      const deptId = this.deptId
+      this.download('inventory/inventory/exportDepAssetLossTb/' + deptId, {
+      }, `资产报表_${new Date().getTime()}.xlsx`)
+      this.openExport = false
+    },
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then((response) => {