Merge remote-tracking branch 'origin/main'

product
chuang 2 years ago
commit bb11861fd4

13
SC-boot/.gitignore vendored

@ -1,3 +1,7 @@
#我的配置
application-dev.yml
application.yml
*.yml
# For Java
*.lck
target/
@ -7,6 +11,7 @@ logback-test.xml
application-dev.yml
# Compiled class file
*.class
@ -75,3 +80,11 @@ config/base.yaml
**/nacos/data/*
**/nacos/logs/*
**/seata/bin/*
### Example user template template
### Example user template
# IntelliJ project files
.idea
*.iml
out
gen

@ -1,115 +0,0 @@
# 应用服务器
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 30000 #tomcat端口
spring:
devtools: #spring开发者工具模块
restart:
enabled: true #热部署开关
freemarker:
cache: false #spring内置freemarker缓存
thymeleaf:
cache: false #spring内置thymeleaf缓存
#===================== 数据源配置 =====================
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL请严格按可选值填写)
host: 222.71.165.188
port: 3309
username: root
password: qawsed,.123
db-name: sc-boot
db-schema: #金仓达梦选填
prepare-url: #自定义url
#===================== 动态多数据源 =====================
dynamic:
enabled: true
seata: false #分布式事务开关
primary: sc-boot #设置默认的数据源或者数据源组,默认值即为master
strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
# datasource:
# master:
# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
# username: ${spring.datasource.username}
# password: ${spring.datasource.password}
# driver-class-name: com.mysql.cj.jdbc.Driver
#===================== Redis配置 =====================
redis:
database: 1 #缓存库编号
# 生产环境
# host: 222.71.165.188
# 测试环境
host: 150.158.169.212
port: 6379
password: qweasd,.123
timeout: 8000 #超时时间(单位:秒)
lettuce: #Lettuce为Redis的Java驱动包
pool:
max-active: 8 # 连接池最大连接数
max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
max-idle: 8 # 连接池中的最大空闲连接
config:
#===================== 是否开启测试环境 =====================
TestVersion: false
#===================== 文件模板配置 =====================
fileType: local #文件存储类型(local-本地存储minio-网络存储)
# win
# Path: /usr/project/jnpf-resources/ #Windows配置静态资源根目录和代码生成器临时目录
# Windows环境配置静态资源根目录和代码生成器临时目录
Path: D:\project\resources\
ServiceDirectoryPath: TemporaryFile
# Linux、MacOS环境配置静态资源根目录和代码生成器临时目录
# Path: /www/wwwroot/JNPF.Admin.test/Resources/
# ServiceDirectoryPath: /www/wwwroot/JNPF.Admin.test/Resources/CodeTemp/
# Linux
#Path: /data/jnpf-resources/ #Linux配置静态资源根目录和代码生成器临时目录
minio:
endpoint: http://192.168.0.147:9000/ #服务端地址
accessKey: minioadmin #账号
secretKey: minioadmin #密码
fileHost: http://192.168.0.147:9000/ #地址
#knife4j:
# 开启增强配置此配置可配置ignoreParameters忽略参数
# enable: true
# # 开启生产环境屏蔽
# production: false
# basic:
# enable: true
# # Basic认证用户名
# username: test
# # Basic认证密码
# password: 123456
#swagger文档开启/关闭
springfox:
documentation:
auto-startup: true
#knife4j
knife4j:
production: false # 开启/屏蔽文档资源
#开启语句打印
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:mapper/**/*.xml
global-config:
db-config:
logic-delete-field: delete_mark # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2)
logic-delete-value: 1 # 逻辑已删除值(默认为 1)
logic-not-delete-value: 0d # 逻辑未删除值(默认为 0)
# @TableLogic //实体类配置这个但前面配置了logic-delete-field于是可以不配置
# private Integer deleted;

