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

投递配置优化

Browse Source
master
guochaojie 4 months ago
parent 222b88e360
commit 79c6fc34e0
32 changed files with 1712 additions and 1677 deletions
Show Stats Download Patch File Download Diff File

8
jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml
Unescape View File

@ -70,10 +70,10 @@ spring:
# redis单机模式 # redis单机模式
redis: redis:
database: 0 #缓存库编号 database: 0 #缓存库编号
host: 222.71.165.187 # host: 222.71.165.187
# host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: qawsed,.123 # 密码为空时，请将本行注释 # password: qawsed,.123 # 密码为空时，请将本行注释
timeout: 3000 #超时时间(单位：秒) timeout: 3000 #超时时间(单位：秒)
lettuce: #Lettuce为Redis的Java驱动包 lettuce: #Lettuce为Redis的Java驱动包
pool: pool:
@ -211,7 +211,7 @@ xxl:
max: 100 max: 100
# xxl-job服务端地址 # xxl-job服务端地址
admin: admin:
addresses: http://127.0.0.1:30020/xxl-job-admin/ addresses: http://192.168.0.23:9999/xxl-job-admin/
executor: executor:
address: '' address: ''
appname: xxl-job-executor-sample1 appname: xxl-job-executor-sample1

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleBucketMapper.java
Unescape View File

@ -5,11 +5,11 @@ import jnpf.entity.RecycleBucketEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* RecycleBucket * 回收桶配置
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-29 * 日期： 2024-06-17
*/ */
public interface RecycleBucketMapper extends BaseMapper<RecycleBucketEntity> { public interface RecycleBucketMapper extends BaseMapper<RecycleBucketEntity> {

8
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceConfigeMapper.java → jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeviceConfigMapper.java
Unescape View File

@ -1,16 +1,16 @@
package jnpf.mapper; package jnpf.mapper;
import jnpf.entity.RecycleDeviceConfigeEntity; import jnpf.entity.RecycleDeviceConfigEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* 投递清单 * 商户设备配置
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-31 * 日期： 2024-06-17
*/ */
public interface RecycleDeviceConfigeMapper extends BaseMapper<RecycleDeviceConfigeEntity> { public interface RecycleDeviceConfigMapper extends BaseMapper<RecycleDeviceConfigEntity> {
} }

7
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleBucketService.java
Unescape View File

@ -2,18 +2,16 @@ package jnpf.service;
import jnpf.model.recyclebucket.*; import jnpf.model.recyclebucket.*;
import jnpf.entity.*; import jnpf.entity.*;
import java.util.*; import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/** /**
* RecycleBucket * 回收桶配置
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-29 * 日期： 2024-06-17
*/ */
public interface RecycleBucketService extends IService<RecycleBucketEntity> { public interface RecycleBucketService extends IService<RecycleBucketEntity> {
List<RecycleBucketEntity> getList(RecycleBucketPagination recycleBucketPagination); List<RecycleBucketEntity> getList(RecycleBucketPagination recycleBucketPagination);
@ -34,5 +32,4 @@ public interface RecycleBucketService extends IService<RecycleBucketEntity> {
void saveOrUpdate(RecycleBucketForm recycleBucketForm,String id, boolean isSave) throws Exception; void saveOrUpdate(RecycleBucketForm recycleBucketForm,String id, boolean isSave) throws Exception;
List<RecycleBucketEntity> getList(RecycleBucketEntity entity);
} }

35
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigService.java
Unescape View File

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.recycledeviceconfig.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* 商户设备配置
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-06-17
*/
public interface RecycleDeviceConfigService extends IService<RecycleDeviceConfigEntity> {
List<RecycleDeviceConfigEntity> getList(RecycleDeviceConfigPagination recycleDeviceConfigPagination);
List<RecycleDeviceConfigEntity> getTypeList(RecycleDeviceConfigPagination recycleDeviceConfigPagination,String dataType);
RecycleDeviceConfigEntity getInfo(String id);
void delete(RecycleDeviceConfigEntity entity);
void create(RecycleDeviceConfigEntity entity);
boolean update(String id, RecycleDeviceConfigEntity entity);
//子表方法
//副表数据方法
String checkForm(RecycleDeviceConfigForm form,int i);
void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm,String id, boolean isSave) throws Exception;
}

35
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleDeviceConfigeService.java
Unescape View File

@ -1,35 +0,0 @@
package jnpf.service;
import jnpf.model.recycledeviceconfige.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* 投递清单
* 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组
* 日期： 2024-05-31
*/
public interface RecycleDeviceConfigeService extends IService<RecycleDeviceConfigeEntity> {
List<RecycleDeviceConfigeEntity> getList(RecycleDeviceConfigePagination recycleDeviceConfigePagination);
List<RecycleDeviceConfigeEntity> getTypeList(RecycleDeviceConfigePagination recycleDeviceConfigePagination,String dataType);
RecycleDeviceConfigeEntity getInfo(String id);
void delete(RecycleDeviceConfigeEntity entity);
void create(RecycleDeviceConfigeEntity entity);
boolean update(String id, RecycleDeviceConfigeEntity entity);
//子表方法
//副表数据方法
String checkForm(RecycleDeviceConfigeForm form,int i);
void saveOrUpdate(RecycleDeviceConfigeForm recycleDeviceConfigeForm,String id, boolean isSave) throws Exception;
}

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

@ -32,11 +32,11 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
* *
* RecycleBucket * 回收桶配置
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-29 * 日期： 2024-06-17
*/ */
@Service @Service
public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, RecycleBucketEntity> implements RecycleBucketService{ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, RecycleBucketEntity> implements RecycleBucketService{
@ -305,12 +305,4 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
} }
@Override
public List<RecycleBucketEntity> getList(RecycleBucketEntity entity) {
QueryWrapper<RecycleBucketEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtil.isNotEmpty(entity.getDeviceCode()), "device_code", entity.getDeviceCode());
wrapper.eq(StringUtil.isNotEmpty(entity.getBucketCode()), "bucket_code", entity.getBucketCode());
return this.list(wrapper);
}
} }

142
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigeServiceImpl.java → jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceConfigServiceImpl.java
Unescape View File

