yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://222.71.165.188:3000/huchuanhu/jigangSCM2

Browse Source
jg-waiwang-pro
mhsnet 6 months ago
parent 6775d19244 c34fc5dde6
commit c9d1b7aea3
41 changed files with 957 additions and 581 deletions
Show Stats Download Patch File Download Diff File

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineServiceImpl.java
Unescape View File

@ -422,6 +422,9 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<BusinessLineEntity> page=new Page<>(businessLinePagination.getCurrentPage(), businessLinePagination.getPageSize());
if("1".equals(businessLinePagination.getQueryFlowTaskPass())){
businessLineQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");
}
IPage<BusinessLineEntity> userIPage = businessLineMapper.queryBusinessLineList(page,businessLinePagination, businessLineQueryWrapper);
return businessLinePagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{

213
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwCostServiceImpl.java
Unescape View File

@ -113,120 +113,129 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwCostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwCostQueryWrapper,CwCostEntity.class,cwCostPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwCostObj)){
return new ArrayList<>();
} else {
cwCostQueryWrapper = (QueryWrapper<CwCostEntity>)cwCostObj;
if( cwCostQueryWrapper.getExpression().getNormal().size()>0){
cwCostNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwCostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwCostQueryWrapper,CwCostEntity.class,cwCostPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwCostObj)){
return new ArrayList<>();
} else {
cwCostQueryWrapper = (QueryWrapper<CwCostEntity>)cwCostObj;
if( cwCostQueryWrapper.getExpression().getNormal().size()>0){
cwCostNum++;
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwCostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwCostQueryWrapper,CwCostEntity.class,cwCostPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwCostObj)){
return new ArrayList<>();
} else {
cwCostQueryWrapper = (QueryWrapper<CwCostEntity>)cwCostObj;
if( cwCostQueryWrapper.getExpression().getNormal().size()>0){
cwCostNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwCostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwCostQueryWrapper,CwCostEntity.class,cwCostPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwCostObj)){
return new ArrayList<>();
} else {
cwCostQueryWrapper = (QueryWrapper<CwCostEntity>)cwCostObj;
if( cwCostQueryWrapper.getExpression().getNormal().size()>0){
cwCostNum++;
}
}
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(cwCostPagination.getCode())){
cwCostNum++;
cwCostNum++;
String value = cwCostPagination.getCode() instanceof List ?
JsonUtil.getObjectToString(cwCostPagination.getCode()) :
String.valueOf(cwCostPagination.getCode());
JsonUtil.getObjectToString(cwCostPagination.getCode()) :
String.valueOf(cwCostPagination.getCode());
cwCostQueryWrapper.lambda().like(CwCostEntity::getCode,value);
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getInstitutionId())){
cwCostNum++;
cwCostNum++;
List<String> idList = new ArrayList<>();
try {
String[][] institutionId = JsonUtil.getJsonToBean(cwCostPagination.getInstitutionId(),String[][].class);
for(int i=0;i<institutionId.length;i++){
if(institutionId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(institutionId[i])));
}
}
}catch (Exception e1){
try {
List<String> institutionId = JsonUtil.getJsonToList(cwCostPagination.getInstitutionId(),String.class);
if(institutionId.size()>0){
idList.add(JsonUtil.getObjectToString(institutionId));
}
}catch (Exception e2){
idList.add(String.valueOf(cwCostPagination.getInstitutionId()));
}
}
cwCostQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(CwCostEntity::getInstitutionId, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] institutionId = JsonUtil.getJsonToBean(cwCostPagination.getInstitutionId(),String[][].class);
for(int i=0;i<institutionId.length;i++){
if(institutionId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(institutionId[i])));
}
}
}catch (Exception e1){
try {
List<String> institutionId = JsonUtil.getJsonToList(cwCostPagination.getInstitutionId(),String.class);
if(institutionId.size()>0){
idList.add(JsonUtil.getObjectToString(institutionId));
}
}catch (Exception e2){
idList.add(String.valueOf(cwCostPagination.getInstitutionId()));
}
}
cwCostQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(CwCostEntity::getInstitutionId, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getCostTime())){
cwCostNum++;
cwCostNum++;
List CostTimeList = JsonUtil.getJsonToList(cwCostPagination.getCostTime(),String.class);
Long fir = Long.valueOf(String.valueOf(CostTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(CostTimeList.get(1)));
Long fir = Long.valueOf(String.valueOf(CostTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(CostTimeList.get(1)));
cwCostQueryWrapper.lambda().ge(CwCostEntity::getCostTime, new Date(fir))
.le(CwCostEntity::getCostTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
cwCostQueryWrapper.lambda().ge(CwCostEntity::getCostTime, new Date(fir))
.le(CwCostEntity::getCostTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getCostProject())){
cwCostNum++;
cwCostNum++;
List<String> idList = new ArrayList<>();
try {
String[][] costProject = JsonUtil.getJsonToBean(cwCostPagination.getCostProject(),String[][].class);
for(int i=0;i<costProject.length;i++){
if(costProject[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(costProject[i])));
}
}
}catch (Exception e1){
try {
List<String> costProject = JsonUtil.getJsonToList(cwCostPagination.getCostProject(),String.class);
if(costProject.size()>0){
idList.add(JsonUtil.getObjectToString(costProject));
}
}catch (Exception e2){
idList.add(String.valueOf(cwCostPagination.getCostProject()));
}
}
cwCostQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(CwCostEntity::getCostProject, tt).or();
});
});
List<String> idList = new ArrayList<>();
try {
String[][] costProject = JsonUtil.getJsonToBean(cwCostPagination.getCostProject(),String[][].class);
for(int i=0;i<costProject.length;i++){
if(costProject[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(costProject[i])));
}
}
}catch (Exception e1){
try {
List<String> costProject = JsonUtil.getJsonToList(cwCostPagination.getCostProject(),String.class);
if(costProject.size()>0){
idList.add(JsonUtil.getObjectToString(costProject));
}
}catch (Exception e2){
idList.add(String.valueOf(cwCostPagination.getCostProject()));
}
}
cwCostQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(CwCostEntity::getCostProject, tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getType())){
cwCostNum++;
cwCostQueryWrapper.lambda().eq(CwCostEntity::getType,cwCostPagination.getType());
cwCostNum++;
cwCostQueryWrapper.lambda().eq(CwCostEntity::getType,cwCostPagination.getType());
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getSubjectId())){
cwCostNum++;
cwCostQueryWrapper.lambda().eq(CwCostEntity::getSubjectId,cwCostPagination.getSubjectId());
}
if(cwCostPagination.getExcludeIdList() != null && cwCostPagination.getExcludeIdList().size()>0){
cwCostNum++;
cwCostQueryWrapper.lambda().notIn(CwCostEntity::getId,cwCostPagination.getExcludeIdList());
}
if(ObjectUtil.isNotEmpty(cwCostPagination.getCostType())){
@ -264,7 +273,7 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
}
cwCostQueryWrapper.lambda().in(CwCostEntity::getId, intersection);
}
//是否有高级查询
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
@ -272,7 +281,7 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
List<String> finalAllSuperIDlist = allSuperIDlist;
cwCostQueryWrapper.lambda().and(t->t.in(CwCostEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
@ -343,39 +352,39 @@ public class CwCostServiceImpl extends ServiceImpl<CwCostMapper, CwCostEntity> i
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getCostPrice())){
return "费用金额不能为空";
}
if(StringUtil.isNotEmpty(form.getCostPrice())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCostPrice())).matches()){
return "请输入正确的金额";
if(StringUtil.isEmpty(form.getCostPrice())){
return "费用金额不能为空";
}
if(StringUtil.isNotEmpty(form.getCostPrice())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCostPrice())).matches()){
return "请输入正确的金额";
}
}
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
* @param id
* @param cwCostForm
* @return
*/
* 新增修改数据(事务回滚)
* @param id
* @param cwCostForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(CwCostForm cwCostForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
cwCostForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(CwCostConstant.getFormData(),cwCostForm),CwCostForm.class);
generaterSwapUtil.swapDatetime(CwCostConstant.getFormData(),cwCostForm),CwCostForm.class);
CwCostEntity entity = JsonUtil.getJsonToBean(cwCostForm, CwCostEntity.class);
if(isSave){
String mainId = id ;
entity.setCode(generaterSwapUtil.getBillNumber("costCode", false));
entity.setCode(generaterSwapUtil.getBillNumber("costCode", false));
entity.setId(mainId);
entity.setFlowId(cwCostForm.getFlowId());
entity.setVersion(0);
}else{
entity.setCode(generaterSwapUtil.getBillNumber("costCode", false));
entity.setCode(generaterSwapUtil.getBillNumber("costCode", false));
entity.setFlowId(cwCostForm.getFlowId());
}
this.saveOrUpdate(entity);

19
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java
Unescape View File

