回收设备基础

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/NxRecycleDeviceMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.NxRecycleDeviceMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/NxRecycleDeviceMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.NxRecycleDeviceEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * NxRecycleDevice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-05-24
+ */
+public interface NxRecycleDeviceMapper extends BaseMapper<NxRecycleDeviceEntity> {
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/NxRecycleDeviceService.java

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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/NxRecycleDeviceServiceImpl.java

@@ -0,0 +1,297 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.NxRecycleDeviceMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.nxrecycledevice.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * NxRecycleDevice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-05-24
+ */
+@Service
+public class NxRecycleDeviceServiceImpl extends ServiceImpl<NxRecycleDeviceMapper, NxRecycleDeviceEntity> implements NxRecycleDeviceService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<NxRecycleDeviceEntity> getList(NxRecycleDevicePagination nxRecycleDevicePagination){
+        return getTypeList(nxRecycleDevicePagination,nxRecycleDevicePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<NxRecycleDeviceEntity> getTypeList(NxRecycleDevicePagination nxRecycleDevicePagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? NxRecycleDeviceConstant.getAppColumnData() : NxRecycleDeviceConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int nxRecycleDeviceNum =0;
+        QueryWrapper<NxRecycleDeviceEntity> nxRecycleDeviceQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(nxRecycleDevicePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = nxRecycleDevicePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<NxRecycleDeviceEntity> nxRecycleDeviceSuperWrapper = new QueryWrapper<>();
+            nxRecycleDeviceSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxRecycleDeviceSuperWrapper,NxRecycleDeviceEntity.class,queryJson,"0"));
+            int nxRecycleDeviceNum1 = nxRecycleDeviceSuperWrapper.getExpression().getNormal().size();
+            if (nxRecycleDeviceNum1>0){
+                List<String> nxRecycleDeviceList =this.list(nxRecycleDeviceSuperWrapper).stream().map(NxRecycleDeviceEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(nxRecycleDeviceList);
+                intersectionSuperList.add(nxRecycleDeviceList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<NxRecycleDeviceEntity> nxRecycleDeviceSuperWrapper = new QueryWrapper<>();
+            nxRecycleDeviceSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxRecycleDeviceSuperWrapper,NxRecycleDeviceEntity.class,ruleJson,"0"));
+            int nxRecycleDeviceNum1 = nxRecycleDeviceSuperWrapper.getExpression().getNormal().size();
+            if (nxRecycleDeviceNum1>0){
+                List<String> nxRecycleDeviceList =this.list(nxRecycleDeviceSuperWrapper).stream().map(NxRecycleDeviceEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(nxRecycleDeviceList);
+                intersectionRuleList.add(nxRecycleDeviceList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxRecycleDeviceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxRecycleDeviceQueryWrapper,NxRecycleDeviceEntity.class,nxRecycleDevicePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxRecycleDeviceObj)){
+        return new ArrayList<>();
+        } else {
+        nxRecycleDeviceQueryWrapper = (QueryWrapper<NxRecycleDeviceEntity>)nxRecycleDeviceObj;
+        if( nxRecycleDeviceQueryWrapper.getExpression().getNormal().size()>0){
+        nxRecycleDeviceNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxRecycleDeviceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxRecycleDeviceQueryWrapper,NxRecycleDeviceEntity.class,nxRecycleDevicePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxRecycleDeviceObj)){
+        return new ArrayList<>();
+        } else {
+        nxRecycleDeviceQueryWrapper = (QueryWrapper<NxRecycleDeviceEntity>)nxRecycleDeviceObj;
+        if( nxRecycleDeviceQueryWrapper.getExpression().getNormal().size()>0){
+        nxRecycleDeviceNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(nxRecycleDevicePagination.getDeviceCode())){
+            nxRecycleDeviceNum++;
+
+                String value = nxRecycleDevicePagination.getDeviceCode() instanceof List ?
+                    JsonUtil.getObjectToString(nxRecycleDevicePagination.getDeviceCode()) :
+                    String.valueOf(nxRecycleDevicePagination.getDeviceCode());
+                nxRecycleDeviceQueryWrapper.lambda().like(NxRecycleDeviceEntity::getDeviceCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxRecycleDevicePagination.getDeviceName())){
+            nxRecycleDeviceNum++;
+
+                String value = nxRecycleDevicePagination.getDeviceName() instanceof List ?
+                    JsonUtil.getObjectToString(nxRecycleDevicePagination.getDeviceName()) :
+                    String.valueOf(nxRecycleDevicePagination.getDeviceName());
+                nxRecycleDeviceQueryWrapper.lambda().like(NxRecycleDeviceEntity::getDeviceName,value);
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            nxRecycleDeviceQueryWrapper.lambda().in(NxRecycleDeviceEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            nxRecycleDeviceQueryWrapper.lambda().and(t->t.in(NxRecycleDeviceEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            nxRecycleDeviceQueryWrapper.lambda().and(t->t.in(NxRecycleDeviceEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(nxRecycleDevicePagination.getSidx())){
+            nxRecycleDeviceQueryWrapper.lambda().orderByDesc(NxRecycleDeviceEntity::getId);
+        }else{
+            try {
+                String sidx = nxRecycleDevicePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                NxRecycleDeviceEntity nxRecycleDeviceEntity = new NxRecycleDeviceEntity();
+                Field declaredField = nxRecycleDeviceEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                nxRecycleDeviceQueryWrapper="asc".equals(nxRecycleDevicePagination.getSort().toLowerCase())?nxRecycleDeviceQueryWrapper.orderByAsc(value):nxRecycleDeviceQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<NxRecycleDeviceEntity> page=new Page<>(nxRecycleDevicePagination.getCurrentPage(), nxRecycleDevicePagination.getPageSize());
+                IPage<NxRecycleDeviceEntity> userIPage=this.page(page, nxRecycleDeviceQueryWrapper);
+                return nxRecycleDevicePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<NxRecycleDeviceEntity> list = new ArrayList();
+                return nxRecycleDevicePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(nxRecycleDeviceQueryWrapper);
+        }
+    }
+    @Override
+    public NxRecycleDeviceEntity getInfo(String id){
+        QueryWrapper<NxRecycleDeviceEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(NxRecycleDeviceEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(NxRecycleDeviceEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, NxRecycleDeviceEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(NxRecycleDeviceEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(NxRecycleDeviceForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+                if(StringUtil.isEmpty(form.getDeviceCode())){
+                    return "设备编码不能为空";
+                }
+                if(StringUtil.isNotEmpty(form.getDeviceCode())){
+                    form.setDeviceCode(form.getDeviceCode().trim());
+                    QueryWrapper<NxRecycleDeviceEntity> deviceCodeWrapper=new QueryWrapper<>();
+                    deviceCodeWrapper.lambda().eq(NxRecycleDeviceEntity::getDeviceCode,form.getDeviceCode());
+                    if (isUp){
+                        deviceCodeWrapper.lambda().ne(NxRecycleDeviceEntity::getId, id);
+                    }
+                    if((int) this.count(deviceCodeWrapper)>0){
+                        countRecover = "设备编码不能重复";
+                    }
+                }
+                if(StringUtil.isEmpty(form.getDeviceName())){
+                    return "设备名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getAddress())){
+                    return "地址不能为空";
+                }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param nxRecycleDeviceForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(NxRecycleDeviceForm nxRecycleDeviceForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        nxRecycleDeviceForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(NxRecycleDeviceConstant.getFormData(),nxRecycleDeviceForm),NxRecycleDeviceForm.class);
+        NxRecycleDeviceEntity entity = JsonUtil.getJsonToBean(nxRecycleDeviceForm, NxRecycleDeviceEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/NxRecycleDeviceController.java

@@ -0,0 +1,190 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.nxrecycledevice.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * NxRecycleDevice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-05-24
+ */
+@Slf4j
+@RestController
+@Tag(name = "NxRecycleDevice" , description = "scm")
+@RequestMapping("/api/scm/NxRecycleDevice")
+public class NxRecycleDeviceController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private NxRecycleDeviceService nxRecycleDeviceService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param nxRecycleDevicePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody NxRecycleDevicePagination nxRecycleDevicePagination)throws IOException{
+        List<NxRecycleDeviceEntity> list= nxRecycleDeviceService.getList(nxRecycleDevicePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (NxRecycleDeviceEntity entity : list) {
+        Map<String, Object> nxRecycleDeviceMap=JsonUtil.entityToMap(entity);
+        nxRecycleDeviceMap.put("id", nxRecycleDeviceMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(nxRecycleDeviceMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, NxRecycleDeviceConstant.getFormData(), NxRecycleDeviceConstant.getColumnData(), nxRecycleDevicePagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(nxRecycleDevicePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param nxRecycleDeviceForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid NxRecycleDeviceForm nxRecycleDeviceForm) {
+        String b = nxRecycleDeviceService.checkForm(nxRecycleDeviceForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            nxRecycleDeviceService.saveOrUpdate(nxRecycleDeviceForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param nxRecycleDeviceForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid NxRecycleDeviceForm nxRecycleDeviceForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        nxRecycleDeviceForm.setId(id);
+        if (!isImport) {
+            String b =  nxRecycleDeviceService.checkForm(nxRecycleDeviceForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        NxRecycleDeviceEntity entity= nxRecycleDeviceService.getInfo(id);
+        if(entity!=null){
+            try{
+                nxRecycleDeviceService.saveOrUpdate(nxRecycleDeviceForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        NxRecycleDeviceEntity entity= nxRecycleDeviceService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            nxRecycleDeviceService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        NxRecycleDeviceEntity entity= nxRecycleDeviceService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxRecycleDeviceMap=JsonUtil.entityToMap(entity);
+        nxRecycleDeviceMap.put("id", nxRecycleDeviceMap.get("id"));
+        //副表数据
+        //子表数据
+        nxRecycleDeviceMap = generaterSwapUtil.swapDataDetail(nxRecycleDeviceMap,NxRecycleDeviceConstant.getFormData(),"563701730794023749",false);
+        return ActionResult.success(nxRecycleDeviceMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        NxRecycleDeviceEntity entity= nxRecycleDeviceService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxRecycleDeviceMap=JsonUtil.entityToMap(entity);
+        nxRecycleDeviceMap.put("id", nxRecycleDeviceMap.get("id"));
+        //副表数据
+        //子表数据
+        nxRecycleDeviceMap = generaterSwapUtil.swapDataForm(nxRecycleDeviceMap,NxRecycleDeviceConstant.getFormData(),NxRecycleDeviceConstant.TABLEFIELDKEY,NxRecycleDeviceConstant.TABLERENAMES);
+        return ActionResult.success(nxRecycleDeviceMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/NxRecycleDeviceEntity.java

@@ -0,0 +1,65 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 回收柜设备表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-05-24
+ */
+@Data
+@TableName("nx_recycle_device")
+public class NxRecycleDeviceEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceCode;
+    @TableField(value = "DEVICE_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deviceName;
+    @TableField(value = "CITY" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer city;
+    @TableField(value = "ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer address;
+    @TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer status;
+    @TableField(value = "USE_STATUS" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer useStatus;
+    @TableField(value = "IP_ADDRESS" , updateStrategy = FieldStrategy.IGNORED)
+    private String ipAddress;
+    @TableField(value = "BOX_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
+    private Double boxWeight;
+    @TableField(value = "BE_LONG_STATION_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String beLongStationCode;
+    @TableField(value = "BE_LONG_COMPANY_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String beLongCompanyId;
+    @TableField("LATITUDE")
+    private String latitude;
+    @TableField("LONGITUDE")
+    private String longitude;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("ORGANIZE_JSON_ID")
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private Integer tenantId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxrecycledevice/NxRecycleDeviceForm.java

@@ -0,0 +1,50 @@
+package jnpf.model.nxrecycledevice;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * NxRecycleDevice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-05-24
+ */
+@Data
+public class NxRecycleDeviceForm  {
+    /** 主键 */
+    private String id;
+
+    /** 设备编码 **/
+    @JsonProperty("deviceCode")
+    private String deviceCode;
+    /** 设备名称 **/
+    @JsonProperty("deviceName")
+    private String deviceName;
+    /** 所在城市 **/
+    @JsonProperty("city")
+    private Object city;
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+    /** 设备状态 **/
+    @JsonProperty("status")
+    private String status;
+    /** 启用 **/
+    @JsonProperty("useStatus")
+    private String useStatus;
+    /** 设备通信ip地址 **/
+    @JsonProperty("ipAddress")
+    private String ipAddress;
+    /** 设备总重 **/
+    @JsonProperty("boxWeight")
+    private String boxWeight;
+    /** 所属回收站 **/
+    @JsonProperty("beLongStationCode")
+    private String beLongStationCode;
+    /** 所属商户 **/
+    @JsonProperty("beLongCompanyId")
+    private String beLongCompanyId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxrecycledevice/NxRecycleDevicePagination.java

@@ -0,0 +1,36 @@
+package jnpf.model.nxrecycledevice;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * NxRecycleDevice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-05-24
+ */
+@Data
+public class NxRecycleDevicePagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+    /** 设备编码 */
+    @JsonProperty("deviceCode")
+    private Object deviceCode;
+    /** 设备名称 */
+    @JsonProperty("deviceName")
+    private Object deviceName;
+}

jnpf-java-boot/jnpf-web/src/views/nxrecycledevice/Detail.vue

@@ -0,0 +1,153 @@
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" content="详情" />
+                <div class="options">
+                    <el-button @click="goBack">取 消</el-button>
+                </div>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" size="small" label-width="125px" label-position="right">
+                    <template v-if="!loading">
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备编码" prop="deviceCode">
+                                <p>{{ dataForm.deviceCode }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备名称" prop="deviceName">
+                                <p>{{ dataForm.deviceName }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所在城市" prop="city">
+                                <p>{{ dataForm.city }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="地址" prop="address">
+                                <p>{{ dataForm.address }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备状态" prop="status">
+                                <p>{{ dataForm.status }} </p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="启用" prop="useStatus">
+                                <p>{{ dataForm.useStatus }} </p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备通信ip地址" prop="ipAddress">
+                                <p>{{ dataForm.ipAddress }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备总重" prop="boxWeight">
+                                <p>{{ dataForm.boxWeight }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属回收站" prop="beLongStationCode">
+                                <p>{{ dataForm.beLongStationCode }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属商户" prop="beLongCompanyId">
+                                <p>{{ dataForm.beLongCompanyId }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                    </template>
+                </el-form>
+            </el-row>
+        </div>
+    </transition>
+</template>
+<script>
+import request from '@/utils/request'
+
+import { getConfigData } from '@/api/onlineDev/visualDev'
+import jnpf from '@/utils/jnpf'
+import Detail from '@/views/basic/dynamicModel/list/detail'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: { Detail },
+    props: [],
+    data() {
+        return {
+            visible: false,
+            detailVisible: false,
+            loading: false,
+
+            dataForm: {
+                id: '',
+                deviceCode: '',
+                deviceName: '',
+                city: [],
+                address: '',
+                status: "1",
+                useStatus: "1",
+                ipAddress: '',
+                boxWeight: '',
+                beLongStationCode: "",
+                beLongCompanyId: "",
+            },
+            statusOptions: [{ "fullName": "离线", "id": "0" }, { "fullName": "在线", "id": "1" }],
+            statusProps: { "label": "fullName", "value": "id" },
+            useStatusOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "启用", "id": "1" }, { "fullName": "暂停服务", "id": "2" }],
+            useStatusProps: { "label": "fullName", "value": "id" },
+
+        }
+    },
+    computed: {},
+    watch: {},
+    created() {
+
+    },
+    mounted() { },
+    methods: {
+        toDetail(defaultValue, modelId) {
+            if (!defaultValue) return
+            getConfigData(modelId).then(res => {
+                if (!res.data || !res.data.formData) return
+                let formData = JSON.parse(res.data.formData)
+                formData.popupType = 'general'
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(formData, modelId, defaultValue)
+                })
+            })
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+        },
+
+        goBack() {
+            this.$emit('refresh')
+        },
+        init(id) {
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/scm/NxRecycleDevice/detail/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    })
+                }
+
+            })
+        },
+    },
+}
+
+</script>

jnpf-java-boot/jnpf-web/src/views/nxrecycledevice/form.vue

@@ -0,0 +1,527 @@
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
+                <div class="options">
+                    <el-dropdown class="dropdown" placement="bottom">
+                        <el-button style="width:70px">
+                            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <template v-if="dataForm.id">
+                                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                    {{ '上一条' }}
+                                </el-dropdown-item>
+                                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                    {{ '下一条' }}
+                                </el-dropdown-item>
+                            </template>
+                            <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                :loading="continueBtnLoading" :disabled='btnLoading'>
+                                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+                        :disabled='continueBtnLoading'> 保
+                        存</el-button>
+                    <el-button @click="goBack"> 取 消</el-button>
+                </div>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="125px"
+                    label-position="right">
+                    <template v-if="!loading">
+                        <!-- 具体表单 -->
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备编码" prop="deviceCode">
+                                <JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备名称" prop="deviceName">
+                                <JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所在城市" prop="city">
+                                <JnpfAreaSelect v-model="dataForm.city" @change="changeData('city', -1)"
+                                    placeholder="请选择" selectType="all" clearable :style='{ "width": "100%" }' :level="2">
+                                </JnpfAreaSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="地址" prop="address">
+                                <JnpfInput v-model="dataForm.address" @change="changeData('address', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备状态" prop="status">
+                                <JnpfRadio v-model="dataForm.status" @change="changeData('status', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="statusOptions"
+                                    :props="statusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="启用" prop="useStatus">
+                                <JnpfRadio v-model="dataForm.useStatus" @change="changeData('useStatus', -1)"
+                                    optionType="default" direction="horizontal" size="small" :options="useStatusOptions"
+                                    :props="useStatusProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备通信ip地址" prop="ipAddress">
+                                <JnpfInput v-model="dataForm.ipAddress" @change="changeData('ipAddress', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="设备总重" prop="boxWeight">
+                                <JnpfInput v-model="dataForm.boxWeight" @change="changeData('boxWeight', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属回收站" prop="beLongStationCode">
+                                <JnpfPopupSelect v-model="dataForm.beLongStationCode"
+                                    @change="changeData('beLongStationCode', -1)" :rowIndex="null" :formData="dataForm"
+                                    :templateJson="interfaceRes.beLongStationCode" placeholder="请选择"
+                                    propsValue="station_code" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                                    relationField='station_name' field='beLongStationCode'
+                                    interfaceId="563705984451619653" :pageSize="20"
+                                    :columnOptions="beLongStationCodecolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="所属商户" prop="beLongCompanyId">
+                                <JnpfPopupSelect v-model="dataForm.beLongCompanyId"
+                                    @change="changeData('beLongCompanyId', -1)" :rowIndex="null" :formData="dataForm"
+                                    :templateJson="interfaceRes.beLongCompanyId" placeholder="请选择" propsValue="f_id"
+                                    popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
+                                    field='beLongCompanyId' interfaceId="563706688754953029" :pageSize="20"
+                                    :columnOptions="beLongCompanyIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </div>
+    </transition>
+</template>
+
+
+<script>
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: {},
+    props: [],
+    data() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting: {},
+            eventType: '',
+            userBoxVisible: false,
+            selectDialogVisible: false,
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
+            },
+            //可选范围默认值
+            ableAll: {
+            },
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
+            dataForm: {
+                deviceCode: undefined,
+                deviceName: undefined,
+                city: [],
+                address: undefined,
+                status: "1",
+                useStatus: "1",
+                ipAddress: undefined,
+                boxWeight: undefined,
+                beLongStationCode: undefined,
+                beLongCompanyId: undefined,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                deviceCode: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                deviceName: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                city: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: 'change'
+                    },
+                ],
+                address: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+            },
+            statusOptions: [{ "fullName": "离线", "id": "0" }, { "fullName": "在线", "id": "1" }],
+            statusProps: { "label": "fullName", "value": "id" },
+            useStatusOptions: [{ "fullName": "关闭", "id": "0" }, { "fullName": "启用", "id": "1" }, { "fullName": "暂停服务", "id": "2" }],
+            useStatusProps: { "label": "fullName", "value": "id" },
+            beLongStationCodecolumnOptions: [{ "label": "回收站编号", "value": "station_code" }, { "label": "回收站名称", "value": "station_name" },],
+            beLongCompanyIdcolumnOptions: [{ "label": "商户ID", "value": "f_id" }, { "label": "商户名称", "value": "f_full_name" },],
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                deviceCode: [],
+                deviceName: [],
+                city: [],
+                address: [],
+                status: [],
+                useStatus: [],
+                ipAddress: [],
+                boxWeight: [],
+                beLongStationCode: [],
+                beLongCompanyId: [],
+            },
+        }
+    },
+    computed: {
+        ...mapGetters(['userInfo'])
+    },
+    watch: {},
+    created() {
+        this.dataAll()
+        this.initDefaultData()
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        prev() {
+            this.index--
+            if (this.index === 0) {
+                this.prevDis = true
+            }
+            this.nextDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
+        },
+        next() {
+            this.index++
+            if (this.index === this.allList.length - 1) {
+                this.nextDis = true
+            }
+            this.prevDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
+        },
+        getInfo(id) {
+            request({
+                url: '/api/scm/NxRecycleDevice/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
+        },
+        goBack() {
+            this.visible = false
+            this.$emit('refreshDataList', true)
+        },
+        changeData(model, index) {
+            this.isEdit = false
+            this.childIndex = index
+            let modelAll = model.split("-");
+            let faceMode = "";
+            for (let i = 0; i < modelAll.length; i++) {
+                faceMode += modelAll[i];
+            }
+            for (let key in this.interfaceRes) {
+                if (key != faceMode) {
+                    let faceReList = this.interfaceRes[key]
+                    for (let i = 0; i < faceReList.length; i++) {
+                        if (faceReList[i].relationField == model) {
+                            let options = 'get' + key + 'Options';
+                            if (this[options]) {
+                                this[options]()
+                            }
+                            this.changeData(key, index)
+                        }
+                    }
+                }
+            }
+        },
+        changeDataFormData(type, data, model, index, defaultValue) {
+            if (!this.isEdit) {
+                if (type == 2) {
+                    for (let i = 0; i < this.dataForm[data].length; i++) {
+                        if (index == -1) {
+                            this.dataForm[data][i][model] = defaultValue
+                        } else if (index == i) {
+                            this.dataForm[data][i][model] = defaultValue
+                        }
+                    }
+                } else {
+                    this.dataForm[data] = defaultValue
+                }
+            }
+        },
+        dataAll() {
+        },
+        goBack() {
+            this.$emit('refresh')
+        },
+        clearData() {
+            this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+        },
+        init(id, isDetail, allList) {
+            this.prevDis = false
+            this.nextDis = false
+            this.allList = allList || []
+            if (allList.length) {
+                this.index = this.allList.findIndex(item => item.id === id)
+                if (this.index == 0) {
+                    this.prevDis = true
+                }
+                if (this.index == this.allList.length - 1) {
+                    this.nextDis = true
+                }
+            } else {
+                this.prevDis = true
+                this.nextDis = true
+            }
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/scm/NxRecycleDevice/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
+                } else {
+                    this.clearData()
+                    this.initDefaultData()
+                }
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+        },
+        //初始化默认数据
+        initDefaultData() {
+
+        },
+        // 表单提交
+        dataFormSubmit(type) {
+            this.dataFormSubmitType = type ? type : 0
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    this.request()
+                }
+            })
+        },
+        request() {
+            let _data = this.dataList()
+            if (this.dataFormSubmitType == 2) {
+                this.continueBtnLoading = true
+            } else {
+                this.btnLoading = true
+            }
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/scm/NxRecycleDevice',
+                    method: 'post',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) {
+                                this.$nextTick(() => {
+                                    this.clearData()
+                                    this.initDefaultData()
+                                })
+                                this.continueBtnLoading = false
+                                return
+                            }
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
+                    })
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/scm/NxRecycleDevice/' + this.dataForm.id,
+                    method: 'PUT',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
+                    })
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            }
+        },
+        openSelectDialog(key) {
+            this.currTableConf = this.addTableConf[key]
+            this.currVmodel = key
+            this.selectDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.selectDialog.init()
+            })
+        },
+        addForSelect(data) {
+            for (let i = 0; i < data.length; i++) {
+                let t = data[i]
+                if (this['get' + this.currVmodel]) {
+                    this['get' + this.currVmodel](t)
+                }
+            }
+        },
+        dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+            let timeDataValue = null;
+            let timeValue = Number(timeValueData)
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = new Date().getTime()
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getBeforeData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                    }
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getLaterData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+                    }
+                }
+            }
+            return timeDataValue;
+        },
+        time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+            let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+            let timeDataValue = null
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue || '00:00:00'
+                    if (timeDataValue.split(':').length == 3) {
+                        timeDataValue = timeDataValue
+                    } else {
+                        timeDataValue = timeDataValue + ':00'
+                    }
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = this.jnpf.toDate(new Date(), format)
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    previousDate = getBeforeTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    previousDate = getLaterTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                }
+            }
+            return timeDataValue;
+        },
+        dataList() {
+            var _data = this.dataForm;
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+            this.isEdit = true
+            this.dataAll()
+            this.childIndex = -1
+        },
+    },
+}
+
+</script>

jnpf-java-boot/jnpf-web/src/views/nxrecycledevice/index.vue

@@ -0,0 +1,497 @@
+
+
+
+
+
+
+
+<template>
+    <div class="JNPF-common-layout">
+        <div class="JNPF-common-layout-center">
+            <el-row class="JNPF-common-search-box" :gutter="16">
+                <el-form @submit.native.prevent>
+                            <el-col :span="6">
+                                <el-form-item label="设备编码">
+                                        <el-input v-model="query.deviceCode" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="设备名称">
+                                        <el-input v-model="query.deviceName" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="icon-ym icon-ym-btn-add"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                            <el-tooltip content="高级查询" placement="top" v-if="true">
+                                <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                                         @click="openSuperQuery()" />
+                            </el-tooltip>
+                            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+                                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                         @click="initData()" />
+                            </el-tooltip>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  
+ :span-method="arraySpanMethod"  
+
+>
+                                                <el-table-column
+                                                            prop="deviceCode"
+ label="设备编码"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="deviceName"
+ label="设备名称"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="city"
+ label="所在城市"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="address"
+ label="地址"  align="left"
+ >
+                                                </el-table-column>
+                                        <el-table-column label="设备状态"  prop="status" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.status}}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="启用"  prop="use" algin="left"
+ >
+                                            <template slot-scope="scope">
+                                                {{ scope.row.use}}
+                                            </template>
+                                        </el-table-column>
+                                                <el-table-column
+                                                            prop="ipAddress"
+ label="设备通信ip地址"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="boxWeight"
+ label="设备总重"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="beLongStationCode"
+ label="所属回收站"  align="left"
+ >
+                                                </el-table-column>
+                                                <el-table-column
+                                                            prop="beLongCompanyId"
+ label="所属商户"  align="left"
+ >
+                                                </el-table-column>
+                        <el-table-column label="操作"
+ fixed="right" width="150" >
+                            <template slot-scope="scope"  >
+                                            <el-button type="text"
+                                                       @click="addOrUpdateHandle(scope.row)" >编辑
+                                            </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+             </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+
+
+
+
+        <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
+            <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+                        @superQuery="superQuery" />
+    </div>
+</template>
+
+<script>
+
+    import request from '@/utils/request'
+    import {mapGetters} from "vuex";
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './form'
+    import Detail from './Detail'
+    import ExportBox from '@/components/ExportBox'
+    import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import { getConfigData } from '@/api/onlineDev/visualDev'
+    import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
+    import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
+            import columnList from './columnList'
+    import { thousandsFormat } from "@/components/Generator/utils/index"
+        import SuperQuery from '@/components/SuperQuery'
+        import superQueryJson from './superQueryJson'
+
+    export default {
+        components: {
+                JNPFForm,
+                Detail,
+ ExportBox,ToFormDetail , SuperQuery
+        },
+        data() {
+            return {
+
+                keyword:'',
+                expandsTree: true,
+                refreshTree: true,
+                toFormDetailVisible:false,
+                                expandObj:{},
+                columnOptions: [],
+                mergeList: [],
+                exportList:[],
+                    columnList,
+
+                    superQueryVisible: false,
+                    superQueryJson,
+                uploadBoxVisible: false,
+                detailVisible: false,
+                query: {
+                        deviceCode:undefined,
+                        deviceName:undefined,
+            },
+            treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id',
+                    isLeaf: 'isLeaf'
+            },
+            list: [],
+            listLoading: true,
+                    total: 0,
+            queryData: {},
+            listQuery: {
+                    superQueryJson: '',
+                        currentPage: 1,
+                        pageSize: 20,
+                sort: "desc",
+                        sidx: "",
+            },
+            formVisible: false,
+            flowVisible: false,
+            flowListVisible: false,
+            flowList: [],
+            exportBoxVisible: false,
+                                                                                                                                                                statusOptions:[{"fullName":"离线","id":"0"},{"fullName":"在线","id":"1"}],
+                        statusProps:{"label":"fullName","value":"id"  },
+                            useStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"启用","id":"1"},{"fullName":"暂停服务","id":"2"}],
+                        useStatusProps:{"label":"fullName","value":"id"  },
+            interfaceRes: {
+                        beLongStationCode:[] ,
+                        beLongCompanyId:[] ,
+                },
+            }
+        },
+        computed: {
+            ...mapGetters(['userInfo']),
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                        this.getColumnList(),
+                this.initSearchDataAndListData()
+            this.queryData = JSON.parse(JSON.stringify(this.query))
+        },
+        methods: {
+            toDetail(defaultValue, modelId) {
+                if (!defaultValue) return
+                getConfigData(modelId).then(res => {
+                    if (!res.data || !res.data.formData) return
+                    let formData = JSON.parse(res.data.formData)
+                    formData.popupType = 'general'
+                    this.toFormDetailVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.toFormDetail.init(formData, modelId, defaultValue)
+                    })
+                })
+            },
+            toggleTreeExpand(expands) {
+                this.refreshTree = false
+                this.expandsTree = expands
+                this.$nextTick(() => {
+                    this.refreshTree = true
+                    this.$nextTick(() => {
+                        this.$refs.treeBox.setCurrentKey(null)
+                    })
+                })
+            },
+            filterNode(value, data) {
+                if (!value) return true;
+                return data[this.treeProps.label].indexOf(value) !== -1;
+            },
+            loadNode(node, resolve) {
+                const nodeData = node.data
+                const config ={
+                    treeInterfaceId:"",
+                    treeTemplateJson:[]
+                }
+                if (config.treeInterfaceId) {
+                    //这里是为了拿到参数中关联的字段的值，后端自行拿
+                    if (config.treeTemplateJson && config.treeTemplateJson.length) {
+                        for (let i = 0; i < config.treeTemplateJson.length; i++) {
+                            const element = config.treeTemplateJson[i];
+                            element.defaultValue = nodeData[element.relationField] || ''
+                        }
+                    }
+                    //参数
+                    let query = {
+                        paramList: config.treeTemplateJson || [],
+                    }
+                    //接口
+                    getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+                        let data = res.data
+                        if (Array.isArray(data)) {
+                            resolve(data);
+                        } else {
+                            resolve([]);
+                        }
+                    })
+                }
+            },
+                        getColumnList() {
+                    // 没有开启权限
+                    this.columnOptions = this.transformColumnList(this.columnList)
+            },
+            transformColumnList(columnList) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    const e = columnList[i];
+                    if (!e.prop.includes('-')) {
+                        list.push(e)
+                    } else {
+                        let prop = e.prop.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let vModel = e.prop.split('-')[1]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        e.vModel = vModel
+                        if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                this.getMergeList(list)
+                this.getExportList(list)
+                return list
+            },
+            arraySpanMethod({ column }) {
+                for (let i = 0; i < this.mergeList.length; i++) {
+                    if (column.property == this.mergeList[i].prop) {
+                        return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+                    }
+                }
+            },
+            getMergeList(list) {
+                let newList = JSON.parse(JSON.stringify(list))
+                newList.forEach(item => {
+                    if (item.children && item.children.length) {
+                        let child = {
+                            prop: item.prop + '-child-first'
+                        }
+                        item.children.unshift(child)
+                    }
+                })
+                newList.forEach(item => {
+                    if (item.children && item.children.length ) {
+                        item.children.forEach((child, index) => {
+                            if (index == 0) {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 1,
+                                    colspan: item.children.length
+                                })
+                            } else {
+                                this.mergeList.push({
+                                    prop: child.prop,
+                                    rowspan: 0,
+                                    colspan: 0
+                                })
+                            }
+                        })
+                    } else {
+                        this.mergeList.push({
+                            prop: item.prop,
+                            rowspan: 1,
+                            colspan: 1
+                        })
+                    }
+                })
+            },
+            getExportList(list) {
+                let exportList = []
+                for (let i = 0; i < list.length; i++) {
+                    if (list[i].jnpfKey === 'table') {
+                        for (let j = 0; j < list[i].children.length; j++) {
+                            exportList.push(list[i].children[j])
+                        }
+                    } else {
+                        exportList.push(list[i])
+                    }
+                }
+                this.exportList = exportList
+            },
+            goDetail(id){
+                this.detailVisible = true
+                this.$nextTick(() => {
+                    this.$refs.Detail.init(id)
+                })
+            },
+            sortChange({column, prop, order}) {
+                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+                this.listQuery.sidx = !order ? '' : prop
+                this.initData()
+            },
+            async initSearchDataAndListData() {
+                await this.initSearchData()
+                this.initData()
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                        keyword: this.keyword,
+                        dataType: 0,
+                    menuId:this.menuId,
+                    moduleId:'563701730794023749',
+                    type:1,
+                };
+                request({
+                    url: `/api/scm/NxRecycleDevice/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =res.data.list;
+                                            this.list = _list.map(o => ({
+                            ...o,
+                            ...this.expandObj,
+                        }))
+                            this.total = res.data.pagination.total
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/scm/NxRecycleDevice/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+            handelUpload(){
+                this.uploadBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.UploadBox.init("","scm/NxRecycleDevice")
+                })
+            },
+                openSuperQuery() {
+                    this.superQueryVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.SuperQuery.init()
+                    })
+                },
+                superQuery(queryJson) {
+                    this.listQuery.superQueryJson = queryJson
+                    this.listQuery.currentPage = 1
+                    this.initData()
+                },
+            addOrUpdateHandle(row, isDetail) {
+                let id = row?row.id:""
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail,this.list)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.exportList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/scm/NxRecycleDevice/Actions/Export`,
+                    method: 'post',
+                    data: query
+                }).then(res => {
+                    if (!res.data.url) return
+                    this.jnpf.downloadFile(res.data.url)
+                    this.$refs.ExportBox.visible = false
+                    this.exportBoxVisible = false
+                })
+            },
+            search() {
+                    this.listQuery.currentPage=1
+                        this.listQuery.pageSize=20
+                    this.listQuery.sort="desc"
+                this.listQuery.sidx=""
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                this.query = JSON.parse(JSON.stringify(this.queryData))
+                this.search()
+            },
+            colseFlow(isrRefresh) {
+                this.flowVisible = false
+                if (isrRefresh) this.reset()
+            },
+        }
+    }
+</script>

