yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
杨世强 2 years ago
parent 21160250cf 7ce14b7641
commit 1b915d37ae
53 changed files with 1902 additions and 1383 deletions
Show Stats Download Patch File Download Diff File

8
SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/service/impl/Jg_naturalServiceImpl.java
Unescape View File

@ -56,8 +56,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
int total=0;
int jg_naturalNum =0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
@ -133,8 +133,8 @@ public class Jg_naturalServiceImpl extends ServiceImpl<Jg_naturalMapper, Jg_natu
int total=0;
int jg_naturalNum =0;
QueryWrapper<Jg_naturalEntity> jg_naturalQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){

16
SC-boot/linkage-scm/src/main/java/jnpf/areasetting/service/impl/AreasettingServiceImpl.java
Unescape View File

@ -61,12 +61,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
int total=0;
int areasettingNum =0;
QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>();
} else {
@ -77,7 +77,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>();
} else {
@ -127,12 +127,12 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
int total=0;
int areasettingNum =0;
QueryWrapper<AreasettingEntity> areasettingQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>();
} else {
@ -143,7 +143,7 @@ public class AreasettingServiceImpl extends ServiceImpl<AreasettingMapper, Areas
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"areasetting"));
Object areasettingObj=authorizeService.getCondition(new AuthorizeConditionModel(areasettingQueryWrapper,areasettingPagination.getMenuId(),"jg_areasetting"));
if (ObjectUtil.isEmpty(areasettingObj)){
return new ArrayList<>();
} else {

32
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
Unescape View File

@ -71,26 +71,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
arinvoicesNum++;
}
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>();
} else {
arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
arinvoices_item0Num++;
}
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>();
} else {
@ -101,7 +101,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
@ -110,7 +110,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>();
} else {
@ -119,7 +119,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>();
} else {
@ -184,26 +184,26 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
arinvoicesQueryWrapper = (QueryWrapper<ArinvoicesEntity>)arinvoicesObj;
arinvoicesNum++;
}
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>();
} else {
arinvoices_item0QueryWrapper = (QueryWrapper<Arinvoices_item0Entity>)arinvoices_item0Obj;
arinvoices_item0Num++;
}
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>();
} else {
@ -214,7 +214,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices"));
Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
if (ObjectUtil.isEmpty(arinvoicesObj)){
return new ArrayList<>();
} else {
@ -223,7 +223,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item0"));
Object arinvoices_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item0"));
if (ObjectUtil.isEmpty(arinvoices_item0Obj)){
return new ArrayList<>();
} else {
@ -232,7 +232,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"arinvoices_item1"));
Object arinvoices_item1Obj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item1QueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices_item1"));
if (ObjectUtil.isEmpty(arinvoices_item1Obj)){
return new ArrayList<>();
} else {

24
SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java
Unescape View File

@ -74,19 +74,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
int collection_item0Num =0;
QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
collectionNum++;
}
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>();
} else {
@ -97,7 +97,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
@ -106,7 +106,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>();
} else {
@ -158,19 +158,19 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
int collection_item0Num =0;
QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
collectionQueryWrapper = (QueryWrapper<CollectionEntity>)collectionObj;
collectionNum++;
}
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>();
} else {
@ -181,7 +181,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"collection"));
Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
if (ObjectUtil.isEmpty(collectionObj)){
return new ArrayList<>();
} else {
@ -190,7 +190,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"collection_item0"));
Object collection_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(collection_item0QueryWrapper,collectionPagination.getMenuId(),"jg_collection_item0"));
if (ObjectUtil.isEmpty(collection_item0Obj)){
return new ArrayList<>();
} else {

8
SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java
Unescape View File

@ -55,8 +55,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
int total=0;
int customerNum =0;
QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
@ -144,8 +144,8 @@ public class CustomerVOServiceImpl extends ServiceImpl<CustomerVMapper, Customer
int total=0;
int customerNum =0;
QueryWrapper<CustomerEntity> customerQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){

16
SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrd/service/impl/InventoryOrgServiceImpl.java
Unescape View File

@ -51,12 +51,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
int total=0;
int inventoryOrgNum =0;
QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>();
} else {
@ -67,7 +67,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>();
} else {
@ -122,12 +122,12 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
int total=0;
int inventoryOrgNum =0;
QueryWrapper<InventoryOrgEntity> inventoryOrgQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>();
} else {
@ -138,7 +138,7 @@ public class InventoryOrgServiceImpl extends ServiceImpl<InventoryOrgMapper, Inv
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"inventoryOrg"));
Object inventoryOrgObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgQueryWrapper,inventoryOrgPagination.getMenuId(),"jg_inventoryOrg"));
if (ObjectUtil.isEmpty(inventoryOrgObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/inventoryOrdDetail/service/impl/InventoryOrgDetailServiceImpl.java
Unescape View File

@ -51,12 +51,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
int total=0;
int inventoryOrgDetailNum =0;
QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>();
} else {
@ -67,7 +67,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>();
} else {
@ -122,12 +122,12 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
int total=0;
int inventoryOrgDetailNum =0;
QueryWrapper<InventoryOrgDetailEntity> inventoryOrgDetailQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>();
} else {
@ -138,7 +138,7 @@ public class InventoryOrgDetailServiceImpl extends ServiceImpl<InventoryOrgDetai
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"inventoryOrgDetail"));
Object inventoryOrgDetailObj=authorizeService.getCondition(new AuthorizeConditionModel(inventoryOrgDetailQueryWrapper,inventoryOrgDetailPagination.getMenuId(),"jg_inventoryOrgDetail"));
if (ObjectUtil.isEmpty(inventoryOrgDetailObj)){
return new ArrayList<>();
} else {

32
SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
Unescape View File

@ -71,26 +71,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
int invoicesItem1Num =0;
QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
invoicesNum++;
}
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>();
} else {
invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
invoicesItem0Num++;
}
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>();
} else {
@ -101,7 +101,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
@ -110,7 +110,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>();
} else {
@ -119,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>();
} else {
@ -173,26 +173,26 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
int invoicesItem1Num =0;
QueryWrapper<InvoicesItem1Entity> invoicesItem1QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
invoicesQueryWrapper = (QueryWrapper<InvoicesEntity>)invoicesObj;
invoicesNum++;
}
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>();
} else {
invoicesItem0QueryWrapper = (QueryWrapper<InvoicesItem0Entity>)invoicesItem0Obj;
invoicesItem0Num++;
}
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>();
} else {
@ -203,7 +203,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"invoices"));
Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
if (ObjectUtil.isEmpty(invoicesObj)){
return new ArrayList<>();
} else {
@ -212,7 +212,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem0"));
Object invoicesItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem0QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem0"));
if (ObjectUtil.isEmpty(invoicesItem0Obj)){
return new ArrayList<>();
} else {
@ -221,7 +221,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"invoicesItem1"));
Object invoicesItem1Obj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesItem1QueryWrapper,invoicesPagination.getMenuId(),"jg_invoicesItem1"));
if (ObjectUtil.isEmpty(invoicesItem1Obj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
Unescape View File

@ -67,12 +67,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
int total=0;
int materialNum =0;
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
@ -83,7 +83,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
@ -138,12 +138,12 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
int total=0;
int materialNum =0;
QueryWrapper<MaterialEntity> materialQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {
@ -154,7 +154,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"material"));
Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
if (ObjectUtil.isEmpty(materialObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java
Unescape View File

@ -54,12 +54,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
int total=0;
int monitoringitemNum =0;
QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>();
} else {
@ -70,7 +70,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>();
} else {
@ -125,12 +125,12 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
int total=0;
int monitoringitemNum =0;
QueryWrapper<MonitoringitemEntity> monitoringitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>();
} else {
@ -141,7 +141,7 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"monitoringitem"));
Object monitoringitemObj=authorizeService.getCondition(new AuthorizeConditionModel(monitoringitemQueryWrapper,monitoringitemPagination.getMenuId(),"jg_monitoringitem"));
if (ObjectUtil.isEmpty(monitoringitemObj)){
return new ArrayList<>();
} else {

20
SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
Unescape View File

@ -68,19 +68,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
int payment_item0Num =0;
QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>();
} else {
paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
paymentNum++;
}
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>();
} else {
@ -91,7 +91,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>();
} else {
@ -100,7 +100,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
}
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>();
} else {
@ -152,19 +152,19 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
QueryWrapper<PaymentEntity> paymentQueryWrapper=new QueryWrapper<>();
int payment_item0Num =0;
QueryWrapper<Payment_item0Entity> payment_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>();
} else {
paymentQueryWrapper = (QueryWrapper<PaymentEntity>)paymentObj;
paymentNum++;
}
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>();
} else {
@ -175,7 +175,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"payment"));
Object paymentObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentQueryWrapper,paymentPagination.getMenuId(),"jg_payment"));
if (ObjectUtil.isEmpty(paymentObj)){
return new ArrayList<>();
} else {
@ -184,7 +184,7 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
}
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"payment_item0"));
Object payment_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(payment_item0QueryWrapper,paymentPagination.getMenuId(),"jg_payment_item0"));
if (ObjectUtil.isEmpty(payment_item0Obj)){
return new ArrayList<>();
} else {

24
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
Unescape View File

@ -67,19 +67,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
int paymentdocItem0Num =0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>();
} else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++;
}
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>();
} else {
@ -90,14 +90,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>();
} else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++;
}
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>();
} else {
@ -147,19 +147,19 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper=new QueryWrapper<>();
int paymentdocItem0Num =0;
QueryWrapper<PaymentdocItem0Entity> paymentdocItem0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>();
} else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++;
}
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>();
} else {
@ -170,14 +170,14 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"paymentdoc"));
Object paymentdocObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocQueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdoc"));
if (ObjectUtil.isEmpty(paymentdocObj)){
return new ArrayList<>();
} else {
paymentdocQueryWrapper = (QueryWrapper<PaymentdocEntity>)paymentdocObj;
paymentdocNum++;
}
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"paymentdocItem0"));
Object paymentdocItem0Obj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocItem0QueryWrapper,paymentdocPagination.getMenuId(),"jg_paymentdocItem0"));
if (ObjectUtil.isEmpty(paymentdocItem0Obj)){
return new ArrayList<>();
} else {

30
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
Unescape View File

@ -62,12 +62,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int poundlistNum =0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine,"1");
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>();
} else {
@ -76,11 +76,27 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
}
}
<<<<<<< HEAD
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>();
} else {
poundlistQueryWrapper = (QueryWrapper<PoundlistEntity>)poundlistObj;
poundlistNum++;
}
}
}
=======
/*if(!isPc){
Page<PoundlistEntity> page=new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize());
IPage<PoundlistEntity> poundlistEntityIPage = poundlistMapper.queryByKeyword(page, poundlistPagination.getKeyword());
return poundlistPagination.setData(poundlistEntityIPage.getRecords(),poundlistEntityIPage.getTotal());
}*/
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if(StringUtil.isNotEmpty(poundlistPagination.getPoundDate())){
poundlistNum++;
List<String> PoundDateList = poundlistPagination.getPoundDate();
@ -130,12 +146,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
int total=0;
int poundlistNum =0;
QueryWrapper<PoundlistEntity> poundlistQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>();
} else {
@ -146,7 +162,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"poundlist"));
Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
if (ObjectUtil.isEmpty(poundlistObj)){
return new ArrayList<>();
} else {

32
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
Unescape View File

@ -70,26 +70,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
int purchaseorderNum =0;
QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
purchasebackNum++;
}
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>();
} else {
purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
purchaseback_item0Num++;
}
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
@ -100,7 +100,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
@ -109,7 +109,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>();
} else {
@ -118,7 +118,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
@ -172,26 +172,26 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
int purchaseorderNum =0;
QueryWrapper<PurchaseorderEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
purchasebackQueryWrapper = (QueryWrapper<PurchasebackEntity>)purchasebackObj;
purchasebackNum++;
}
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>();
} else {
purchaseback_item0QueryWrapper = (QueryWrapper<Purchaseback_item0Entity>)purchaseback_item0Obj;
purchaseback_item0Num++;
}
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
@ -202,7 +202,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"purchaseback"));
Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
if (ObjectUtil.isEmpty(purchasebackObj)){
return new ArrayList<>();
} else {
@ -211,7 +211,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"purchaseback_item0"));
Object purchaseback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseback_item0QueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback_item0"));
if (ObjectUtil.isEmpty(purchaseback_item0Obj)){
return new ArrayList<>();
} else {
@ -220,7 +220,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {

56
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -678,47 +678,47 @@ if (pMap!=null&&pMap.size()>0){
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
purchaseorderNum++;
}
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>();
} else {
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
@ -729,7 +729,7 @@ if (pMap!=null&&pMap.size()>0){
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
@ -738,7 +738,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>();
} else {
@ -747,7 +747,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
@ -756,7 +756,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
@ -765,7 +765,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
@ -774,7 +774,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
@ -834,47 +834,47 @@ if (pMap!=null&&pMap.size()>0){
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
purchaseorderQueryWrapper = (QueryWrapper<PurchaseorderitemEntity>)purchaseorderObj;
purchaseorderNum++;
}
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>();
} else {
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
@ -885,7 +885,7 @@ if (pMap!=null&&pMap.size()>0){
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder"));
Object purchaseorderObj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder"));
if (ObjectUtil.isEmpty(purchaseorderObj)){
return new ArrayList<>();
} else {
@ -894,7 +894,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"purchaseorder_item0"));
Object purchaseorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(purchaseorder_item0QueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchaseorder_item0"));
if (ObjectUtil.isEmpty(purchaseorder_item0Obj)){
return new ArrayList<>();
} else {
@ -903,7 +903,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
@ -912,7 +912,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
@ -921,7 +921,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
@ -930,7 +930,7 @@ if (pMap!=null&&pMap.size()>0){
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"jg_collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {

24
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
Unescape View File

@ -66,19 +66,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
int receiptin_item0Num =0;
QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
receiptinNum++;
}
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>();
} else {
@ -89,7 +89,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
@ -98,7 +98,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>();
} else {
@ -155,19 +155,19 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
int receiptin_item0Num =0;
QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
receiptinQueryWrapper = (QueryWrapper<ReceiptinEntity>)receiptinObj;
receiptinNum++;
}
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>();
} else {
@ -178,7 +178,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"receiptin"));
Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
if (ObjectUtil.isEmpty(receiptinObj)){
return new ArrayList<>();
} else {
@ -187,7 +187,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"receiptin_item0"));
Object receiptin_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptin_item0QueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin_item0"));
if (ObjectUtil.isEmpty(receiptin_item0Obj)){
return new ArrayList<>();
} else {

24
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
Unescape View File

@ -66,19 +66,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
int receiptout_item0Num =0;
QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
receiptoutNum++;
}
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>();
} else {
@ -89,7 +89,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
@ -98,7 +98,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>();
} else {
@ -155,19 +155,19 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
int receiptout_item0Num =0;
QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
receiptoutQueryWrapper = (QueryWrapper<ReceiptoutEntity>)receiptoutObj;
receiptoutNum++;
}
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>();
} else {
@ -178,7 +178,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"receiptout"));
Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
if (ObjectUtil.isEmpty(receiptoutObj)){
return new ArrayList<>();
} else {
@ -187,7 +187,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
}
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"receiptout_item0"));
Object receiptout_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(receiptout_item0QueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout_item0"));
if (ObjectUtil.isEmpty(receiptout_item0Obj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/service/impl/ReservoirareaServiceImpl.java
Unescape View File

@ -51,12 +51,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
int total=0;
int reservoirareaNum =0;
QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>();
} else {
@ -67,7 +67,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>();
} else {
@ -122,12 +122,12 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
int total=0;
int reservoirareaNum =0;
QueryWrapper<ReservoirareaEntity> reservoirareaQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>();
} else {
@ -138,7 +138,7 @@ public class ReservoirareaServiceImpl extends ServiceImpl<ReservoirareaMapper, R
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"reservoirarea"));
Object reservoirareaObj=authorizeService.getCondition(new AuthorizeConditionModel(reservoirareaQueryWrapper,reservoirareaPagination.getMenuId(),"jg_reservoirarea"));
if (ObjectUtil.isEmpty(reservoirareaObj)){
return new ArrayList<>();
} else {

71
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -66,31 +66,48 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
int saleback_item0Num =0;
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
<<<<<<< HEAD
int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = true;
boolean appPermission = true;
=======
boolean pcPermission = false;
boolean appPermission = false;
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
salebackNum++;
}
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>();
} else {
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++;
}
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
=======
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
@ -99,7 +116,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>();
} else {
@ -108,6 +125,17 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
=======
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
}
}
@ -152,32 +180,49 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
int saleback_item0Num =0;
QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
<<<<<<< HEAD
int saleorderNum =0;
QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
boolean pcPermission = true;
boolean appPermission = true;
=======
boolean pcPermission = false;
boolean appPermission = false;
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
salebackNum++;
}
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>();
} else {
saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
saleback_item0Num++;
}
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
=======
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
if (ObjectUtil.isEmpty(salebackObj)){
return new ArrayList<>();
} else {
@ -186,7 +231,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
if (ObjectUtil.isEmpty(saleback_item0Obj)){
return new ArrayList<>();
} else {
@ -195,7 +240,17 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
}
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
return new ArrayList<>();
} else {
saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
saleorderNum++;
}
=======
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
}

