lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-18 17:46:27 +08:00
parent 87036f8df2 8f1e944602
commit 17b1f210c7
24 changed files with 133 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-admin/src/main/java/com/ruoyi/index/controller/IndexController.java
View File

@@ -6,6 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.ViewIndexJob;
import com.ruoyi.index.mapper.ViewIndexJobMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,30 +54,33 @@ public class IndexController extends BaseController {
/**
* 查询单据状态统计
*/
@PreAuthorize("@ss.hasPermi('index:bill:list')")
//@PreAuthorize("@ss.hasPermi('index:bill:list')")
@Anonymous
@GetMapping("/bill/status")
public AjaxResult getBillStatusCount() {
List<BillStatusCount> list = billStatusCountService.selectAllBillStatusCount();
List<BillStatusCount> list = billStatusCountService.selectAllBillStatusCount(new BaseEntity());
return success(list);
}
/**
* 查询各状态货位数量
*/
@PreAuthorize("@ss.hasPermi('index:cargospace:list')")
//@PreAuthorize("@ss.hasPermi('index:cargospace:list')")
@Anonymous
@GetMapping("/cargospace/count")
public AjaxResult getCargoSpaceCount() {
CargoSpaceCount cargoSpaceCount = cargoSpaceCountService.selectStatusCount();
CargoSpaceCount cargoSpaceCount = cargoSpaceCountService.selectStatusCount(new BaseEntity());
return success(cargoSpaceCount);
}
/**
* 查询已完成单据数量统计
*/
@PreAuthorize("@ss.hasPermi('index:count:list')")
//@PreAuthorize("@ss.hasPermi('index:count:list')")
@Anonymous
@GetMapping("/finishCount")
public AjaxResult getFinishCount() {
IndexCount indexCount = indexCountService.selectFinishCount();
IndexCount indexCount = indexCountService.selectFinishCount(new BaseEntity());
return success(indexCount);
}
@@ -86,9 +91,10 @@ public class IndexController extends BaseController {
/**
* 获取任务状态统计
*/
@Anonymous
@GetMapping("/job/status")
public AjaxResult getJobStatusCount() {
List<ViewIndexJob> allJobs = viewIndexJobMapper.selectViewIndexJobByStatus(null);
List<ViewIndexJob> allJobs = viewIndexJobMapper.selectViewIndexJobByStatus(new BaseEntity());
Map<String, List<ViewIndexJob>> result = new HashMap<>();
result.put("status2", allJobs.stream().filter(job -> "2".equals(job.getStatus())).collect(Collectors.toList()));
result.put("status3", allJobs.stream().filter(job -> "3".equals(job.getStatus())).collect(Collectors.toList()));

5
ruoyi-admin/src/main/java/com/ruoyi/index/controller/WeekJobCountController.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.index.controller;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,10 +27,11 @@ public class WeekJobCountController
/**
* 获取近一周的入库和出库作业数量统计
*/
@Anonymous
@GetMapping("/count")
public AjaxResult getWeekJobCount()
{
WeekJobCount weekJobCount = weekJobCountService.getWeekJobCount();
WeekJobCount weekJobCount = weekJobCountService.getWeekJobCount(new BaseEntity());
return AjaxResult.success(weekJobCount);
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/index/domain/BillStatusCount.java
View File

@@ -1,12 +1,13 @@
package com.ruoyi.index.domain;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 单据状态统计对象
*/
@Data
public class BillStatusCount {
public class BillStatusCount extends BaseEntity {
/** 单据ID */
private String id;

8
ruoyi-admin/src/main/java/com/ruoyi/index/mapper/BillStatusCountMapper.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.index.mapper;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.BillStatusCount;
/**
@@ -12,19 +14,19 @@ public interface BillStatusCountMapper {
*
* @return 入库单据状态统计列表
*/
public List<BillStatusCount> selectStockinStatusCount();
public List<BillStatusCount> selectStockinStatusCount(BaseEntity baseEntity);
/**
* 查询出库单据状态统计
*
* @return 出库单据状态统计列表
*/
public List<BillStatusCount> selectStockoutStatusCount();
public List<BillStatusCount> selectStockoutStatusCount(BaseEntity baseEntity);
/**
* 查询盘点单据状态统计
*
* @return 盘点单据状态统计列表
*/
public List<BillStatusCount> selectStockcheckStatusCount();
public List<BillStatusCount> selectStockcheckStatusCount(BaseEntity baseEntity);
}

3
ruoyi-admin/src/main/java/com/ruoyi/index/mapper/CargoSpaceCountMapper.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.index.mapper;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -15,5 +16,5 @@ public interface CargoSpaceCountMapper {
*
* @return 各状态货位数量列表
*/
public List<Map<String, Object>> selectStatusCount();
public List<Map<String, Object>> selectStatusCount(BaseEntity baseEntity);
}

8
ruoyi-admin/src/main/java/com/ruoyi/index/mapper/IndexCountMapper.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.index.mapper;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 首页统计信息Mapper接口
*
@@ -13,19 +15,19 @@ public interface IndexCountMapper
*
* @return 入库单数量
*/
public Integer selectStockinFinishCount();
public Integer selectStockinFinishCount(BaseEntity baseEntity);
/**
* 查询已完成出库单数量
*
* @return 出库单数量
*/
public Integer selectStockoutFinishCount();
public Integer selectStockoutFinishCount(BaseEntity baseEntity);
/**
* 查询已完成盘点单数量
*
* @return 盘点单数量
*/
public Integer selectStockcheckFinishCount();
public Integer selectStockcheckFinishCount(BaseEntity baseEntity);
}

4
ruoyi-admin/src/main/java/com/ruoyi/index/mapper/ViewIndexJobMapper.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.index.mapper;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.ViewIndexJob;
/**
@@ -13,5 +15,5 @@ public interface ViewIndexJobMapper {
* @param status 任务状态
* @return 任务列表
*/
public List<ViewIndexJob> selectViewIndexJobByStatus(String status);
public List<ViewIndexJob> selectViewIndexJobByStatus(BaseEntity baseEntity);
}

6
ruoyi-admin/src/main/java/com/ruoyi/index/mapper/WeekJobCountMapper.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.index.mapper;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.ibatis.annotations.Param;
/**
@@ -18,7 +20,7 @@ public interface WeekJobCountMapper
* @param endDate 结束日期
* @return 每天的入库作业数量列表
*/
public List<Integer> selectInJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate);
public List<Integer> selectInJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate, BaseEntity baseEntity);
/**
* 查询指定日期范围内每天的出库作业数量
@@ -27,5 +29,5 @@ public interface WeekJobCountMapper
* @param endDate 结束日期
* @return 每天的出库作业数量列表
*/
public List<Integer> selectOutJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate);
public List<Integer> selectOutJobCounts(@Param("startDate") String startDate, @Param("endDate") String endDate,BaseEntity baseEntity);
}