@ -1,70 +0,0 @@
# 应用服务器
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 30000 #tomcat端口
spring:
devtools: #spring开发者工具模块
restart:
enabled: true #热部署开关
freemarker:
cache: false #spring内置freemarker缓存
thymeleaf:
cache: false #spring内置thymeleaf缓存
#===================== 数据源配置 =====================
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL请严格按可选值填写)
host: 192.168.0.10
port: 3306
username: java_boot_test
password: pBx5HaW6WMGSTdDf
db-name: java_boot_test
db-schema: #金仓达梦选填
prepare-url: #自定义url
#===================== 动态多数据源 =====================
dynamic:
enabled: true
seata: false #分布式事务开关
primary: master #设置默认的数据源或者数据源组,默认值即为master
strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
# datasource:
# master:
# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
# username: ${spring.datasource.username}
# password: ${spring.datasource.password}
# driver-class-name: com.mysql.cj.jdbc.Driver
#===================== Redis配置 =====================
redis:
database: 1 #缓存库编号
host: 127.0.0.1
port: 6379
password:
timeout: 3000 #超时时间(单位:秒)
lettuce: #Lettuce为Redis的Java驱动包
pool:
max-active: 8 # 连接池最大连接数
max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
max-idle: 8 # 连接池中的最大空闲连接
config:
#===================== 是否开启测试环境 =====================
TestVersion: false
#===================== 文件模板配置 =====================
fileType: local #文件存储类型(local-本地存储minio-网络存储)
# win
# Path: F:\project\jnpf-resources\ #Windows配置静态资源根目录和代码生成器临时目录
Path: D:\jnpf-resources\ #Windows配置静态资源根目录和代码生成器临时目录
# Linux
#Path: /data/jnpf-resources/ #Linux配置静态资源根目录和代码生成器临时目录
minio:
endpoint: http://192.168.0.147:9000/ #服务端地址
accessKey: minioadmin #账号
secretKey: minioadmin #密码
fileHost: http://192.168.0.147:9000/ #地址

@ -1,69 +0,0 @@
# 应用服务器
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 30000 #tomcat端口
spring:
devtools: #spring开发者工具模块
restart:
enabled: true #热部署开关
freemarker:
cache: false #spring内置freemarker缓存
thymeleaf:
cache: false #spring内置thymeleaf缓存
#===================== 数据源配置 =====================
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL请严格按可选值填写)
host: 222.71.165.188
port: 3309
username: root
password: qawsed,.123
db-name: sc-product
db-schema: #金仓达梦选填
prepare-url: #自定义url
#===================== 动态多数据源 =====================
dynamic:
enabled: true
seata: false #分布式事务开关
primary: master #设置默认的数据源或者数据源组,默认值即为master
strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
# datasource:
# master:
# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
# username: ${spring.datasource.username}
# password: ${spring.datasource.password}
# driver-class-name: com.mysql.cj.jdbc.Driver
#===================== Redis配置 =====================
redis:
database: 1 #缓存库编号
host: 222.71.165.188
port: 6379
password: qweasd,.123
timeout: 3000 #超时时间(单位:秒)
lettuce: #Lettuce为Redis的Java驱动包
pool:
max-active: 8 # 连接池最大连接数
max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
max-idle: 8 # 连接池中的最大空闲连接
config:
#===================== 是否开启测试环境 =====================
TestVersion: false
#===================== 文件模板配置 =====================
fileType: local #文件存储类型(local-本地存储minio-网络存储)
# win
Path: D:\project\resources\ #Windows配置静态资源根目录和代码生成器临时目录
# Linux
#Path: /data/jnpf-resources/ #Linux配置静态资源根目录和代码生成器临时目录
minio:
endpoint: http://192.168.0.147:9000/ #服务端地址
accessKey: minioadmin #账号
secretKey: minioadmin #密码
fileHost: http://192.168.0.147:9000/ #地址

@ -1,69 +0,0 @@
# 应用服务器
server:
tomcat:
uri-encoding: UTF-8 #tomcat编码
port: 30000 #tomcat端口
spring:
devtools: #spring开发者工具模块
restart:
enabled: true #热部署开关
freemarker:
cache: false #spring内置freemarker缓存
thymeleaf:
cache: false #spring内置thymeleaf缓存
#===================== 数据源配置 =====================
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置手动配置druid
datasource:
db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL请严格按可选值填写)
host: 192.168.0.10
port: 3306
username: java_boot_test
password: pBx5HaW6WMGSTdDf
db-name: java_boot_test
db-schema: #金仓达梦选填
prepare-url: #自定义url
#===================== 动态多数据源 =====================
dynamic:
enabled: true
seata: false #分布式事务开关
primary: master #设置默认的数据源或者数据源组,默认值即为master
strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
# datasource:
# master:
# url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
# username: ${spring.datasource.username}
# password: ${spring.datasource.password}
# driver-class-name: com.mysql.cj.jdbc.Driver
#===================== Redis配置 =====================
redis:
database: 1 #缓存库编号
host: 127.0.0.1
port: 6379
password:
timeout: 3000 #超时时间(单位:秒)
lettuce: #Lettuce为Redis的Java驱动包
pool:
max-active: 8 # 连接池最大连接数
max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
min-idle: 0 # 连接池中的最小空闲连接
max-idle: 8 # 连接池中的最大空闲连接
config:
#===================== 是否开启测试环境 =====================
TestVersion: false
#===================== 文件模板配置 =====================
fileType: local #文件存储类型(local-本地存储minio-网络存储)
# win
Path: D:\project\resources\ #Windows配置静态资源根目录和代码生成器临时目录
# Linux
#Path: /data/jnpf-resources/ #Linux配置静态资源根目录和代码生成器临时目录
minio:
endpoint: http://192.168.0.147:9000/ #服务端地址
accessKey: minioadmin #账号
secretKey: minioadmin #密码
fileHost: http://192.168.0.147:9000/ #地址

