no message

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/ClientAccountDetailMapper.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.ClientAccountDetailMapper">
+
+
+
+</mapper>

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

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

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

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

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

@@ -0,0 +1,324 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.ClientAccountDetailMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.clientaccountdetail.*;
+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;
+/**
+ *
+ * clientAccountDetail
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-14
+ */
+@Service
+public class ClientAccountDetailServiceImpl extends ServiceImpl<ClientAccountDetailMapper, ClientAccountDetailEntity> implements ClientAccountDetailService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<ClientAccountDetailEntity> getList(ClientAccountDetailPagination clientAccountDetailPagination){
+        return getTypeList(clientAccountDetailPagination,clientAccountDetailPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<ClientAccountDetailEntity> getTypeList(ClientAccountDetailPagination clientAccountDetailPagination,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 ? ClientAccountDetailConstant.getAppColumnData() : ClientAccountDetailConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int clientAccountDetailNum =0;
+        QueryWrapper<ClientAccountDetailEntity> clientAccountDetailQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(clientAccountDetailPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = clientAccountDetailPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<ClientAccountDetailEntity> clientAccountDetailSuperWrapper = new QueryWrapper<>();
+            clientAccountDetailSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(clientAccountDetailSuperWrapper,ClientAccountDetailEntity.class,queryJson,"0"));
+            int clientAccountDetailNum1 = clientAccountDetailSuperWrapper.getExpression().getNormal().size();
+            if (clientAccountDetailNum1>0){
+                List<String> clientAccountDetailList =this.list(clientAccountDetailSuperWrapper).stream().map(ClientAccountDetailEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(clientAccountDetailList);
+                intersectionSuperList.add(clientAccountDetailList);
+                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<ClientAccountDetailEntity> clientAccountDetailSuperWrapper = new QueryWrapper<>();
+            clientAccountDetailSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(clientAccountDetailSuperWrapper,ClientAccountDetailEntity.class,ruleJson,"0"));
+            int clientAccountDetailNum1 = clientAccountDetailSuperWrapper.getExpression().getNormal().size();
+            if (clientAccountDetailNum1>0){
+                List<String> clientAccountDetailList =this.list(clientAccountDetailSuperWrapper).stream().map(ClientAccountDetailEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(clientAccountDetailList);
+                intersectionRuleList.add(clientAccountDetailList);
+                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 clientAccountDetailObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(clientAccountDetailQueryWrapper,ClientAccountDetailEntity.class,clientAccountDetailPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(clientAccountDetailObj)){
+        return new ArrayList<>();
+        } else {
+        clientAccountDetailQueryWrapper = (QueryWrapper<ClientAccountDetailEntity>)clientAccountDetailObj;
+        if( clientAccountDetailQueryWrapper.getExpression().getNormal().size()>0){
+        clientAccountDetailNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object clientAccountDetailObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(clientAccountDetailQueryWrapper,ClientAccountDetailEntity.class,clientAccountDetailPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(clientAccountDetailObj)){
+        return new ArrayList<>();
+        } else {
+        clientAccountDetailQueryWrapper = (QueryWrapper<ClientAccountDetailEntity>)clientAccountDetailObj;
+        if( clientAccountDetailQueryWrapper.getExpression().getNormal().size()>0){
+        clientAccountDetailNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(clientAccountDetailPagination.getChangeType())){
+            clientAccountDetailNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] changeType = JsonUtil.getJsonToBean(clientAccountDetailPagination.getChangeType(),String[][].class);
+        for(int i=0;i<changeType.length;i++){
+        if(changeType[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(changeType[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> changeType = JsonUtil.getJsonToList(clientAccountDetailPagination.getChangeType(),String.class);
+        if(changeType.size()>0){
+            idList.addAll(changeType);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(clientAccountDetailPagination.getChangeType()));
+        }
+        }
+        clientAccountDetailQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(ClientAccountDetailEntity::getChangeType, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(clientAccountDetailPagination.getOrderNumber())){
+            clientAccountDetailNum++;
+
+                String value = clientAccountDetailPagination.getOrderNumber() instanceof List ?
+                    JsonUtil.getObjectToString(clientAccountDetailPagination.getOrderNumber()) :
+                    String.valueOf(clientAccountDetailPagination.getOrderNumber());
+                clientAccountDetailQueryWrapper.lambda().like(ClientAccountDetailEntity::getOrderNumber,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(clientAccountDetailPagination.getAmount())){
+            clientAccountDetailNum++;
+
+                String value = clientAccountDetailPagination.getAmount() instanceof List ?
+                    JsonUtil.getObjectToString(clientAccountDetailPagination.getAmount()) :
+                    String.valueOf(clientAccountDetailPagination.getAmount());
+                clientAccountDetailQueryWrapper.lambda().like(ClientAccountDetailEntity::getAmount,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(clientAccountDetailPagination.getBanlance())){
+            clientAccountDetailNum++;
+
+                String value = clientAccountDetailPagination.getBanlance() instanceof List ?
+                    JsonUtil.getObjectToString(clientAccountDetailPagination.getBanlance()) :
+                    String.valueOf(clientAccountDetailPagination.getBanlance());
+                clientAccountDetailQueryWrapper.lambda().like(ClientAccountDetailEntity::getBanlance,value);
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            clientAccountDetailQueryWrapper.lambda().in(ClientAccountDetailEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            clientAccountDetailQueryWrapper.lambda().and(t->t.in(ClientAccountDetailEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            clientAccountDetailQueryWrapper.lambda().and(t->t.in(ClientAccountDetailEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(clientAccountDetailPagination.getSidx())){
+            clientAccountDetailQueryWrapper.lambda().orderByDesc(ClientAccountDetailEntity::getId);
+        }else{
+            try {
+                String sidx = clientAccountDetailPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                ClientAccountDetailEntity clientAccountDetailEntity = new ClientAccountDetailEntity();
+                Field declaredField = clientAccountDetailEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                clientAccountDetailQueryWrapper="asc".equals(clientAccountDetailPagination.getSort().toLowerCase())?clientAccountDetailQueryWrapper.orderByAsc(value):clientAccountDetailQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<ClientAccountDetailEntity> page=new Page<>(clientAccountDetailPagination.getCurrentPage(), clientAccountDetailPagination.getPageSize());
+                IPage<ClientAccountDetailEntity> userIPage=this.page(page, clientAccountDetailQueryWrapper);
+                return clientAccountDetailPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<ClientAccountDetailEntity> list = new ArrayList();
+                return clientAccountDetailPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(clientAccountDetailQueryWrapper);
+        }
+    }
+    @Override
+    public ClientAccountDetailEntity getInfo(String id){
+        QueryWrapper<ClientAccountDetailEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(ClientAccountDetailEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(ClientAccountDetailEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, ClientAccountDetailEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(ClientAccountDetailEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(ClientAccountDetailForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param clientAccountDetailForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(ClientAccountDetailForm clientAccountDetailForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        clientAccountDetailForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(ClientAccountDetailConstant.getFormData(),clientAccountDetailForm),ClientAccountDetailForm.class);
+        ClientAccountDetailEntity entity = JsonUtil.getJsonToBean(clientAccountDetailForm, ClientAccountDetailEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setId(mainId);
+        }else{
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

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

@@ -154,6 +154,12 @@ public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProduct
 
             }
 
+            if(nxProductPagination.getExcludeIdList() != null && nxProductPagination.getExcludeIdList().size() > 0){
+                nxProductNum++;
+                nxProductQueryWrapper.lambda().notIn(NxProductEntity::getId,nxProductPagination.getExcludeIdList());
+            }
+
+
             if(ObjectUtil.isNotEmpty(nxProductPagination.getName())){
             nxProductNum++;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ClientAccountDetailController.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.clientaccountdetail.*;
+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;
+
+/**
+ * clientAccountDetail
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-14
+ */
+@Slf4j
+@RestController
+@Tag(name = "clientAccountDetail" , description = "scm")
+@RequestMapping("/api/scm/ClientAccountDetail")
+public class ClientAccountDetailController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private ClientAccountDetailService clientAccountDetailService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param clientAccountDetailPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody ClientAccountDetailPagination clientAccountDetailPagination)throws IOException{
+        List<ClientAccountDetailEntity> list= clientAccountDetailService.getList(clientAccountDetailPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (ClientAccountDetailEntity entity : list) {
+        Map<String, Object> clientAccountDetailMap=JsonUtil.entityToMap(entity);
+        clientAccountDetailMap.put("id", clientAccountDetailMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(clientAccountDetailMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, ClientAccountDetailConstant.getFormData(), ClientAccountDetailConstant.getColumnData(), clientAccountDetailPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(clientAccountDetailPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param clientAccountDetailForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid ClientAccountDetailForm clientAccountDetailForm) {
+        String b = clientAccountDetailService.checkForm(clientAccountDetailForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            clientAccountDetailService.saveOrUpdate(clientAccountDetailForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param clientAccountDetailForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ClientAccountDetailForm clientAccountDetailForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        clientAccountDetailForm.setId(id);
+        if (!isImport) {
+            String b =  clientAccountDetailService.checkForm(clientAccountDetailForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        ClientAccountDetailEntity entity= clientAccountDetailService.getInfo(id);
+        if(entity!=null){
+            try{
+                clientAccountDetailService.saveOrUpdate(clientAccountDetailForm,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){
+        ClientAccountDetailEntity entity= clientAccountDetailService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            clientAccountDetailService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        ClientAccountDetailEntity entity= clientAccountDetailService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> clientAccountDetailMap=JsonUtil.entityToMap(entity);
+        clientAccountDetailMap.put("id", clientAccountDetailMap.get("id"));
+        //副表数据
+        //子表数据
+        clientAccountDetailMap = generaterSwapUtil.swapDataDetail(clientAccountDetailMap,ClientAccountDetailConstant.getFormData(),"537978999461124805",false);
+        return ActionResult.success(clientAccountDetailMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        ClientAccountDetailEntity entity= clientAccountDetailService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> clientAccountDetailMap=JsonUtil.entityToMap(entity);
+        clientAccountDetailMap.put("id", clientAccountDetailMap.get("id"));
+        //副表数据
+        //子表数据
+        clientAccountDetailMap = generaterSwapUtil.swapDataForm(clientAccountDetailMap,ClientAccountDetailConstant.getFormData(),ClientAccountDetailConstant.TABLEFIELDKEY,ClientAccountDetailConstant.TABLERENAMES);
+        return ActionResult.success(clientAccountDetailMap);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 散户余额明细
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-14
+ */
+@Data
+@TableName("nx_client_account_detail")
+public class ClientAccountDetailEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "CLIENT_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String clientId;
+    @TableField(value = "CHANGE_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String changeType;
+    @TableField(value = "ORDER_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
+    private String orderNumber;
+    @TableField(value = "AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal amount;
+    @TableField(value = "BANLANCE" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal banlance;
+    @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
+    private String remark;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @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 String tenantId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

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

@@ -16,7 +16,7 @@ import java.util.Date;
 public class EnterpriserecyclestationEntity  {
     @TableId(value ="ID"  )
     private String id;
-    @TableField("ENTERPRISE_ID")
+    @TableField(value = "ENTERPRISE_ID" , updateStrategy = FieldStrategy.IGNORED)
     private String enterpriseId;
     @TableField(value = "STATION_CODE" , updateStrategy = FieldStrategy.IGNORED)
     private String stationCode;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/clientaccountdetail/ClientAccountDetailForm.java

@@ -0,0 +1,50 @@
+package jnpf.model.clientaccountdetail;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * clientAccountDetail
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-14
+ */
+@Data
+public class ClientAccountDetailForm  {
+    /** 主键 */
+    private String id;
+
+    /** 散户 **/
+    @JsonProperty("clientId")
+    private String clientId;
+    /** 变动类型 **/
+    @JsonProperty("changeType")
+    private Object changeType;
+    /** 订单编号 **/
+    @JsonProperty("orderNumber")
+    private String orderNumber;
+    /** 金额 **/
+    @JsonProperty("amount")
+    private String amount;
+    /** 账户余额 **/
+    @JsonProperty("banlance")
+    private String banlance;
+    /** 备注 **/
+    @JsonProperty("remark")
+    private String remark;
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+    /** 创建用户 **/
+    @JsonProperty("creatorUserId")
+    private String creatorUserId;
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+    /** 修改用户 **/
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/clientaccountdetail/ClientAccountDetailPagination.java

@@ -0,0 +1,42 @@
+package jnpf.model.clientaccountdetail;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * clientAccountDetail
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-14
+ */
+@Data
+public class ClientAccountDetailPagination 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("changeType")
+    private Object changeType;
+    /** 订单编号 */
+    @JsonProperty("orderNumber")
+    private Object orderNumber;
+    /** 金额 */
+    @JsonProperty("amount")
+    private Object amount;
+    /** 账户余额 */
+    @JsonProperty("banlance")
+    private Object banlance;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxproduct/NxProductPagination.java

@@ -39,4 +39,7 @@ public class NxProductPagination extends Pagination {
     /** 库存单位 */
     @JsonProperty("unit")
     private Object unit;
+
+    @JsonProperty("excludeIdList")
+    private List<String> excludeIdList;
 }

jnpf-java-boot/jnpf-web/public/index.html

@@ -9,7 +9,7 @@
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
   <title><%= webpackConfig.name %></title>
   <script src="<%= BASE_URL %>cdn/echarts/echarts.min.js"></script>
-  <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nYAafE0e8IXpGM0ykV3BO2k7CVRHI79Y"></script>
+  <!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nYAafE0e8IXpGM0ykV3BO2k7CVRHI79Y"></script> -->
 </head>
 
 <body>

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

@@ -0,0 +1,156 @@
+<template>
+  <el-dialog
+    title="详情"
+    :close-on-click-modal="false"
+    append-to-body
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    width="600px"
+  >
+    <el-row :gutter="15" class="">
+      <el-form
+        ref="formRef"
+        :model="dataForm"
+        size="small"
+        label-width="100px"
+        label-position="right"
+      >
+        <template v-if="!loading">
+          <el-col :span="8">
+            <jnpf-form-tip-item label="散户" prop="clientId">
+              <p>{{ dataForm.clientId }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="变动类型" prop="changeType">
+              <p>{{ dataForm.changeType }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="订单编号" prop="orderNumber">
+              <p>{{ dataForm.orderNumber }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="金额" prop="amount">
+              <p>{{ dataForm.amount }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="账户余额" prop="banlance">
+              <p>{{ dataForm.banlance }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="备注" prop="remark">
+              <p>{{ dataForm.remark }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="创建时间" prop="creatorTime">
+              <p>{{ dataForm.creatorTime }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
+              <p>{{ dataForm.creatorUserId }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
+              <p>{{ dataForm.lastModifyTime }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
+              <p>{{ dataForm.lastModifyUserId }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+        </template>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
+  </el-dialog>
+</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: "",
+        clientId: "",
+        changeType: "",
+        orderNumber: "",
+        amount: "",
+        banlance: "",
+        remark: "",
+        creatorTime: "",
+        creatorUserId: "",
+        lastModifyTime: "",
+        lastModifyUserId: "",
+      },
+      changeTypeOptions: [
+        { fullName: "消费", id: "1" },
+        { fullName: "充值", id: "2" },
+        { fullName: "提现", id: "3" },
+      ],
+      changeTypeProps: { 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;
+    },
+
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true;
+          request({
+            url: "/api/scm/ClientAccountDetail/detail/" + this.dataForm.id,
+            method: "get",
+          }).then((res) => {
+            this.dataInfo(res.data);
+            this.loading = false;
+          });
+        }
+      });
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,570 @@
+
+
+
+    <template>
+  <el-dialog
+    :title="!dataForm.id ? '新建' : '编辑'"
+    :close-on-click-modal="false"
+    append-to-body
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    width="600px"
+  >
+    <el-row :gutter="15" class="">
+      <el-form
+        ref="formRef"
+        :model="dataForm"
+        :rules="dataRule"
+        size="small"
+        label-width="100px"
+        label-position="right"
+      >
+        <template v-if="!loading">
+          <!-- 具体表单 -->
+          <el-col :span="8">
+            <jnpf-form-tip-item label="散户" prop="clientId">
+              <JnpfPopupSelect
+                v-model="dataForm.clientId"
+                @change="changeData('clientId', -1)"
+                :rowIndex="null"
+                :formData="dataForm"
+                :templateJson="interfaceRes.clientId"
+                placeholder="请选择"
+                hasPage
+                propsValue="id"
+                popupWidth="800px"
+                popupTitle="选择数据"
+                popupType="dialog"
+                relationField="nick_name"
+                field="clientId"
+                interfaceId="537982260289215173"
+                :pageSize="20"
+                :columnOptions="clientIdcolumnOptions"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfPopupSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="变动类型" prop="changeType">
+              <JnpfSelect
+                v-model="dataForm.changeType"
+                @change="changeData('changeType', -1)"
+                placeholder="请选择"
+                clearable
+                :style="{ width: '100%' }"
+                :options="changeTypeOptions"
+                :props="changeTypeProps"
+              >
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="订单编号" prop="orderNumber">
+              <JnpfInput
+                v-model="dataForm.orderNumber"
+                @change="changeData('orderNumber', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="金额" prop="amount">
+              <JnpfInput
+                v-model="dataForm.amount"
+                @change="changeData('amount', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="账户余额" prop="banlance">
+              <JnpfInput
+                v-model="dataForm.banlance"
+                @change="changeData('banlance', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="备注" prop="remark">
+              <JnpfInput
+                v-model="dataForm.remark"
+                @change="changeData('remark', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="创建时间" prop="creatorTime">
+              <JnpfOpenData
+                v-model="dataForm.creatorTime"
+                @change="changeData('creatorTime', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+                type="currTime"
+              >
+              </JnpfOpenData>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="8">
+            <jnpf-form-tip-item label="创建用户" prop="creatorUserId">
+              <JnpfOpenData
+                v-model="dataForm.creatorUserId"
+                @change="changeData('creatorUserId', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+                type="currUser"
+              >
+              </JnpfOpenData>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
+              <JnpfInput
+                v-model="dataForm.lastModifyTime"
+                @change="changeData('lastModifyTime', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
+              <JnpfInput
+                v-model="dataForm.lastModifyUserId"
+                @change="changeData('lastModifyUserId', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </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>
+    <span slot="footer" class="dialog-footer">
+      <div class="upAndDown-button" v-if="dataForm.id">
+        <el-button @click="prev" :disabled="prevDis">
+          {{ "上一条" }}
+        </el-button>
+        <el-button @click="next" :disabled="nextDis">
+          {{ "下一条" }}
+        </el-button>
+      </div>
+      <el-button
+        type="primary"
+        @click="dataFormSubmit(2)"
+        :loading="continueBtnLoading"
+      >
+        {{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button
+      >
+      <el-button @click="visible = false"> 取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+        确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</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: {
+        clientId: undefined,
+        changeType: undefined,
+        orderNumber: undefined,
+        amount: undefined,
+        banlance: undefined,
+        remark: undefined,
+        creatorTime: undefined,
+        creatorUserId: undefined,
+        lastModifyTime: undefined,
+        lastModifyUserId: undefined,
+      },
+      tableRequiredData: {},
+      dataRule: {},
+      clientIdcolumnOptions: [{ label: "名称", value: "nick_name" }],
+      changeTypeOptions: [
+        { fullName: "消费", id: "1" },
+        { fullName: "充值", id: "2" },
+        { fullName: "提现", id: "3" },
+      ],
+      changeTypeProps: { label: "fullName", value: "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        clientId: [],
+        changeType: [],
+        orderNumber: [],
+        amount: [],
+        banlance: [],
+        remark: [],
+        creatorTime: [],
+        creatorUserId: [],
+        lastModifyTime: [],
+        lastModifyUserId: [],
+      },
+    };
+  },
+  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/ClientAccountDetail/" + 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() {},
+    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/ClientAccountDetail/" + 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/ClientAccountDetail",
+          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/ClientAccountDetail/" + 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/clientaccountdetail/index.vue

@@ -0,0 +1,557 @@
+
+
+
+
+
+
+
+<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="变动类型">
+              <JnpfSelect
+                v-model="query.changeType"
+                placeholder="请选择"
+                clearable
+                :options="changeTypeOptions"
+                :props="changeTypeProps"
+                multiple
+              >
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="订单编号">
+              <el-input
+                v-model="query.orderNumber"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="金额">
+              <el-input v-model="query.amount" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="账户余额">
+                <el-input
+                  v-model="query.banlance"
+                  placeholder="请输入"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="reset()"
+                >重置</el-button
+              >
+              <el-button
+                type="text"
+                icon="el-icon-arrow-down"
+                @click="showAll = true"
+                v-if="!showAll"
+              >
+                展开
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-arrow-up"
+                @click="showAll = false"
+                v-else
+              >
+                收起
+              </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="clientId" label="散户" align="left">
+          </el-table-column>
+          <el-table-column label="变动类型" prop="changeType" algin="left">
+            <template slot-scope="scope">
+              {{ scope.row.changeType }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="orderNumber" label="订单编号" align="left">
+          </el-table-column>
+          <el-table-column prop="amount" label="金额" align="left">
+          </el-table-column>
+          <el-table-column prop="banlance" label="账户余额" align="left">
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" align="left">
+          </el-table-column>
+          <el-table-column prop="creatorTime" label="创建时间" align="left">
+          </el-table-column>
+          <el-table-column prop="creatorUserId" 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,
+
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        changeType: undefined,
+        orderNumber: undefined,
+        amount: undefined,
+        banlance: 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,
+      changeTypeOptions: [
+        { fullName: "消费", id: "1" },
+        { fullName: "充值", id: "2" },
+        { fullName: "提现", id: "3" },
+      ],
+      changeTypeProps: { label: "fullName", value: "id" },
+      interfaceRes: {
+        clientId: [],
+      },
+    };
+  },
+  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: "537978999461124805",
+        type: 1,
+      };
+      request({
+        url: `/api/scm/ClientAccountDetail/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/ClientAccountDetail/${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/ClientAccountDetail");
+      });
+    },
+    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/ClientAccountDetail/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/enterpriseaccountbill/index.vue

@@ -99,14 +99,14 @@
       </el-row>
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
-          <div>
+          <!-- <div>
             <el-button
               type="primary"
               icon="icon-ym icon-ym-btn-add"
               @click="addOrUpdateHandle()"
               >新增
             </el-button>
-          </div>
+          </div> -->
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
               <el-link
@@ -182,7 +182,7 @@
           </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 type="text" @click="addOrUpdateHandle(scope.row)"
                 >编辑
               </el-button>
               <el-button
@@ -190,7 +190,7 @@
                 class="JNPF-table-delBtn"
                 @click="handleDel(scope.row.id)"
                 >删除
-              </el-button>
+              </el-button> -->
               <el-button type="text" @click="goDetail(scope.row.id)"
                 >详情
               </el-button>

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

@@ -1,99 +1,138 @@
 <template>
   <transition name="el-zoom-in-center">
     <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">
         <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="default" label-width="100px"
-          label-position="right">
+      <el-row
+        :gutter="15"
+        class="main"
+        :style="{ margin: '0 auto', width: '100%' }"
+      >
+        <el-form
+          ref="formRef"
+          :model="dataForm"
+          size="default"
+          label-width="100px"
+          label-position="right"
+        >
           <template v-if="!loading">
             <el-col :span="24">
               <jnpf-form-tip-item label-width="0">
-                <JnpfGroupTitle contentPosition="left" :closable="false" content="基础信息">
+                <JnpfGroupTitle
+                  contentPosition="left"
+                  :closable="false"
+                  content="基础信息"
+                >
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站编号" prop="stationCode">
-                <p>{{dataForm.stationCode}}</p>
+                <p>{{ dataForm.stationCode }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站名称" prop="stationName">
-                <p>{{dataForm.stationName}}</p>
+                <p>{{ dataForm.stationName }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站简称" prop="shortName">
-                <p>{{dataForm.shortName}}</p>
+                <p>{{ dataForm.shortName }}</p>
               </jnpf-form-tip-item>
             </el-col>
+
+            <el-col :span="8">
+              <jnpf-form-tip-item label="公司企业" prop="enterpriseId">
+                <p>{{ dataForm.enterpriseId }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+
             <el-col :span="8">
               <jnpf-form-tip-item label="经营模式" prop="managementModel">
-                <p>{{dataForm.managementModel}}</p>
+                <p>{{ dataForm.managementModel }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="所在城市" prop="city">
-                <p>{{dataForm.city}}</p>
+                <p>{{ dataForm.city }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收类目" prop="recycleTypeIds">
-                <p>{{dataForm.recycleTypeIds}}</p>
+                <p>{{ dataForm.recycleTypeIds }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="首联系人" prop="firstContactPerson">
-                <p>{{dataForm.firstContactPerson}}</p>
+                <p>{{ dataForm.firstContactPerson }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
-              <jnpf-form-tip-item label="职位" prop="firstContactPersonPosition">
-                <p>{{dataForm.firstContactPersonPosition}}</p>
+              <jnpf-form-tip-item
+                label="职位"
+                prop="firstContactPersonPosition"
+              >
+                <p>{{ dataForm.firstContactPersonPosition }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="手机号码" prop="firstContactPersonTel">
-                <p>{{dataForm.firstContactPersonTel}}</p>
+                <p>{{ dataForm.firstContactPersonTel }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站状态" prop="stationStatus">
-                <p>{{dataForm.stationStatus}}</p>
+                <p>{{ dataForm.stationStatus }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
               <jnpf-form-tip-item label-width="0">
-                <JnpfGroupTitle contentPosition="left" :closable="false" content="详细信息">
+                <JnpfGroupTitle
+                  contentPosition="left"
+                  :closable="false"
+                  content="详细信息"
+                >
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收站照片" prop="stationImg">
-                <JnpfUploadImg v-model="dataForm.stationImg" disabled detailed :fileSize="10"
-                  sizeUnit="MB" :limit="1" pathType="defaultPath" :isAccount="0">
+                <JnpfUploadImg
+                  v-model="dataForm.stationImg"
+                  disabled
+                  detailed
+                  :fileSize="10"
+                  sizeUnit="MB"
+                  :limit="1"
+                  pathType="defaultPath"
+                  :isAccount="0"
+                >
                 </JnpfUploadImg>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="详细地址" prop="address">
-                <p>{{dataForm.address}}</p>
+                <p>{{ dataForm.address }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="8">
               <jnpf-form-tip-item label="回收电话" prop="recycleTel">
-                <p>{{dataForm.recycleTel}}</p>
+                <p>{{ dataForm.recycleTel }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="16">
               <jnpf-form-tip-item label="回收站介绍" prop="stationDescription">
-                <p>{{dataForm.stationDescription}}</p>
+                <p>{{ dataForm.stationDescription }}</p>
               </jnpf-form-tip-item>
             </el-col>
             <el-col :span="24">
@@ -101,16 +140,21 @@
                 <div class="JNPF-common-title">
                   <h2>价格配置</h2>
                 </div>
-                <el-table :data="dataForm.tableField135" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table :data="dataForm.tableField135" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
                   <el-table-column prop="recycleTypeId" label="回收类目">
                     <template slot-scope="scope">
-                      <p>{{scope.row.recycleTypeId}}</p>
+                      <p>{{ scope.row.recycleTypeId }}</p>
                     </template>
                   </el-table-column>
                   <el-table-column prop="unitPrice" label="单价(kg)">
                     <template slot-scope="scope">
-                      <p>{{scope.row.unitPrice}}</p>
+                      <p>{{ scope.row.unitPrice }}</p>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -118,7 +162,11 @@
             </el-col>
             <el-col :span="24">
               <jnpf-form-tip-item label-width="0">
-                <JnpfGroupTitle contentPosition="left" :closable="false" content="业务配置">
+                <JnpfGroupTitle
+                  contentPosition="left"
+                  :closable="false"
+                  content="业务配置"
+                >
                 </JnpfGroupTitle>
               </jnpf-form-tip-item>
             </el-col>
@@ -126,17 +174,23 @@
               <el-card class="mb-20" shadow="never" header="营业时间配置">
                 <el-col :span="12">
                   <jnpf-form-tip-item label="营业时间" prop="businessDays">
-                    <p>{{ dataForm.businessDays }} </p>
+                    <p>{{ dataForm.businessDays }}</p>
                   </jnpf-form-tip-item>
                 </el-col>
                 <el-col :span="6">
-                  <jnpf-form-tip-item label="营业时间起" prop="appointmentTimeStart">
-                    <p>{{dataForm.appointmentTimeStart}}</p>
+                  <jnpf-form-tip-item
+                    label="营业时间起"
+                    prop="appointmentTimeStart"
+                  >
+                    <p>{{ dataForm.appointmentTimeStart }}</p>
                   </jnpf-form-tip-item>
                 </el-col>
                 <el-col :span="6">
-                  <jnpf-form-tip-item label="营业时间止" prop="appointmentTimeEnd">
-                    <p>{{dataForm.appointmentTimeEnd}}</p>
+                  <jnpf-form-tip-item
+                    label="营业时间止"
+                    prop="appointmentTimeEnd"
+                  >
+                    <p>{{ dataForm.appointmentTimeEnd }}</p>
                   </jnpf-form-tip-item>
                 </el-col>
               </el-card>
@@ -145,7 +199,7 @@
               <el-card class="mb-20" shadow="never" header="接单范围配置">
                 <el-col :span="8">
                   <jnpf-form-tip-item label="接单范围" prop="acceptRange">
-                    <p>{{ dataForm.acceptRange }} </p>
+                    <p>{{ dataForm.acceptRange }}</p>
                   </jnpf-form-tip-item>
                 </el-col>
               </el-card>
@@ -155,11 +209,16 @@
                 <div class="JNPF-common-title">
                   <h2>范围内小区</h2>
                 </div>
-                <el-table :data="dataForm.tableField119" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table :data="dataForm.tableField119" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
                   <el-table-column prop="housingEstateId" label="小区id">
                     <template slot-scope="scope">
-                      <p>{{scope.row.housingEstateId}}</p>
+                      <p>{{ scope.row.housingEstateId }}</p>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -172,12 +231,12 @@
   </transition>
 </template>
 <script>
-import request from '@/utils/request'
+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"
+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: [],
@@ -188,21 +247,21 @@ export default {
       loading: false,
 
       dataForm: {
-        id: '',
-        stationCode: '',
-        stationName: '',
-        shortName: '',
+        id: "",
+        stationCode: "",
+        stationName: "",
+        shortName: "",
         managementModel: "",
         city: [],
         recycleTypeIds: "",
-        firstContactPerson: '',
-        firstContactPersonPosition: '',
-        firstContactPersonTel: '',
+        firstContactPerson: "",
+        firstContactPersonPosition: "",
+        firstContactPersonTel: "",
         stationStatus: 1,
         stationImg: [],
-        address: '',
-        recycleTel: '',
-        stationDescription: '',
+        address: "",
+        recycleTel: "",
+        stationDescription: "",
         businessDays: [],
         appointmentTimeStart: "",
         appointmentTimeEnd: "",
@@ -210,61 +269,70 @@ export default {
         recyclestationpriceList: [],
         recyclestationhousingestateList: [],
       },
-      managementModelProps: { "label": "fullName", "value": "id" },
-      recycleTypeIdsProps: { "label": "fullName", "value": "id" },
-      businessDaysOptions: [{ "fullName": "周一", "id": "1" }, { "fullName": "周二", "id": "2" }, { "fullName": "周三", "id": "3" }, { "fullName": "周四", "id": "4" }, { "fullName": "周五", "id": "5" }, { "fullName": "周六", "id": "6" }, { "fullName": "周日", "id": "7" }],
-      businessDaysProps: { "label": "fullName", "value": "id" },
-      acceptRangeOptions: [{ "fullName": "无限制", "id": "0" }, { "fullName": "1KM", "id": "1" }, { "fullName": "3KM", "id": "3" }, { "fullName": "5KM", "id": "5" }],
-      acceptRangeProps: { "label": "fullName", "value": "id" },
+      managementModelProps: { label: "fullName", value: "id" },
+      recycleTypeIdsProps: { label: "fullName", value: "id" },
+      businessDaysOptions: [
+        { fullName: "周一", id: "1" },
+        { fullName: "周二", id: "2" },
+        { fullName: "周三", id: "3" },
+        { fullName: "周四", id: "4" },
+        { fullName: "周五", id: "5" },
+        { fullName: "周六", id: "6" },
+        { fullName: "周日", id: "7" },
+      ],
+      businessDaysProps: { label: "fullName", value: "id" },
+      acceptRangeOptions: [
+        { fullName: "无限制", id: "0" },
+        { fullName: "1KM", id: "1" },
+        { fullName: "3KM", id: "3" },
+        { fullName: "5KM", id: "5" },
+      ],
+      acceptRangeProps: { label: "fullName", value: "id" },
 
-      recycleTypeIdProps: { "label": "fullName", "value": "id" },
-    }
+      recycleTypeIdProps: { label: "fullName", value: "id" },
+    };
   },
   computed: {},
   watch: {},
-  created() {
-
-  },
-  mounted() { },
+  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
+      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)
-        })
-      })
+          this.$refs.Detail.init(formData, modelId, defaultValue);
+        });
+      });
     },
     dataInfo(dataAll) {
-      let _dataAll = dataAll
-      this.dataForm = _dataAll
+      let _dataAll = dataAll;
+      this.dataForm = _dataAll;
     },
 
     goBack() {
-      this.$emit('refresh')
+      this.$emit("refresh");
     },
     init(id) {
       this.dataForm.id = id || 0;
       this.visible = true;
       this.$nextTick(() => {
         if (this.dataForm.id) {
-          this.loading = true
+          this.loading = true;
           request({
-            url: '/api/scm/Enterpriserecyclestation/detail/' + this.dataForm.id,
-            method: 'get'
-          }).then(res => {
-            this.dataInfo(res.data)
-            this.loading = false
-          })
+            url: "/api/scm/Enterpriserecyclestation/detail/" + this.dataForm.id,
+            method: "get",
+          }).then((res) => {
+            this.dataInfo(res.data);
+            this.loading = false;
+          });
         }
-
-      })
+      });
     },
   },
-}
-
+};
 </script>

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

@@ -88,6 +88,22 @@
                 </JnpfInput>
               </jnpf-form-tip-item>
             </el-col>
+
+            <el-col :span="8">
+              <jnpf-form-tip-item label="公司企业" prop="enterpriseId">
+                <JnpfOrganizeSelect
+                  v-model="dataForm.enterpriseId"
+                  @change="changeData('enterpriseId', -1)"
+                  placeholder="请选择"
+                  selectType="all"
+                  :ableIds="ableAll.enterpriseIdableIds"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfOrganizeSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+
             <el-col :span="8">
               <jnpf-form-tip-item
                 class="site-item"
@@ -640,6 +656,7 @@ export default {
       Vmodel: "",
       currVmodel: "",
       dataForm: {
+        enterpriseId: [],
         stationCode: undefined,
         stationName: undefined,
         address: undefined, // 站点位置
@@ -807,6 +824,7 @@ export default {
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
+        enterpriseId: [],
         stationCode: [],
         stationName: [],
         shortName: [],
@@ -1047,7 +1065,16 @@ export default {
     },
 
     //初始化默认数据
+    // initDefaultData() {
+    //   this.dataForm.firstContactPerson = this.userInfo.userId;
+    // },
     initDefaultData() {
+      if (
+        this.userInfo.organizeIdList instanceof Array &&
+        this.userInfo.organizeIdList.length > 0
+      ) {
+        this.dataForm.enterpriseId = this.userInfo.organizeIdList;
+      }
       this.dataForm.firstContactPerson = this.userInfo.userId;
     },
     // 表单提交

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

@@ -154,13 +154,13 @@
                     </template>
                   </el-table-column>
 
-                  <el-table-column label="单位" prop="units">
+                  <el-table-column label="单位" prop="unit">
                     <template slot="header" v-if="false">
                       <span class="required-sign"></span>单位
                     </template>
                     <template slot-scope="scope">
                       <JnpfInput
-                        v-model="scope.row.units"
+                        v-model="scope.row.unit"
                         disabled
                         @change="
                           changeData('nxpriceproduct-units', scope.$index)
@@ -225,7 +225,11 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <div class="table-actions" @click="addnxpriceproductList()">
+                <!-- <div class="table-actions" @click="addnxpriceproductList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div> -->
+
+                <div class="table-actions" @click="choice()">
                   <el-button type="text" icon="el-icon-plus">添加</el-button>
                 </div>
               </jnpf-form-tip-item>
@@ -319,6 +323,12 @@
           @close="selectDialogVisible = false"
         />
       </el-row>
+
+      <ProductBox
+        v-if="productBoxxVisible"
+        ref="ProductBoxs"
+        @refreshDataList="initList"
+      />
     </div>
   </transition>
 </template>
@@ -339,8 +349,11 @@ import {
   getLaterTime,
 } from "@/components/Generator/utils/index.js";
 import { thousandsFormat } from "@/components/Generator/utils/index";
+
+import ProductBox from "@/views/publicPopup/productBox";
+
 export default {
-  components: {},
+  components: { ProductBox },
   props: [],
   data() {
     return {
@@ -357,6 +370,7 @@ export default {
       setting: {},
       eventType: "",
       userBoxVisible: false,
+      productBoxxVisible: false,
       selectDialogVisible: false,
       currTableConf: {},
       dataValueAll: {},
@@ -620,6 +634,33 @@ export default {
       });
       this.$store.commit("generator/UPDATE_RELATION_DATA", {});
     },
+
+    choice() {
+      this.productBoxxVisible = true;
+      let excludeIdList = [];
+      for (let i = 0; i < this.dataForm.nxPriceProductList.length; i++) {
+        excludeIdList.push(this.dataForm.nxPriceProductList[i].productId);
+      }
+      this.$nextTick(() => {
+        this.$refs.ProductBoxs.init(excludeIdList);
+      });
+    },
+    initList(list) {
+      for (let i = 0; i < list.length; i++) {
+        const e = list[i];
+        let item = {
+          productId: e.id,
+          name: e.name,
+          code: e.code,
+          spec: e.spec,
+          unit: e.unit,
+          // hasSchedule: e.hasSchedule,
+          // recycleAddress: e.recycleAddress,
+        };
+        this.dataForm.nxPriceProductList.push(item);
+      }
+    },
+
     //初始化默认数据
     initDefaultData() {
       if (

jnpf-java-boot/jnpf-web/src/views/publicPopup/enterpriseRecycleStationBox.vue

@@ -0,0 +1,180 @@
+<template>
+  <el-dialog
+    title="选择商品"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    append-to-body
+    width="800px"
+  >
+    <el-row class="JNPF-common-search-box" :gutter="16">
+      <el-form @submit.native.prevent>
+        <el-col :span="10">
+          <el-form-item label="关键词">
+            <el-input
+              v-model="keyword"
+              placeholder="请输入关键词查询"
+              clearable
+              @keyup.enter.native="search()"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search()"
+              >{{ $t("common.search") }}
+            </el-button>
+            <el-button icon="el-icon-refresh-right" @click="refresh()"
+              >{{ $t("common.reset") }}
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div class="JNPF-common-search-box-right">
+        <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="search()"
+          />
+        </el-tooltip>
+      </div>
+    </el-row>
+    <JNPF-table
+      v-loading="listLoading"
+      :data="list"
+      hasC
+      @selection-change="handleSelectionChange"
+      :border="false"
+    >
+      <el-table-column prop="name" label="小区名" align="left">
+      </el-table-column>
+      <el-table-column prop="address" label="小区详细地址" align="left">
+      </el-table-column>
+      <el-table-column prop="longitude" label="经度" align="left">
+      </el-table-column>
+      <el-table-column prop="latitude" label="纬度" align="left">
+      </el-table-column>
+      <el-table-column
+        prop="hasSchedule"
+        label="是否是定时定点回收"
+        align="left"
+      >
+      </el-table-column>
+      <el-table-column prop="recycleAddress" label="定点回收地址" align="left">
+      </el-table-column>
+    </JNPF-table>
+    <pagination
+      :total="total"
+      :page.sync="listQuery.currentPage"
+      :limit.sync="listQuery.pageSize"
+      @pagination="init"
+    />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{
+        $t("common.cancelButton")
+      }}</el-button>
+      <el-button type="primary" @click="select()">{{
+        $t("common.confirmButton")
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import request from "@/utils/request";
+import { GoodsList } from "@/api/extend/order";
+export default {
+  data() {
+    return {
+      visible: false,
+      listLoading: true,
+      keyword: "",
+      list: [],
+      total: 0,
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      excludeIdList: [],
+      checked: [],
+    };
+  },
+  methods: {
+    init(excludeIdList) {
+      this.visible = true;
+      this.listLoading = true;
+      if (excludeIdList) {
+        this.excludeIdList = excludeIdList;
+      }
+      let query = {
+        ...this.listQuery,
+        keyword: this.keyword,
+        excludeIdList: this.excludeIdList,
+        dataType: 0,
+      };
+      /* GoodsList(query).then(res => {
+          this.list = res.data.list
+          this.listLoading = false
+        }) */
+      request({
+        url: `/api/scm/HousingEstate/getList`,
+        method: "post",
+        data: query,
+      }).then((res) => {
+        this.list = res.data.list;
+        this.listLoading = false;
+        this.total = res.data.pagination.total;
+      });
+    },
+    refresh() {
+      this.keyword = "";
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    select() {
+      if (!this.checked.length) return;
+      this.visible = false;
+      this.$emit("refreshDataList", this.checked);
+    },
+    handleSelectionChange(val) {
+      this.checked = val;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  height: 70vh;
+  padding: 0 0 10px !important;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .JNPF-common-search-box {
+    margin-bottom: 0;
+
+    .JNPF-common-search-box-right {
+      padding: 10px 10px 0 0;
+    }
+  }
+}
+</style>

jnpf-java-boot/jnpf-web/src/views/publicPopup/productBox.vue

@@ -0,0 +1,170 @@
+<template>
+  <el-dialog
+    title="选择商品"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    append-to-body
+    width="800px"
+  >
+    <el-row class="JNPF-common-search-box" :gutter="16">
+      <el-form @submit.native.prevent>
+        <el-col :span="10">
+          <el-form-item label="关键词">
+            <el-input
+              v-model="keyword"
+              placeholder="请输入关键词查询"
+              clearable
+              @keyup.enter.native="search()"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search()"
+              >{{ $t("common.search") }}
+            </el-button>
+            <el-button icon="el-icon-refresh-right" @click="refresh()"
+              >{{ $t("common.reset") }}
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div class="JNPF-common-search-box-right">
+        <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="search()"
+          />
+        </el-tooltip>
+      </div>
+    </el-row>
+    <JNPF-table
+      v-loading="listLoading"
+      :data="list"
+      hasC
+      @selection-change="handleSelectionChange"
+      :border="false"
+    >
+      <el-table-column prop="name" label="名称" align="left"> </el-table-column>
+      <el-table-column prop="code" label="编码" align="left"> </el-table-column>
+      <el-table-column prop="spec" label="规格" align="left"> </el-table-column>
+      <el-table-column prop="unit" label="单位" align="left"> </el-table-column>
+      <el-table-column prop="description" label="描述" align="left">
+      </el-table-column>
+    </JNPF-table>
+    <pagination
+      :total="total"
+      :page.sync="listQuery.currentPage"
+      :limit.sync="listQuery.pageSize"
+      @pagination="init"
+    />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{
+        $t("common.cancelButton")
+      }}</el-button>
+      <el-button type="primary" @click="select()">{{
+        $t("common.confirmButton")
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import request from "@/utils/request";
+import { GoodsList } from "@/api/extend/order";
+export default {
+  data() {
+    return {
+      visible: false,
+      listLoading: true,
+      keyword: "",
+      list: [],
+      total: 0,
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      excludeIdList: [],
+      checked: [],
+    };
+  },
+  methods: {
+    init(excludeIdList) {
+      this.visible = true;
+      this.listLoading = true;
+      if (excludeIdList) {
+        this.excludeIdList = excludeIdList;
+      }
+      let query = {
+        ...this.listQuery,
+        keyword: this.keyword,
+        excludeIdList: this.excludeIdList,
+        dataType: 0,
+      };
+      /* GoodsList(query).then(res => {
+          this.list = res.data.list
+          this.listLoading = false
+        }) */
+      request({
+        url: `/api/scm/NxProduct/getList`,
+        method: "post",
+        data: query,
+      }).then((res) => {
+        this.list = res.data.list;
+        this.listLoading = false;
+        this.total = res.data.pagination.total;
+      });
+    },
+    refresh() {
+      this.keyword = "";
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    select() {
+      if (!this.checked.length) return;
+      this.visible = false;
+      this.$emit("refreshDataList", this.checked);
+    },
+    handleSelectionChange(val) {
+      this.checked = val;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  height: 70vh;
+  padding: 0 0 10px !important;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .JNPF-common-search-box {
+    margin-bottom: 0;
+
+    .JNPF-common-search-box-right {
+      padding: 10px 10px 0 0;
+    }
+  }
+}
+</style>