4
ruoyi-admin/src/main/java/com/ruoyi/index/service/IBillStatusCountService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.index.service;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.BillStatusCount;
/**
@@ -12,5 +14,5 @@ public interface IBillStatusCountService {
*
* @return 单据状态统计列表
*/
public List<BillStatusCount> selectAllBillStatusCount();
public List<BillStatusCount> selectAllBillStatusCount(BaseEntity baseEntity);
}

3
ruoyi-admin/src/main/java/com/ruoyi/index/service/ICargoSpaceCountService.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.index.service;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.CargoSpaceCount;
/**
@@ -11,5 +12,5 @@ public interface ICargoSpaceCountService {
*
* @return 货位状态统计对象
*/
public CargoSpaceCount selectStatusCount();
public CargoSpaceCount selectStatusCount(BaseEntity baseEntity);
}

3
ruoyi-admin/src/main/java/com/ruoyi/index/service/IIndexCountService.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.index.service;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.IndexCount;
/**
@@ -15,5 +16,5 @@ public interface IIndexCountService
*
* @return 统计结果
*/
public IndexCount selectFinishCount();
public IndexCount selectFinishCount(BaseEntity baseEntity);
}

3
ruoyi-admin/src/main/java/com/ruoyi/index/service/IWeekJobCountService.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.index.service;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.WeekJobCount;
/**
@@ -15,5 +16,5 @@ public interface IWeekJobCountService
*
* @return 近一周的入库和出库作业数量统计
*/
public WeekJobCount getWeekJobCount();
public WeekJobCount getWeekJobCount(BaseEntity baseEntity);
}