@ -1,62 +0,0 @@
spring: #环境 dev|test|pro|preview
profiles:
active: dev
servlet:
multipart: #文件传输配置
max-file-size: 1000MB #单个数据大小限制
max-request-size: 1000MB #请求总数据大小限制
enabled: true #是否启用分段上传支持
mvc:
hiddenmethod: #隐式方法过滤器
filter:
enabled: true #默认关闭。开启以支持PUT,DELETE表单提交方法
jackson: #序列化和反序列化json框架
serialization:
write-dates-as-timestamps: true #是否写入日期时间时间戳格式
time-zone: GMT+8 #指定日期格式化时区
main:
allow-bean-definition-overriding: true #允许同名bean后者覆盖,默认true
allow-circular-references: true #允许Bean相互引用,默认false
config:
AllowUploadImageType: jpg,gif,png,bmp,jpeg,tiff,psd,swf,svg,pcx,dxf,wmf,emf,lic,eps,tga #允许上传图片类型
AllowUploadFileType: jpg,gif,png,bmp,jpeg,doc,docx,ppt,pptx,xls,xlsx,pdf,txt,rar,zip,csv,mp3 #允许上传文件类型
AllowPreviewFileType: doc,docx,xls,xlsx,ppt,pptx,pdf #允许预览文件类型
PreviewType: kkfile #文件预览方式 1.yozo 2.kkfile默认使用kk
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kk文件预览服务地址
Domain: http://127.0.0.1:30000 #当前域名配置(文档预览中使用)
CodeAreasName: example #代码生成器模块命名
#===================== 多租户 =====================
MultiTenancy: false #是否开启
MultiTenancyUrl: http://127.0.0.1:30006/api/tenant/DbName/ #多租户项目地址
#===================== 系统及错误报告反馈相关 =====================
SoftName: linkage-java-boot #项目名
SoftFullName: LINKAGE软件开发平台 #项目全名
SoftVersion: V3.4.1 #版本号
RecordLog: true #系统日志启用
ErrorReport: false #软件错误报告
ErrorReportTo: surrpot@qq.com #软件错误报告接收者
IgexinEnabled: true #推送启动
#===================== APP =====================
AppVersion: V3.4.1 #APP版本号
IgexinAppid: HLFY9T2d1z7MySY8hwGwh4 #APPID应用的唯一标识
IgexinAppkey: 6Uiduugq648YDChhCjAt59 #APPKEY公匙相当于账号
IgexinMastersecret: pEyQm156SJ9iS7PbyjLCZ6 #Mastersecret私匙相当于密码
AppUpdateContent: ; #APP更新内容
#===================== 永中office在线预览配置 =====================
YozoDomain: //dcsapi.com/ #永中api域名
YozoDomainKey: 57462250284462899305150 #域名key
YozoCloudDomain: //dmc.yozocloud.cn #云预览
YozoAppId: yozoAgR41jgC0062 #appid
YozoAppKey: fc3134a9ba8bc6f4c69d635f9adf #app秘钥
YozoEditDomain: //eic.yozocloud.cn #云编辑
#===================== 接口鉴权 =====================
EnablePreAuth: false #是否开启
fixedRateString: 5000