@ -366,6 +366,25 @@ public class CwaccountServiceImpl extends ServiceImpl<CwaccountMapper, Cwaccount
}
if(ObjectUtil.isNotEmpty(cwaccountPagination.getContractCode())){
cwaccountNum++;
cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getContractCode,cwaccountPagination.getContractCode());
}
if(ObjectUtil.isNotEmpty(cwaccountPagination.getAccountState())){
cwaccountNum++;
cwaccountQueryWrapper.lambda().eq(CwaccountEntity::getAccountState,cwaccountPagination.getAccountState());
}
if(cwaccountPagination.getExcludeIdList() != null && cwaccountPagination.getExcludeIdList().size() > 0){
cwaccountNum++;
cwaccountQueryWrapper.lambda().notIn(CwaccountEntity::getId,cwaccountPagination.getExcludeIdList());
}
if(ObjectUtil.isNotEmpty(cwaccountPagination.getAccountSubjectName())){
cwaccountNum++;

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwpaymentreceiptServiceImpl.java
Unescape View File

@ -344,11 +344,6 @@ public class CwpaymentreceiptServiceImpl extends ServiceImpl<CwpaymentreceiptMap
return "请输入正确的金额";
}
}
if(StringUtil.isNotEmpty(form.getApplyAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getApplyAmount())).matches()){
return "请输入正确的金额";
}
}
if(StringUtil.isNotEmpty(form.getPaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPaymentAmount())).matches()){
return "请输入正确的金额";

519
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
Unescape View File

@ -239,239 +239,238 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwsettlementObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementQueryWrapper,CwsettlementEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementObj)){
return new ArrayList<>();
} else {
cwsettlementQueryWrapper = (QueryWrapper<CwsettlementEntity>)cwsettlementObj;
if( cwsettlementQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementNum++;
}
}
Object cwsettlementaccountObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementaccountQueryWrapper,CwsettlementaccountEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementaccountObj)){
return new ArrayList<>();
} else {
cwsettlementaccountQueryWrapper = (QueryWrapper<CwsettlementaccountEntity>)cwsettlementaccountObj;
if( cwsettlementaccountQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementaccountNum++;
}
}
Object cwsettlementcontractObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcontractQueryWrapper,CwsettlementcontractEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcontractObj)){
return new ArrayList<>();
} else {
cwsettlementcontractQueryWrapper = (QueryWrapper<CwsettlementcontractEntity>)cwsettlementcontractObj;
if( cwsettlementcontractQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcontractNum++;
}
}
Object cwsettlementcostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcostQueryWrapper,CwsettlementcostEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcostObj)){
return new ArrayList<>();
} else {
cwsettlementcostQueryWrapper = (QueryWrapper<CwsettlementcostEntity>)cwsettlementcostObj;
if( cwsettlementcostQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcostNum++;
}
}
Object cwsettlementpaymentreceiptObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementpaymentreceiptQueryWrapper,CwsettlementpaymentreceiptEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementpaymentreceiptObj)){
return new ArrayList<>();
} else {
cwsettlementpaymentreceiptQueryWrapper = (QueryWrapper<CwsettlementpaymentreceiptEntity>)cwsettlementpaymentreceiptObj;
if( cwsettlementpaymentreceiptQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementpaymentreceiptNum++;
}
}
Object cwsettlementsubjectObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsubjectQueryWrapper,CwsettlementsubjectEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsubjectObj)){
return new ArrayList<>();
} else {
cwsettlementsubjectQueryWrapper = (QueryWrapper<CwsettlementsubjectEntity>)cwsettlementsubjectObj;
if( cwsettlementsubjectQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsubjectNum++;
}
}
Object cwsettlementsummaryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsummaryQueryWrapper,CwsettlementsummaryEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsummaryObj)){
return new ArrayList<>();
} else {
cwsettlementsummaryQueryWrapper = (QueryWrapper<CwsettlementsummaryEntity>)cwsettlementsummaryObj;
if( cwsettlementsummaryQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsummaryNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwsettlementObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementQueryWrapper,CwsettlementEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementObj)){
return new ArrayList<>();
} else {
cwsettlementQueryWrapper = (QueryWrapper<CwsettlementEntity>)cwsettlementObj;
if( cwsettlementQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementNum++;
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwsettlementObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementQueryWrapper,CwsettlementEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementObj)){
return new ArrayList<>();
} else {
cwsettlementQueryWrapper = (QueryWrapper<CwsettlementEntity>)cwsettlementObj;
if( cwsettlementQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementNum++;
}
}
Object cwsettlementaccountObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementaccountQueryWrapper,CwsettlementaccountEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementaccountObj)){
return new ArrayList<>();
} else {
cwsettlementaccountQueryWrapper = (QueryWrapper<CwsettlementaccountEntity>)cwsettlementaccountObj;
if( cwsettlementaccountQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementaccountNum++;
}
}
Object cwsettlementcontractObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcontractQueryWrapper,CwsettlementcontractEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcontractObj)){
return new ArrayList<>();
} else {
cwsettlementcontractQueryWrapper = (QueryWrapper<CwsettlementcontractEntity>)cwsettlementcontractObj;
if( cwsettlementcontractQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcontractNum++;
}
}
Object cwsettlementcostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcostQueryWrapper,CwsettlementcostEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcostObj)){
return new ArrayList<>();
} else {
cwsettlementcostQueryWrapper = (QueryWrapper<CwsettlementcostEntity>)cwsettlementcostObj;
if( cwsettlementcostQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcostNum++;
}
}
Object cwsettlementpaymentreceiptObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementpaymentreceiptQueryWrapper,CwsettlementpaymentreceiptEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementpaymentreceiptObj)){
return new ArrayList<>();
} else {
cwsettlementpaymentreceiptQueryWrapper = (QueryWrapper<CwsettlementpaymentreceiptEntity>)cwsettlementpaymentreceiptObj;
if( cwsettlementpaymentreceiptQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementpaymentreceiptNum++;
}
}
Object cwsettlementsubjectObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsubjectQueryWrapper,CwsettlementsubjectEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsubjectObj)){
return new ArrayList<>();
} else {
cwsettlementsubjectQueryWrapper = (QueryWrapper<CwsettlementsubjectEntity>)cwsettlementsubjectObj;
if( cwsettlementsubjectQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsubjectNum++;
}
}
Object cwsettlementsummaryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsummaryQueryWrapper,CwsettlementsummaryEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsummaryObj)){
return new ArrayList<>();
} else {
cwsettlementsummaryQueryWrapper = (QueryWrapper<CwsettlementsummaryEntity>)cwsettlementsummaryObj;
if( cwsettlementsummaryQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsummaryNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object cwsettlementObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementQueryWrapper,CwsettlementEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementObj)){
return new ArrayList<>();
} else {
cwsettlementQueryWrapper = (QueryWrapper<CwsettlementEntity>)cwsettlementObj;
if( cwsettlementQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementNum++;
}
}
Object cwsettlementaccountObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementaccountQueryWrapper,CwsettlementaccountEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementaccountObj)){
return new ArrayList<>();
} else {
cwsettlementaccountQueryWrapper = (QueryWrapper<CwsettlementaccountEntity>)cwsettlementaccountObj;
if( cwsettlementaccountQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementaccountNum++;
}
}
Object cwsettlementaccountObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementaccountQueryWrapper,CwsettlementaccountEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementaccountObj)){
return new ArrayList<>();
} else {
cwsettlementaccountQueryWrapper = (QueryWrapper<CwsettlementaccountEntity>)cwsettlementaccountObj;
if( cwsettlementaccountQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementaccountNum++;
}
}
Object cwsettlementcontractObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcontractQueryWrapper,CwsettlementcontractEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcontractObj)){
return new ArrayList<>();
} else {
cwsettlementcontractQueryWrapper = (QueryWrapper<CwsettlementcontractEntity>)cwsettlementcontractObj;
if( cwsettlementcontractQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcontractNum++;
}
}
Object cwsettlementcontractObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcontractQueryWrapper,CwsettlementcontractEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcontractObj)){
return new ArrayList<>();
} else {
cwsettlementcontractQueryWrapper = (QueryWrapper<CwsettlementcontractEntity>)cwsettlementcontractObj;
if( cwsettlementcontractQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcontractNum++;
}
}
Object cwsettlementcostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcostQueryWrapper,CwsettlementcostEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcostObj)){
return new ArrayList<>();
} else {
cwsettlementcostQueryWrapper = (QueryWrapper<CwsettlementcostEntity>)cwsettlementcostObj;
if( cwsettlementcostQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcostNum++;
}
}
Object cwsettlementcostObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementcostQueryWrapper,CwsettlementcostEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementcostObj)){
return new ArrayList<>();
} else {
cwsettlementcostQueryWrapper = (QueryWrapper<CwsettlementcostEntity>)cwsettlementcostObj;
if( cwsettlementcostQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementcostNum++;
}
}
Object cwsettlementpaymentreceiptObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementpaymentreceiptQueryWrapper,CwsettlementpaymentreceiptEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementpaymentreceiptObj)){
return new ArrayList<>();
} else {
cwsettlementpaymentreceiptQueryWrapper = (QueryWrapper<CwsettlementpaymentreceiptEntity>)cwsettlementpaymentreceiptObj;
if( cwsettlementpaymentreceiptQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementpaymentreceiptNum++;
}
}
Object cwsettlementpaymentreceiptObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementpaymentreceiptQueryWrapper,CwsettlementpaymentreceiptEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementpaymentreceiptObj)){
return new ArrayList<>();
} else {
cwsettlementpaymentreceiptQueryWrapper = (QueryWrapper<CwsettlementpaymentreceiptEntity>)cwsettlementpaymentreceiptObj;
if( cwsettlementpaymentreceiptQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementpaymentreceiptNum++;
}
}
Object cwsettlementsubjectObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsubjectQueryWrapper,CwsettlementsubjectEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsubjectObj)){
return new ArrayList<>();
} else {
cwsettlementsubjectQueryWrapper = (QueryWrapper<CwsettlementsubjectEntity>)cwsettlementsubjectObj;
if( cwsettlementsubjectQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsubjectNum++;
}
}
Object cwsettlementsubjectObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsubjectQueryWrapper,CwsettlementsubjectEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsubjectObj)){
return new ArrayList<>();
} else {
cwsettlementsubjectQueryWrapper = (QueryWrapper<CwsettlementsubjectEntity>)cwsettlementsubjectObj;
if( cwsettlementsubjectQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsubjectNum++;
}
}
Object cwsettlementsummaryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsummaryQueryWrapper,CwsettlementsummaryEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsummaryObj)){
return new ArrayList<>();
} else {
cwsettlementsummaryQueryWrapper = (QueryWrapper<CwsettlementsummaryEntity>)cwsettlementsummaryObj;
if( cwsettlementsummaryQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsummaryNum++;
}
}
Object cwsettlementsummaryObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(cwsettlementsummaryQueryWrapper,CwsettlementsummaryEntity.class,cwsettlementPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(cwsettlementsummaryObj)){
return new ArrayList<>();
} else {
cwsettlementsummaryQueryWrapper = (QueryWrapper<CwsettlementsummaryEntity>)cwsettlementsummaryObj;
if( cwsettlementsummaryQueryWrapper.getExpression().getNormal().size()>0){
cwsettlementsummaryNum++;
}
}
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(cwsettlementPagination.getCode())){
cwsettlementNum++;
cwsettlementNum++;
String value = cwsettlementPagination.getCode() instanceof List ?
JsonUtil.getObjectToString(cwsettlementPagination.getCode()) :
String.valueOf(cwsettlementPagination.getCode());
JsonUtil.getObjectToString(cwsettlementPagination.getCode()) :
String.valueOf(cwsettlementPagination.getCode());
cwsettlementQueryWrapper.lambda().like(CwsettlementEntity::getCode,value);
}
if(ObjectUtil.isNotEmpty(cwsettlementPagination.getType())){
cwsettlementNum++;
cwsettlementNum++;
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getType,cwsettlementPagination.getType());
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getType,cwsettlementPagination.getType());
}
if(ObjectUtil.isNotEmpty(cwsettlementPagination.getSettlementSubjectName())){
cwsettlementNum++;
cwsettlementNum++;
String value = cwsettlementPagination.getSettlementSubjectName() instanceof List ?
JsonUtil.getObjectToString(cwsettlementPagination.getSettlementSubjectName()) :
String.valueOf(cwsettlementPagination.getSettlementSubjectName());
JsonUtil.getObjectToString(cwsettlementPagination.getSettlementSubjectName()) :
String.valueOf(cwsettlementPagination.getSettlementSubjectName());
cwsettlementQueryWrapper.lambda().like(CwsettlementEntity::getSettlementSubjectName,value);
}
}
if(cwsettlementaccountNum>0){
if(cwsettlementaccountNum>0){
List<String> cwsettlementaccountIdList = cwsettlementaccountService.list(cwsettlementaccountQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementaccountService.count();
if (count>0){
intersectionList.add(cwsettlementaccountIdList);
intersectionList.add(cwsettlementaccountIdList);
}
AllIdList.addAll(cwsettlementaccountIdList);
}
total+=cwsettlementaccountNum;
if(cwsettlementcontractNum>0){
}
total+=cwsettlementaccountNum;
if(cwsettlementcontractNum>0){
List<String> cwsettlementcontractIdList = cwsettlementcontractService.list(cwsettlementcontractQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementcontractService.count();
if (count>0){
intersectionList.add(cwsettlementcontractIdList);
intersectionList.add(cwsettlementcontractIdList);
}
AllIdList.addAll(cwsettlementcontractIdList);
}
total+=cwsettlementcontractNum;
if(cwsettlementcostNum>0){
}
total+=cwsettlementcontractNum;
if(cwsettlementcostNum>0){
List<String> cwsettlementcostIdList = cwsettlementcostService.list(cwsettlementcostQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementcostService.count();
if (count>0){
intersectionList.add(cwsettlementcostIdList);
intersectionList.add(cwsettlementcostIdList);
}
AllIdList.addAll(cwsettlementcostIdList);
}
total+=cwsettlementcostNum;
if(cwsettlementpaymentreceiptNum>0){
}
total+=cwsettlementcostNum;
if(cwsettlementpaymentreceiptNum>0){
List<String> cwsettlementpaymentreceiptIdList = cwsettlementpaymentreceiptService.list(cwsettlementpaymentreceiptQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementpaymentreceiptService.count();
if (count>0){
intersectionList.add(cwsettlementpaymentreceiptIdList);
intersectionList.add(cwsettlementpaymentreceiptIdList);
}
AllIdList.addAll(cwsettlementpaymentreceiptIdList);
}
total+=cwsettlementpaymentreceiptNum;
if(cwsettlementsubjectNum>0){
}
total+=cwsettlementpaymentreceiptNum;
if(cwsettlementsubjectNum>0){
List<String> cwsettlementsubjectIdList = cwsettlementsubjectService.list(cwsettlementsubjectQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementsubjectService.count();
if (count>0){
intersectionList.add(cwsettlementsubjectIdList);
intersectionList.add(cwsettlementsubjectIdList);
}
AllIdList.addAll(cwsettlementsubjectIdList);
}
total+=cwsettlementsubjectNum;
if(cwsettlementsummaryNum>0){
}
total+=cwsettlementsubjectNum;
if(cwsettlementsummaryNum>0){
List<String> cwsettlementsummaryIdList = cwsettlementsummaryService.list(cwsettlementsummaryQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getSettlementId())).map(t->t.getSettlementId()).collect(Collectors.toList());
long count = cwsettlementsummaryService.count();
if (count>0){
intersectionList.add(cwsettlementsummaryIdList);
intersectionList.add(cwsettlementsummaryIdList);
}
AllIdList.addAll(cwsettlementsummaryIdList);
}
total+=cwsettlementsummaryNum;
}
total+=cwsettlementsummaryNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
@ -479,7 +478,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
}
cwsettlementQueryWrapper.lambda().in(CwsettlementEntity::getId, intersection);
}
//是否有高级查询
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
@ -487,7 +486,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
List<String> finalAllSuperIDlist = allSuperIDlist;
cwsettlementQueryWrapper.lambda().and(t->t.in(CwsettlementEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
@ -552,7 +551,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementsubjectEntity> getCwsettlementsubjectList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementsubject";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementsubjectEntity> queryWrapper = new QueryWrapper<>();
@ -573,7 +572,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementcontractEntity> getCwsettlementcontractList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementcontract";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementcontractEntity> queryWrapper = new QueryWrapper<>();
@ -594,7 +593,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementaccountEntity> getCwsettlementaccountList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementaccount";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementaccountEntity> queryWrapper = new QueryWrapper<>();
@ -615,7 +614,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementcostEntity> getCwsettlementcostList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementcost";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementcostEntity> queryWrapper = new QueryWrapper<>();
@ -636,7 +635,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementpaymentreceiptEntity> getCwsettlementpaymentreceiptList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementpaymentreceipt";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementpaymentreceiptEntity> queryWrapper = new QueryWrapper<>();
@ -657,7 +656,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
@Override
public List<CwsettlementsummaryEntity> getCwsettlementsummaryList(String id,CwsettlementPagination cwsettlementPagination){
Map<String, Object> newtabMap=CwsettlementConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="cwsettlementsummary";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<CwsettlementsummaryEntity> queryWrapper = new QueryWrapper<>();
@ -684,122 +683,122 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
id = form.getId();
}
//主表字段验证
if(StringUtil.isNotEmpty(form.getSettledAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettledAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getSettledAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettledAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getSettlementAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlementAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getSettlementAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlementAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getSettlementExpenses())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlementExpenses())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getSettlementExpenses())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlementExpenses())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getPaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPaymentAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getPaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPaymentAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getPrepaidDeductionAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPrepaidDeductionAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getPrepaidDeductionAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPrepaidDeductionAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getReturnAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getReturnAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getReturnAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getReturnAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getMarginAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getMarginAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getMarginAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getMarginAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getUnderpaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getUnderpaymentAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getUnderpaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getUnderpaymentAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getOverdueAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getOverdueAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getOverdueAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getOverdueAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getPayableAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPayableAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getPayableAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getPayableAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getCurrentMarginAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCurrentMarginAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getCurrentMarginAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCurrentMarginAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getCurrentUnderpaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCurrentUnderpaymentAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getCurrentUnderpaymentAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getCurrentUnderpaymentAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getSettlableAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlableAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getSettlableAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getSettlableAmount())).matches()){
return "请输入正确的金额";
}
}
}
if(StringUtil.isNotEmpty(form.getApplyAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getApplyAmount())).matches()){
return "请输入正确的金额";
if(StringUtil.isNotEmpty(form.getApplyAmount())){
if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getApplyAmount())).matches()){
return "请输入正确的金额";
}
}
}
//子表字段验证
if (form.getCwsettlementsubjectList()!=null){
}
if (form.getCwsettlementcontractList()!=null){
}
if (form.getCwsettlementaccountList()!=null){
}
if (form.getCwsettlementcostList()!=null){
}
if (form.getCwsettlementpaymentreceiptList()!=null){
}
if (form.getCwsettlementsummaryList()!=null){
}
if (form.getCwsettlementsubjectList()!=null){
}
if (form.getCwsettlementcontractList()!=null){
}
if (form.getCwsettlementaccountList()!=null){
}
if (form.getCwsettlementcostList()!=null){
}
if (form.getCwsettlementpaymentreceiptList()!=null){
}
if (form.getCwsettlementsummaryList()!=null){
}
return countRecover;
}
/**
* 新增修改数据(事务回滚)
* @param id
* @param cwsettlementForm
* @return
*/
* 新增修改数据(事务回滚)
* @param id
* @param cwsettlementForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(CwsettlementForm cwsettlementForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
cwsettlementForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(CwsettlementConstant.getFormData(),cwsettlementForm),CwsettlementForm.class);
generaterSwapUtil.swapDatetime(CwsettlementConstant.getFormData(),cwsettlementForm),CwsettlementForm.class);
CwsettlementEntity entity = JsonUtil.getJsonToBean(cwsettlementForm, CwsettlementEntity.class);
if(isSave){
String mainId = id ;
entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setId(mainId);
entity.setFlowId(cwsettlementForm.getFlowId());
entity.setVersion(0);
}else{
entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));
entity.setCreatorUserId(userInfo.getUserId());
entity.setCreatorTime(DateUtil.getNowDate());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setFlowId(cwsettlementForm.getFlowId());
}
this.saveOrUpdate(entity);