124
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
Unescape View File

@ -95,54 +95,83 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
=======
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList<>();
} else {
saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
saleorderitemNum++;
}
<<<<<<< HEAD
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
=======
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>();
} else {
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++;
}
<<<<<<< HEAD
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
=======
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
<<<<<<< HEAD
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
=======
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
<<<<<<< HEAD
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
=======
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
<<<<<<< HEAD
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
=======
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
<<<<<<< HEAD
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
=======
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
@ -153,8 +182,13 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
=======
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList<>();
} else {
saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
@ -162,7 +196,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
=======
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>();
} else {
@ -171,7 +209,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
=======
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
@ -180,7 +222,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
=======
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
@ -189,7 +235,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
=======
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
@ -198,7 +248,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
=======
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
@ -207,7 +261,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
=======
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
@ -274,54 +332,83 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
=======
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList<>();
} else {
saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
saleorderitemNum++;
}
<<<<<<< HEAD
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
=======
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>();
} else {
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++;
}
<<<<<<< HEAD
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
=======
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
<<<<<<< HEAD
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
=======
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
<<<<<<< HEAD
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
=======
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
<<<<<<< HEAD
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
=======
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
<<<<<<< HEAD
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
=======
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
@ -332,8 +419,13 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
<<<<<<< HEAD
Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
if (ObjectUtil.isEmpty(saleorderObj)){
=======
Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
if (ObjectUtil.isEmpty(saleorderitemObj)){
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
return new ArrayList<>();
} else {
saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
@ -341,7 +433,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
=======
Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesorder_item0Obj)){
return new ArrayList<>();
} else {
@ -350,7 +446,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
=======
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
@ -359,7 +459,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
=======
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
@ -368,7 +472,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
=======
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
@ -377,7 +485,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
=======
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
@ -386,7 +498,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
<<<<<<< HEAD
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
=======
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java
Unescape View File

@ -55,12 +55,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
int total=0;
int supplierNum =0;
QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>();
} else {
@ -71,7 +71,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>();
} else {
@ -141,12 +141,12 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
int total=0;
int supplierNum =0;
QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>();
} else {
@ -157,7 +157,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEnt
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"supplier"));
Object supplierObj=authorizeService.getCondition(new AuthorizeConditionModel(supplierQueryWrapper,supplierPagination.getMenuId(),"jg_supplier"));
if (ObjectUtil.isEmpty(supplierObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
Unescape View File

@ -68,12 +68,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {
@ -84,7 +84,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {
@ -145,12 +145,12 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
int total=0;
int tradeuploadNum =0;
QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {
@ -161,7 +161,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"tradeupload"));
Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_tradeupload"));
if (ObjectUtil.isEmpty(tradeuploadObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java
Unescape View File

@ -55,12 +55,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
int total=0;
int vehicleNum =0;
QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>();
} else {
@ -71,7 +71,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>();
} else {
@ -136,12 +136,12 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
int total=0;
int vehicleNum =0;
QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>();
} else {
@ -152,7 +152,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
if (ObjectUtil.isEmpty(vehicleObj)){
return new ArrayList<>();
} else {

16
SC-boot/linkage-scm/src/main/java/jnpf/warehouse/service/impl/WareHouseServiceImpl.java
Unescape View File

@ -51,12 +51,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
int total=0;
int wareHouseNum =0;
QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>();
} else {
@ -67,7 +67,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>();
} else {
@ -122,12 +122,12 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
int total=0;
int wareHouseNum =0;
QueryWrapper<WareHouseEntity> wareHouseQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean pcPermission = true;
boolean appPermission = true;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>();
} else {
@ -138,7 +138,7 @@ public class WareHouseServiceImpl extends ServiceImpl<WareHouseMapper, WareHouse
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"wareHouse"));
Object wareHouseObj=authorizeService.getCondition(new AuthorizeConditionModel(wareHouseQueryWrapper,wareHousePagination.getMenuId(),"jg_wareHouse"));
if (ObjectUtil.isEmpty(wareHouseObj)){
return new ArrayList<>();
} else {

2
SC-web/src/settings.js
Unescape View File

@ -1,5 +1,5 @@
module.exports = {
title: 'LINKAGE-快速开发平台',
title: '再生资源智慧管家平台',
/**
* @type {boolean} true | false

32
SC-web/src/views/basic/profile/index.vue
Unescape View File

@ -1,23 +1,22 @@
<template>
<div class="app-container Profile-container">
<el-tabs tab-position="left" style="height:100%" v-model="activeTab" class="profile-tabs"
v-loading="userLoading">
<!--
<el-tab-pane label="个人资料" name="user">
<UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="password">
<Password ref="password" v-if="visible.password" />
</el-tab-pane>
-->
<el-tab-pane disabled name="line"></el-tab-pane>
<el-tab-pane disabled name="line"></el-tab-pane>
v-loading="userLoading" z-index="99">
<el-tab-pane disabled name="line1"></el-tab-pane>
<el-tab-pane disabled name="line2"></el-tab-pane>
<el-tab-pane label="个人资料" name="user">
<UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="password">
<Password ref="password" v-if="visible.password" />
</el-tab-pane>
<!-- <el-tab-pane disabled name="line"></el-tab-pane> -->
<!-- <el-tab-pane label="个人资料" name="user">-->
<!-- <UserInfo ref="user" :user='user' v-if="visible.user" @updateInfo="getInfo"/>-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="修改密码" name="password">-->
<!-- <Password ref="password" v-if="visible.password"/>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="我的组织" name="organize">
<div class="JNPF-common-title mb-10">
<h2 class="bold">我的组织
@ -92,14 +91,14 @@
<SysLog ref="sysLog" v-if="visible.sysLog" />
</el-tab-pane>
</el-tabs>
<div class="head">
<div class="head" z-index="999">
<el-upload class="avatar-uploader" :action="define.comUploadUrl+'/userAvatar'"
:headers="uploadHeaders" :on-success="handleSuccess" :show-file-list="false"
accept="image/*">
<div class="avatar-box">
<el-avatar :size="50" :src="define.comUrl + user.avatar" class="avatar"
v-if="user.avatar" />
<!-- <div class="avatar-hover">更换头像</div>-->
<div class="avatar-hover">更换头像</div>
</div>
</el-upload>
<!-- <span class="username">{{user.realName}}</span>-->
@ -295,11 +294,12 @@ export default {
}
}
.head {
z-index: 9999;
position: absolute;
left: 10px;
left: 27px;
top: 10px;
height: 70px;
width: 160px;
height: 80px;
width: 80px;
padding-top: 10px;
>>> .avatar-uploader {
display: inline-block;

14
SC-web/src/views/scm/basicInformation/areasetting/index.vue
Unescape View File

@ -20,15 +20,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" icon="el-icon-plus"v-has="'btn_add'" @click="addOrUpdateHandle()" >新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-download" @click="">编辑
<el-button type="text" icon="el-icon-download" v-has="'btn_edit'" @click="">编辑
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -49,9 +49,9 @@
<el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

112
SC-web/src/views/scm/basicInformation/arinvoices/index.vue
Unescape View File

@ -1,6 +1,117 @@
<template>
<div class="JNPF-common-layout">
<<<<<<< HEAD
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<!-- <el-button type="text" icon="el-icon-download" @click="exportData()">导出-->
<!-- </el-button>-->
<!-- <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除-->
<!-- </el-button>-->
<el-button type="text" v-has="'btn_edit'" icon="el-icon-plus" @click="1">编辑
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">查看
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">审核
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">弃审
</el-button>
<el-button type="text" icon="el-icon-plus" @click="1">提交
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="reset()"/>
</el-tooltip>
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
<el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center" fixed="left"
/>
<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" fixed="left"
/>
<el-table-column prop="amount" label="金额" width="120" sortable align="center"
/>
<el-table-column prop="quantity" label="数量" width="120" sortable align="center"
/>
<el-table-column label="币别" width="80" sortable prop="currency" align="center">
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="invoiceAmount" label="发票金额" sortable width="120" align="center"
/>
<el-table-column prop="invoiceQuantity" label="发票数量" sortable width="120" align="center"
/>
<el-table-column prop="salesOrderNo" label="销售订单号" sortable width="200" align="center"
/>
<el-table-column prop="contractName" label="合同名称" sortable width="200" align="center"
/>
<el-table-column label="单据状态" width="120" sortable prop="status" align="center">
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" width="120" sortable align="center"
/>
<el-table-column label="操作" fixed="right" align="center"
width="200">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
<!-- </el-button>-->
<!-- <el-button type="text"-->
<!-- @click="goDetail(scope.row.id)">详情-->
<!-- </el-button>-->
<el-button type="text"
@click="goDetail">撤回申请
</el-button>
<el-button type="text"
@click="goDetail">审核
</el-button>
<el-button type="text"
@click="goDetail">弃审
</el-button>
<el-button type="text"
@click="goDetail">提交
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div>
=======
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -96,6 +207,7 @@ width="150" >
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
</div>
</template>

12
SC-web/src/views/scm/basicInformation/collection/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">审核
</el-button>
@ -74,11 +74,11 @@
<el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" @click="">撤回申请</el-button>

12
SC-web/src/views/scm/basicInformation/customer/index.vue
Unescape View File

@ -43,13 +43,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -119,10 +119,10 @@
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情

47
SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue
Unescape View File

@ -6,12 +6,12 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="编码">
<el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.inventoryOrgCode" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="名称">
<el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.inventoryOrgName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -25,7 +25,7 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -36,27 +36,28 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' >
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
<el-table-column prop="inventoryOrgCode" label="编码" width="0" align="left"
/>
/>
<el-table-column prop="inventoryOrgName" label="名称" width="0" align="left"
/>
/>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/>
/>
<el-table-column prop="companyId" label="所属组织" width="0" align="left"
/>
/>
<el-table-column label="操作" fixed="right"
width="100" >
width="100">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -74,13 +75,13 @@
import Detail from './Detail'
export default {
components: {JNPFForm, ExportBox,Detail},
components: {JNPFForm, ExportBox, Detail},
data() {
return {
detailVisible: false,
query: {
inventoryOrgCode:undefined,
inventoryOrgName:undefined,
inventoryOrgCode: undefined,
inventoryOrgName: undefined,
},
treeProps: {
children: 'children',
@ -104,8 +105,8 @@
{prop: 'creatorTime', label: '创建时间'},
{prop: 'companyId', label: '所属组织'},
],
companyIdOptions:[],
companyIdProps:{"label":"F_FullName","value":"F_Id"},
companyIdOptions: [],
companyIdProps: {"label": "F_FullName", "value": "F_Id"},
}
},
computed: {
@ -117,7 +118,7 @@
this.initData()
},
methods: {
goDetail(id){
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
@ -133,15 +134,15 @@
let _query = {
...this.listQuery,
...this.query,
menuId:this.menuId
menuId: this.menuId
};
request({
url: `/api/example/InventoryOrg/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
for(let i=0;i<res.data.list.length;i++){
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
_list.push(_data)
}
@ -183,7 +184,7 @@
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
request({
url: `/api/example/InventoryOrg/Actions/Export`,
method: 'GET',

45
SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue
Unescape View File

@ -6,12 +6,12 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="编码">
<el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.inventoryOrgDetailCode" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="名称">
<el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable> </el-input>
<el-input v-model="query.inventoryOrgDetailName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -25,9 +25,9 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()" >导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -38,27 +38,28 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' >
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'>
<el-table-column prop="inventoryOrgDetailCode" label="编码" width="0" align="left"
/>
/>
<el-table-column prop="inventoryOrgDetailName" label="名称" width="0" align="left"
/>
/>
<el-table-column prop="inventoryId" label="库存组织" width="0" align="left"
/>
/>
<el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
/>
/>
<el-table-column label="操作" fixed="right"
width="100" >
width="100">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)" >编辑
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -76,13 +77,13 @@
import Detail from './Detail'
export default {
components: {JNPFForm, ExportBox,Detail},
components: {JNPFForm, ExportBox, Detail},
data() {
return {
detailVisible: false,
query: {
inventoryOrgDetailCode:undefined,
inventoryOrgDetailName:undefined,
inventoryOrgDetailCode: undefined,
inventoryOrgDetailName: undefined,
},
treeProps: {
children: 'children',
@ -117,7 +118,7 @@
this.initData()
},
methods: {
goDetail(id){
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
@ -133,15 +134,15 @@
let _query = {
...this.listQuery,
...this.query,
menuId:this.menuId
menuId: this.menuId
};
request({
url: `/api/example/InventoryOrgDetail/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =[];
for(let i=0;i<res.data.list.length;i++){
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
let _data = res.data.list[i];
_list.push(_data)
}
@ -183,7 +184,7 @@
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
let query = {...data, ...this.listQuery, ...this.query, menuId: this.menuId}
request({
url: `/api/example/InventoryOrgDetail/Actions/Export`,
method: 'GET',

12
SC-web/src/views/scm/basicInformation/invoices/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -64,11 +64,11 @@
<el-table-column prop="remark" label="备注" width="150" align="center" sortable="custom" />
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

72
SC-web/src/views/scm/basicInformation/jg_contract/Detail.vue
Unescape View File

@ -11,178 +11,178 @@
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorUserId')" >
<el-form-item label="创建人id"
prop="creatorUserId" >
<p>{{dataForm.creatorUserId}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorUserName')" >
<el-form-item label="创建人名称"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractType')" >
<el-form-item label="合同类型 "
prop="contractType" >
<p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractCode')" >
<el-form-item label="合同编码"
prop="contractCode" >
<p>{{dataForm.contractCode}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractName')" >
<el-form-item label="合同名称"
prop="contractName" >
<p>{{dataForm.contractName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('status')" >
<el-form-item label="合同状态"
prop="status" >
<p>{{dataForm.status}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('bidOpeningDate')" >
<el-form-item label="开标日期"
prop="bidOpeningDate" >
<p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('startDate')" >
<el-form-item label="开始日期"
prop="startDate" >
<p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('auditDate')" >
<el-form-item label="审核日期"
prop="auditDate" >
<p>{{jnpf.dateFormat(dataForm.auditDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('completionDate')" >
<el-form-item label="供货完成日期"
prop="completionDate" >
<p>{{jnpf.dateFormat(dataForm.completionDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('closingDate')" >
<el-form-item label="关闭日期"
prop="closingDate" >
<p>{{jnpf.dateFormat(dataForm.closingDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('collectionCycle')" >
<el-form-item label="回款周期(日)"
prop="collectionCycle" >
<p>{{dataForm.collectionCycle}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('signingDate')" >
<el-form-item label="签订日期"
prop="signingDate" >
<p>{{jnpf.dateFormat(dataForm.signingDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('endDate')" >
<el-form-item label="截止日期"
prop="endDate" >
<p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商/客户编"
<el-col :span="8" v-if="jnpf.hasFormP('code')" >
<el-form-item label="供应商/客户id"
prop="code" >
<p>{{dataForm.code}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商/客户名"
<el-col :span="8" v-if="jnpf.hasFormP('name')" >
<el-form-item label="供应商/客户id"
prop="name" >
<p>{{dataForm.name}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractNo')" >
<el-form-item label="对方合同号"
prop="contractNo" >
<p>{{dataForm.contractNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('currency')" >
<el-form-item label="币种 "
prop="currency" >
<p>{{dataForm.currency}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('num')" >
<el-form-item label="数量"
prop="num" >
<p>{{dataForm.num}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('amount')" >
<el-form-item label="金额"
prop="amount" >
<p>{{dataForm.amount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('organization')" >
<el-form-item label="库存组织"
prop="organization" >
<p>{{dataForm.organization}}</p>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-col :span="16" v-if="jnpf.hasFormP('remark')" >
<el-form-item label="备注"
prop="remark" >
<p>{{dataForm.remark}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('classification')" >
<el-form-item label="合同分类 "
prop="classification" >
<p>{{dataForm.classification}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('declarationDate')" >
<el-form-item label="申报日期"
prop="declarationDate" >
<p>{{dataForm.declarationDate}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('deptCode')" >
<el-form-item label="部门编码"
prop="deptCode" >
<p>{{dataForm.deptCode}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorusername')" >
<el-form-item label="录入人"
prop="creatorusername" >
<p>{{dataForm.creatorusername}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('deptName')" >
<el-form-item label="部门名称"
prop="deptName" >
<p>{{dataForm.deptName}}</p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('approval')" >
<el-form-item label="集团审批"
prop="approval" >
<p>{{dataForm.approval}}</p>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activenydeop" tab-position="top" class="mb-20">
<el-tabs v-model="activeayhzdd" tab-position="top" class="mb-20">
<el-tab-pane label="物料明细">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item0List')" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
@ -249,7 +249,7 @@
</el-col>
</el-tab-pane >
<el-tab-pane label="附件详情">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item1List')" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
@ -305,8 +305,8 @@
collectionCycle : '',
signingDate : '',
endDate : '',
code : '',
name : '',
code : "",
name : "",
contractNo : '',
currency : '',
num : '',
@ -322,7 +322,7 @@
jg_contract_item0List:[],
jg_contract_item1List:[],
},
activenydeop:'0',
activeayhzdd:'0',
contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
}

352
SC-web/src/views/scm/basicInformation/jg_contract/Form.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
:content="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"/>
@ -9,272 +9,288 @@
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorUserId')">
<el-form-item label="创建人id"
prop="creatorUserId" >
prop="creatorUserId">
<el-input v-model="dataForm.creatorUserId"
placeholder="系统自动生成" readonly >
placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorUserName')">
<el-form-item label="创建人名称"
prop="creatorUserName" >
prop="creatorUserName">
<el-input v-model="dataForm.creatorUserName"
placeholder="系统自动生成" readonly >
placeholder="系统自动生成" readonly>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractType')">
<el-form-item label="合同类型 "
prop="contractType" >
prop="contractType">
<el-select v-model="dataForm.contractType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractCode')">
<el-form-item label="合同编码"
prop="contractCode" >
prop="contractCode">
<el-input v-model="dataForm.contractCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractName')">
<el-form-item label="合同名称"
prop="contractName" >
prop="contractName">
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('status')">
<el-form-item label="合同状态"
prop="status" >
prop="status">
<el-input v-model="dataForm.status"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('bidOpeningDate')">
<el-form-item label="开标日期"
prop="bidOpeningDate" >
prop="bidOpeningDate">
<el-date-picker v-model="dataForm.bidOpeningDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('startDate')">
<el-form-item label="开始日期"
prop="startDate" >
prop="startDate">
<el-date-picker v-model="dataForm.startDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('auditDate')">
<el-form-item label="审核日期"
prop="auditDate" >
prop="auditDate">
<el-date-picker v-model="dataForm.auditDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('completionDate')">
<el-form-item label="供货完成日期"
prop="completionDate" >
prop="completionDate">
<el-date-picker v-model="dataForm.completionDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('closingDate')">
<el-form-item label="关闭日期"
prop="closingDate" >
prop="closingDate">
<el-date-picker v-model="dataForm.closingDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('collectionCycle')">
<el-form-item label="回款周期(日)"
prop="collectionCycle" >
prop="collectionCycle">
<el-input v-model="dataForm.collectionCycle"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('signingDate')">
<el-form-item label="签订日期"
prop="signingDate" >
prop="signingDate">
<el-date-picker v-model="dataForm.signingDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('endDate')">
<el-form-item label="截止日期"
prop="endDate" >
prop="endDate">
<el-date-picker v-model="dataForm.endDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商/客户编"
prop="code" >
<el-input v-model="dataForm.code"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="8" v-if="jnpf.hasFormP('code')">
<el-form-item label="供应商/客户id"
prop="code">
<popupSelect v-model="dataForm.code"
placeholder="请选择" clearable field="code" interfaceId="382494924156735557"
:columnOptions="codecolumnOptions" propsValue="id" relationField="fullName"
popupType="dialog"
popupTitle="选择供应商" popupWidth="800px"
>
</el-input>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商/客户名"
prop="name" >
<el-input v-model="dataForm.name"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="8" v-if="jnpf.hasFormP('name')">
<el-form-item label="供应商/客户id"
prop="name">
<popupSelect v-model="dataForm.name"
placeholder="请选择" clearable field="name" interfaceId="395936123471343749"
:columnOptions="namecolumnOptions" propsValue="id" relationField="fullName"
popupType="dialog"
popupTitle="选择客户" popupWidth="800px"
>
</el-input>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('contractNo')">
<el-form-item label="对方合同号"
prop="contractNo" >
prop="contractNo">
<el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('currency')">
<el-form-item label="币种 "
prop="currency" >
prop="currency">
<el-input v-model="dataForm.currency"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('num')">
<el-form-item label="数量"
prop="num" >
prop="num">
<el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('amount')">
<el-form-item label="金额"
prop="amount" >
prop="amount">
<el-input v-model="dataForm.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-col :span="8" v-if="jnpf.hasFormP('organization')">
<el-form-item label="库存组织"
prop="organization" >
prop="organization">
<el-input v-model="dataForm.organization"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-col :span="16" v-if="jnpf.hasFormP('remark')">
<el-form-item label="备注"
prop="remark" >
prop="remark">
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('classification')">
<el-form-item label="合同分类 "
prop="classification" >
prop="classification">
<el-input v-model="dataForm.classification"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('declarationDate')">
<el-form-item label="申报日期"
prop="declarationDate" >
prop="declarationDate">
<el-input v-model="dataForm.declarationDate"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('deptCode')">
<el-form-item label="部门编码"
prop="deptCode" >
prop="deptCode">
<el-input v-model="dataForm.deptCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('creatorusername')">
<el-form-item label="录入人"
prop="creatorusername" >
prop="creatorusername">
<el-input v-model="dataForm.creatorusername"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('deptName')">
<el-form-item label="部门名称"
prop="deptName" >
prop="deptName">
<el-input v-model="dataForm.deptName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('approval')">
<el-form-item label="集团审批"
prop="approval" >
prop="approval">
<el-switch v-model="dataForm.approval"
:active-value="1" :inactive-value="0" >
:active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activenydeop" tab-position="top" class="mb-20">
<el-tabs v-model="activeayhzdd" tab-position="top" class="mb-20">
<el-tab-pane label="物料明细">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item0List')">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.jg_contract_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.jg_contract_item0List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="materialCode" label="物料编码">
<template slot-scope="scope">
<el-input v-model="scope.row.materialCode"
@ -352,9 +368,11 @@
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item0List(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="deljg_contract_item0List(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -363,25 +381,27 @@
</div>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
<el-tab-pane label="附件详情">
<el-col :span="24" >
<el-col :span="24" v-if="jnpf.hasFormP('jg_contract_item1List')">
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.jg_contract_item1List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table :data="dataForm.jg_contract_item1List" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="enclosure" label="附件内容">
<template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.enclosure"
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
</JNPF-UploadFz>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="deljg_contract_item1List(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="deljg_contract_item1List(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -390,19 +410,20 @@
</div>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tab-pane>
</el-tabs>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
export default {
components: {},
props: [],
@ -412,38 +433,38 @@
loading: false,
isDetail: false,
dataForm: {
creatorUserId : "",
creatorUserName : "",
contractType : "",
contractCode : '',
contractName : '',
status : '',
bidOpeningDate : '',
startDate : '',
auditDate : '',
completionDate : '',
closingDate : '',
collectionCycle : '',
signingDate : '',
endDate : '',
code : '',
name : '',
contractNo : '',
currency : '',
num : '',
amount : '',
organization : '',
remark : '',
classification : '',
declarationDate : '',
deptCode : '',
creatorusername : '',
deptName : '',
approval : 0,
jg_contract_item0List:[],
jg_contract_item1List:[],
creatorUserId: "",
creatorUserName: "",
contractType: "",
contractCode: '',
contractName: '',
status: '',
bidOpeningDate: '',
startDate: '',
auditDate: '',
completionDate: '',
closingDate: '',
collectionCycle: '',
signingDate: '',
endDate: '',
code: "",
name: "",
contractNo: '',
currency: '',
num: '',
amount: '',
organization: '',
remark: '',
classification: '',
declarationDate: '',
deptCode: '',
creatorusername: '',
deptName: '',
approval: 0,
jg_contract_item0List: [],
jg_contract_item1List: [],
},
activenydeop:'0',
activeayhzdd: '0',
rules:
{
contractType: [
@ -480,7 +501,15 @@
},
],
},
contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
contractTypeOptions: [{"fullName": "选项一", "id": "1"}, {"fullName": "选项二", "id": "2"}],
codecolumnOptions: [{"label": "供应商Code", "value": "supplier_code"}, {
"label": "供应商",
"value": "supplier_name"
},],
namecolumnOptions: [{"label": "ID", "value": "id"}, {"label": "客户编码", "value": "supplier_cd"}, {
"label": "客户名称",
"value": "supplier_nm"
},],
}
},
@ -488,18 +517,19 @@
watch: {},
created() {
},
mounted() {},
mounted() {
},
methods: {
jg_contract_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.jg_contract_item0List.length;i++){
for (let i = 0; i < this.dataForm.jg_contract_item0List.length; i++) {
const e = this.dataForm.jg_contract_item0List[i];
}
return isOk;
},
jg_contract_item1Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.jg_contract_item1List.length;i++){
for (let i = 0; i < this.dataForm.jg_contract_item1List.length; i++) {
const e = this.dataForm.jg_contract_item1List[i];
}
return isOk;
@ -507,7 +537,7 @@
goBack() {
this.$emit('refresh')
},
clearData(data){
clearData(data) {
for (let key in data) {
if (data[key] instanceof Array) {
data[key] = [];
@ -524,16 +554,16 @@
this.isDetail = isDetail || false;
this.$nextTick(() => {
this.$refs['elForm'].resetFields();
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/Jg_contract/'+this.dataForm.id,
url: '/api/example/Jg_contract/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
} else {
this.clearData(this.dataForm)
}
});
@ -550,7 +580,7 @@
})
},
request() {
var _data =this.dataList()
var _data = this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/example/Jg_contract',
@ -567,9 +597,9 @@
}
})
})
}else{
} else {
request({
url: '/api/example/Jg_contract/'+this.dataForm.id,
url: '/api/example/Jg_contract/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -585,53 +615,53 @@
})
}
},
addjg_contract_item0List(){
addjg_contract_item0List() {
let item = {
materialCode:undefined,
materialName:undefined,
specification:undefined,
unit:undefined,
num:undefined,
price:undefined,
amount:undefined,
rate:undefined,
notPrice:undefined,
notAmount:undefined,
remark:undefined,
materialCode: undefined,
materialName: undefined,
specification: undefined,
unit: undefined,
num: undefined,
price: undefined,
amount: undefined,
rate: undefined,
notPrice: undefined,
notAmount: undefined,
remark: undefined,
}
this.dataForm.jg_contract_item0List.push(item)
},
deljg_contract_item0List(index) {
this.dataForm.jg_contract_item0List.splice(index, 1);
},
addjg_contract_item1List(){
addjg_contract_item1List() {
let item = {
enclosure:undefined,
enclosure: undefined,
}
this.dataForm.jg_contract_item1List.push(item)
},
deljg_contract_item1List(index) {
this.dataForm.jg_contract_item1List.splice(index, 1);
},
dataList(){
dataList() {
var _data = JSON.parse(JSON.stringify(this.dataForm));
_data.approval = parseInt(_data.approval)
for(let i=0;i<_data.jg_contract_item0List.length;i++){
for (let i = 0; i < _data.jg_contract_item0List.length; i++) {
var _list = _data.jg_contract_item0List[i];
}
for(let i=0;i<_data.jg_contract_item1List.length;i++){
for (let i = 0; i < _data.jg_contract_item1List.length; i++) {
var _list = _data.jg_contract_item1List[i];
_list.enclosure = JSON.stringify(_list.enclosure)
}
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
_dataAll.approval = parseInt( _dataAll.approval)
for(let i=0;i<_dataAll.jg_contract_item0List.length;i++){
dataInfo(dataAll) {
let _dataAll = dataAll
_dataAll.approval = parseInt(_dataAll.approval)
for (let i = 0; i < _dataAll.jg_contract_item0List.length; i++) {
var _list = _dataAll.jg_contract_item0List[i];
}
for(let i=0;i<_dataAll.jg_contract_item1List.length;i++){
for (let i = 0; i < _dataAll.jg_contract_item1List.length; i++) {
var _list = _dataAll.jg_contract_item1List[i];
_list.enclosure = JSON.parse(_list.enclosure)
}

32
SC-web/src/views/scm/basicInformation/jg_contract/index.vue
Unescape View File

@ -43,37 +43,37 @@
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange">
<el-table-column prop="contractCode" label="合同编码" width="0" align="left"
/>
v-if="jnpf.hasP('contractCode')"/>
<el-table-column prop="contractName" label="合同名称" width="0" align="left"
/>
v-if="jnpf.hasP('contractName')"/>
<el-table-column prop="contractNo" label="对方合同号" width="0" align="left"
/>
v-if="jnpf.hasP('contractNo')"/>
<el-table-column label="合同类型 " width="0" prop="contractType" algin="left"
>
v-if="jnpf.hasP('contractType')">
<template slot-scope="scope">
{{ scope.row.contractType | dynamicText(contractTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="classification" label="合同分类 " width="0" align="left"
/>
v-if="jnpf.hasP('classification')"/>
<el-table-column prop="declarationDate" label="申报日期" width="0" align="left"
/>
<el-table-column prop="name" label="供应商/客户名" width="0" align="left"
/>
v-if="jnpf.hasP('declarationDate')"/>
<el-table-column prop="name" label="供应商/客户id" width="0" align="left"
v-if="jnpf.hasP('name')"/>
<el-table-column prop="num" label="数量" width="0" align="left"
/>
v-if="jnpf.hasP('num')"/>
<el-table-column prop="amount" label="金额" width="0" align="left"
/>
v-if="jnpf.hasP('amount')"/>
<el-table-column prop="deptName" label="部门名称" width="0" align="left"
/>
v-if="jnpf.hasP('deptName')"/>
<el-table-column prop="remark" label="备注" width="0" align="left"
/>
v-if="jnpf.hasP('remark')"/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="left"
/>
v-if="jnpf.hasP('creatorusername')"/>
<el-table-column prop="status" label="合同状态" width="0" align="left"
/>
v-if="jnpf.hasP('status')"/>
<el-table-column prop="approval" label="集团审批" width="0" align="left"
/>
v-if="jnpf.hasP('approval')"/>
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
@ -138,7 +138,7 @@
{prop: 'contractType', label: '合同类型 '},
{prop: 'classification', label: '合同分类 '},
{prop: 'declarationDate', label: '申报日期'},
{prop: 'name', label: '供应商/客户名'},
{prop: 'name', label: '供应商/客户id'},
{prop: 'num', label: '数量'},
{prop: 'amount', label: '金额'},
{prop: 'deptName', label: '部门名称'},

12
SC-web/src/views/scm/basicInformation/material/index.vue
Unescape View File

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -94,10 +94,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

14
SC-web/src/views/scm/basicInformation/monitormanage/index.vue
Unescape View File

@ -30,15 +30,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-download" @click="">编辑
<el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">编辑
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -77,10 +77,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

12
SC-web/src/views/scm/basicInformation/natural/index.vue
Unescape View File

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_download'">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" icon="el-icon-download" v-has="'btn_upload'" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'" >批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -58,10 +58,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
</el-button>
</template>
</el-table-column>

12
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" icon="el-icon-delete" v-has="'btn_batchRemove'" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="submitprice()">提交
</el-button>
@ -70,11 +70,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button v-if="scope.row.status == 0" type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

6
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -75,13 +75,13 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
<el-button v-has="'btn_edit'" type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" :disabled="!!scope.row.flowState"
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" :disabled="!!scope.row.flowState"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
<el-button size="mini" v-has="'btn_detail'" type="text" :disabled="!scope.row.flowState"
@click="addOrUpdateHandle(scope.row.id,scope.row.flowState)">详情</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="fukuanHandle(scope.row.id,scope.row.flowState, scope.row.docStatus)">付款</el-button>

10
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()">生成采购
</el-button>
@ -104,9 +104,9 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="100" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

14
SC-web/src/views/scm/basicInformation/purchaseback/index.vue
Unescape View File

@ -20,15 +20,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="">编辑
<el-button type="text" v-has="'btn_edit'" icon="el-icon-download" @click="">编辑
</el-button>
<el-button type="text" icon="el-icon-download" @click="">查看
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -66,11 +66,11 @@
<el-table-column prop="remark" label="备注" width="0" align="center"sortable/>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

12
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-delete" @click="fapiaoluruHandle()">发票录入
</el-button>
@ -72,11 +72,11 @@
<el-table-column prop="remark" label="备注信息" width="0" align="center" /> -->
<el-table-column label="操作" fixed="right" width="100" align="center" >
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row)">删除
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleTuihuo(scope.row)">退货
</el-button>

12
SC-web/src/views/scm/basicInformation/receiptin/index.vue
Unescape View File

@ -28,11 +28,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -71,11 +71,11 @@
<el-table-column prop="creatorUserName" sortable label="创建人" width="120" align="center" />
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>

94
SC-web/src/views/scm/basicInformation/receiptout/index.vue
Unescape View File

@ -1,6 +1,99 @@
<template>
<div class="JNPF-common-layout">
<<<<<<< HEAD
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务类型">
<el-select v-model="query.type" placeholder="请选择" clearable>
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input v-model="query.customerName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">审核
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">弃审
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
</el-tooltip>
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" width="200" sortable align="center" fixed="left" />
<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left" />
<el-table-column prop="amount" label="出库金额" width="120" sortable align="center" />
<el-table-column prop="num" label="出库数量" width="120" sortable align="center" />
<el-table-column label="币别" width="80" sortable prop="currency" align="center" >
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom" />
<el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center" />
<el-table-column label="业务类型" width="120" sortable prop="type" align="center" >
<template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" width="120" sortable align="center" />
<el-table-column label="单据状态" width="120" sortable prop="status" align="center" >
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center" />
<el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" />
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
=======
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -102,6 +195,7 @@ width="150" >
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
</div>
</template>

12
SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
Unescape View File

@ -25,15 +25,15 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -69,10 +69,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

12
SC-web/src/views/scm/basicInformation/saleback/index.vue
Unescape View File

@ -20,11 +20,11 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -75,12 +75,12 @@
<el-table-column label="操作" fixed="right"
width="150">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>

94
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -1,6 +1,99 @@
<template>
<div class="JNPF-common-layout">
<<<<<<< HEAD
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="单据编号">
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态 ">
<el-select v-model="query.status" placeholder="请选择" clearable>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">发货
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">发票录入
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">回款
</el-button>
<el-button type="text" icon="el-icon-close" @click="exportData()">归档
</el-button>
<el-button type="text" icon="el-icon-check" @click="exportData()">退货
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
</el-tooltip>
<screenfull isContainer />
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" sortable fixed="left" width="200" align="center" />
<el-table-column prop="costomerName" label="客户名称" sortable fixed="left" width="150" align="center" />
<el-table-column prop="price" label="金额" sortable width="150" align="center" />
<el-table-column prop="num" label="数量" sortable width="150" align="center" />
<el-table-column label="币别" width="100" sortable prop="currency" align="center" >
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column prop="amountCollected" sortable label="已回款金额" width="150" align="center" />
<el-table-column prop="invoiceNum" sortable label="发票数量" width="150" align="center" />
<el-table-column prop="invoiceAmount" sortable label="发票金额" width="150" align="center" />
<el-table-column label="来源系统" width="150" sortable prop="sourceSystem" align="center" >
<template slot-scope="scope">
{{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
</template>
</el-table-column>
<el-table-column label="单据状态 " width="150" sortable prop="status" align="center" >
<template slot-scope="scope">
{{ scope.row.status | dynamicText(statusOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
<el-table-column label="操作" fixed="right" width="150" align="center" >
<template slot-scope="scope">
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
=======
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -116,6 +209,7 @@ width="150" >
<JNPF-Form5 v-if="formVisible" ref="JNPFForm5" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
>>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
</div>
</template>

12
SC-web/src/views/scm/basicInformation/supplier/index.vue
Unescape View File

@ -48,13 +48,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -153,10 +153,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

14
SC-web/src/views/scm/basicInformation/tradeupload/index.vue
Unescape View File

@ -28,13 +28,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -124,12 +124,12 @@
<el-button type="text"
@click="addOrUpdateHandle2(scope.row.id)">审核
</el-button>
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>

12
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -68,9 +68,9 @@
<el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
<el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
<el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

12
SC-web/src/views/scm/basicInformation/warehouse/index.vue
Unescape View File

@ -25,13 +25,13 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
<el-button type="primary" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="el-icon-download" @click="exportData()">导出
<el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
</el-button>
<el-button type="text" icon="el-icon-download" @click="">导入
<el-button type="text" v-has="'btn_upload'" icon="el-icon-download" @click="">导入
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
<el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -75,10 +75,10 @@
<el-table-column label="操作" fixed="right"
width="100">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text" v-has="'btn_edit'"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
<el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
</template>
</el-table-column>

Write Preview
Loading…
Cancel
Save