@ -23,8 +23,8 @@ public class Pagination extends Page{
private String sidx="";
@ApiModelProperty(value = "当前页数",example = "1")
private long currentPage=1;
@ApiModelProperty(value = "菜单id")
private String menuId;
@ApiModelProperty(hidden = true)
@JsonIgnore

@ -1,6 +1,7 @@
package jnpf.arinvoices.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.arinvoices.entity.ArinvoicesEntity;
@ -20,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {
IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination);
IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination, @Param("ew") Wrapper<ArinvoicesEntity> queryWrapper);
}

@ -77,6 +77,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
int total=0;
int arinvoicesNum =0;
QueryWrapper<ArinvoicesEntity> arinvoicesQueryWrapper=new QueryWrapper<>();
arinvoicesQueryWrapper.eq("a.delete_mark", "0");
int arinvoices_item0Num =0;
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0;
@ -86,7 +87,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
@ -111,7 +112,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
@ -140,23 +141,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
}
if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){
arinvoicesNum++;
arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo());
}
if(StringUtil.isNotEmpty(arinvoicesPagination.getBusinessDate())){
arinvoicesNum++;
List<String> BusinessDateList = arinvoicesPagination.getBusinessDate();
Long fir = Long.valueOf(BusinessDateList.get(0));
Long sec = Long.valueOf(BusinessDateList.get(1));
arinvoicesPagination.setStartDate(new Date(fir));
arinvoicesPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
// arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
// .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(AllIdList.size()>0){
arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList);
}
@ -197,7 +181,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
if (StringUtil.isNotNull(detpartment)) {
arinvoicesPagination.setDepartmentId(detpartment);
}
IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination, arinvoicesQueryWrapper);
return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override

@ -1,8 +1,10 @@
package jnpf.collection.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.collection.entity.CollectionEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.collection.model.collection.CollectionPagination;
@ -29,5 +31,5 @@ public interface CollectionMapper extends BaseMapper<CollectionEntity> {
List<ContractFileEntity> queryContract(String code);
IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination);
IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination, @Param("ew") Wrapper<CollectionEntity> queryWrapper);
}

@ -85,6 +85,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
int total=0;
int collectionNum =0;
QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
collectionQueryWrapper.eq("a.delete_mark", "0");
int collection_item0Num =0;
QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = true;
@ -92,7 +93,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
@ -110,7 +111,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
@ -130,11 +131,6 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
}
if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
collectionNum++;
collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo());
}
if(AllIdList.size()>0){
collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
}
@ -176,7 +172,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
if (StringUtil.isNotNull(detpartment)) {
collectionPagination.setDepartmentId(detpartment);
}
IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination, collectionQueryWrapper);
return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override

@ -1,8 +1,10 @@
package jnpf.invoices.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.collection.entity.CollectionEntity;
import jnpf.invoices.entity.InvoicesEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.invoices.model.invoices.InvoicesPagination;
@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface InvoicesMapper extends BaseMapper<InvoicesEntity> {
IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination);
IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination, @Param("ew") Wrapper<InvoicesEntity> queryWrapper);
}

@ -84,6 +84,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
int total=0;
int invoicesNum =0;
QueryWrapper<InvoicesEntity> invoicesQueryWrapper=new QueryWrapper<>();
invoicesQueryWrapper.eq("a.delete_mark", "0");
int invoicesItem0Num =0;
QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
int invoicesItem1Num =0;
@ -93,7 +94,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
@ -118,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
@ -189,7 +190,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
if (StringUtil.isNotNull(detpartment)) {
invoicesPagination.setDepartmentId(detpartment);
}
IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination, invoicesQueryWrapper);
return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());

@ -1,8 +1,10 @@
package jnpf.purchaseback.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.invoices.entity.InvoicesEntity;
import jnpf.purchaseback.entity.PurchasebackEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.purchaseback.model.purchaseback.PurchasebackPagination;
@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface PurchasebackMapper extends BaseMapper<PurchasebackEntity> {
IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination);
IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination, @Param("ew") Wrapper<PurchasebackEntity> queryWrapper);
}

@ -76,6 +76,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
int total=0;
int purchasebackNum =0;
QueryWrapper<PurchasebackEntity> purchasebackQueryWrapper=new QueryWrapper<>();
purchasebackQueryWrapper.eq("a.delete_mark", "0");
int purchaseback_item0Num =0;
QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
int purchaseorderNum =0;
@ -85,7 +86,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
@ -110,7 +111,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
@ -174,7 +175,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
if (StringUtil.isNotNull(detpartment)) {
purchasebackPagination.setDepartmentId(detpartment);
}
IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination, purchasebackQueryWrapper);
return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
/*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){
purchasebackNum++;

@ -1,8 +1,10 @@
package jnpf.receiptout.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.purchaseback.entity.PurchasebackEntity;
import jnpf.receiptout.entity.ReceiptoutEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
* 2023-02-24
*/
public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {
IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination);
IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination, @Param("ew") Wrapper<ReceiptoutEntity> queryWrapper);
}