jnpf-java-boot/jnpf-web/src/views/recycleorder/Detail.vue

@@ -47,7 +47,7 @@
                                 <p>{{ dataForm.receivePeriod }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="6">
+                        <!-- <el-col :span="6">
                             <jnpf-form-tip-item label="下单地址经度" prop="longitude">
                                 <p>{{ dataForm.longitude }}</p>
                             </jnpf-form-tip-item>
@@ -56,7 +56,7 @@
                             <jnpf-form-tip-item label="下单地址纬度" prop="latitude">
                                 <p>{{ dataForm.latitude }}</p>
                             </jnpf-form-tip-item>
-                        </el-col>
+                        </el-col> -->
                         <el-col :span="6">
                             <jnpf-form-tip-item label="订单距离" prop="distance">
                                 <p>{{ dataForm.distance }}</p>
@@ -143,7 +143,7 @@
                                 <p>{{ dataForm.appointmentTimeEnd }}</p>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="12">
                             <jnpf-form-tip-item label="散户下单关联地址" prop="clientAddressId">
                                 <p>{{ dataForm.clientAddressId }}</p>
                             </jnpf-form-tip-item>
@@ -207,18 +207,6 @@
                                 </JnpfRate>
                             </jnpf-form-tip-item>
                         </el-col>
-                        <el-col :span="6">
-                            <jnpf-form-tip-item label="评价详情" prop="comment">
-                                <p>{{ dataForm.comment }}</p>
-                            </jnpf-form-tip-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <jnpf-form-tip-item label="评价图片" prop="commentPics">
-                                <JnpfUploadImg v-model="dataForm.commentPics" disabled detailed :fileSize="10"
-                                    sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
-                                </JnpfUploadImg>
-                            </jnpf-form-tip-item>
-                        </el-col>
                         <el-col :span="6">
                             <jnpf-form-tip-item label="响应速度" prop="responseStar">
                                 <JnpfRate v-model="dataForm.responseStar" disabled :max="5">
@@ -237,6 +225,18 @@
                                 </JnpfRate>
                             </jnpf-form-tip-item>
                         </el-col>
+                        <el-col :span="6">
+                            <jnpf-form-tip-item label="评价详情" prop="comment">
+                                <p>{{ dataForm.comment }}</p>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <jnpf-form-tip-item label="评价图片" prop="commentPics">
+                                <JnpfUploadImg v-model="dataForm.commentPics" disabled detailed :fileSize="10"
+                                    sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                                </JnpfUploadImg>
+                            </jnpf-form-tip-item>
+                        </el-col>
                     </template>
                 </el-form>
             </el-row>

jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue

@@ -292,21 +292,6 @@
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
-            <el-col :span="6">
-              <jnpf-form-tip-item label="评价详情" prop="comment">
-                <JnpfTextarea v-model="dataForm.comment" @change="changeData('comment', -1)" placeholder="请输入"
-                  :maxlength="200" :style="{ width: '100%' }" true type="textarea"
-                  :autosize="{ minRows: 4, maxRows: 8 }">
-                </JnpfTextarea>
-              </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="6">
-              <jnpf-form-tip-item label="评价图片" prop="commentPics">
-                <JnpfUploadImg v-model="dataForm.commentPics" @change="changeData('commentPics', -1)" :fileSize="10"
-                  sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
-                </JnpfUploadImg>
-              </jnpf-form-tip-item>
-            </el-col>
             <el-col :span="6">
               <jnpf-form-tip-item label="响应速度" prop="responseStar">
                 <JnpfRate v-model="dataForm.responseStar" @change="changeData('responseStar', -1)" :max="5">
@@ -325,6 +310,21 @@
                 </JnpfRate>
               </jnpf-form-tip-item>
             </el-col>
+            <el-col :span="6">
+              <jnpf-form-tip-item label="评价详情" prop="comment">
+                <JnpfTextarea v-model="dataForm.comment" @change="changeData('comment', -1)" placeholder="请输入"
+                  :maxlength="200" :style="{ width: '100%' }" true type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 8 }">
+                </JnpfTextarea>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="6">
+              <jnpf-form-tip-item label="评价图片" prop="commentPics">
+                <JnpfUploadImg v-model="dataForm.commentPics" @change="changeData('commentPics', -1)" :fileSize="10"
+                  sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                </JnpfUploadImg>
+              </jnpf-form-tip-item>
+            </el-col>
             <!-- 表单结束 -->
           </template>
         </el-form>