@ -1,10 +1,10 @@
package jnpf.service.impl; package jnpf.service.impl;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.mapper.RecycleDeviceConfigeMapper; import jnpf.mapper.RecycleDeviceConfigMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.recycledeviceconfige.*; import jnpf.model.recycledeviceconfig.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
@ -32,14 +32,14 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
* *
* 投递清单 * 商户设备配置
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* 作者： JNPF开发平台组 * 作者： JNPF开发平台组
* 日期： 2024-05-31 * 日期： 2024-06-17
*/ */
@Service @Service
public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceConfigeMapper, RecycleDeviceConfigeEntity> implements RecycleDeviceConfigeService{ public class RecycleDeviceConfigServiceImpl extends ServiceImpl<RecycleDeviceConfigMapper, RecycleDeviceConfigEntity> implements RecycleDeviceConfigService{
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -47,38 +47,38 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
private UserProvider userProvider; private UserProvider userProvider;
@Override @Override
public List<RecycleDeviceConfigeEntity> getList(RecycleDeviceConfigePagination recycleDeviceConfigePagination){ public List<RecycleDeviceConfigEntity> getList(RecycleDeviceConfigPagination recycleDeviceConfigPagination){
return getTypeList(recycleDeviceConfigePagination,recycleDeviceConfigePagination.getDataType()); return getTypeList(recycleDeviceConfigPagination,recycleDeviceConfigPagination.getDataType());
} }
/** 列表查询 */ /** 列表查询 */
@Override @Override
public List<RecycleDeviceConfigeEntity> getTypeList(RecycleDeviceConfigePagination recycleDeviceConfigePagination,String dataType){ public List<RecycleDeviceConfigEntity> getTypeList(RecycleDeviceConfigPagination recycleDeviceConfigPagination,String dataType){
String userId=userProvider.get().getUserId(); String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? RecycleDeviceConfigeConstant.getAppColumnData() : RecycleDeviceConfigeConstant.getColumnData(); String columnData = !isPc ? RecycleDeviceConfigConstant.getAppColumnData() : RecycleDeviceConfigConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total=0;
int recycleDeviceConfigeNum =0; int recycleDeviceConfigNum =0;
QueryWrapper<RecycleDeviceConfigeEntity> recycleDeviceConfigeQueryWrapper=new QueryWrapper<>(); QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp ="";
if (ObjectUtil.isNotEmpty(recycleDeviceConfigePagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = recycleDeviceConfigePagination.getSuperQueryJson(); String queryJson = recycleDeviceConfigPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<RecycleDeviceConfigeEntity> recycleDeviceConfigeSuperWrapper = new QueryWrapper<>(); QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigSuperWrapper = new QueryWrapper<>();
recycleDeviceConfigeSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigeSuperWrapper,RecycleDeviceConfigeEntity.class,queryJson,"0")); recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper,RecycleDeviceConfigEntity.class,queryJson,"0"));
int recycleDeviceConfigeNum1 = recycleDeviceConfigeSuperWrapper.getExpression().getNormal().size(); int recycleDeviceConfigNum1 = recycleDeviceConfigSuperWrapper.getExpression().getNormal().size();
if (recycleDeviceConfigeNum1>0){ if (recycleDeviceConfigNum1>0){
List<String> recycleDeviceConfigeList =this.list(recycleDeviceConfigeSuperWrapper).stream().map(RecycleDeviceConfigeEntity::getId).collect(Collectors.toList()); List<String> recycleDeviceConfigList =this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
allSuperList.addAll(recycleDeviceConfigeList); allSuperList.addAll(recycleDeviceConfigList);
intersectionSuperList.add(recycleDeviceConfigeList); intersectionSuperList.add(recycleDeviceConfigList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
@ -96,13 +96,13 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<RecycleDeviceConfigeEntity> recycleDeviceConfigeSuperWrapper = new QueryWrapper<>(); QueryWrapper<RecycleDeviceConfigEntity> recycleDeviceConfigSuperWrapper = new QueryWrapper<>();
recycleDeviceConfigeSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigeSuperWrapper,RecycleDeviceConfigeEntity.class,ruleJson,"0")); recycleDeviceConfigSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceConfigSuperWrapper,RecycleDeviceConfigEntity.class,ruleJson,"0"));
int recycleDeviceConfigeNum1 = recycleDeviceConfigeSuperWrapper.getExpression().getNormal().size(); int recycleDeviceConfigNum1 = recycleDeviceConfigSuperWrapper.getExpression().getNormal().size();
if (recycleDeviceConfigeNum1>0){ if (recycleDeviceConfigNum1>0){
List<String> recycleDeviceConfigeList =this.list(recycleDeviceConfigeSuperWrapper).stream().map(RecycleDeviceConfigeEntity::getId).collect(Collectors.toList()); List<String> recycleDeviceConfigList =this.list(recycleDeviceConfigSuperWrapper).stream().map(RecycleDeviceConfigEntity::getId).collect(Collectors.toList());
allRuleList.addAll(recycleDeviceConfigeList); allRuleList.addAll(recycleDeviceConfigList);
intersectionRuleList.add(recycleDeviceConfigeList); intersectionRuleList.add(recycleDeviceConfigList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
@ -117,26 +117,26 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object recycleDeviceConfigeObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigeQueryWrapper,RecycleDeviceConfigeEntity.class,recycleDeviceConfigePagination.getMenuId(),"0")); Object recycleDeviceConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper,RecycleDeviceConfigEntity.class,recycleDeviceConfigPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleDeviceConfigeObj)){ if (ObjectUtil.isEmpty(recycleDeviceConfigObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recycleDeviceConfigeQueryWrapper = (QueryWrapper<RecycleDeviceConfigeEntity>)recycleDeviceConfigeObj; recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>)recycleDeviceConfigObj;
if( recycleDeviceConfigeQueryWrapper.getExpression().getNormal().size()>0){ if( recycleDeviceConfigQueryWrapper.getExpression().getNormal().size()>0){
recycleDeviceConfigeNum++; recycleDeviceConfigNum++;
} }
} }
} }
} }
if(!isPc && appPermission){ if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()){
Object recycleDeviceConfigeObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigeQueryWrapper,RecycleDeviceConfigeEntity.class,recycleDeviceConfigePagination.getMenuId(),"0")); Object recycleDeviceConfigObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceConfigQueryWrapper,RecycleDeviceConfigEntity.class,recycleDeviceConfigPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(recycleDeviceConfigeObj)){ if (ObjectUtil.isEmpty(recycleDeviceConfigObj)){
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
recycleDeviceConfigeQueryWrapper = (QueryWrapper<RecycleDeviceConfigeEntity>)recycleDeviceConfigeObj; recycleDeviceConfigQueryWrapper = (QueryWrapper<RecycleDeviceConfigEntity>)recycleDeviceConfigObj;
if( recycleDeviceConfigeQueryWrapper.getExpression().getNormal().size()>0){ if( recycleDeviceConfigQueryWrapper.getExpression().getNormal().size()>0){
recycleDeviceConfigeNum++; recycleDeviceConfigNum++;
} }
} }
@ -144,12 +144,12 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
} }
} }
if(isPc){ if(isPc){
if(ObjectUtil.isNotEmpty(recycleDeviceConfigePagination.getOrganizeJsonId())){ if(ObjectUtil.isNotEmpty(recycleDeviceConfigPagination.getOrganizeJsonId())){
recycleDeviceConfigeNum++; recycleDeviceConfigNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] organizeJsonId = JsonUtil.getJsonToBean(recycleDeviceConfigePagination.getOrganizeJsonId(),String[][].class); String[][] organizeJsonId = JsonUtil.getJsonToBean(recycleDeviceConfigPagination.getOrganizeJsonId(),String[][].class);
for(int i=0;i<organizeJsonId.length;i++){ for(int i=0;i<organizeJsonId.length;i++){
if(organizeJsonId[i].length>0){ if(organizeJsonId[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(organizeJsonId[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(organizeJsonId[i])));
@ -157,17 +157,17 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
} }
}catch (Exception e1){ }catch (Exception e1){
try { try {
List<String> organizeJsonId = JsonUtil.getJsonToList(recycleDeviceConfigePagination.getOrganizeJsonId(),String.class); List<String> organizeJsonId = JsonUtil.getJsonToList(recycleDeviceConfigPagination.getOrganizeJsonId(),String.class);
if(organizeJsonId.size()>0){ if(organizeJsonId.size()>0){
idList.add(organizeJsonId.get(organizeJsonId.size()-1)); idList.add(organizeJsonId.get(organizeJsonId.size()-1));
} }
}catch (Exception e2){ }catch (Exception e2){
idList.add(String.valueOf(recycleDeviceConfigePagination.getOrganizeJsonId())); idList.add(String.valueOf(recycleDeviceConfigPagination.getOrganizeJsonId()));
} }
} }
recycleDeviceConfigeQueryWrapper.lambda().and(t->{ recycleDeviceConfigQueryWrapper.lambda().and(t->{
idList.forEach(tt->{ idList.forEach(tt->{
t.like(RecycleDeviceConfigeEntity::getOrganizeJsonId, tt).or(); t.like(RecycleDeviceConfigEntity::getOrganizeJsonId, tt).or();
}); });
}); });
@ -179,7 +179,7 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
if (intersection.size()==0){ if (intersection.size()==0){
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
recycleDeviceConfigeQueryWrapper.lambda().in(RecycleDeviceConfigeEntity::getId, intersection); recycleDeviceConfigQueryWrapper.lambda().in(RecycleDeviceConfigEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)){
@ -187,7 +187,7 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
recycleDeviceConfigeQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigeEntity::getId, finalAllSuperIDlist)); recycleDeviceConfigQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)){
@ -195,21 +195,21 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
recycleDeviceConfigeQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigeEntity::getId, finalAllRuleIDlist)); recycleDeviceConfigQueryWrapper.lambda().and(t->t.in(RecycleDeviceConfigEntity::getId, finalAllRuleIDlist));
} }
//排序 //排序
if(StringUtil.isEmpty(recycleDeviceConfigePagination.getSidx())){ if(StringUtil.isEmpty(recycleDeviceConfigPagination.getSidx())){
recycleDeviceConfigeQueryWrapper.lambda().orderByDesc(RecycleDeviceConfigeEntity::getId); recycleDeviceConfigQueryWrapper.lambda().orderByDesc(RecycleDeviceConfigEntity::getId);
}else{ }else{
try { try {
String sidx = recycleDeviceConfigePagination.getSidx(); String sidx = recycleDeviceConfigPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs= sidx.split("_name");
RecycleDeviceConfigeEntity recycleDeviceConfigeEntity = new RecycleDeviceConfigeEntity(); RecycleDeviceConfigEntity recycleDeviceConfigEntity = new RecycleDeviceConfigEntity();
Field declaredField = recycleDeviceConfigeEntity.getClass().getDeclaredField(strs[0]); Field declaredField = recycleDeviceConfigEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
recycleDeviceConfigeQueryWrapper="asc".equals(recycleDeviceConfigePagination.getSort().toLowerCase())?recycleDeviceConfigeQueryWrapper.orderByAsc(value):recycleDeviceConfigeQueryWrapper.orderByDesc(value); recycleDeviceConfigQueryWrapper="asc".equals(recycleDeviceConfigPagination.getSort().toLowerCase())?recycleDeviceConfigQueryWrapper.orderByAsc(value):recycleDeviceConfigQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -217,40 +217,40 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
if("0".equals(dataType)){ if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){ if((total>0 && AllIdList.size()>0) || total==0){
Page<RecycleDeviceConfigeEntity> page=new Page<>(recycleDeviceConfigePagination.getCurrentPage(), recycleDeviceConfigePagination.getPageSize()); Page<RecycleDeviceConfigEntity> page=new Page<>(recycleDeviceConfigPagination.getCurrentPage(), recycleDeviceConfigPagination.getPageSize());
IPage<RecycleDeviceConfigeEntity> userIPage=this.page(page, recycleDeviceConfigeQueryWrapper); IPage<RecycleDeviceConfigEntity> userIPage=this.page(page, recycleDeviceConfigQueryWrapper);
return recycleDeviceConfigePagination.setData(userIPage.getRecords(),userIPage.getTotal()); return recycleDeviceConfigPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{ }else{
List<RecycleDeviceConfigeEntity> list = new ArrayList(); List<RecycleDeviceConfigEntity> list = new ArrayList();
return recycleDeviceConfigePagination.setData(list, list.size()); return recycleDeviceConfigPagination.setData(list, list.size());
} }
}else{ }else{
return this.list(recycleDeviceConfigeQueryWrapper); return this.list(recycleDeviceConfigQueryWrapper);
} }
} }
@Override @Override
public RecycleDeviceConfigeEntity getInfo(String id){ public RecycleDeviceConfigEntity getInfo(String id){
QueryWrapper<RecycleDeviceConfigeEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<RecycleDeviceConfigEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(RecycleDeviceConfigeEntity::getId,id); queryWrapper.lambda().eq(RecycleDeviceConfigEntity::getId,id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(RecycleDeviceConfigeEntity entity){ public void create(RecycleDeviceConfigEntity entity){
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, RecycleDeviceConfigeEntity entity){ public boolean update(String id, RecycleDeviceConfigEntity entity){
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(RecycleDeviceConfigeEntity entity){ public void delete(RecycleDeviceConfigEntity entity){
if(entity!=null){ if(entity!=null){
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@Override @Override
public String checkForm(RecycleDeviceConfigeForm form,int i) { public String checkForm(RecycleDeviceConfigForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id="";
String countRecover = ""; String countRecover = "";
@ -333,17 +333,17 @@ public class RecycleDeviceConfigeServiceImpl extends ServiceImpl<RecycleDeviceCo
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* @param id * @param id
* @param recycleDeviceConfigeForm * @param recycleDeviceConfigForm
* @return * @return
*/ */
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(RecycleDeviceConfigeForm recycleDeviceConfigeForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(RecycleDeviceConfigForm recycleDeviceConfigForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get(); UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
recycleDeviceConfigeForm = JsonUtil.getJsonToBean( recycleDeviceConfigForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(RecycleDeviceConfigeConstant.getFormData(),recycleDeviceConfigeForm),RecycleDeviceConfigeForm.class); generaterSwapUtil.swapDatetime(RecycleDeviceConfigConstant.getFormData(),recycleDeviceConfigForm),RecycleDeviceConfigForm.class);
RecycleDeviceConfigeEntity entity = JsonUtil.getJsonToBean(recycleDeviceConfigeForm, RecycleDeviceConfigeEntity.class); RecycleDeviceConfigEntity entity = JsonUtil.getJsonToBean(recycleDeviceConfigForm, RecycleDeviceConfigEntity.class);
if(isSave){ if(isSave){
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId() ;

6
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleBucketController.java
Unescape View File

@ -30,15 +30,15 @@ import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
/** /**
* RecycleBucket * 回收桶配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-29 * @日期： 2024-06-17
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Tag(name = "RecycleBucket" , description = "scm") @Tag(name = "回收桶配置" , description = "scm")
@RequestMapping("/api/scm/RecycleBucket") @RequestMapping("/api/scm/RecycleBucket")
public class RecycleBucketController { public class RecycleBucketController {

76
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigeController.java → jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleDeviceConfigController.java
Unescape View File

@ -11,7 +11,7 @@ import jnpf.permission.entity.UserEntity;
import jnpf.service.*; import jnpf.service.*;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.util.*; import jnpf.util.*;
import jnpf.model.recycledeviceconfige.*; import jnpf.model.recycledeviceconfig.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -30,17 +30,17 @@ import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
/** /**
* 投递清单 * 商户设备配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-31 * @日期： 2024-06-17
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Tag(name = "投递清单" , description = "scm") @Tag(name = "商户设备配置" , description = "scm")
@RequestMapping("/api/scm/RecycleDeviceConfige") @RequestMapping("/api/scm/RecycleDeviceConfig")
public class RecycleDeviceConfigeController { public class RecycleDeviceConfigController {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -49,53 +49,53 @@ public class RecycleDeviceConfigeController {
private UserProvider userProvider; private UserProvider userProvider;
@Autowired @Autowired
private RecycleDeviceConfigeService recycleDeviceConfigeService; private RecycleDeviceConfigService recycleDeviceConfigService;
/** /**
* 列表 * 列表
* *
* @param recycleDeviceConfigePagination * @param recycleDeviceConfigPagination
* @return * @return
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody RecycleDeviceConfigePagination recycleDeviceConfigePagination)throws IOException{ public ActionResult list(@RequestBody RecycleDeviceConfigPagination recycleDeviceConfigPagination)throws IOException{
List<RecycleDeviceConfigeEntity> list= recycleDeviceConfigeService.getList(recycleDeviceConfigePagination); List<RecycleDeviceConfigEntity> list= recycleDeviceConfigService.getList(recycleDeviceConfigPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList=new ArrayList<>();
for (RecycleDeviceConfigeEntity entity : list) { for (RecycleDeviceConfigEntity entity : list) {
Map<String, Object> recycleDeviceConfigeMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
recycleDeviceConfigeMap.put("id", recycleDeviceConfigeMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
realList.add(recycleDeviceConfigeMap); realList.add(recycleDeviceConfigMap);
} }
//数据转换 //数据转换
realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigeConstant.getFormData(), RecycleDeviceConfigeConstant.getColumnData(), recycleDeviceConfigePagination.getModuleId(),false); realList = generaterSwapUtil.swapDataList(realList, RecycleDeviceConfigConstant.getFormData(), RecycleDeviceConfigConstant.getColumnData(), recycleDeviceConfigPagination.getModuleId(),false);
//返回对象 //返回对象
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
vo.setList(realList); vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(recycleDeviceConfigePagination, PaginationVO.class); PaginationVO page = JsonUtil.getJsonToBean(recycleDeviceConfigPagination, PaginationVO.class);
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 创建 * 创建
* *
* @param recycleDeviceConfigeForm * @param recycleDeviceConfigForm
* @return * @return
*/ */
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid RecycleDeviceConfigeForm recycleDeviceConfigeForm) { public ActionResult create(@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm) {
String b = recycleDeviceConfigeService.checkForm(recycleDeviceConfigeForm,0); String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,0);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b ); return ActionResult.fail(b );
} }
try{ try{
recycleDeviceConfigeService.saveOrUpdate(recycleDeviceConfigeForm, null ,true); recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm, null ,true);
}catch(Exception e){ }catch(Exception e){
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");
} }
@ -104,24 +104,24 @@ public class RecycleDeviceConfigeController {
/** /**
* 编辑 * 编辑
* @param id * @param id
* @param recycleDeviceConfigeForm * @param recycleDeviceConfigForm
* @return * @return
*/ */
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleDeviceConfigeForm recycleDeviceConfigeForm, public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleDeviceConfigForm recycleDeviceConfigForm,
@RequestParam(value = "isImport", required = false) boolean isImport){ @RequestParam(value = "isImport", required = false) boolean isImport){
recycleDeviceConfigeForm.setId(id); recycleDeviceConfigForm.setId(id);
if (!isImport) { if (!isImport) {
String b = recycleDeviceConfigeService.checkForm(recycleDeviceConfigeForm,1); String b = recycleDeviceConfigService.checkForm(recycleDeviceConfigForm,1);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b ); return ActionResult.fail(b );
} }
} }
RecycleDeviceConfigeEntity entity= recycleDeviceConfigeService.getInfo(id); RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
if(entity!=null){ if(entity!=null){
try{ try{
recycleDeviceConfigeService.saveOrUpdate(recycleDeviceConfigeForm,id,false); recycleDeviceConfigService.saveOrUpdate(recycleDeviceConfigForm,id,false);
}catch(Exception e){ }catch(Exception e){
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }
@ -139,10 +139,10 @@ public class RecycleDeviceConfigeController {
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id){
RecycleDeviceConfigeEntity entity= recycleDeviceConfigeService.getInfo(id); RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
if(entity!=null){ if(entity!=null){
//主表数据删除 //主表数据删除
recycleDeviceConfigeService.delete(entity); recycleDeviceConfigService.delete(entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
@ -155,16 +155,16 @@ public class RecycleDeviceConfigeController {
@Operation(summary = "表单信息(详情页)") @Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){ public ActionResult detailInfo(@PathVariable("id") String id){
RecycleDeviceConfigeEntity entity= recycleDeviceConfigeService.getInfo(id); RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
if(entity==null){ if(entity==null){
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> recycleDeviceConfigeMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
recycleDeviceConfigeMap.put("id", recycleDeviceConfigeMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceConfigeMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigeMap,RecycleDeviceConfigeConstant.getFormData(),"565858748388610501",false); recycleDeviceConfigMap = generaterSwapUtil.swapDataDetail(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),"565858748388610501",false);
return ActionResult.success(recycleDeviceConfigeMap); return ActionResult.success(recycleDeviceConfigMap);
} }
/** /**
* 获取详情(编辑页) * 获取详情(编辑页)
@ -175,16 +175,16 @@ public class RecycleDeviceConfigeController {
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){ public ActionResult info(@PathVariable("id") String id){
RecycleDeviceConfigeEntity entity= recycleDeviceConfigeService.getInfo(id); RecycleDeviceConfigEntity entity= recycleDeviceConfigService.getInfo(id);
if(entity==null){ if(entity==null){
return ActionResult.fail("表单数据不存在！"); return ActionResult.fail("表单数据不存在！");
} }
Map<String, Object> recycleDeviceConfigeMap=JsonUtil.entityToMap(entity); Map<String, Object> recycleDeviceConfigMap=JsonUtil.entityToMap(entity);
recycleDeviceConfigeMap.put("id", recycleDeviceConfigeMap.get("id")); recycleDeviceConfigMap.put("id", recycleDeviceConfigMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
recycleDeviceConfigeMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigeMap,RecycleDeviceConfigeConstant.getFormData(),RecycleDeviceConfigeConstant.TABLEFIELDKEY,RecycleDeviceConfigeConstant.TABLERENAMES); recycleDeviceConfigMap = generaterSwapUtil.swapDataForm(recycleDeviceConfigMap,RecycleDeviceConfigConstant.getFormData(),RecycleDeviceConfigConstant.TABLEFIELDKEY,RecycleDeviceConfigConstant.TABLERENAMES);
return ActionResult.success(recycleDeviceConfigeMap); return ActionResult.success(recycleDeviceConfigMap);
} }
} }

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleBucketEntity.java
Unescape View File

@ -13,7 +13,7 @@ import java.math.BigDecimal;
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-29 * @日期： 2024-06-17
*/ */
@Data @Data
@TableName("nx_recycle_bucket") @TableName("nx_recycle_bucket")
@ -42,8 +42,8 @@ public class RecycleBucketEntity {
private Integer fullStatus; private Integer fullStatus;
@TableField(value = "FULL_SET" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "FULL_SET" , updateStrategy = FieldStrategy.IGNORED)
private Integer fullSet; private Integer fullSet;
@TableField(value = "SMOG_STAUTS" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "SMOG_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private Integer smogStauts; private Integer smogStatus;
@TableField(value = "SMOG_SET" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "SMOG_SET" , updateStrategy = FieldStrategy.IGNORED)
private Integer smogSet; private Integer smogSet;
@TableField(value = "CONTAINER_WEIGHT" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "CONTAINER_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceConfigeEntity.java → jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceConfigEntity.java
Unescape View File

@ -23,11 +23,11 @@ import java.math.BigDecimal;
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-31 * @日期： 2024-06-17
*/ */
@Data @Data
@TableName("nx_recycle_device_confige") @TableName("nx_recycle_device_config")
public class RecycleDeviceConfigeEntity { public class RecycleDeviceConfigEntity {
@TableId(value ="ID" ) @TableId(value ="ID" )
private String id; private String id;
@TableField(value = "DELIVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "DELIVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)

14
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketConstant.java
View File

File diff suppressed because one or more lines are too long

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketForm.java
Unescape View File

@ -6,11 +6,11 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* RecycleBucket * 回收桶配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-29 * @日期： 2024-06-17
*/ */
@Data @Data
public class RecycleBucketForm { public class RecycleBucketForm {
@ -51,8 +51,8 @@ public class RecycleBucketForm {
@JsonProperty("fullSet") @JsonProperty("fullSet")
private String fullSet; private String fullSet;
/** 烟雾状态 **/ /** 烟雾状态 **/
@JsonProperty("smogStauts") @JsonProperty("smogStatus")
private String smogStauts; private String smogStatus;
/** 烟雾设置 **/ /** 烟雾设置 **/
@JsonProperty("smogSet") @JsonProperty("smogSet")
private String smogSet; private String smogSet;

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketPagination.java
Unescape View File

@ -7,11 +7,11 @@ import java.util.List;
/** /**
* *
* RecycleBucket * 回收桶配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-29 * @日期： 2024-06-17
*/ */
@Data @Data
public class RecycleBucketPagination extends Pagination { public class RecycleBucketPagination extends Pagination {

45
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigConstant.java
View File

File diff suppressed because one or more lines are too long

16
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfige/RecycleDeviceConfigeForm.java → jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigForm.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.model.recycledeviceconfige; package jnpf.model.recycledeviceconfig;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -6,14 +6,14 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
* 投递清单 * 商户设备配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-31 * @日期： 2024-06-17
*/ */
@Data @Data
public class RecycleDeviceConfigeForm { public class RecycleDeviceConfigForm {
/** 主键 */ /** 主键 */
private String id; private String id;
@ -56,7 +56,7 @@ public class RecycleDeviceConfigeForm {
/** 12号桶价格 **/ /** 12号桶价格 **/
@JsonProperty("bucket12Price") @JsonProperty("bucket12Price")
private String bucket12Price; private String bucket12Price;
/** 投递审核 **/ /** 投递审核配置 **/
@JsonProperty("deliveryAdjustSet") @JsonProperty("deliveryAdjustSet")
private String deliveryAdjustSet; private String deliveryAdjustSet;
/** 手机号登录 **/ /** 手机号登录 **/
@ -65,13 +65,13 @@ public class RecycleDeviceConfigeForm {
/** 清运锁 **/ /** 清运锁 **/
@JsonProperty("cleanLock") @JsonProperty("cleanLock")
private String cleanLock; private String cleanLock;
/** 清运审核 **/ /** 清运审核配置 **/
@JsonProperty("cleanAdjustSet") @JsonProperty("cleanAdjustSet")
private String cleanAdjustSet; private String cleanAdjustSet;
/** 烟雾报警 **/ /** 烟雾报警 **/
@JsonProperty("smogSet") @JsonProperty("smogSet")
private String smogSet; private String smogSet;
/** 关门延时 **/ /** 投递关门 **/
@JsonProperty("closeDelay") @JsonProperty("closeDelay")
private String closeDelay; private String closeDelay;
/** 满溢报警 **/ /** 满溢报警 **/
@ -95,7 +95,7 @@ public class RecycleDeviceConfigeForm {
/** 修改时间 **/ /** 修改时间 **/
@JsonProperty("lastModifyTime") @JsonProperty("lastModifyTime")
private String lastModifyTime; private String lastModifyTime;
/** 组织json_id **/ /** 组织架构 **/
@JsonProperty("organizeJsonId") @JsonProperty("organizeJsonId")
private Object organizeJsonId; private Object organizeJsonId;
/** 公司id **/ /** 公司id **/

8
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfige/RecycleDeviceConfigePagination.java → jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigPagination.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.model.recycledeviceconfige; package jnpf.model.recycledeviceconfig;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
@ -7,14 +7,14 @@ import java.util.List;
/** /**
* *
* 投递清单 * 商户设备配置
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
* @日期： 2024-05-31 * @日期： 2024-06-17
*/ */
@Data @Data
public class RecycleDeviceConfigePagination extends Pagination { public class RecycleDeviceConfigPagination extends Pagination {
/** 查询key */ /** 查询key */
private String[] selectKey; private String[] selectKey;
/** json */ /** json */

45
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfige/RecycleDeviceConfigeConstant.java
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
Unescape View File

@ -15,5 +15,5 @@ module.exports = {
// 开发环境接口配置 // 开发环境接口配置
APIURl: 'http://127.0.0.1:30000' APIURl: 'http://127.0.0.1:30000'
// 测试环境接口配置 // 测试环境接口配置
// APIURl: 'http://192.168.0.23:30000' // APIURl: 'http://222.71.165.187:30000'
} }

120
jnpf-java-boot/jnpf-web/src/views/recyclebucket/Detail.vue
Unescape View File

@ -3,7 +3,8 @@
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" /> <el-page-header @back="goBack"
content="详情"/>
<div class="options"> <div class="options">
<el-button @click="goBack">取 消</el-button> <el-button @click="goBack">取 消</el-button>
</div> </div>
@ -12,123 +13,152 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="显示别名" prop="showName"> <jnpf-form-tip-item label="显示别名"
prop="showName" >
<p>{{dataForm.showName}}</p> <p>{{dataForm.showName}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="门号" prop="doorNum"> <jnpf-form-tip-item label="门号"
prop="doorNum" >
<p>{{ dataForm.doorNum }} </p> <p>{{ dataForm.doorNum }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="所属设备" prop="deviceCode"> <jnpf-form-tip-item label="所属设备"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p> <p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="是否显示" prop="isShow"> <jnpf-form-tip-item label="是否显示"
prop="isShow" >
<p>{{ dataForm.isShow }} </p> <p>{{ dataForm.isShow }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="显示顺序" prop="showOrd"> <jnpf-form-tip-item label="显示顺序"
<JnpfNumber v-model="dataForm.showOrd" placeholder="数字文本" disabled :step="1"> prop="showOrd" >
<JnpfNumber v-model="dataForm.showOrd"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="回收品大类" prop="productCode"> <jnpf-form-tip-item label="回收品大类"
prop="productCode" >
<p>{{dataForm.productCode}}</p> <p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="回收品子类" prop="productSubCode"> <jnpf-form-tip-item label="回收品子类"
prop="productSubCode" >
<p>{{dataForm.productSubCode}}</p> <p>{{dataForm.productSubCode}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="价格" prop="price"> <jnpf-form-tip-item label="价格"
<JnpfNumber v-model="dataForm.price" placeholder="数字文本" disabled :step="1" prop="price" >
:precision="2"> <JnpfNumber v-model="dataForm.price"
placeholder="数字文本" disabled
:step="1" :precision="2" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="满溢状态" prop="fullStatus"> <jnpf-form-tip-item label="满溢状态"
prop="fullStatus" >
<p>{{ dataForm.fullStatus }} </p> <p>{{ dataForm.fullStatus }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="满溢设置" prop="fullSet"> <jnpf-form-tip-item label="满溢设置"
prop="fullSet" >
<p>{{ dataForm.fullSet }} </p> <p>{{ dataForm.fullSet }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="烟雾状态" prop="smogStauts"> <jnpf-form-tip-item label="烟雾状态"
<p>{{ dataForm.smogStauts }} </p> prop="smogStatus" >
<p>{{ dataForm.smogStatus }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="烟雾设置" prop="smogSet"> <jnpf-form-tip-item label="烟雾设置"
prop="smogSet" >
<p>{{ dataForm.smogSet }} </p> <p>{{ dataForm.smogSet }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="容器重量" prop="containerWeight"> <jnpf-form-tip-item label="容器重量"
<JnpfNumber v-model="dataForm.containerWeight" placeholder="数字文本" disabled :step="1" prop="containerWeight" >
:precision="2" addonAfter="KG"> <JnpfNumber v-model="dataForm.containerWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="当前重量" prop="currentWeight"> <jnpf-form-tip-item label="当前重量"
<JnpfNumber v-model="dataForm.currentWeight" placeholder="数字文本" disabled :step="1" prop="currentWeight" >
:precision="2" addonAfter="KG"> <JnpfNumber v-model="dataForm.currentWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="重量上限" prop="warningWeight"> <jnpf-form-tip-item label="重量上限"
<JnpfNumber v-model="dataForm.warningWeight" placeholder="数字文本" disabled :step="1" prop="warningWeight" >
:precision="2" addonAfter="KG"> <JnpfNumber v-model="dataForm.warningWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="关闭延时" prop="closeDelay" tip-label="投递门关闭延时"> <jnpf-form-tip-item label="关闭延时"
prop="closeDelay" tip-label="投递门关闭延时" >
<p>{{dataForm.closeDelay}}秒</p> <p>{{dataForm.closeDelay}}秒</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="投递门" prop="deliveryDoorStatus" tip-label="投递门状态"> <jnpf-form-tip-item label="投递门"
prop="deliveryDoorStatus" tip-label="投递门状态" >
<p>{{ dataForm.deliveryDoorStatus }} </p> <p>{{ dataForm.deliveryDoorStatus }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="清运门" prop="cleanDoorStatus" tip-label="清运门状态"> <jnpf-form-tip-item label="清运门"
prop="cleanDoorStatus" tip-label="清运门状态" >
<p>{{ dataForm.cleanDoorStatus }} </p> <p>{{ dataForm.cleanDoorStatus }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="垃圾袋编码" prop="bagNo"> <jnpf-form-tip-item label="垃圾袋编码"
prop="bagNo" >
<p>{{dataForm.bagNo}}</p> <p>{{dataForm.bagNo}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="桶身图片" prop="bucketImg"> <jnpf-form-tip-item label="桶身图片"
<JnpfUploadImg v-model="dataForm.bucketImg" disabled detailed :fileSize="10" prop="bucketImg" >
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0"> <JnpfUploadImg v-model="dataForm.bucketImg"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg> </JnpfUploadImg>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="状态" prop="status"> <jnpf-form-tip-item label="状态"
prop="status" >
<p>{{ dataForm.status }} </p> <p>{{ dataForm.status }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="租户" prop="tenantId"> <jnpf-form-tip-item label="租户"
prop="tenantId" >
<p>{{dataForm.tenantId}}</p> <p>{{dataForm.tenantId}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -167,7 +197,7 @@ export default {
price : '', price : '',
fullStatus : '', fullStatus : '',
fullSet : '', fullSet : '',
smogStauts: '', smogStatus : '',
smogSet : '', smogSet : '',
containerWeight : '', containerWeight : '',
currentWeight : '', currentWeight : '',
@ -182,23 +212,23 @@ export default {
}, },
doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}], doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}],
doorNumProps:{"label":"fullName","value":"id" }, doorNumProps:{"label":"fullName","value":"id" },
isShowOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "显示", "id": 1 }], isShowOptions:[{"fullName":"关闭","id":"0"},{"fullName":"显示","id":"1"}],
isShowProps:{"label":"fullName","value":"id" }, isShowProps:{"label":"fullName","value":"id" },
productCodeProps:{"label":"name","value":"id" }, productCodeProps:{"label":"name","value":"id" },
productSubCodeProps:{"label":"name","value":"id" }, productSubCodeProps:{"label":"name","value":"id" },
fullStatusOptions: [{ "fullName": "未满", "id": 0 }, { "fullName": "满", "id": 1 }], fullStatusOptions:[{"fullName":"未满","id":"0"},{"fullName":"满","id":"1"}],
fullStatusProps:{"label":"fullName","value":"id" }, fullStatusProps:{"label":"fullName","value":"id" },
fullSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
fullSetProps:{"label":"fullName","value":"id" }, fullSetProps:{"label":"fullName","value":"id" },
smogStautsOptions: [{ "fullName": "正常", "id": 0 }, { "fullName": "报警", "id": 1 }], smogStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"报警","id":"1"}],
smogStautsProps: { "label": "fullName", "value": "id" }, smogStatusProps:{"label":"fullName","value":"id" },
smogSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
smogSetProps:{"label":"fullName","value":"id" }, smogSetProps:{"label":"fullName","value":"id" },
deliveryDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
deliveryDoorStatusProps:{"label":"fullName","value":"id" }, deliveryDoorStatusProps:{"label":"fullName","value":"id" },
cleanDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], cleanDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
cleanDoorStatusProps:{"label":"fullName","value":"id" }, cleanDoorStatusProps:{"label":"fullName","value":"id" },
statusOptions: [{ "fullName": "停用", "id": 0 }, { "fullName": "启用", "id":1 }], statusOptions:[{"fullName":"停用","id":"0"},{"fullName":"启用","id":"1"}],
statusProps:{"label":"fullName","value":"id" }, statusProps:{"label":"fullName","value":"id" },
} }

2
jnpf-java-boot/jnpf-web/src/views/recyclebucket/columnList.js
View File

File diff suppressed because one or more lines are too long

171
jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
Unescape View File

@ -1,8 +1,12 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" /> <el-page-header @back="goBack"
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
@ -22,196 +26,195 @@
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item> {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
:disabled='continueBtnLoading'> 保
存</el-button>
<el-button @click="goBack"> 取 消</el-button> <el-button @click="goBack"> 取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="显示别名" prop="showName"> <jnpf-form-tip-item
label="显示别名" prop="showName" >
<JnpfInput v-model="dataForm.showName" @change="changeData('showName',-1)" <JnpfInput v-model="dataForm.showName" @change="changeData('showName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="门号" prop="doorNum"> <jnpf-form-tip-item
label="门号" prop="doorNum" >
<JnpfSelect v-model="dataForm.doorNum" @change="changeData('doorNum',-1)" <JnpfSelect v-model="dataForm.doorNum" @change="changeData('doorNum',-1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="doorNumOptions" placeholder="请选择" clearable :style='{"width":"100%"}' :options="doorNumOptions" :props="doorNumProps" >
:props="doorNumProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="所属设备" prop="deviceCode"> <jnpf-form-tip-item
label="所属设备" prop="deviceCode" >
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)" <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode" placeholder="请选择" propsValue="device_code" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='device_name' field='deviceCode' interfaceId="564713894723988869" :pageSize="20" :columnOptions="deviceCodecolumnOptions" clearable :style='{"width":"100%"}'>
placeholder="请选择" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_name' field='deviceCode'
interfaceId="564713894723988869" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="是否显示" prop="isShow"> <jnpf-form-tip-item
label="是否显示" prop="isShow" >
<JnpfRadio v-model="dataForm.isShow" @change="changeData('isShow',-1)" <JnpfRadio v-model="dataForm.isShow" @change="changeData('isShow',-1)"
optionType="default" direction="horizontal" size="small" :options="isShowOptions" optionType="default" direction="horizontal" size="small" :options="isShowOptions" :props="isShowProps" >
:props="isShowProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="显示顺序" prop="showOrd"> <jnpf-form-tip-item
label="显示顺序" prop="showOrd" >
<JnpfInputNumber v-model="dataForm.showOrd" @change="changeData('showOrd',-1)" <JnpfInputNumber v-model="dataForm.showOrd" @change="changeData('showOrd',-1)"
placeholder="数字文本" :step="1" > placeholder="数字文本" :step="1" >
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="回收品大类" prop="productCode"> <jnpf-form-tip-item
label="回收品大类" prop="productCode" >
<JnpfRadio v-model="dataForm.productCode" @change="changeData('productCode',-1)" <JnpfRadio v-model="dataForm.productCode" @change="changeData('productCode',-1)"
optionType="default" direction="horizontal" size="small" optionType="default" direction="horizontal" size="small" :options="productCodeOptions" :props="productCodeProps" >
:options="productCodeOptions" :props="productCodeProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="回收品子类" prop="productSubCode"> <jnpf-form-tip-item
label="回收品子类" prop="productSubCode" >
<JnpfRadio v-model="dataForm.productSubCode" @change="changeData('productSubCode',-1)" <JnpfRadio v-model="dataForm.productSubCode" @change="changeData('productSubCode',-1)"
optionType="default" direction="horizontal" size="small" optionType="default" direction="horizontal" size="small" :options="productSubCodeOptions" :props="productSubCodeProps" >
:options="productSubCodeOptions" :props="productSubCodeProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="价格" prop="price"> <jnpf-form-tip-item
label="价格" prop="price" >
<JnpfInputNumber v-model="dataForm.price" @change="changeData('price',-1)" <JnpfInputNumber v-model="dataForm.price" @change="changeData('price',-1)"
placeholder="数字文本" :precision="2" :step="1" > placeholder="数字文本" :precision="2" :step="1" >
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="满溢状态" prop="fullStatus"> <jnpf-form-tip-item
label="满溢状态" prop="fullStatus" >
<JnpfRadio v-model="dataForm.fullStatus" @change="changeData('fullStatus',-1)" <JnpfRadio v-model="dataForm.fullStatus" @change="changeData('fullStatus',-1)"
optionType="default" direction="horizontal" size="small" optionType="default" direction="horizontal" size="small" :options="fullStatusOptions" :props="fullStatusProps" >
:options="fullStatusOptions" :props="fullStatusProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="满溢设置" prop="fullSet"> <jnpf-form-tip-item
label="满溢设置" prop="fullSet" >
<JnpfRadio v-model="dataForm.fullSet" @change="changeData('fullSet',-1)" <JnpfRadio v-model="dataForm.fullSet" @change="changeData('fullSet',-1)"
optionType="default" direction="horizontal" size="small" :options="fullSetOptions" optionType="default" direction="horizontal" size="small" :options="fullSetOptions" :props="fullSetProps" >
:props="fullSetProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="烟雾状态" prop="smogStauts"> <jnpf-form-tip-item
<JnpfRadio v-model="dataForm.smogStauts" @change="changeData('smogStauts', -1)" label="烟雾状态" prop="smogStatus" >
optionType="default" direction="horizontal" size="small" <JnpfRadio v-model="dataForm.smogStatus" @change="changeData('smogStatus',-1)"
:options="smogStautsOptions" :props="smogStautsProps"> optionType="default" direction="horizontal" size="small" :options="smogStatusOptions" :props="smogStatusProps" >
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="烟雾设置" prop="smogSet"> <jnpf-form-tip-item
label="烟雾设置" prop="smogSet" >
<JnpfRadio v-model="dataForm.smogSet" @change="changeData('smogSet',-1)" <JnpfRadio v-model="dataForm.smogSet" @change="changeData('smogSet',-1)"
optionType="default" direction="horizontal" size="small" :options="smogSetOptions" optionType="default" direction="horizontal" size="small" :options="smogSetOptions" :props="smogSetProps" >
:props="smogSetProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="容器重量" prop="containerWeight"> <jnpf-form-tip-item
<JnpfInputNumber v-model="dataForm.containerWeight" label="容器重量" prop="containerWeight" >
@change="changeData('containerWeight', -1)" placeholder="数字文本" :precision="2" <JnpfInputNumber v-model="dataForm.containerWeight" @change="changeData('containerWeight',-1)"
addonAfter="KG" :step="1"> placeholder="数字文本" :precision="2" addonAfter="KG" :step="1" >
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="当前重量" prop="currentWeight"> <jnpf-form-tip-item
<JnpfInputNumber v-model="dataForm.currentWeight" label="当前重量" prop="currentWeight" >
@change="changeData('currentWeight', -1)" placeholder="数字文本" :precision="2" <JnpfInputNumber v-model="dataForm.currentWeight" @change="changeData('currentWeight',-1)"
addonAfter="KG" :step="1"> placeholder="数字文本" :precision="2" addonAfter="KG" :step="1" >
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="重量上限" prop="warningWeight"> <jnpf-form-tip-item
<JnpfInputNumber v-model="dataForm.warningWeight" label="重量上限" prop="warningWeight" >
@change="changeData('warningWeight', -1)" placeholder="数字文本" :precision="2" <JnpfInputNumber v-model="dataForm.warningWeight" @change="changeData('warningWeight',-1)"
addonAfter="KG" :step="1"> placeholder="数字文本" :precision="2" addonAfter="KG" :step="1" >
</JnpfInputNumber> </JnpfInputNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="关闭延时" tipLabel="投递门关闭延时" prop="closeDelay"> <jnpf-form-tip-item
label="关闭延时" tipLabel="投递门关闭延时" prop="closeDelay" >
<JnpfInput v-model="dataForm.closeDelay" @change="changeData('closeDelay',-1)" <JnpfInput v-model="dataForm.closeDelay" @change="changeData('closeDelay',-1)"
placeholder="请输入" addonAfter="秒" clearable :style='{"width":"100%"}'> placeholder="请输入" addonAfter="秒" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="投递门" tipLabel="投递门状态" prop="deliveryDoorStatus"> <jnpf-form-tip-item
<JnpfRadio v-model="dataForm.deliveryDoorStatus" label="投递门" tipLabel="投递门状态" prop="deliveryDoorStatus" >
@change="changeData('deliveryDoorStatus', -1)" optionType="default" <JnpfRadio v-model="dataForm.deliveryDoorStatus" @change="changeData('deliveryDoorStatus',-1)"
direction="horizontal" size="small" :options="deliveryDoorStatusOptions" optionType="default" direction="horizontal" size="small" :options="deliveryDoorStatusOptions" :props="deliveryDoorStatusProps" >
:props="deliveryDoorStatusProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="清运门" tipLabel="清运门状态" prop="cleanDoorStatus"> <jnpf-form-tip-item
label="清运门" tipLabel="清运门状态" prop="cleanDoorStatus" >
<JnpfRadio v-model="dataForm.cleanDoorStatus" @change="changeData('cleanDoorStatus',-1)" <JnpfRadio v-model="dataForm.cleanDoorStatus" @change="changeData('cleanDoorStatus',-1)"
optionType="default" direction="horizontal" size="small" optionType="default" direction="horizontal" size="small" :options="cleanDoorStatusOptions" :props="cleanDoorStatusProps" >
:options="cleanDoorStatusOptions" :props="cleanDoorStatusProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="垃圾袋编码" prop="bagNo"> <jnpf-form-tip-item
<JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo', -1)" placeholder="请输入" label="垃圾袋编码" prop="bagNo" >
clearable :style='{ "width": "100%" }'> <JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24" >
<jnpf-form-tip-item label="桶身图片" prop="bucketImg"> <jnpf-form-tip-item
label="桶身图片" prop="bucketImg" >
<JnpfUploadImg v-model="dataForm.bucketImg" @change="changeData('bucketImg',-1)" <JnpfUploadImg v-model="dataForm.bucketImg" @change="changeData('bucketImg',-1)"
:fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" > :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg> </JnpfUploadImg>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="状态" prop="status"> <jnpf-form-tip-item
label="状态" prop="status" >
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)" <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="default" direction="horizontal" size="small" :options="statusOptions" optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
:props="statusProps">
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="租户" prop="tenantId"> <jnpf-form-tip-item
label="租户" prop="tenantId" >
<JnpfOrganizeSelect v-model="dataForm.tenantId" @change="changeData('tenantId',-1)" <JnpfOrganizeSelect v-model="dataForm.tenantId" @change="changeData('tenantId',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.tenantIdableIds" clearable placeholder="请选择" selectType="all" :ableIds="ableAll.tenantIdableIds" clearable :style='{"width":"100%"}'>
:style='{ "width": "100%" }'>
</JnpfOrganizeSelect> </JnpfOrganizeSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog" <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
@select="addForSelect" @close="selectDialogVisible = false" /> ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row> </el-row>
</div> </div>
</transition> </transition>
@ -269,7 +272,7 @@ export default {
price : undefined, price : undefined,
fullStatus : undefined, fullStatus : undefined,
fullSet : undefined, fullSet : undefined,
smogStauts: undefined, smogStatus : undefined,
smogSet : undefined, smogSet : undefined,
containerWeight : undefined, containerWeight : undefined,
currentWeight : undefined, currentWeight : undefined,
@ -296,25 +299,25 @@ export default {
doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}], doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}],
doorNumProps:{"label":"fullName","value":"id" }, doorNumProps:{"label":"fullName","value":"id" },
deviceCodecolumnOptions:[ {"label":"设备编码","value":"device_code"}, {"label":"设备名称","value":"device_name"},], deviceCodecolumnOptions:[ {"label":"设备编码","value":"device_code"}, {"label":"设备名称","value":"device_name"},],
isShowOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "显示", "id": 1 }], isShowOptions:[{"fullName":"关闭","id":"0"},{"fullName":"显示","id":"1"}],
isShowProps:{"label":"fullName","value":"id" }, isShowProps:{"label":"fullName","value":"id" },
productCodeOptions:[], productCodeOptions:[],
productCodeProps:{"label":"name","value":"id" }, productCodeProps:{"label":"name","value":"id" },
productSubCodeOptions:[], productSubCodeOptions:[],
productSubCodeProps:{"label":"name","value":"id" }, productSubCodeProps:{"label":"name","value":"id" },
fullStatusOptions: [{ "fullName": "未满", "id": 0 }, { "fullName": "满", "id": 1 }], fullStatusOptions:[{"fullName":"未满","id":"0"},{"fullName":"满","id":"1"}],
fullStatusProps:{"label":"fullName","value":"id" }, fullStatusProps:{"label":"fullName","value":"id" },
fullSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
fullSetProps:{"label":"fullName","value":"id" }, fullSetProps:{"label":"fullName","value":"id" },
smogStautsOptions: [{ "fullName": "正常", "id": 0 }, { "fullName": "报警", "id": 1 }], smogStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"报警","id":"1"}],
smogStautsProps: { "label": "fullName", "value": "id" }, smogStatusProps:{"label":"fullName","value":"id" },
smogSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
smogSetProps:{"label":"fullName","value":"id" }, smogSetProps:{"label":"fullName","value":"id" },
deliveryDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
deliveryDoorStatusProps:{"label":"fullName","value":"id" }, deliveryDoorStatusProps:{"label":"fullName","value":"id" },
cleanDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }], cleanDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
cleanDoorStatusProps:{"label":"fullName","value":"id" }, cleanDoorStatusProps:{"label":"fullName","value":"id" },
statusOptions: [{ "fullName": "停用", "id": 0 }, { "fullName": "启用", "id": 1 }], statusOptions:[{"fullName":"停用","id":"0"},{"fullName":"启用","id":"1"}],
statusProps:{"label":"fullName","value":"id" }, statusProps:{"label":"fullName","value":"id" },
childIndex:-1, childIndex:-1,
isEdit:false, isEdit:false,
@ -330,7 +333,7 @@ export default {
price:[] , price:[] ,
fullStatus:[] , fullStatus:[] ,
fullSet:[] , fullSet:[] ,
smogStauts: [], smogStatus:[] ,
smogSet:[] , smogSet:[] ,
containerWeight:[] , containerWeight:[] ,
currentWeight:[] , currentWeight:[] ,

130
jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue
Unescape View File

@ -1,3 +1,10 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
@ -15,7 +22,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="门号"> <el-form-item label="门号">
<JnpfSelect v-model="query.doorNum" placeholder="请选择" clearable :options="doorNumOptions" <JnpfSelect v-model="query.doorNum" placeholder="请选择" clearable
:options="doorNumOptions"
:props="doorNumProps" multiple > :props="doorNumProps" multiple >
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
@ -31,8 +39,7 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -47,107 +54,158 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod"
<el-table-column prop="bucketCode" label="桶编号" align="left">
>
<el-table-column
prop="bucketCode"
label="桶编号" align="left"
>
</el-table-column> </el-table-column>
<el-table-column prop="showName" label="显示别名" align="left"> <el-table-column
prop="showName"
label="显示别名" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="门号" prop="doorNum" algin="left"> <el-table-column label="门号" prop="doorNum" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.doorNum}} {{ scope.row.doorNum}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceCode" label="所属设备" align="left"> <el-table-column
prop="deviceCode"
label="所属设备" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="是否显示" prop="isShow" algin="left"> <el-table-column label="是否显示" prop="isShow" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.isShow}} {{ scope.row.isShow}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="showOrd" label="显示顺序" align="left"> <el-table-column
prop="showOrd"
label="显示顺序" align="left"
>
<template slot-scope="scope" v-if="scope.row.showOrd" > <template slot-scope="scope" v-if="scope.row.showOrd" >
<JnpfNumber v-model="scope.row.showOrd" :thousands="false"/> <JnpfNumber v-model="scope.row.showOrd" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productCode" label="回收品大类" align="left"> <el-table-column
prop="productCode"
label="回收品大类" align="left"
>
</el-table-column> </el-table-column>
<el-table-column prop="productSubCode" label="回收品子类" align="left"> <el-table-column
prop="productSubCode"
label="回收品子类" align="left"
>
</el-table-column> </el-table-column>
<el-table-column prop="price" label="价格" align="left"> <el-table-column
prop="price"
label="价格" align="left"
>
<template slot-scope="scope" v-if="scope.row.price" > <template slot-scope="scope" v-if="scope.row.price" >
<JnpfNumber v-model="scope.row.price" :thousands="false"/> <JnpfNumber v-model="scope.row.price" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="满溢状态" prop="fullStatus" algin="left"> <el-table-column label="满溢状态" prop="fullStatus" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.fullStatus}} {{ scope.row.fullStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="满溢设置" prop="fullSet" algin="left"> <el-table-column label="满溢设置" prop="fullSet" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.fullSet}} {{ scope.row.fullSet}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="烟雾状态" prop="smogStauts" algin="left"> <el-table-column label="烟雾状态" prop="smogStatus" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.smogStauts }} {{ scope.row.smogStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="烟雾设置" prop="smogSet" algin="left"> <el-table-column label="烟雾设置" prop="smogSet" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.smogSet}} {{ scope.row.smogSet}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="containerWeight" label="容器重量" align="left"> <el-table-column
prop="containerWeight"
label="容器重量" align="left"
>
<template slot-scope="scope" v-if="scope.row.containerWeight" > <template slot-scope="scope" v-if="scope.row.containerWeight" >
<JnpfNumber v-model="scope.row.containerWeight" :thousands="false"/> <JnpfNumber v-model="scope.row.containerWeight" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentWeight" label="当前重量" align="left"> <el-table-column
prop="currentWeight"
label="当前重量" align="left"
>
<template slot-scope="scope" v-if="scope.row.currentWeight" > <template slot-scope="scope" v-if="scope.row.currentWeight" >
<JnpfNumber v-model="scope.row.currentWeight" :thousands="false"/> <JnpfNumber v-model="scope.row.currentWeight" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warningWeight" label="重量上限" align="left"> <el-table-column
prop="warningWeight"
label="重量上限" align="left"
>
<template slot-scope="scope" v-if="scope.row.warningWeight" > <template slot-scope="scope" v-if="scope.row.warningWeight" >
<JnpfNumber v-model="scope.row.warningWeight" :thousands="false"/> <JnpfNumber v-model="scope.row.warningWeight" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="closeDelay" label="关闭延时" align="left"> <el-table-column
prop="closeDelay"
label="关闭延时" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="投递门" prop="deliveryDoorStatus" algin="left"> <el-table-column label="投递门" prop="deliveryDoorStatus" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.deliveryDoorStatus}} {{ scope.row.deliveryDoorStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="清运门" prop="cleanDoorStatus" algin="left"> <el-table-column label="清运门" prop="cleanDoorStatus" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.cleanDoorStatus}} {{ scope.row.cleanDoorStatus}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="bagNo" label="垃圾袋编码" align="left"> <el-table-column
prop="bagNo"
label="垃圾袋编码" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" algin="left"> <el-table-column label="状态" prop="status" algin="left"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status}} {{ scope.row.status}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="tenantId" label="租户" align="left"> <el-table-column
prop="tenantId"
label="租户" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" > <template slot-scope="scope" >
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑 <el-button type="text"
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情 <el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@ -244,8 +302,8 @@ export default {
fullStatusProps:{"label":"fullName","value":"id" }, fullStatusProps:{"label":"fullName","value":"id" },
fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}], fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
fullSetProps:{"label":"fullName","value":"id" }, fullSetProps:{"label":"fullName","value":"id" },
smogStautsOptions: [{ "fullName": "正常", "id": "0" }, { "fullName": "报警", "id": "1" }], smogStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"报警","id":"1"}],
smogStautsProps: { "label": "fullName", "value": "id" }, smogStatusProps:{"label":"fullName","value":"id" },
smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}], smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
smogSetProps:{"label":"fullName","value":"id" }, smogSetProps:{"label":"fullName","value":"id" },
deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}], deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],

2
jnpf-java-boot/jnpf-web/src/views/recyclebucket/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

12
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfige/Detail.vue → jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/Detail.vue
Unescape View File

@ -13,7 +13,7 @@
<el-form ref="formRef" :model="dataForm" size="medium" label-width="150px" label-position="right" > <el-form ref="formRef" :model="dataForm" size="medium" label-width="150px" label-position="right" >
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="24"> <el-col :span="24">
<el-collapse :accordion="false" v-model="activeajjooa" class="mb-20"> <el-collapse :accordion="false" v-model="activesvflpo" class="mb-20">
<el-collapse-item title="价格配置" name="1"> <el-collapse-item title="价格配置" name="1">
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="统一投递价格" <jnpf-form-tip-item label="统一投递价格"
@ -103,7 +103,7 @@
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="设备配置" name="2"> <el-collapse-item title="设备配置" name="2">
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="投递审核" <jnpf-form-tip-item label="投递审核配置 "
prop="deliveryAdjustSet" tip-label="投递后审核结算" > prop="deliveryAdjustSet" tip-label="投递后审核结算" >
<p>{{ dataForm.deliveryAdjustSet }} </p> <p>{{ dataForm.deliveryAdjustSet }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -121,7 +121,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="清运审核" <jnpf-form-tip-item label="清运审核配置"
prop="cleanAdjustSet" tip-label="清运数据审核入库" > prop="cleanAdjustSet" tip-label="清运数据审核入库" >
<p>{{ dataForm.cleanAdjustSet }} </p> <p>{{ dataForm.cleanAdjustSet }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -133,7 +133,7 @@
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item label="关门延时" <jnpf-form-tip-item label="投递关门"
prop="closeDelay" > prop="closeDelay" >
<p>{{dataForm.closeDelay}}秒</p> <p>{{dataForm.closeDelay}}秒</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -237,7 +237,7 @@
companyId : "", companyId : "",
departmentId : "", departmentId : "",
}, },
activeajjooa:["1","2"], activesvflpo:["1","2"],
deliveryAdjustSetOptions:[{"fullName":"即时自动","id":"1"},{"fullName":"24H自动","id":"2"},{"fullName":"48H自动","id":"3"}], deliveryAdjustSetOptions:[{"fullName":"即时自动","id":"1"},{"fullName":"24H自动","id":"2"},{"fullName":"48H自动","id":"3"}],
deliveryAdjustSetProps:{"label":"fullName","value":"id" }, deliveryAdjustSetProps:{"label":"fullName","value":"id" },
allowPhoneLoginProps:{"label":"fullName","value":"enCode" }, allowPhoneLoginProps:{"label":"fullName","value":"enCode" },
@ -284,7 +284,7 @@
if(this.dataForm.id){ if(this.dataForm.id){
this.loading = true this.loading = true
request({ request({
url: '/api/scm/RecycleDeviceConfige/detail/'+this.dataForm.id, url: '/api/scm/RecycleDeviceConfig/detail/'+this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)

2
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/columnList.js
View File

File diff suppressed because one or more lines are too long

18
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfige/form.vue → jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/form.vue
Unescape View File

@ -35,7 +35,7 @@
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24"> <el-col :span="24">
<el-collapse :accordion="false" v-model="activeajjooa" class="mb-20"> <el-collapse :accordion="false" v-model="activesvflpo" class="mb-20">
<el-collapse-item title="价格配置" name="1"> <el-collapse-item title="价格配置" name="1">
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item
@ -152,7 +152,7 @@
<el-collapse-item title="设备配置" name="2"> <el-collapse-item title="设备配置" name="2">
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="投递审核" tipLabel="投递后审核结算" prop="deliveryAdjustSet" > label="投递审核配置 " tipLabel="投递后审核结算" prop="deliveryAdjustSet" >
<JnpfRadio v-model="dataForm.deliveryAdjustSet" @change="changeData('deliveryAdjustSet',-1)" <JnpfRadio v-model="dataForm.deliveryAdjustSet" @change="changeData('deliveryAdjustSet',-1)"
optionType="button" direction="horizontal" size="small" :options="deliveryAdjustSetOptions" :props="deliveryAdjustSetProps" > optionType="button" direction="horizontal" size="small" :options="deliveryAdjustSetOptions" :props="deliveryAdjustSetProps" >
</JnpfRadio> </JnpfRadio>
@ -176,7 +176,7 @@
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="清运审核" tipLabel="清运数据审核入库" prop="cleanAdjustSet" > label="清运审核配置" tipLabel="清运数据审核入库" prop="cleanAdjustSet" >
<JnpfRadio v-model="dataForm.cleanAdjustSet" @change="changeData('cleanAdjustSet',-1)" <JnpfRadio v-model="dataForm.cleanAdjustSet" @change="changeData('cleanAdjustSet',-1)"
optionType="button" direction="horizontal" size="small" :options="cleanAdjustSetOptions" :props="cleanAdjustSetProps" > optionType="button" direction="horizontal" size="small" :options="cleanAdjustSetOptions" :props="cleanAdjustSetProps" >
</JnpfRadio> </JnpfRadio>
@ -192,7 +192,7 @@
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8" >
<jnpf-form-tip-item <jnpf-form-tip-item
label="关门延时" prop="closeDelay" > label="投递关门" prop="closeDelay" >
<JnpfInput v-model="dataForm.closeDelay" @change="changeData('closeDelay',-1)" <JnpfInput v-model="dataForm.closeDelay" @change="changeData('closeDelay',-1)"
placeholder="请输入" addonAfter="秒" clearable :style='{"width":"100%"}'> placeholder="请输入" addonAfter="秒" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
@ -332,7 +332,7 @@
departmentId : undefined, departmentId : undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
activeajjooa:["1","2"], activesvflpo:["1","2"],
dataRule: dataRule:
{ {
deliveryPrice: [ deliveryPrice: [
@ -571,7 +571,7 @@
}, },
getInfo(id) { getInfo(id) {
request({ request({
url: '/api/scm/RecycleDeviceConfige/'+ id, url: '/api/scm/RecycleDeviceConfig/'+ id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -679,7 +679,7 @@
if(this.dataForm.id){ if(this.dataForm.id){
this.loading = true this.loading = true
request({ request({
url: '/api/scm/RecycleDeviceConfige/'+this.dataForm.id, url: '/api/scm/RecycleDeviceConfig/'+this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -714,7 +714,7 @@
} }
if (!this.dataForm.id) { if (!this.dataForm.id) {
request({ request({
url: '/api/scm/RecycleDeviceConfige', url: '/api/scm/RecycleDeviceConfig',
method: 'post', method: 'post',
data: _data data: _data
}).then((res) => { }).then((res) => {
@ -742,7 +742,7 @@
}) })
}else{ }else{
request({ request({
url: '/api/scm/RecycleDeviceConfige/'+this.dataForm.id, url: '/api/scm/RecycleDeviceConfig/'+this.dataForm.id,
method: 'PUT', method: 'PUT',
data: _data data: _data
}).then((res) => { }).then((res) => {

65
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfige/index.vue → jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/index.vue
Unescape View File

@ -46,112 +46,73 @@
> >
<el-table-column <el-table-column
prop="organizeJsonId" prop="organizeJsonId"
label="当前商户" align="left" label="组织架构" align="left"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="deliveryPrice" prop="deliveryPrice"
label="统一价格" align="left" label="统一投递价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.deliveryPrice" >
<JnpfNumber v-model="scope.row.deliveryPrice" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket1Price" prop="bucket1Price"
label="1号桶价" align="left" label="1号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket1Price" >
<JnpfNumber v-model="scope.row.bucket1Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket2Price" prop="bucket2Price"
label="2号桶价格" align="left" label="2号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket2Price" >
<JnpfNumber v-model="scope.row.bucket2Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket3Price" prop="bucket3Price"
label="3号桶价格" align="left" label="3号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket3Price" >
<JnpfNumber v-model="scope.row.bucket3Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket4Price" prop="bucket4Price"
label="4号桶价格" align="left" label="4号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket4Price" >
<JnpfNumber v-model="scope.row.bucket4Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket5Price" prop="bucket5Price"
label="5号桶价格" align="left" label="5号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket5Price" >
<JnpfNumber v-model="scope.row.bucket5Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket6Price" prop="bucket6Price"
label="6号桶价格" align="left" label="6号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket6Price" >
<JnpfNumber v-model="scope.row.bucket6Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket7Price" prop="bucket7Price"
label="7号桶价格" align="left" label="7号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket7Price" >
<JnpfNumber v-model="scope.row.bucket7Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket8Price" prop="bucket8Price"
label="8号桶价格" align="left" label="8号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket8Price" >
<JnpfNumber v-model="scope.row.bucket8Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket9Price" prop="bucket9Price"
label="9号桶价格" align="left" label="9号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket9Price" >
<JnpfNumber v-model="scope.row.bucket9Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket10Price" prop="bucket10Price"
label="10号桶价格" align="left" label="10号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket10Price" >
<JnpfNumber v-model="scope.row.bucket10Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket11Price" prop="bucket11Price"
label="11号桶价格" align="left" label="11号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket11Price" >
<JnpfNumber v-model="scope.row.bucket11Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="bucket12Price" prop="bucket12Price"
label="12号桶价格" align="left" label="12号桶价格" align="left"
> >
<template slot-scope="scope" v-if="scope.row.bucket12Price" >
<JnpfNumber v-model="scope.row.bucket12Price" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="allowPhoneLogin" prop="allowPhoneLogin"
@ -160,27 +121,21 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="closeDelay" prop="closeDelay"
label="关门延时" align="left" label="投递关门" align="left"
> >
<template slot-scope="scope" v-if="scope.row.closeDelay" >
<JnpfNumber v-model="scope.row.closeDelay" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="warningWeight" prop="warningWeight"
label="报警重量" align="left" label="报警重量" align="left"
> >
<template slot-scope="scope" v-if="scope.row.warningWeight" >
<JnpfNumber v-model="scope.row.warningWeight" :thousands="false"/>
</template>
</el-table-column> </el-table-column>
<el-table-column label="投递审核" prop="deliveryAdjustSet" algin="left" <el-table-column label="投递审核配置 " prop="deliveryAdjustSet" algin="left"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.deliveryAdjustSet}} {{ scope.row.deliveryAdjustSet}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="清运审核" prop="cleanAdjustSet" algin="left" <el-table-column label="清运审核配置" prop="cleanAdjustSet" algin="left"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.cleanAdjustSet}} {{ scope.row.cleanAdjustSet}}
@ -525,7 +480,7 @@
type:1, type:1,
}; };
request({ request({
url: `/api/scm/RecycleDeviceConfige/getList`, url: `/api/scm/RecycleDeviceConfig/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
@ -543,7 +498,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
request({ request({
url: `/api/scm/RecycleDeviceConfige/${id}`, url: `/api/scm/RecycleDeviceConfig/${id}`,
method: 'DELETE' method: 'DELETE'
}).then(res => { }).then(res => {
this.$message({ this.$message({
@ -560,7 +515,7 @@
handelUpload(){ handelUpload(){
this.uploadBoxVisible = true this.uploadBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.UploadBox.init("","scm/RecycleDeviceConfige") this.$refs.UploadBox.init("","scm/RecycleDeviceConfig")
}) })
}, },
openSuperQuery() { openSuperQuery() {
@ -590,7 +545,7 @@
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({ request({
url: `/api/scm/RecycleDeviceConfige/Actions/Export`, url: `/api/scm/RecycleDeviceConfig/Actions/Export`,
method: 'post', method: 'post',
data: query data: query
}).then(res => { }).then(res => {

2
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfig/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfige/columnList.js
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/recycledeviceconfige/superQueryJson.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save