@ -74,6 +74,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
int total=0;
int receiptoutNum =0;
QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
receiptoutQueryWrapper.eq("a.delete_mark", "0");
int receiptout_item0Num =0;
QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = true;
@ -81,7 +82,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
@ -99,7 +100,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
@ -119,7 +120,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
}
if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
/* if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
receiptoutNum++;
receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getDocumentNo,receiptoutPagination.getDocumentNo());
}
@ -134,7 +135,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
Long sec = Long.valueOf(creatorTime.get(1));
receiptoutPagination.setStartDate(new Date(fir));
receiptoutPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
}*/
if(AllIdList.size()>0){
receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList);
@ -176,7 +177,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
if (StringUtil.isNotNull(detpartment)) {
receiptoutPagination.setDepartmentId(detpartment);
}
IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination, receiptoutQueryWrapper);
return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override

@ -1,8 +1,10 @@
package jnpf.saleback.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.receiptout.entity.ReceiptoutEntity;
import jnpf.saleback.entity.SalebackEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.saleback.entity.Saleback_item0Entity;
@ -23,7 +25,7 @@ import java.util.List;
* 2023-01-13
*/
public interface SalebackMapper extends BaseMapper<SalebackEntity> {
IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination, @Param("ew") Wrapper<SalebackEntity> queryWrapper);
List<Saleback_item0Entity> querySaleBackItem(String id);
}

@ -72,6 +72,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
int total=0;
int salebackNum =0;
QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
salebackQueryWrapper.eq("a.delete_mark", "0");
int saleback_item0Num =0;
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
@ -80,7 +81,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
@ -98,7 +99,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
@ -118,20 +119,6 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
}
if(StringUtil.isNotEmpty(salebackPagination.getDocumentNo())){
salebackNum++;
salebackQueryWrapper.lambda().like(SalebackEntity::getDocumentNo,salebackPagination.getDocumentNo());
}
if(StringUtil.isNotEmpty(salebackPagination.getCreatorTime())){
List<String> creatorTime = salebackPagination.getCreatorTime();
Long fir = Long.valueOf(creatorTime.get(0));
Long sec = Long.valueOf(creatorTime.get(1));
salebackPagination.setStartDate(new Date(fir));
salebackPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
// saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
// .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(AllIdList.size()>0){
@ -174,7 +161,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
if (StringUtil.isNotNull(detpartment)) {
salebackPagination.setDepartmentId(detpartment);
}
IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination, salebackQueryWrapper);
return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override

@ -1,12 +1,14 @@
package jnpf.saleorder.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.model.poundlist.PoundlistPagination;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.saleback.entity.SalebackEntity;
import jnpf.saleorder.entity.SaleorderitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.saleorder.entity.Salesorder_item0Entity;
@ -24,7 +26,7 @@ import java.util.List;
* 2023-02-22
*/
public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination);
IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination, @Param("ew") Wrapper<SaleorderitemEntity> queryWrapper);
PoundlistEntity queryPoundlist(String poundlistId);
List<Salesorder_item0Entity> querySaleOrderItem(String id);
List<Receiptout_item0Entity> queryReceiptoutItem(String id);