12
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SubjectbasicServiceImpl.java
Unescape View File

@ -582,15 +582,15 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
if(StringUtil.isEmpty(form.getAddress())){
return "详细地址不能为空";
}
if(StringUtil.isEmpty(form.getPhone())){
/*if(StringUtil.isEmpty(form.getPhone())){
return "公司电话不能为空";
}
}*/
if(StringUtil.isNotEmpty(form.getPhone())){
if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getPhone())).matches()){
return "请输入正确的联系方式";
}
}
if(StringUtil.isEmpty(form.getRegisterAddress())){
/*if(StringUtil.isEmpty(form.getRegisterAddress())){
return "注册地址不能为空";
}
if(StringUtil.isEmpty(form.getInformationCode())){
@ -598,7 +598,7 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
}
if(StringUtil.isEmpty(form.getRegisterFunds())){
return "注册资金不能为空";
}
}*/
if(StringUtil.isNotEmpty(form.getRegisterFunds())){
if(!Pattern.compile("^\\d+$").matcher(String.valueOf(form.getRegisterFunds())).matches()){
return "请输入正确的数字";
@ -630,12 +630,12 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
if(StringUtil.isEmpty(form.getBankBranchName())){
return "支行名称不能为空";
}
if(StringUtil.isEmpty(form.getCompanyTaxNumber())){
/*if(StringUtil.isEmpty(form.getCompanyTaxNumber())){
return "公司税号不能为空";
}
if(StringUtil.isEmpty(form.getEnterpriseName())){
return "企业名称不能为空";
}
}*/
if(StringUtil.isEmpty(form.getWorkAddress())){
return "单位地址不能为空";
}

1
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwaccountController.java
Unescape View File

@ -626,6 +626,7 @@ public class CwaccountController {
CwaccountEntity entity= cwaccountService.getInfo(id);
if(entity!=null){
try{
cwaccountForm.setAccountState("1");
cwaccountService.saveOrUpdate(cwaccountForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");

31
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwpaymentreceiptController.java
Unescape View File

@ -148,6 +148,19 @@ public class CwpaymentreceiptController {
CwsettlementEntity cwsettlementEntity = cwsettlementService.getInfo(cwpaymentreceiptForm.getSettlementId());
cwsettlementEntity.setSettlableAmount(cwsettlementEntity.getSettlableAmount().subtract(new BigDecimal(cwpaymentreceiptForm.getPaymentAmount())));
cwsettlementEntity.setSettledAmount(cwsettlementEntity.getSettledAmount().add(new BigDecimal(cwpaymentreceiptForm.getPaymentAmount())));
if(cwsettlementEntity.getSettlableAmount().compareTo(BigDecimal.ZERO) == 0){
//1.未付款，2.部分付款3.已付款
//可结金额为0已付款
cwsettlementEntity.setPaymentState("3");//已付款
cwsettlementEntity.setCompletionDate(new Date());//完成时间
}
if(cwsettlementEntity.getSettlableAmount().compareTo(cwsettlementEntity.getPayableAmount()) == 0){
//可结金额=应结金额（未付款）
cwsettlementEntity.setPaymentState("1");//已付款
}else if(cwsettlementEntity.getSettlableAmount().compareTo(cwsettlementEntity.getPayableAmount()) < 0){
//可结金额<应结金额（部分付款）
cwsettlementEntity.setPaymentState("2");//部分付款
}
cwsettlementService.updateById(cwsettlementEntity);
cwpaymentreceiptService.saveOrUpdate(cwpaymentreceiptForm, id ,true);
@ -367,6 +380,24 @@ public class CwpaymentreceiptController {
CwpaymentreceiptEntity entity= cwpaymentreceiptService.getInfo(id);
if(entity!=null){
try{
//修改可结算金额和已结金额
CwsettlementEntity cwsettlementEntity = cwsettlementService.getInfo(cwpaymentreceiptForm.getSettlementId());
cwsettlementEntity.setSettlableAmount(cwsettlementEntity.getSettlableAmount().subtract(new BigDecimal(cwpaymentreceiptForm.getPaymentAmount())));
cwsettlementEntity.setSettledAmount(cwsettlementEntity.getSettledAmount().add(new BigDecimal(cwpaymentreceiptForm.getPaymentAmount())));
if(cwsettlementEntity.getSettlableAmount().compareTo(BigDecimal.ZERO) == 0){
//1.未付款，2.部分付款3.已付款
//可结金额为0已付款
cwsettlementEntity.setPaymentState("3");//已付款
cwsettlementEntity.setCompletionDate(new Date());//完成时间
}
if(cwsettlementEntity.getSettlableAmount().compareTo(cwsettlementEntity.getPayableAmount()) == 0){
//可结金额=应结金额（未付款）
cwsettlementEntity.setPaymentState("1");//已付款
}else if(cwsettlementEntity.getSettlableAmount().compareTo(cwsettlementEntity.getPayableAmount()) < 0){
//可结金额<应结金额（部分付款）
cwsettlementEntity.setPaymentState("2");//部分付款
}
cwsettlementService.updateById(cwsettlementEntity);
cwpaymentreceiptService.saveOrUpdate(cwpaymentreceiptForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");

15
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
Unescape View File

@ -83,7 +83,8 @@ public class CwsettlementController {
private CwsettlementpaymentreceiptService cwsettlementpaymentreceiptService;
@Autowired
private CwsettlementsummaryService cwsettlementsummaryService;
@Autowired
private CwaccountService cwaccountService;
@Autowired
private ConfigValueUtil configValueUtil;
@ -162,7 +163,16 @@ public class CwsettlementController {
return ActionResult.fail(b );
}
try{
if(cwsettlementForm.getCwsettlementaccountList() != null){
cwsettlementForm.setDocmentNum(String.valueOf(cwsettlementForm.getCwsettlementaccountList().size()));
}
cwsettlementService.saveOrUpdate(cwsettlementForm, id ,true);
List<CwsettlementaccountModel> cwsettlementaccountModels = cwsettlementForm.getCwsettlementaccountList();
for (CwsettlementaccountModel cwsettlementaccountModel : cwsettlementaccountModels) {
CwaccountEntity cwaccountEntity = cwaccountService.getById(cwsettlementaccountModel.getAccountId());
cwaccountEntity.setAccountState("2");//已结算
cwaccountService.updateById(cwaccountEntity);
}
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
@ -617,6 +627,9 @@ public class CwsettlementController {
CwsettlementEntity entity= cwsettlementService.getInfo(id);
if(entity!=null){
try{
if(cwsettlementForm.getCwsettlementaccountList() != null){
cwsettlementForm.setDocmentNum(String.valueOf(cwsettlementForm.getCwsettlementaccountList().size()));
}
cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");

30
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
Unescape View File

@ -565,4 +565,34 @@ public class WarehousingStorageController {
return ActionResult.success(warehousingStorageMap);
}
/**
* 列表
*
* @param warehousingStoragePagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getWarehousingstorageoutboundList")
public ActionResult getWarehousingstorageoutboundList(@RequestBody WarehousingStoragePagination warehousingStoragePagination)throws IOException{
List<WarehousingStorageEntity> list= warehousingStorageService.getWarehousingstorageoutboundList(warehousingStoragePagination);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(list);
PaginationVO page = JsonUtil.getJsonToBean(warehousingStoragePagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
* 列表
*
* @param warehousingStoragePagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getWarehousingstorageoutboundPoundlist")
public ActionResult getWarehousingstorageoutboundPoundlist(@RequestBody WarehousingStoragePagination warehousingStoragePagination)throws IOException{
List<CwaccountvoucherEntity> list= warehousingStorageService.getWarehousingstorageoutboundPoundlist(warehousingStoragePagination);
return ActionResult.success(list);
}
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountEntity.java
Unescape View File

@ -54,16 +54,16 @@ public class CwaccountEntity {
private String deleteUserId;
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark;
@TableField(value = "company_id" , fill = FieldFill.INSERT)
private String companyId;
@TableField(value = "department_id" , fill = FieldFill.INSERT)
private String departmentId;
@TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
private String organizeJsonId;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_FLOW_ID")
private String flowId;
@TableField("F_VERSION")
private Integer version;
@TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT)
private String companyId;
@TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT)
private String departmentId;
@TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT)
private String organizeJsonId;
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwaccountsummaryEntity.java
Unescape View File

@ -30,6 +30,8 @@ public class CwaccountsummaryEntity {
private String productId;
@TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
private String spec;
@TableField(value = "RATE" , updateStrategy = FieldStrategy.IGNORED)
private String rate;
@TableField(value = "INVENTORY_UNIT_ID" , updateStrategy = FieldStrategy.IGNORED)
private String inventoryUnitId;
@TableField(value = "PURCHASE_UNIT_ID" , updateStrategy = FieldStrategy.IGNORED)

26
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwpaymentreceiptEntity.java
Unescape View File

@ -43,30 +43,30 @@ public class CwpaymentreceiptEntity {
private Date payDate;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;
@TableField("F_CREATOR_TIME")
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
@TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
@TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
@TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
@TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
private String deleteUserId;
@TableField("F_DELETE_MARK")
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark;
@TableField(value = "company_id" , fill = FieldFill.INSERT)
private String companyId;
@TableField(value = "department_id" , fill = FieldFill.INSERT)
private String departmentId;
@TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
private String organizeJsonId;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_FLOW_ID")
private String flowId;
@TableField("F_VERSION")
private Integer version;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwpaymentsummaryEntity.java
Unescape View File

@ -30,6 +30,8 @@ public class CwpaymentsummaryEntity {
private String productId;
@TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
private String spec;
@TableField(value = "RATE" , updateStrategy = FieldStrategy.IGNORED)
private String rate;
@TableField(value = "SETTLEMENT_UNIT" , updateStrategy = FieldStrategy.IGNORED)
private String settlementUnit;
@TableField(value = "SETTLEMENT_SUM" , updateStrategy = FieldStrategy.IGNORED)

26
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
Unescape View File

@ -75,32 +75,32 @@ public class CwsettlementEntity {
private BigDecimal settledAmount;
@TableField(value = "COMPLETION_DATE" , updateStrategy = FieldStrategy.IGNORED)
private Date completionDate;
@TableField("F_CREATOR_TIME")
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
@TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
@TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
@TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
@TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
private String deleteUserId;
@TableField("F_DELETE_MARK")
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark;
@TableField(value = "company_id" , fill = FieldFill.INSERT)
private String companyId;
@TableField(value = "department_id" , fill = FieldFill.INSERT)
private String departmentId;
@TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
private String organizeJsonId;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_FLOW_ID")
private String flowId;
@TableField("F_VERSION")
private Integer version;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
Unescape View File

@ -30,6 +30,8 @@ public class CwsettlementsummaryEntity {
private String productId;
@TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
private String spec;
@TableField(value = "RATE" , updateStrategy = FieldStrategy.IGNORED)
private String rate;
@TableField(value = "SETTLEMENT_UNIT" , updateStrategy = FieldStrategy.IGNORED)
private String settlementUnit;
@TableField(value = "SETTLEMENT_SUM" , updateStrategy = FieldStrategy.IGNORED)

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLinePagination.java
Unescape View File

@ -52,4 +52,6 @@ public class BusinessLinePagination extends Pagination {
private boolean hasParam=false;
@JsonProperty("excludeIdList")
private List<String> excludeIdList;
@JsonProperty("queryFlowTaskPass")
private String queryFlowTaskPass;
}

5
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountPagination.java
Unescape View File

@ -39,7 +39,10 @@ public class CwaccountPagination extends Pagination {
/** 对账主体类型 */
@JsonProperty("accountSubjectType")
private Object accountSubjectType;
@JsonProperty("excludeIdList")
private List<String> excludeIdList;
@JsonProperty("idList")
private List<String> idList;
private String contractCode;
private String accountState;
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwaccount/CwaccountsummaryModel.java
Unescape View File

@ -39,6 +39,9 @@ public class CwaccountsummaryModel {
/** 结算单价（含税） **/
@JSONField(name = "settlementPrice")
private String settlementPrice;
/** 税率 **/
@JSONField(name = "rate")
private String rate;
/** 结算小计（含税） **/
@JSONField(name = "settlementSubtotal")
private String settlementSubtotal;

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwcost/CwCostPagination.java
Unescape View File

@ -45,4 +45,6 @@ public class CwCostPagination extends Pagination {
/** 费用单类型 */
@JsonProperty("costType")
private Object costType;
private String subjectId;
private List<String> excludeIdList;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwpaymentreceipt/CwpaymentreceiptForm.java
Unescape View File

@ -60,8 +60,8 @@ public class CwpaymentreceiptForm {
@JsonProperty("settlableAmount")
private String settlableAmount;
/** 申请金额 **/
@JsonProperty("applyAmount")
private String applyAmount;
/*@JsonProperty("applyAmount")
private String applyAmount;*/
/** 付款金额 **/
@JsonProperty("paymentAmount")
private String paymentAmount;

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwpaymentreceipt/CwpaymentsummaryModel.java
Unescape View File

@ -33,6 +33,9 @@ public class CwpaymentsummaryModel {
/** 结算单价（含税） **/
@JSONField(name = "settlementPrice")
private String settlementPrice;
/** 税率 **/
@JSONField(name = "rate")
private String rate;
/** 结算小计（含税） **/
@JSONField(name = "settlementSubtotal")
private String settlementSubtotal;

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementsummaryModel.java
Unescape View File

@ -33,6 +33,9 @@ public class CwsettlementsummaryModel {
/** 结算单价（含税） **/
@JSONField(name = "settlementPrice")
private String settlementPrice;
/** 税率 **/
@JSONField(name = "rate")
private String rate;
/** 结算小计（含税） **/
@JSONField(name = "settlementSubtotal")
private String settlementSubtotal;

16
jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectblacklist/form.vue
Unescape View File

@ -10,7 +10,7 @@
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="548131936766303109"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -159,7 +159,19 @@
trigger: 'change'
}, ],
},
subjectBasicIdcolumnOptions:[ {"label":"客户名称","value":"name"}, {"label":"客户编码","value":"code"},],
subjectBasicIdcolumnOptions: [{
"label": "客户名称",
"value": "name"
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
blacklistTypeOptions: [{
"fullName": "违规",
"id": "1"

13
jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectfollowmanagement/form.vue
Unescape View File

@ -35,7 +35,7 @@
<JnpfPopupSelect v-model="dataForm.subjectBasicId" @change="changeData('subjectBasicId',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
:disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="520962013808039429"
popupType="dialog" relationField='name' field='subjectBasicId' interfaceId="548131936766303109"
:pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -266,7 +266,16 @@
subjectBasicIdcolumnOptions: [{
"label": "客户名称",
"value": "name"
}, ],
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
urgencyOptions: [{
"fullName": "重要",
"id": "1"

20
jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
Unescape View File

@ -1194,7 +1194,7 @@
</template>
</el-table-column> -->
</el-table>
<div class="table-actions" @click="addcwaccountvoucherList()" v-if="!judgeWrite('cwaccountvoucherList') && this.dataForm.cwaccountvoucherList.length == 0">
<div class="table-actions" @click="addcwaccountvoucherList()" v-if="!judgeWrite('cwaccountvoucherList')">
<el-button type="text" icon="el-icon-plus">加载凭证</el-button>
</div>
</jnpf-form-tip-item>
@ -1290,6 +1290,21 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="税率" v-if="judgeShow('cwaccountsummary-settlementSubtotal')"
prop="settlementSubtotal" align="center" width="200">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('cwaccountsummaryList-settlementSubtotal')">*</span>税率
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.rate"
@change="changeData('cwaccountsummary-settlementSubtotal',scope.$index)" placeholder="请输入"
:disabled="true"
addonAfter="%"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="结算单价（不含税）" v-if="judgeShow('cwaccountsummary-settlementPriceNo')"
prop="settlementPriceNo" align="center" width="250">
<template slot="header">
@ -2544,6 +2559,7 @@
}
let storageIdList = [];
let outboundIdList = [];
this.dataForm.cwaccountvoucherList = [];
for (let i = 0; i < this.dataForm.cwaccountstorageList.length; i++) {
if(this.dataForm.cwaccountstorageList[i].warehousingStorageType == '3'){
storageIdList.push(this.dataForm.cwaccountstorageList[i].storageId);
@ -2726,7 +2742,7 @@
found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses));
}
} else {
acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, rate:cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.unit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
}
return acc
}, [])

11
jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
Unescape View File

@ -79,6 +79,13 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="accountState" label="结算状态" width="150" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.accountState==1">未结算</el-tag>
<el-tag type="success" v-else-if="scope.row.accountState==2">已结算</el-tag>
</template>
</el-table-column>
<el-table-column prop="contractCode" label="关联合同" align="center" width="200">
</el-table-column>
<el-table-column prop="docmentNum" label="关联单据数" align="center" width="150">
@ -102,9 +109,9 @@
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
<!-- <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
</el-button> -->
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
</template>

70
jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/form.vue
Unescape View File

@ -68,18 +68,18 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('applyAmount')">
<!-- <el-col :span="8" v-if="judgeShow('applyAmount')">
<jnpf-form-tip-item label="申请金额" v-if="judgeShow('applyAmount')" prop="applyAmount">
<JnpfInput v-model="dataForm.applyAmount" @change="changeData('applyAmount',-1)" placeholder="请输入"
:disabled="judgeWrite('applyAmount')" addonAfter="元" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
</el-col> -->
<el-col :span="8" v-if="judgeShow('paymentAmount')">
<jnpf-form-tip-item label="付款金额" v-if="judgeShow('paymentAmount')" prop="paymentAmount">
<JnpfInput v-model="dataForm.paymentAmount" @change="changeData('paymentAmount',-1)" placeholder="请输入"
:disabled="judgeWrite('paymentAmount')" addonAfter="元" clearable :style='{"width":"100%"}'>
</JnpfInput>
<jnpf-form-tip-item label="收付款金额" v-if="judgeShow('paymentAmount')" prop="paymentAmount">
<JnpfInputNumber v-model="dataForm.paymentAmount" @change="changeData('paymentAmount',-1)" placeholder="请输入"
:disabled="judgeWrite('paymentAmount')" addonAfter="元" clearable :style='{"width":"100%"}' :max="Number(dataForm.settlableAmount)" min="0">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('remark')">
@ -93,7 +93,7 @@
<el-col :span="24" v-if="judgeShow('-${html.relationField}')">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>结算汇总</h2>
<h2>最后结算明细（票据明细）</h2>
</div>
<el-table :data="dataForm.cwpaymentsummaryList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
@ -178,6 +178,21 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="税率" v-if="judgeShow('cwpaymentsummary-settlementSubtotal')"
prop="settlementSubtotal" align="center" width="200">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('cwpaymentsummaryList-settlementSubtotal')">*</span>税率
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.rate"
@change="changeData('cwpaymentsummary-settlementSubtotal',scope.$index)" placeholder="请输入"
:disabled="true"
addonAfter="%"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="结算单价（不含税）" v-if="judgeShow('cwpaymentsummary-settlementPriceNo')"
prop="settlementPriceNo" align="center" width="250">
<template slot="header">
@ -247,9 +262,9 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addcwpaymentsummaryList()" v-if="!judgeWrite('cwpaymentsummaryList')">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
<!-- <div class="table-actions" @click="addcwpaymentsummaryList()" v-if="!judgeWrite('cwpaymentsummaryList')">
<el-button type="text" icon="el-icon-plus">加载票据</el-button>
</div> -->
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
@ -731,9 +746,44 @@
this.dataForm.settlementCode = res.data.code;
this.dataForm.type = res.data.type;
this.dataForm.settlableAmount = res.data.settlableAmount;
this.dataForm.paymentAmount = res.data.settlableAmount;
this.dataForm.payee = res.data.cwsettlementpaymentreceiptList[1].name;
this.dataForm.payer = res.data.cwsettlementpaymentreceiptList[0].name;
this.dataForm.cwpaymentsummaryList = res.data.cwsettlementsummaryList;
/* this.dataForm.cwpaymentsummaryList.forEach(item => {
`settlement_sum` decimal(32,6) DEFAULT NULL COMMENT '结算数量',
`settlement_price` decimal(32,6) DEFAULT NULL COMMENT '结算单价（含税）',
`settlement_subtotal` decimal(32,6) DEFAULT NULL COMMENT '结算小计（含税）',
`rate` varchar(255) DEFAULT NULL COMMENT '税率',
`settlement_price_no` decimal(32,6) DEFAULT NULL COMMENT '结算单价（不含税）',
`settlement_subtotal_no` decimal(32,6) DEFAULT NULL COMMENT '结算小计（不含税）',
`other_type` char(1) DEFAULT NULL COMMENT '其他费用类型（1：增加（+） 2：减少（-））',
`other_expenses` decimal(32,6) DEFAULT NULL COMMENT '其他费用',
`settlement_total` decimal(32,6) DEFAULT NULL COMMENT '结算合计（含税）',
`settlement_total_no` decimal(32,6) DEFAULT NULL COMMENT '结算合计（不含税）',
//费用单总价/数量总和 = 单价增加量(含税单价)
item.settlementPrice = this.jnpf.floatAdd(item.settlementPrice, this.jnpf.floatDiv(costAmount, summarySettlementSum));//汇总结算含税单价
//结算小计(含税)=含税单价*数量
item.settlementSubtotal = this.jnpf.floatMul(item.settlementPrice, item.settlementSum)
//结算合计（含税）= 结算小计+其他费用
item.settlementTotal = item.settlementSubtotal + item.otherExpenses
//结算单价(不含税)
item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100));
//结算小计(不含税)
item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo));
//应收/应付合计（含税）
settlementAmount = this.jnpf.floatAdd(settlementAmount, item.settlementTotal);
}) */
})
}
}

36
jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue
Unescape View File

@ -59,37 +59,35 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod"
show-summary :summary-method="getTableSummaries">
<el-table-column label="类型" prop="type" algin="left">
show-summary :summary-method="getTableSummaries" border>
<el-table-column label="类型" prop="type" align="center" width="150" fixed="left">
<template slot-scope="scope">
{{ scope.row.type}}
</template>
</el-table-column>
<el-table-column prop="code" label="单据编号" align="left">
<el-table-column prop="code" label="单据编号" align="center" width="200" fixed="left">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建用户" align="left">
<el-table-column prop="settlementId" label="结算单号" align="center" width="200" fixed="left">
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" align="left">
<el-table-column prop="payee" label="收款方" align="center" width="250">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
<el-table-column prop="payer" label="付款方" align="center" width="250">
</el-table-column>
<el-table-column prop="lastModifyUserId" label="修改用户" align="left">
<el-table-column prop="creatorTime" label="收付款时间" align="center" width="150">
</el-table-column>
<el-table-column prop="paymentAmount" label="付款金额" align="left">
<el-table-column prop="paymentAmount" label="收付款金额" align="center" width="150">
</el-table-column>
<el-table-column prop="settlableAmount" label="可结金额" align="left">
<el-table-column prop="settlableAmount" label="可结金额" align="center" width="150">
</el-table-column>
<el-table-column prop="applyAmount" label="申请金额" align="left">
<el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
</el-table-column>
<el-table-column prop="payee" label="收款方" align="left">
<el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
</el-table-column>
<el-table-column prop="payer" label="付款方" align="left">
<el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
</el-table-column>
<el-table-column prop="payDate" label="收付款时间" align="left">
<el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
</el-table-column>
<el-table-column prop="settlementId" label="结算单号" align="left">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100">
<el-table-column prop="flowState" label="状态" width="100" align="center">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
@ -99,14 +97,14 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
<!-- <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
</el-button> -->
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
</template>

73
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
Unescape View File

@ -1302,6 +1302,21 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="税率" v-if="judgeShow('cwsettlementsummary-settlementSubtotal')"
prop="settlementSubtotal" align="center" width="200">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('cwsettlementsummaryList-settlementSubtotal')">*</span>税率
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.rate"
@change="changeData('cwsettlementsummary-settlementSubtotal',scope.$index)" placeholder="请输入"
:disabled="true"
addonAfter="%"
clearable :style='{"width":"100%"}'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="结算单价（不含税）" v-if="judgeShow('cwsettlementsummary-settlementPriceNo')"
prop="settlementPriceNo" align="center" width="250">
<template slot="header">
@ -2201,30 +2216,62 @@
found.otherExpenses = this.jnpf.floatSub(Number(found.otherExpenses), Number(cur.otherExpenses));
}
} else {
acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.settlementUnit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
acc.push({ productId: cur.productId, productName: cur.productName, spec:cur.spec, rate:cur.rate, settlementSum: cur.settlementSum, settlementTotal: cur.settlementTotal, settlementUnit: cur.settlementUnit, settlementPrice: cur.settlementPrice, settlementSubtotal: cur.settlementSubtotal, settlementPriceNo: cur.settlementPriceNo, settlementSubtotalNo: cur.settlementSubtotalNo, otherType: cur.otherType, otherExpenses: cur.otherExpenses, settlementTotal: cur.settlementTotal, settlementTotalNo: cur.settlementTotalNo})
}
return acc
}, [])
return result
},
choice() {
if(!this.dataForm.cwsettlementsubjectList || this.dataForm.cwsettlementsubjectList.length == 0){
this.$message({
type: 'error',
message: '请先添加主体信息',
duration: 1500,
})
return
}
if(!this.dataForm.cwsettlementcontractList || this.dataForm.cwsettlementcontractList.length == 0){
this.$message({
type: 'error',
message: '请先添加合同信息',
duration: 1500,
})
return
}
this.goodsBoxVisible = true
let excludeIdList = [];
let excludeIdList = [];
for (let i = 0; i < this.dataForm.cwsettlementaccountList.length; i++) {
excludeIdList.push(this.dataForm.cwsettlementaccountList[i].accountId);
}
this.$nextTick(() => {
this.$refs.goodsBox.init(excludeIdList)
this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, this.dataForm.cwsettlementcontractList[0].contractName, '1')
})
},
choice2() {
if(!this.dataForm.cwsettlementsubjectList || this.dataForm.cwsettlementsubjectList.length == 0){
this.$message({
type: 'error',
message: '请先添加主体信息',
duration: 1500,
})
return
}
if(!this.dataForm.cwsettlementcontractList || this.dataForm.cwsettlementcontractList.length == 0){
this.$message({
type: 'error',
message: '请先添加合同信息',
duration: 1500,
})
return
}
this.goodsBoxVisible2 = true
let excludeIdList = [];
for (let i = 0; i < this.dataForm.cwsettlementcostList.length; i++) {
excludeIdList.push(this.dataForm.cwsettlementcostList[i].accountId);
excludeIdList.push(this.dataForm.cwsettlementcostList[i].costId);
}
this.$nextTick(() => {
this.$refs.goodsBox2.init(excludeIdList)
this.$refs.goodsBox2.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectId)
})
},
contractChangeData(model, row){
@ -2247,6 +2294,7 @@
subjectChangeData(model, row){
let aaa = {};
let companyName = '';
this.dataForm.cwsettlementsubjectList[0].subjectName = row.name;
request({
url: `/api/permission/Organize/currentOrg/getCurrentOrg`,
method: 'get',
@ -2662,6 +2710,14 @@
this.childIndex = -1
},
addcwsettlementsummaryList() {
if(!this.dataForm.cwsettlementaccountList || this.dataForm.cwsettlementaccountList.length == 0){
this.$message({
type: 'error',
message: '请先添加对账信息',
duration: 1500,
})
return
}
let param = [];
for (let i = 0; i < this.dataForm.cwsettlementaccountList.length; i++) {
param.push(this.dataForm.cwsettlementaccountList[i].accountId)
@ -2711,7 +2767,12 @@
item.settlementSubtotal = this.jnpf.floatMul(item.settlementPrice, item.settlementSum)
//结算合计（含税）= 结算小计+其他费用
item.settlementTotal = item.settlementSubtotal + item.otherExpenses
settlementAmount = this.jnpf.floatAdd(settlementAmount, item.settlementTotal);//应收/应付合计（含税）
//结算单价(不含税)
item.settlementPriceNo = this.jnpf.floatDiv(Number(item.settlementPrice), this.jnpf.floatDiv(this.jnpf.floatAdd(100 + Number(item.rate)), 100));
//结算小计(不含税)
item.settlementSubtotalNo = this.jnpf.floatMul(Number(item.settlementSum), Number(item.settlementPriceNo));
//应收/应付合计（含税）
settlementAmount = this.jnpf.floatAdd(settlementAmount, item.settlementTotal);
})

16
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
Unescape View File

@ -66,9 +66,13 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="settlementState" label="结算状态" align="center" width="150">
</el-table-column>
<el-table-column prop="paymentState" label="付款状态" align="center" width="150">
<el-table-column prop="paymentState" label="付款状态" width="100" align="center" fixed="left">
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentState==1">未付款</el-tag>
<el-tag type="success" v-else-if="scope.row.flowState==2">部分付款</el-tag>
<el-tag type="danger" v-else-if="scope.row.flowState==3">已付款</el-tag>
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="docmentNum" label="单据数" align="center" width="150">
</el-table-column>
@ -101,12 +105,12 @@
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
<!-- <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
</el-button> -->
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text" v-if="scope.row.settlableAmount > scope.row.settledAmount && scope.row.settlableAmount != 0"
<el-button size="mini" type="text" v-if="scope.row.settlableAmount > 0"
@click="shoufukuanHandle(scope.row)">收付款</el-button>
</template>
</el-table-column>

17
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue
Unescape View File

@ -73,20 +73,35 @@ export default {
sidx: "",
},
excludeIdList: [],
accountSubjectName: '',
contractCode: '',
accountState: '',
checked: []
}
},
methods: {
init(excludeIdList) {
init(excludeIdList, accountSubjectName, contractCode, accountState) {
this.visible = true
this.listLoading = true
if (excludeIdList) {
this.excludeIdList = excludeIdList;
}
if (accountSubjectName) {
this.accountSubjectName = accountSubjectName;
}
if (contractCode) {
this.contractCode = contractCode;
}
if (accountState) {
this.accountState = accountState;
}
let query = {
...this.listQuery,
keyword: this.keyword,
excludeIdList: this.excludeIdList,
accountSubjectName: accountSubjectName,
contractCode: contractCode,
accountState: accountState,
dataType: 0,
}
/* GoodsList(query).then(res => {

7
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementcostList.vue
Unescape View File

@ -92,19 +92,24 @@ export default {
sidx: "",
},
excludeIdList: [],
subjectId: '',
checked: []
}
},
methods: {
init(excludeIdList) {
init(excludeIdList, subjectId) {
this.visible = true
this.listLoading = true
if (excludeIdList) {
this.excludeIdList = excludeIdList;
}
if (subjectId) {
this.subjectId = subjectId;
}
let query = {
...this.listQuery,
keyword: this.keyword,
subjectId: this.subjectId,
excludeIdList: this.excludeIdList,
dataType: 0,
}

14
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectblacklist/form.vue
Unescape View File

@ -159,7 +159,19 @@
trigger: 'change'
}, ],
},
subjectBasicIdcolumnOptions:[ {"label":"服务商名称","value":"name"}, {"label":"服务商编码","value":"code"},],
subjectBasicIdcolumnOptions: [{
"label": "服务商名称",
"value": "name"
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
blacklistTypeOptions: [{
"fullName": "违规",
"id": "1"

11
jnpf-java-boot/jnpf-web/src/views/extend/service/subjectfollowmanagement/form.vue
Unescape View File

@ -266,7 +266,16 @@
subjectBasicIdcolumnOptions: [{
"label": "服务商名称",
"value": "name"
}, ],
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
urgencyOptions: [{
"fullName": "重要",
"id": "1"

34
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue
Unescape View File

@ -45,7 +45,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('enterpriseNature')">
<jnpf-form-tip-item label="企业性质" v-if="judgeShow('enterpriseNature')" prop="enterpriseNature">
<jnpf-form-tip-item label="企业性质" v-if="judgeShow('enterpriseNature') && dataForm.calssify != 3" prop="enterpriseNature">
<JnpfSelect v-model="dataForm.enterpriseNature" @change="changeData('enterpriseNature',-1)"
placeholder="请选择" :disabled="judgeWrite('enterpriseNature')" clearable :style='{"width":"100%"}'
:options="enterpriseNatureOptions" :props="enterpriseNatureProps">
@ -53,7 +53,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('industryClassify')">
<jnpf-form-tip-item label="行业分类" v-if="judgeShow('industryClassify')" prop="industryClassify">
<jnpf-form-tip-item label="行业分类" v-if="judgeShow('industryClassify') && dataForm.calssify != 3" prop="industryClassify">
<JnpfSelect v-model="dataForm.industryClassify" @change="changeData('industryClassify',-1)"
placeholder="请选择" :disabled="judgeWrite('industryClassify')" clearable :style='{"width":"100%"}'
:options="industryClassifyOptions" :props="industryClassifyProps">
@ -69,7 +69,7 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('customerStarRating')">
<jnpf-form-tip-item label="供应商星级" v-if="judgeShow('customerStarRating')" prop="customerStarRating">
<jnpf-form-tip-item label="供应商星级" v-if="judgeShow('customerStarRating') && dataForm.calssify != 3" prop="customerStarRating">
<JnpfSelect v-model="dataForm.customerStarRating" @change="changeData('customerStarRating',-1)"
placeholder="请选择" :disabled="judgeWrite('customerStarRating')" clearable :style='{"width":"100%"}'
:options="customerStarRatingOptions" :props="customerStarRatingProps">
@ -113,42 +113,42 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('phone')">
<jnpf-form-tip-item label="公司电话" v-if="judgeShow('phone')" prop="phone">
<jnpf-form-tip-item label="公司电话" v-if="judgeShow('phone') && dataForm.calssify != 3" prop="phone">
<JnpfInput v-model="dataForm.phone" @change="changeData('phone',-1)" placeholder="请输入"
:disabled="judgeWrite('phone')" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('companyFax')">
<jnpf-form-tip-item label="公司传真" v-if="judgeShow('companyFax')" prop="companyFax">
<jnpf-form-tip-item label="公司传真" v-if="judgeShow('companyFax') && dataForm.calssify != 3" prop="companyFax">
<JnpfInput v-model="dataForm.companyFax" @change="changeData('companyFax',-1)" placeholder="请输入"
:disabled="judgeWrite('companyFax')" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('companyWebsite')">
<jnpf-form-tip-item label="公司网址" v-if="judgeShow('companyWebsite')" prop="companyWebsite">
<jnpf-form-tip-item label="公司网址" v-if="judgeShow('companyWebsite') && dataForm.calssify != 3" prop="companyWebsite">
<JnpfInput v-model="dataForm.companyWebsite" @change="changeData('companyWebsite',-1)" placeholder="请输入"
:disabled="judgeWrite('companyWebsite')" addonBefore="https://" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('companyDescription')">
<jnpf-form-tip-item label="公司介绍" v-if="judgeShow('companyDescription')" prop="companyDescription">
<jnpf-form-tip-item label="公司介绍" v-if="judgeShow('companyDescription') && dataForm.calssify != 3" prop="companyDescription">
<JnpfTextarea v-model="dataForm.companyDescription" @change="changeData('companyDescription',-1)"
placeholder="请输入" :disabled="judgeWrite('companyDescription')" clearable :style='{"width":"100%"}'
:autosize='{"minRows":4,"maxRows":4}'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<el-col :span="24" v-if="dataForm.calssify != 3">
<div style="padding:15px 0px">
<span style="color: #409EFF;">▋</span>
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">主体信息</span>
</div>
</el-col>
<el-col :span="8" v-if="judgeShow('socialInformationCodeCertificate')">
<jnpf-form-tip-item label="营业执照" v-if="judgeShow('socialInformationCodeCertificate')"
<jnpf-form-tip-item label="营业执照" v-if="judgeShow('socialInformationCodeCertificate') && dataForm.calssify != 3"
prop="socialInformationCodeCertificate">
<JnpfUploadImg v-model="dataForm.socialInformationCodeCertificate"
@change="changeData('socialInformationCodeCertificate',-1)"
@ -158,14 +158,14 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('registerAddress')">
<jnpf-form-tip-item label="注册地址" v-if="judgeShow('registerAddress')" prop="registerAddress">
<jnpf-form-tip-item label="注册地址" v-if="judgeShow('registerAddress') && dataForm.calssify != 3" prop="registerAddress">
<JnpfInput v-model="dataForm.registerAddress" @change="changeData('registerAddress',-1)" placeholder="请输入"
:disabled="judgeWrite('registerAddress')" clearable :style='{"width":"100%"}' @input="registerAddressChange">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('informationCode')">
<jnpf-form-tip-item label="社会统一信息代码" v-if="judgeShow('informationCode')" prop="informationCode">
<jnpf-form-tip-item label="社会统一信息代码" v-if="judgeShow('informationCode') && dataForm.calssify != 3" prop="informationCode">
<JnpfInput v-model="dataForm.informationCode" @change="changeData('informationCode',-1)" placeholder="请输入"
:disabled="judgeWrite('informationCode')" clearable :style='{"width":"100%"}'>
</JnpfInput>
@ -173,7 +173,7 @@
</el-col>
<el-col :span="8" v-if="judgeShow('operationStart')">
<jnpf-form-tip-item label="经营时间" v-if="judgeShow('operationStart')">
<jnpf-form-tip-item label="经营时间" v-if="judgeShow('operationStart') && dataForm.calssify != 3">
<!-- <JnpfDatePicker v-model="dataForm.operationStart" @change="changeData('operationStart',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('operationStart')" clearable :style='{"width":"100%"}' format="yyyy-MM-dd">
@ -191,14 +191,14 @@
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="8" v-if="judgeShow('registerFunds')">
<el-col :span="8" v-if="judgeShow('registerFunds') && dataForm.calssify != 3">
<jnpf-form-tip-item label="注册资金" v-if="judgeShow('registerFunds')" prop="registerFunds">
<JnpfInput v-model="dataForm.registerFunds" @change="changeData('registerFunds',-1)" placeholder="请输入"
:disabled="judgeWrite('registerFunds')" addonAfter="万元" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" v-if="judgeShow('operationScope')">
<el-col :span="24" v-if="judgeShow('operationScope') && dataForm.calssify != 3">
<jnpf-form-tip-item label="经营范围" v-if="judgeShow('operationScope')" prop="operationScope">
<JnpfTextarea v-model="dataForm.operationScope" @change="changeData('operationScope',-1)"
placeholder="请输入" :disabled="judgeWrite('operationScope')" clearable :style='{"width":"100%"}'
@ -511,21 +511,21 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('companyTaxNumber')">
<jnpf-form-tip-item label="公司税号" v-if="judgeShow('companyTaxNumber')" prop="companyTaxNumber">
<jnpf-form-tip-item label="公司税号" v-if="judgeShow('companyTaxNumber') && dataForm.calssify != 3" prop="companyTaxNumber">
<JnpfInput v-model="dataForm.companyTaxNumber" @change="changeData('companyTaxNumber',-1)"
placeholder="请输入" :disabled="judgeWrite('companyTaxNumber')" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('enterpriseName')">
<jnpf-form-tip-item label="企业名称" v-if="judgeShow('enterpriseName')" prop="enterpriseName">
<jnpf-form-tip-item label="企业名称" v-if="judgeShow('enterpriseName') && dataForm.calssify != 3" prop="enterpriseName">
<JnpfInput v-model="dataForm.enterpriseName" @change="changeData('enterpriseName',-1)" placeholder="请输入"
:disabled="judgeWrite('enterpriseName')" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('workAddress')">
<jnpf-form-tip-item label="单位地址" v-if="judgeShow('workAddress')" prop="workAddress">
<jnpf-form-tip-item label="单位地址" v-if="judgeShow('workAddress') && dataForm.calssify != 3" prop="workAddress">
<JnpfInput v-model="dataForm.workAddress" @change="changeData('workAddress',-1)" placeholder="请输入"
:disabled="judgeWrite('workAddress')" clearable :style='{"width":"100%"}'>
</JnpfInput>

14
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectblacklist/form.vue
Unescape View File

@ -159,7 +159,19 @@
trigger: 'change'
}, ],
},
subjectBasicIdcolumnOptions:[ {"label":"供应商名称","value":"name"}, {"label":"供应商编码","value":"code"},],
subjectBasicIdcolumnOptions: [{
"label": "供应商名称",
"value": "name"
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
blacklistTypeOptions: [{
"fullName": "违规",
"id": "1"

11
jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectfollowmanagement/form.vue
Unescape View File

@ -266,7 +266,16 @@
subjectBasicIdcolumnOptions: [{
"label": "供应商名称",
"value": "name"
}, ],
}, {
"label": "分类",
"value": "calssifyName"
}, {
"label": "星级",
"value": "customerStarRatingName"
}, {
"label": "归属人员",
"value": "belongPeopleName"
}],
urgencyOptions: [{
"fullName": "重要",
"id": "1"

4
jnpf-java-boot/jnpf-web/src/views/permission/user/Form.vue
Unescape View File

@ -71,7 +71,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :sm="12" :xs="24">
<!-- <el-col :sm="12" :xs="24">
<el-form-item label="角色" prop="roleId">
<el-select v-model="roleId" placeholder="选择角色" @change="onChange('roleId')"
@visible-change="visibleChange" multiple filterable clearable>
@ -83,7 +83,7 @@
</el-option-group>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="排序" prop="sortCode">
<el-input-number :min="0" :max="999999" v-model="dataForm.sortCode" controls-position="right" />

20
jnpf-java-boot/jnpf-web/src/views/scm/productprice/form.vue
Unescape View File

@ -265,8 +265,26 @@
"value": "name"
}, ],
productIdcolumnOptions: [{
"label": "名称",
"label": "商品名称",
"value": "name"
}, {
"label": "商品规格",
"value": "spec"
}, {
"label": "商品条码",
"value": "barCode"
}, {
"label": "品牌",
"value": "brandName"
}, {
"label": "存货类型",
"value": "inventoryTypeName"
}, {
"label": "首选供应商",
"value": "firstSupplierName"
}, {
"label": "配送方式",
"value": "deliveryTypeName"
}, ],
pricingUnitIdOptions: [],
pricingUnitIdProps: {

211
jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/BusinesslineGoodsBox.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<el-dialog title="选择商品" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
<el-dialog title="选择业务线" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="800px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -10,9 +10,9 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">{{$t('common.search')}}
<el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
<el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
</el-button>
</el-form-item>
</el-col>
@ -24,124 +24,141 @@
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
<el-table-column prop="code" label="业务线编号" align="left">
<el-table-column prop="code" label="业务线编号" align="center" width="170" fixed="left">
</el-table-column>
<el-table-column prop="name" label="业务线名称" align="left">
<el-table-column prop="name" label="业务线名称" align="center" fixed="left">
</el-table-column>
<el-table-column prop="type" label="类型" align="left">
<el-table-column prop="type" label="类型" align="center">
<template slot-scope="scope">
{{ scope.row.businessLineType }}
</template>
</el-table-column>
<el-table-column prop="industry" label="所属分类" align="left">
<!-- <el-table-column prop="industry" label="所属分类" align="left">
</el-table-column> -->
<el-table-column prop="status" label="状态" align="center">
<template slot-scope="scope">
{{ scope.row.status1 }}
</template>
</el-table-column>
<el-table-column prop="status" label="状态" align="left">
<el-table-column prop="relationInstitutionNum" label="关联机构" align="center">
</el-table-column>
<el-table-column prop="relationInstitutionNum" label="关联机构" align="left">
<el-table-column prop="employeeNum" label="成员数量" align="center">
</el-table-column>
<el-table-column prop="employeeNum" label="成员数量" align="left">
<el-table-column prop="belongUserName" label="主管人员" align="center">
</el-table-column>
<el-table-column prop="belongUserId" label="主管人员" align="left">
<el-table-column prop="description" label="描述" align="center">
</el-table-column>
<el-table-column prop="description" label="描述" align="left">
<el-table-column prop="lastModifyTime" label="更新时间" align="center">
<template slot-scope="scope">
{{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="init" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
<el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
<el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
keyword: '',
list: [],
total: 0,
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
excludeIdList: [],
checked: []
}
},
methods: {
init(excludeIdList) {
this.visible = true
this.listLoading = true
if(excludeIdList){
this.excludeIdList = excludeIdList;
}
let query = {
...this.listQuery,
keyword: this.keyword,
excludeIdList: this.excludeIdList
}
/* GoodsList(query).then(res => {
this.list = res.data.list
this.listLoading = false
}) */
request({
url: `/api/scm/BusinessLine/getList`,
method: 'post',
data: query
}).then(res => {
this.list = res.data.list
this.listLoading = false
this.total = res.data.pagination.total
})
},
refresh() {
this.keyword = ''
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
import request from '@/utils/request'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
keyword: '',
list: [],
total: 0,
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
select() {
if (!this.checked.length) return
this.visible = false
this.$emit('refreshDataList', this.checked)
},
handleSelectionChange(val) {
this.checked = val
excludeIdList: [],
accountSubjectName: '',
contractCode: '',
accountState: '',
checked: []
}
},
methods: {
init(excludeIdList) {
this.visible = true
this.listLoading = true
if (excludeIdList) {
this.excludeIdList = excludeIdList;
}
let query = {
...this.listQuery,
keyword: this.keyword,
excludeIdList: this.excludeIdList,
dataType: 0,
diffFlag: '1',
type: '1',
queryFlowTaskPass: '1'//查询审批通过的
}
/* GoodsList(query).then(res => {
this.list = res.data.list
this.listLoading = false
}) */
request({
url: `/api/scm/BusinessLine/getList`,
method: 'post',
data: query
}).then(res => {
this.list = res.data.list
this.listLoading = false
this.total = res.data.pagination.total
})
},
refresh() {
this.keyword = ''
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.init()
},
select() {
if (!this.checked.length) return
this.visible = false
this.$emit('refreshDataList', this.checked)
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

Write Preview
Loading…
Cancel
Save