diff --git a/_web/src/views/system/pos/index.vue b/_web/src/views/system/pos/index.vue index ebec7f12..3bc29f11 100644 --- a/_web/src/views/system/pos/index.vue +++ b/_web/src/views/system/pos/index.vue @@ -14,11 +14,9 @@ - - - 查询 - 重置 - + + 查询 + 重置 @@ -29,127 +27,160 @@ ref="table" :columns="columns" :data="loadData" - :alert="true" - :rowKey="(record) => record.code" - :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" + :alert="options.alert" + :rowKey="(record) => record.id" + :rowSelection="options.rowSelection" > 编辑 - + 删除 - - - diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java index 672f5689..2e758519 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java @@ -37,6 +37,7 @@ import vip.xiaonuo.sys.modular.log.mapper.SysOpLogMapper; import vip.xiaonuo.sys.modular.log.param.SysOpLogParam; import vip.xiaonuo.sys.modular.log.service.SysOpLogService; import org.springframework.stereotype.Service; +import java.util.List; /** * 系统操作日志service接口实现类 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java index f6db7a85..b9ff0a82 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java @@ -36,6 +36,7 @@ import vip.xiaonuo.sys.modular.log.mapper.SysVisLogMapper; import vip.xiaonuo.sys.modular.log.param.SysVisLogParam; import vip.xiaonuo.sys.modular.log.service.SysVisLogService; import org.springframework.stereotype.Service; +import java.util.List; /** * 系统访问日志service接口实现类 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index c9d1c2e6..f6211b34 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -56,7 +56,6 @@ import vip.xiaonuo.sys.modular.role.service.SysRoleDataScopeService; import vip.xiaonuo.sys.modular.user.service.SysUserDataScopeService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.util.List; import java.util.Set; @@ -527,4 +526,10 @@ public class SysOrgServiceImpl extends ServiceImpl impleme resultSet.addAll(childIdListById); return CollectionUtil.newArrayList(resultSet); } + + @Override + public void export(SysOrgParam sysOrgParam) { + List list = this.list(sysOrgParam); + PoiUtil.exportExcelWithStream("SysOrg.xls", SysOrg.class, list); + } }