@ -93,6 +93,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
int total=0;
int saleorderitemNum =0;
QueryWrapper<SaleorderitemEntity> saleorderitemQueryWrapper=new QueryWrapper<>();
saleorderitemQueryWrapper.eq("a.delete_mark","0");
int salesorder_item0Num =0;
QueryWrapper<Salesorder_item0Entity> salesorder_item0QueryWrapper=new QueryWrapper<>();
int receiptoutsoitemNum =0;
@ -110,7 +111,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
return new ArrayList<>();
} else {
@ -163,7 +164,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
return new ArrayList<>();
} else {
@ -228,27 +229,6 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
}
if(StringUtil.isNotEmpty(saleorderitemPagination.getDocumentNo())){
saleorderitemNum++;
saleorderitemQueryWrapper.lambda().like(SaleorderitemEntity::getDocumentNo,saleorderitemPagination.getDocumentNo());
}
if(StringUtil.isNotEmpty(saleorderitemPagination.getStatus())){
saleorderitemNum++;
saleorderitemQueryWrapper.lambda().eq(SaleorderitemEntity::getStatus,saleorderitemPagination.getStatus());
}
if(StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())){
saleorderitemNum++;
List<String> creatorTime = saleorderitemPagination.getCreatorTime();
Long fir = Long.valueOf(creatorTime.get(0));
Long sec = Long.valueOf(creatorTime.get(1));
saleorderitemPagination.setStartDate(new Date(fir));
saleorderitemPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
.le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(AllIdList.size()>0){
saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList);
}
@ -291,7 +271,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination, saleorderitemQueryWrapper);
return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@Override

@ -4,6 +4,7 @@ package jnpf.tradeupload.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.tradeupload.entity.TradeuploadEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.tradeupload.model.tradeupload.TradeuploadPagination;
@ -23,5 +24,5 @@ import java.util.List;
public interface TradeuploadMapper extends BaseMapper<TradeuploadEntity> {
List<TradeuploadEntity> queryVehicle(TradeuploadEntity tradeuploadEntity);
IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination);
IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper<TradeuploadEntity> queryWrapper);
}

@ -86,14 +86,14 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
int total=0;
int tradeuploadNum =0;
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
tradeuploadQueryWrapper.eq("a.is_examine","0");
tradeuploadQueryWrapper.eq("a.delete_mark","0");
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {
@ -104,7 +104,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {
@ -165,7 +165,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
// tradeuploadPagination.setDepartmentId(detpartment);
IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper);
return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());
/*

@ -13,15 +13,7 @@
LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0'
WHERE 1=1
and a.delete_mark = '0'
/*添加权限*/
<if test="arinvoicesPagination.departmentId != null and arinvoicesPagination.departmentId != ''">
AND a.department_id = #{arinvoicesPagination.departmentId}
</if>
<if test="arinvoicesPagination.orgnizeId != null and arinvoicesPagination.orgnizeId != ''">
AND a.orgnize_id = #{arinvoicesPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
</if>

@ -17,15 +17,7 @@
jg_collection a
LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0'
/*添加权限*/
<if test="collectionPagination.departmentId != null and collectionPagination.departmentId != ''">
AND a.department_id = #{collectionPagination.departmentId}
</if>
<if test="collectionPagination.orgnizeId != null and collectionPagination.orgnizeId != ''">
AND a.orgnize_id = #{collectionPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
</if>

@ -7,14 +7,7 @@
LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id
LEFT JOIN jg_contract c on a.contract_id = c.id
LEFT JOIN jg_supplier d on a.supplier_id = d.id
where 1=1 AND a.delete_mark = 0 AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
/*添加权限*/
<if test="invoicesPagination.departmentId != null and invoicesPagination.departmentId != ''">
AND a.department_id = #{invoicesPagination.departmentId}
</if>
<if test="invoicesPagination.orgnizeId != null and invoicesPagination.orgnizeId != ''">
AND a.orgnize_id = #{invoicesPagination.orgnizeId}
</if>
${ew.customSqlSegment} AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
<if test="invoicesPagination.startDate != null and invoicesPagination.endDate != null">
AND a.creator_time &gt; #{invoicesPagination.startDate} AND a.creator_time &lt;= #{invoicesPagination.endDate}
</if>

@ -7,16 +7,7 @@
LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id
LEFT JOIN jg_contract c on b.contract_code = c.id
LEFT JOIN jg_supplier d on b.supplier_id = d.id
where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
/*添加权限*/
<if test="purchasebackPagination.departmentId != null and purchasebackPagination.departmentId != ''">
AND a.department_id = #{purchasebackPagination.departmentId}
</if>
<if test="purchasebackPagination.orgnizeId != null and purchasebackPagination.orgnizeId != ''">
AND a.orgnize_id = #{purchasebackPagination.orgnizeId}
</if>
${ew.customSqlSegment} and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
<if test="purchasebackPagination.documentNo != null and purchasebackPagination.documentNo != ''">
AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%')
</if>