13
ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/BillStatusCountServiceImpl.java
View File

@@ -2,6 +2,9 @@ package com.ruoyi.index.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.index.mapper.BillStatusCountMapper;
@@ -22,23 +25,25 @@ public class BillStatusCountServiceImpl implements IBillStatusCountService {
* @return 单据状态统计列表
*/
@Override
public List<BillStatusCount> selectAllBillStatusCount() {
@DataScope
// @DataScope(warehouseAlias = "")
public List<BillStatusCount> selectAllBillStatusCount(BaseEntity baseEntity) {
List<BillStatusCount> resultList = new ArrayList<>();
// 查询入库单据状态统计
List<BillStatusCount> stockinList = billStatusCountMapper.selectStockinStatusCount();
List<BillStatusCount> stockinList = billStatusCountMapper.selectStockinStatusCount(baseEntity);
if (stockinList != null) {
resultList.addAll(stockinList);
}
// 查询出库单据状态统计
List<BillStatusCount> stockoutList = billStatusCountMapper.selectStockoutStatusCount();
List<BillStatusCount> stockoutList = billStatusCountMapper.selectStockoutStatusCount(baseEntity);
if (stockoutList != null) {
resultList.addAll(stockoutList);
}
// 查询盘点单据状态统计
List<BillStatusCount> stockcheckList = billStatusCountMapper.selectStockcheckStatusCount();
List<BillStatusCount> stockcheckList = billStatusCountMapper.selectStockcheckStatusCount(baseEntity);
if (stockcheckList != null) {
resultList.addAll(stockcheckList);
}

7
ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/CargoSpaceCountServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.index.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.index.domain.CargoSpaceCount;
import com.ruoyi.index.mapper.CargoSpaceCountMapper;
import com.ruoyi.index.service.ICargoSpaceCountService;
@@ -24,9 +26,10 @@ public class CargoSpaceCountServiceImpl implements ICargoSpaceCountService {
* @return 货位状态统计对象
*/
@Override
public CargoSpaceCount selectStatusCount() {
@DataScope
public CargoSpaceCount selectStatusCount(BaseEntity baseEntity) {
// 查询各状态货位数量
List<Map<String, Object>> statusCounts = cargoSpaceCountMapper.selectStatusCount();
List<Map<String, Object>> statusCounts = cargoSpaceCountMapper.selectStatusCount(baseEntity);
// 初始化结果数组，默认所有状态数量为0
List<Integer> counts = new ArrayList<>();

11
ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/IndexCountServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.index.service.impl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.index.mapper.IndexCountMapper;
@@ -24,12 +26,13 @@ public class IndexCountServiceImpl implements IIndexCountService
* @return 统计结果
*/
@Override
public IndexCount selectFinishCount()
@DataScope
public IndexCount selectFinishCount(BaseEntity baseEntity)
{
IndexCount indexCount = new IndexCount();
indexCount.setStockinCount(indexCountMapper.selectStockinFinishCount());
indexCount.setStockoutCount(indexCountMapper.selectStockoutFinishCount());
indexCount.setStockcheckCount(indexCountMapper.selectStockcheckFinishCount());
indexCount.setStockinCount(indexCountMapper.selectStockinFinishCount(baseEntity));
indexCount.setStockoutCount(indexCountMapper.selectStockoutFinishCount(baseEntity));
indexCount.setStockcheckCount(indexCountMapper.selectStockcheckFinishCount(baseEntity));
return indexCount;
}
}

7
ruoyi-admin/src/main/java/com/ruoyi/index/service/impl/WeekJobCountServiceImpl.java
View File

@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -32,7 +33,7 @@ public class WeekJobCountServiceImpl implements IWeekJobCountService
* @return 近一周的入库和出库作业数量统计
*/
@Override
public WeekJobCount getWeekJobCount()
public WeekJobCount getWeekJobCount(BaseEntity baseEntity)
{
// 获取当前日期
LocalDate now = LocalDate.now();
@@ -53,8 +54,8 @@ public class WeekJobCountServiceImpl implements IWeekJobCountService
List<Integer> outJobCounts = Arrays.asList(0, 0, 0, 0, 0, 0, 0);
// 查询近一周的入库和出库作业数量
List<Integer> queryInCounts = weekJobCountMapper.selectInJobCounts(startDate, endDate);
List<Integer> queryOutCounts = weekJobCountMapper.selectOutJobCounts(startDate, endDate);
List<Integer> queryInCounts = weekJobCountMapper.selectInJobCounts(startDate, endDate,baseEntity);
List<Integer> queryOutCounts = weekJobCountMapper.selectOutJobCounts(startDate, endDate,baseEntity);
// 如果查询结果不为空，更新对应日期的数量
if (queryInCounts != null && !queryInCounts.isEmpty()) {

36
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -5,6 +5,8 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
import com.ruoyi.bas.containerDetails.domain.BasContainerDetails;
import com.ruoyi.bas.containerDetails.service.IBasContainerDetailsService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.job.mydojob.domain.MydoJob;
import com.ruoyi.job.mydojob.service.IMydoJobService;
@@ -48,6 +50,8 @@ public class PdaServiceImp implements PdaService{
IInStockinDetailService inStockinDetailService;
@Autowired
ITrayMsgService trayMsgService;
@Autowired
private IBasContainerDetailsService basContainerDetailsService;
/**
* 空托盘入库
@@ -184,14 +188,32 @@ public class PdaServiceImp implements PdaService{
public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
//修改拣选数量
List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList();
for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
MydoJobDetail mydoJobDetailOld = mydoJobDetailService.selectMydoJobDetailByJobDetailId(mydoJobDetail.getJobDetailId());
BigDecimal oldPickQuantity = Convert.toBigDecimal(mydoJobDetailOld.getPickQuantity());
BigDecimal newPickQuantity = Convert.toBigDecimal(mydoJobDetail.getPickQuantity());
mydoJobDetail.setPickQuantity(oldPickQuantity.add(newPickQuantity).toString());
mydoJobDetailService.updateMydoJobDetail(mydoJobDetail);
}
if(CollUtil.isNotEmpty(mydoJobDetailList)){
for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
MydoJobDetail mydoJobDetailOld = mydoJobDetailService.selectMydoJobDetailByJobDetailId(mydoJobDetail.getJobDetailId());
BigDecimal oldPickQuantity = Convert.toBigDecimal(mydoJobDetailOld.getPickQuantity());
BigDecimal newPickQuantity = Convert.toBigDecimal(mydoJobDetail.getPickQuantity());
mydoJobDetailOld.setPickQuantity(oldPickQuantity.add(newPickQuantity).toString());
mydoJobDetailService.updateMydoJobDetail(mydoJobDetailOld);
BasContainerDetails basContainerDetailsParam = new BasContainerDetails();
basContainerDetailsParam.setContainerId(trayCodeMakeSure.getContainerCode());
basContainerDetailsParam.setProductId(mydoJobDetailOld.getProductId());
List<BasContainerDetails> basContainerDetails = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetailsParam);
if (CollUtil.isNotEmpty(basContainerDetails)){
BasContainerDetails oldBasContainerDetails = basContainerDetails.get(0);
oldBasContainerDetails.setQuantity(oldBasContainerDetails.getQuantity()+Convert.toLong(mydoJobDetail.getPickQuantity()));
basContainerDetailsService.updateBasContainerDetails(oldBasContainerDetails);
}else {
BasContainerDetails newBasContainerDetails = new BasContainerDetails();
newBasContainerDetails.setContainerId(trayCodeMakeSure.getContainerCode());
newBasContainerDetails.setProductId(mydoJobDetail.getProductId());
newBasContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickQuantity()));
basContainerDetailsService.insertBasContainerDetails(newBasContainerDetails);
}
}
}
//查询当前任务是否已经全部拣选完成
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());

3
ruoyi-admin/src/main/resources/mapper/index/BillStatusCountMapper.xml
View File

@@ -14,18 +14,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select stockin_id as id, status, '1' as type
from in_stockin
where status in ('1', '2', '3')
${params.warehouseDataScope}
</select>
<select id="selectStockoutStatusCount" resultMap="BillStatusCountResult">
select stockout_id as id, status, '2' as type
from out_stockout
where status in ('1', '2', '3')
${params.warehouseDataScope}
</select>
<select id="selectStockcheckStatusCount" resultMap="BillStatusCountResult">
select stock_check_id as id, status, '3' as type
from check_stockin
where status in ('1', '2', '3')
${params.warehouseDataScope}
</select>
</mapper>

1
ruoyi-admin/src/main/resources/mapper/index/CargoSpaceCountMapper.xml
View File

@@ -8,6 +8,7 @@
SELECT status, COUNT(*) as count
FROM bas_cargo_space
WHERE status IN ('1', '2', '3', '4', '5', '6')
${params.warehouseDataScope}
GROUP BY status
ORDER BY status
</select>

6
ruoyi-admin/src/main/resources/mapper/index/IndexCountMapper.xml
View File

@@ -7,16 +7,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 查询已完成入库单数量 -->
<select id="selectStockinFinishCount" resultType="Integer">
select count(1) from in_stockin_finish
where 1=1
${params.warehouseDataScope}
</select>
<!-- 查询已完成出库单数量 -->
<select id="selectStockoutFinishCount" resultType="Integer">
select count(1) from out_stockout_finish
where 1=1
${params.warehouseDataScope}
</select>
<!-- 查询已完成盘点单数量 -->
<select id="selectStockcheckFinishCount" resultType="Integer">
select count(1) from check_stockin_finish
where 1=1
${params.warehouseDataScope}
</select>
</mapper>

2
ruoyi-admin/src/main/resources/mapper/index/ViewIndexJobMapper.xml
View File

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
in_or_out,
priority
from view_index_job
${params.warehouseDataScope}
</select>
</mapper>

4
ruoyi-admin/src/main/resources/mapper/index/WeekJobCountMapper.xml
View File

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CAST(create_time AS DATE)
ORDER BY
CAST(create_time AS DATE)
${arg2.params.warehouseDataScope}
</select>
<!-- 查询指定日期范围内每天的出库作业数量 -->
@@ -26,12 +27,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
mydo_job_finish
WHERE
in_or_out &gt;= 20
in_or_out >= 20
AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
GROUP BY
CAST(create_time AS DATE)
ORDER BY
CAST(create_time AS DATE)
${arg2.params.warehouseDataScope}
</select>
</mapper>

7
ruoyi-ui/src/views/index.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div class="app-container panel">
<!-- 顶部统计面板 -->
<el-row :gutter="40" class="panel-group">
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
@@ -49,7 +49,7 @@
</el-row>
<!-- 中间图表区域 -->
<el-row :gutter="32" style="margin-bottom: 32px;">
<el-row :gutter="32" style="margin-bottom: 0px;">
<el-col :xs="24" :sm="24" :lg="16">
<div class="chart-wrapper">
<div class="chart-header">
@@ -221,6 +221,9 @@ export default {
</script>
<style lang="scss" scoped>
.panel{
background: #fafafa;
}
.panel-group {
margin-top: 18px;

17
ruoyi-ui/src/views/system/role/index.vue
View File

@@ -308,8 +308,17 @@
</template>
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role"
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu"
import {
addRole,
changeRoleStatus,
dataScope,
delRole,
deptTreeSelect,
getRole,
listRole,
updateRole
} from "@/api/system/role"
import {roleMenuTreeselect, treeselect as menuTreeselect} from "@/api/system/menu"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
@@ -436,9 +445,9 @@ export default {
// let listMenu = response.data.map(item => {
// return this.$t(item.label); // 只提取翻译后的 label
// });
const translatedData = this.translateMenuLabels(response.data);
console.log(response.data);
// this.menuOptions = response.data
this.menuOptions = translatedData
this.menuOptions = this.translateMenuLabels(response.data)
})
},
//@@@