@ -11,15 +11,7 @@
jg_receiptout a
LEFT JOIN jg_customer b on a.customer_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_salesorder c on a.source_no = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0'
/*添加权限*/
<if test="receiptoutPagination.departmentId != null and receiptoutPagination.departmentId != ''">
AND a.department_id = #{receiptoutPagination.departmentId}
</if>
<if test="receiptoutPagination.orgnizeId != null and receiptoutPagination.orgnizeId != ''">
AND a.orgnize_id = #{receiptoutPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
</if>

@ -12,15 +12,7 @@
LEFT JOIN jg_salesorder b on a.sales_order_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_contract c on b.contract_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_customer d on b.customer_id = d.id and d.delete_mark = '0'
where 1 = 1
and a.delete_mark = '0'
/*添加权限*/
<if test="salebackPagination.departmentId != null and salebackPagination.departmentId != ''">
AND a.department_id = #{salebackPagination.departmentId}
</if>
<if test="salebackPagination.orgnizeId != null and salebackPagination.orgnizeId != ''">
AND a.orgnize_id = #{salebackPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
</if>

@ -11,15 +11,7 @@
jg_salesorder a
left join jg_contract b on a.contract_id = b.id and b.delete_mark = '0'
left join jg_customer c on a.customer_id = c.id and c.delete_mark = '0'
where 1=1
and a.delete_mark = '0'
/*添加权限*/
<if test="saleorderitemPagination.departmentId != null and saleorderitemPagination.departmentId != ''">
AND a.department_id = #{saleorderitemPagination.departmentId}
</if>
<if test="saleorderitemPagination.orgnizeId != null and saleorderitemPagination.orgnizeId != ''">
AND a.orgnize_id = #{saleorderitemPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
</if>

@ -26,14 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
LEFT JOIN jg_contract g on a.purchase_id = g.id
LEFT JOIN base_user h on a.business_id = h.f_id
LEFT JOIN jg_natural i on a.natural_id = i.id
where a.is_examine = '0' AND a.delete_mark = 0
/*添加权限*/
<if test="tradeuploadPagination.departmentId != null and tradeuploadPagination.departmentId != ''">
AND a.department_id = #{tradeuploadPagination.departmentId}
</if>
<if test="tradeuploadPagination.orgnizeId != null and tradeuploadPagination.orgnizeId != ''">
AND a.orgnize_id = #{tradeuploadPagination.orgnizeId}
</if>
${ew.customSqlSegment}
<if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))
</if>

@ -222,8 +222,8 @@ aside {
::-webkit-scrollbar-track,
::-webkit-scrollbar-thumb {
border-radius: 999px;
border: 5px solid transparent;
border-radius: 1px;
border: 1px solid transparent;
}
::-webkit-scrollbar-track {

@ -12,7 +12,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -277,6 +277,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -37,7 +37,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -313,6 +313,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -22,7 +22,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -515,6 +515,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -33,7 +33,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
@ -434,6 +434,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -29,7 +29,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
展开
</el-button>
@ -338,6 +338,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -213,6 +213,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -213,6 +213,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -37,7 +37,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -412,6 +412,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -284,6 +284,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -34,7 +34,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
展开
</el-button>
@ -369,6 +369,12 @@ width="150" >
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -307,6 +307,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -32,7 +32,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
@ -236,6 +236,12 @@ export default {
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -22,7 +22,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -285,6 +285,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -29,7 +29,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
@ -271,6 +271,12 @@ export default {
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -26,7 +26,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -513,6 +513,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -16,7 +16,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -534,9 +534,21 @@
if (isrRefresh) this.reset()
},
reset() {
for (let key in this.query) {
this.query[key] = undefined
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.listQuery = {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
}
this.initData()
},
resetAll() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.listQuery = {
currentPage: 1,
pageSize: 20,

File diff suppressed because it is too large Load Diff

@ -12,7 +12,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -356,6 +356,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -39,7 +39,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -908,6 +908,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -40,7 +40,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -409,6 +409,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -42,7 +42,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -329,6 +329,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -267,6 +267,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -35,7 +35,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -317,6 +317,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -42,7 +42,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -600,6 +600,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -34,7 +34,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
@ -374,6 +374,12 @@ export default {
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -8,7 +8,7 @@
<el-col :span="12">
<el-form-item label="磅单上传" prop="poundPictures">
<JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
@change="imgChange" ref="poundUpload" >
@change="imgChange" ref="poundUpload">
</JNPF-UploadImg2B>
</el-form-item>
@ -25,7 +25,7 @@
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable
field="materialId" interfaceId="381037852907038533"
:columnOptions="materialIdcolumnOptions" propsValue="id" relationField="item_name"
popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20" >
popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
</popupSelect>
</el-form-item>
@ -35,7 +35,7 @@
<popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions"
propsValue="id" relationField="supplier_nm" popupType="dialog" popupTitle="选择数据"
popupWidth="800px" hasPage :pageSize="20" @change="customerSelect" >
popupWidth="800px" hasPage :pageSize="20" @change="customerSelect">
</popupSelect>
</el-form-item>
@ -50,31 +50,6 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购合同" prop="purchaseId">
<popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" disabled>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商" prop="supplierId">
<popupSelect v-model="dataForm.supplierId" placeholder="请选择客户" clearable field="supplierId"
interfaceId="382494924156735557" :columnOptions="supplierIdcolumnOptions" propsValue="id"
relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
:pageSize="20" disabled>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购价格" prop="purchasePrice" disabled="">
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="车牌号" prop="vehicleId">
<popupSelect v-model="dataForm.vehicleId" placeholder="请选择车辆" clearable field="vehicleId"
@ -202,7 +177,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable
:style='{"width":"100%"}'>
@ -451,13 +426,7 @@
"label": "业务员2地址",
"value": "adress"
}, ],
supplierIdcolumnOptions: [{
"label": "供应商编码",
"value": "supplier_code"
}, {
"label": "供应商名称",
"value": "supplier_name"
}],
}
},
computed: {},
@ -602,104 +571,20 @@
this.dataInfo(res.data)
this.dataForm.businessId = this.$store.state.user.userInfo.userId;
this.dataForm.businessName = this.$store.state.user.userInfo.userName;
this.dataForm.poundDate = new Date().getTime();
this.dataForm.poundDate = new Date();
this.loading = false
});
} else {
this.clearData(this.dataForm)
this.dataForm.businessId = this.$store.state.user.userInfo.userId;
this.dataForm.businessName = this.$store.state.user.userInfo.userName;
this.dataForm.poundDate = new Date().getTime();
this.dataForm.poundDate = new Date();
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
dataFormSubmit() {
var tareWeight = this.dataForm.tareWeight;//
var grossWeight = this.dataForm.grossWeight;//
var buckleWeight = this.dataForm.buckleWeight;//
var netWeight = this.dataForm.netWeight;//
this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
if(grossWeight < tareWeight + buckleWeight + netWeight){
this.$message({
message: '毛重不得小于皮重+扣重+净重',
type: 'success',
duration: 1000
})
return
}
if(buckleWeight >= netWeight){
this.$message({
message: '扣重不得大于净重',
type: 'success',
duration: 1000
})
return
}
if(buckleWeight >= grossWeight){
this.$message({
message: '扣重不得大于毛重',
type: 'success',
duration: 1000
})
return
}
this.$refs['elForm'].validate((valid) => {
if (valid) {
this.request2()
}
})
},
request2() {
this.submitDisabled = true;
this.dataForm;
var _data = this.dataList()
debugger
if (!this.dataForm.id) {
request({
url: '/api/tradeupload/Tradeupload',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 3000,
onClose: () => {
this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.submitDisabled = false
})
} else {
debugger
request({
url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 3000,
onClose: () => {
this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.submitDisabled = false
})
}
},
/* dataFormSubmit() {
var tareWeight = this.dataForm.tareWeight; //
var grossWeight = this.dataForm.grossWeight; //
var buckleWeight = this.dataForm.buckleWeight; //
@ -763,7 +648,7 @@
this.submitDisabled = false
})
}
},*/
},
request3() {
this.submitDisabled = true;
var _data = this.dataList()

@ -47,7 +47,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
v-if="!showAll">展开</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@ -407,6 +407,12 @@
this.formVisible2 = false
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
reset() {
for (let key in this.query) {
this.query[key] = undefined

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -294,6 +294,12 @@
if (isrRefresh) this.reset()
},
reset() {
// for (let key in this.query) {
// this.query[key] = undefined
// }
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}

@ -17,7 +17,7 @@
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button icon="el-icon-refresh-right" @click="resetAll()"></el-button>
</el-form-item>
</el-col>
</el-form>
@ -289,6 +289,12 @@
this.query[key] = undefined
}
this.search()
},
resetAll() {
for (let key in this.query) {
this.query[key] = undefined
}
this.search()
}
}
}

Loading…
Cancel
Save