添加商品类目，添加价格中心，首页申请入住添加

jnpf-java-boot/jnpf-admin/src/main/resources/application.yml

@@ -107,6 +107,9 @@ gateway:
     - /api/scm/login/hsyLogin
     - /api/scm/login/test
     - /api/scm/Client/test
+    - /api/permission/Organize
+    - /api/permission/Organize/POST
+
   exclude-url:
   #  # 配置示例
   #- /api/message/Notice

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

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

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

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

jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/entity/OrganizeEntity.java

@@ -57,4 +57,28 @@ public class OrganizeEntity extends PermissionEntityBase{
      */
     @TableField("F_ORGANIZE_ID_TREE")
     private String organizeIdTree;
+
+    /**
+     * 注册人手持身份证照片
+     */
+    @TableField("REGISTRANT_PICTURES")
+    private String registrant_pictures;
+
+    /**
+     * 社会信用代码证照片
+     */
+    @TableField("SOCIETY_PICTURES")
+    private String society_pictures;
+
+    /**
+     * 商户logo
+     */
+    @TableField("PICTURES")
+    private String pictures;
+
+    /**
+     * 验证码
+     */
+    @TableField("CODE")
+    private String code;
 }

jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrForm.java

@@ -1,5 +1,6 @@
 package jnpf.permission.model.organize;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -29,4 +30,11 @@ public class OrganizeCrForm {
     private OrganizeCrModel propertyJson;
     @Schema(description = "排序")
     private Long sortCode;
+
+
+
+    private Object registrantPictures;
+    private Object societyPictures;
+    private Object pictures;
+    private String code;
 }

jnpf-java-boot/jnpf-permission/jnpf-permission-entity/src/main/java/jnpf/permission/model/organize/OrganizeCrModel.java

@@ -33,6 +33,13 @@ public class OrganizeCrModel {
     @Schema(description = "公司性质")
     private String enterpriseNature;
     private String fax;
-    private String telePhone;
+    private String registeredAddress;
+    private String socialCreditCode;
+    private String registeredName;
+    private String idCard;
+
+
+
+
 
 }

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.nxprice.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * nxPrice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+public interface NxPriceProductService extends IService<NxPriceProductEntity> {
+    QueryWrapper<NxPriceProductEntity> getChild(NxPricePagination pagination,QueryWrapper<NxPriceProductEntity> nxPriceProductQueryWrapper);
+}

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

@@ -0,0 +1,18 @@
+package jnpf.service;
+
+import jnpf.model.nxprice.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * nxPrice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+public interface NxPriceRecycleService extends IService<NxPriceRecycleEntity> {
+    QueryWrapper<NxPriceRecycleEntity> getChild(NxPricePagination pagination,QueryWrapper<NxPriceRecycleEntity> nxPriceRecycleQueryWrapper);
+}

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

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

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

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

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

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.NxPriceProductMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.nxprice.*;
+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 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;
+/**
+ *
+ * nxPrice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Service
+public class NxPriceProductServiceImpl extends ServiceImpl<NxPriceProductMapper, NxPriceProductEntity> implements NxPriceProductService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<NxPriceProductEntity> getChild(NxPricePagination pagination, QueryWrapper<NxPriceProductEntity> nxPriceProductQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?NxPriceConstant.getColumnData():NxPriceConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return nxPriceProductQueryWrapper;
+    }
+}

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

@@ -0,0 +1,59 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.NxPriceRecycleMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.nxprice.*;
+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 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;
+/**
+ *
+ * nxPrice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Service
+public class NxPriceRecycleServiceImpl extends ServiceImpl<NxPriceRecycleMapper, NxPriceRecycleEntity> implements NxPriceRecycleService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    //子表过滤方法
+    @Override
+    public QueryWrapper<NxPriceRecycleEntity> getChild(NxPricePagination pagination, QueryWrapper<NxPriceRecycleEntity> nxPriceRecycleQueryWrapper){
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    String ruleQueryJson = isPc?NxPriceConstant.getColumnData():NxPriceConstant.getAppColumnData();
+    ColumnDataModel dataModel = JsonUtil.getJsonToBean(ruleQueryJson,ColumnDataModel.class);
+    String ruleJson = isPc?JsonUtil.getObjectToString(dataModel.getRuleList()):JsonUtil.getObjectToString(dataModel.getRuleListApp());
+        if(isPc){
+        }
+        return nxPriceRecycleQueryWrapper;
+    }
+}

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

@@ -0,0 +1,539 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.NxPriceMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.nxprice.*;
+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;
+/**
+ *
+ * nxPrice
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Service
+public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity> implements NxPriceService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private NxPriceProductService nxPriceProductService;
+    @Autowired
+    private NxPriceRecycleService nxPriceRecycleService;
+    @Override
+    public List<NxPriceEntity> getList(NxPricePagination nxPricePagination){
+        return getTypeList(nxPricePagination,nxPricePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<NxPriceEntity> getTypeList(NxPricePagination nxPricePagination,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 ? NxPriceConstant.getAppColumnData() : NxPriceConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int nxPriceNum =0;
+        QueryWrapper<NxPriceEntity> nxPriceQueryWrapper=new QueryWrapper<>();
+        int nxPriceProductNum =0;
+        QueryWrapper<NxPriceProductEntity> nxPriceProductQueryWrapper=new QueryWrapper<>();
+        int nxPriceRecycleNum =0;
+        QueryWrapper<NxPriceRecycleEntity> nxPriceRecycleQueryWrapper=new QueryWrapper<>();
+        long nxPriceProductcount = nxPriceProductService.count();
+        long nxPriceRecyclecount = nxPriceRecycleService.count();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(nxPricePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = nxPricePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<NxPriceEntity> nxPriceSuperWrapper = new QueryWrapper<>();
+            nxPriceSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxPriceSuperWrapper,NxPriceEntity.class,queryJson,"0"));
+            int nxPriceNum1 = nxPriceSuperWrapper.getExpression().getNormal().size();
+            if (nxPriceNum1>0){
+                List<String> nxPriceList =this.list(nxPriceSuperWrapper).stream().map(NxPriceEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(nxPriceList);
+                intersectionSuperList.add(nxPriceList);
+                superNum++;
+            }
+            String nxPriceProductTable = "nx_price_product";
+            boolean nxPriceProductHasSql = queryJson.contains(nxPriceProductTable);
+            List<String> nxPriceProductList = generaterSwapUtil.selectIdsByChildCondition(NxPriceConstant.getTableList(), nxPriceProductTable , queryJson, null);
+            if (nxPriceProductHasSql){
+                allSuperList.addAll(nxPriceProductList);
+                intersectionSuperList.add(nxPriceProductList);
+                superNum++;
+            }
+            String nxPriceRecycleTable = "nx_price_recycle";
+            boolean nxPriceRecycleHasSql = queryJson.contains(nxPriceRecycleTable);
+            List<String> nxPriceRecycleList = generaterSwapUtil.selectIdsByChildCondition(NxPriceConstant.getTableList(), nxPriceRecycleTable , queryJson, null);
+            if (nxPriceRecycleHasSql){
+                allSuperList.addAll(nxPriceRecycleList);
+                intersectionSuperList.add(nxPriceRecycleList);
+                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<NxPriceEntity> nxPriceSuperWrapper = new QueryWrapper<>();
+            nxPriceSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxPriceSuperWrapper,NxPriceEntity.class,ruleJson,"0"));
+            int nxPriceNum1 = nxPriceSuperWrapper.getExpression().getNormal().size();
+            if (nxPriceNum1>0){
+                List<String> nxPriceList =this.list(nxPriceSuperWrapper).stream().map(NxPriceEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(nxPriceList);
+                intersectionRuleList.add(nxPriceList);
+                ruleNum++;
+            }
+            String nxPriceProductTable = "nx_price_product";
+            boolean nxPriceProductHasSql = ruleJson.contains(nxPriceProductTable);
+            List<String> nxPriceProductList = generaterSwapUtil.selectIdsByChildCondition(NxPriceConstant.getTableList(), nxPriceProductTable , ruleJson, null);
+            if (nxPriceProductHasSql){
+                allRuleList.addAll(nxPriceProductList);
+                intersectionRuleList.add(nxPriceProductList);
+                ruleNum++;
+            }
+            String nxPriceRecycleTable = "nx_price_recycle";
+            boolean nxPriceRecycleHasSql = ruleJson.contains(nxPriceRecycleTable);
+            List<String> nxPriceRecycleList = generaterSwapUtil.selectIdsByChildCondition(NxPriceConstant.getTableList(), nxPriceRecycleTable , ruleJson, null);
+            if (nxPriceRecycleHasSql){
+                allRuleList.addAll(nxPriceRecycleList);
+                intersectionRuleList.add(nxPriceRecycleList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxPriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceQueryWrapper,NxPriceEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceQueryWrapper = (QueryWrapper<NxPriceEntity>)nxPriceObj;
+        if( nxPriceQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceNum++;
+        }
+        }
+        Object nxPriceProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceProductQueryWrapper,NxPriceProductEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceProductObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceProductQueryWrapper = (QueryWrapper<NxPriceProductEntity>)nxPriceProductObj;
+        if( nxPriceProductQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceProductNum++;
+        }
+        }
+        Object nxPriceRecycleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceRecycleQueryWrapper,NxPriceRecycleEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceRecycleObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceRecycleQueryWrapper = (QueryWrapper<NxPriceRecycleEntity>)nxPriceRecycleObj;
+        if( nxPriceRecycleQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceRecycleNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxPriceObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceQueryWrapper,NxPriceEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceQueryWrapper = (QueryWrapper<NxPriceEntity>)nxPriceObj;
+        if( nxPriceQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceNum++;
+        }
+        }
+
+
+        Object nxPriceProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceProductQueryWrapper,NxPriceProductEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceProductObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceProductQueryWrapper = (QueryWrapper<NxPriceProductEntity>)nxPriceProductObj;
+        if( nxPriceProductQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceProductNum++;
+        }
+        }
+
+
+        Object nxPriceRecycleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxPriceRecycleQueryWrapper,NxPriceRecycleEntity.class,nxPricePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxPriceRecycleObj)){
+        return new ArrayList<>();
+        } else {
+        nxPriceRecycleQueryWrapper = (QueryWrapper<NxPriceRecycleEntity>)nxPriceRecycleObj;
+        if( nxPriceRecycleQueryWrapper.getExpression().getNormal().size()>0){
+        nxPriceRecycleNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(nxPricePagination.getPriceCode())){
+            nxPriceNum++;
+
+                String value = nxPricePagination.getPriceCode() instanceof List ?
+                    JsonUtil.getObjectToString(nxPricePagination.getPriceCode()) :
+                    String.valueOf(nxPricePagination.getPriceCode());
+                nxPriceQueryWrapper.lambda().like(NxPriceEntity::getPriceCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxPricePagination.getBuinessId())){
+            nxPriceNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] buinessId = JsonUtil.getJsonToBean(nxPricePagination.getBuinessId(),String[][].class);
+        for(int i=0;i<buinessId.length;i++){
+        if(buinessId[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(buinessId[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> buinessId = JsonUtil.getJsonToList(nxPricePagination.getBuinessId(),String.class);
+        if(buinessId.size()>0){
+            idList.add(JsonUtil.getObjectToString(buinessId));
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(nxPricePagination.getBuinessId()));
+        }
+        }
+        nxPriceQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(NxPriceEntity::getBuinessId, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxPricePagination.getPriceType())){
+            nxPriceNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] priceType = JsonUtil.getJsonToBean(nxPricePagination.getPriceType(),String[][].class);
+        for(int i=0;i<priceType.length;i++){
+        if(priceType[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(priceType[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> priceType = JsonUtil.getJsonToList(nxPricePagination.getPriceType(),String.class);
+        if(priceType.size()>0){
+            idList.addAll(priceType);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(nxPricePagination.getPriceType()));
+        }
+        }
+        nxPriceQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(NxPriceEntity::getPriceType, tt).or();
+        });
+        });
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxPricePagination.getCreatorUserId())){
+            nxPriceNum++;
+
+        nxPriceQueryWrapper.lambda().eq(NxPriceEntity::getCreatorUserId,nxPricePagination.getCreatorUserId());
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxPricePagination.getCreatorTime())){
+            nxPriceNum++;
+
+                List CreatorTimeList =  JsonUtil.getJsonToList(nxPricePagination.getCreatorTime(),String.class);
+                    Long fir = Long.valueOf(String.valueOf(CreatorTimeList.get(0)));
+                    Long sec = Long.valueOf(String.valueOf(CreatorTimeList.get(1)));
+
+                    nxPriceQueryWrapper.lambda().ge(NxPriceEntity::getCreatorTime, new Date(fir))
+                    .le(NxPriceEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+
+            }
+
+        }
+            if(nxPriceProductNum>0){
+            List<String> nxPriceProductIdList = nxPriceProductService.list(nxPriceProductQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getPriceId())).map(t->t.getPriceId()).collect(Collectors.toList());
+            long count = nxPriceProductService.count();
+            if (count>0){
+            intersectionList.add(nxPriceProductIdList);
+            }
+            AllIdList.addAll(nxPriceProductIdList);
+            }
+            total+=nxPriceProductNum;
+            if(nxPriceRecycleNum>0){
+            List<String> nxPriceRecycleIdList = nxPriceRecycleService.list(nxPriceRecycleQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getPriceId())).map(t->t.getPriceId()).collect(Collectors.toList());
+            long count = nxPriceRecycleService.count();
+            if (count>0){
+            intersectionList.add(nxPriceRecycleIdList);
+            }
+            AllIdList.addAll(nxPriceRecycleIdList);
+            }
+            total+=nxPriceRecycleNum;
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            nxPriceQueryWrapper.lambda().in(NxPriceEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            nxPriceQueryWrapper.lambda().and(t->t.in(NxPriceEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            nxPriceQueryWrapper.lambda().and(t->t.in(NxPriceEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        nxPriceQueryWrapper.lambda().isNull(NxPriceEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(nxPricePagination.getSidx())){
+            nxPriceQueryWrapper.lambda().orderByDesc(NxPriceEntity::getId);
+        }else{
+            try {
+                String sidx = nxPricePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                NxPriceEntity nxPriceEntity = new NxPriceEntity();
+                Field declaredField = nxPriceEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                nxPriceQueryWrapper="asc".equals(nxPricePagination.getSort().toLowerCase())?nxPriceQueryWrapper.orderByAsc(value):nxPriceQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<NxPriceEntity> page=new Page<>(nxPricePagination.getCurrentPage(), nxPricePagination.getPageSize());
+                IPage<NxPriceEntity> userIPage=this.page(page, nxPriceQueryWrapper);
+                return nxPricePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<NxPriceEntity> list = new ArrayList();
+                return nxPricePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(nxPriceQueryWrapper);
+        }
+    }
+    @Override
+    public NxPriceEntity getInfo(String id){
+        QueryWrapper<NxPriceEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(NxPriceEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(NxPriceEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, NxPriceEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(NxPriceEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** NxPriceProduct子表方法 */
+    @Override
+    public List<NxPriceProductEntity> getNxPriceProductList(String id,NxPricePagination nxPricePagination){
+        Map<String, Object> newtabMap=NxPriceConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="nxPriceProduct";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<NxPriceProductEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = nxPriceProductService.getChild(nxPricePagination,queryWrapper);
+        queryWrapper.lambda().eq(NxPriceProductEntity::getPriceId, id);
+        generaterSwapUtil.wrapperHandle(NxPriceConstant.getColumnData(), NxPriceConstant.getAppColumnData(), queryWrapper,NxPriceProductEntity.class,"sub",tableName);
+        return nxPriceProductService.list(queryWrapper);
+    }
+
+    /** NxPriceProduct子表方法 */
+    @Override
+    public List<NxPriceProductEntity> getNxPriceProductList(String id){
+        QueryWrapper<NxPriceProductEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(NxPriceProductEntity::getPriceId, id);
+        return nxPriceProductService.list(queryWrapper);
+    }
+    /** NxPriceRecycle子表方法 */
+    @Override
+    public List<NxPriceRecycleEntity> getNxPriceRecycleList(String id,NxPricePagination nxPricePagination){
+        Map<String, Object> newtabMap=NxPriceConstant.TABLEFIELDKEY.entrySet()
+        .stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
+        String tableName="nxPriceRecycle";
+        tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
+        QueryWrapper<NxPriceRecycleEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper = nxPriceRecycleService.getChild(nxPricePagination,queryWrapper);
+        queryWrapper.lambda().eq(NxPriceRecycleEntity::getPriceId, id);
+        generaterSwapUtil.wrapperHandle(NxPriceConstant.getColumnData(), NxPriceConstant.getAppColumnData(), queryWrapper,NxPriceRecycleEntity.class,"sub",tableName);
+        return nxPriceRecycleService.list(queryWrapper);
+    }
+
+    /** NxPriceRecycle子表方法 */
+    @Override
+    public List<NxPriceRecycleEntity> getNxPriceRecycleList(String id){
+        QueryWrapper<NxPriceRecycleEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(NxPriceRecycleEntity::getPriceId, id);
+        return nxPriceRecycleService.list(queryWrapper);
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(NxPriceForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        //子表字段验证
+            if (form.getNxPriceProductList()!=null){
+            }
+            if (form.getNxPriceRecycleList()!=null){
+            }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param nxPriceForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(NxPriceForm nxPriceForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        nxPriceForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(NxPriceConstant.getFormData(),nxPriceForm),NxPriceForm.class);
+        NxPriceEntity entity = JsonUtil.getJsonToBean(nxPriceForm, NxPriceEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+        entity.setPriceCode(generaterSwapUtil.getBillNumber("priceCode", false));
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        entity.setPriceCode(generaterSwapUtil.getBillNumber("priceCode", false));
+        entity.setCreatorUserId(userInfo.getUserId());
+        entity.setCreatorTime(DateUtil.getNowDate());
+        entity.setLastModifyTime(null);
+        entity.setLastModifyUserId(null);
+        }
+        this.saveOrUpdate(entity);
+
+        //NxPriceProduct子表数据新增修改
+        if(!isSave){
+            QueryWrapper<NxPriceProductEntity> NxPriceProductqueryWrapper = new QueryWrapper<>();
+            NxPriceProductqueryWrapper.lambda().eq(NxPriceProductEntity::getPriceId, entity.getId());
+            nxPriceProductService.remove(NxPriceProductqueryWrapper);
+        }
+        if (nxPriceForm.getNxPriceProductList()!=null){
+            List<NxPriceProductEntity> tableField106 = JsonUtil.getJsonToList(nxPriceForm.getNxPriceProductList(),NxPriceProductEntity.class);
+            for(NxPriceProductEntity entitys : tableField106){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setPriceId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                nxPriceProductService.saveOrUpdate(entitys);
+            }
+        }
+        //NxPriceRecycle子表数据新增修改
+        if(!isSave){
+            QueryWrapper<NxPriceRecycleEntity> NxPriceRecyclequeryWrapper = new QueryWrapper<>();
+            NxPriceRecyclequeryWrapper.lambda().eq(NxPriceRecycleEntity::getPriceId, entity.getId());
+            nxPriceRecycleService.remove(NxPriceRecyclequeryWrapper);
+        }
+        if (nxPriceForm.getNxPriceRecycleList()!=null){
+            List<NxPriceRecycleEntity> tableField114 = JsonUtil.getJsonToList(nxPriceForm.getNxPriceRecycleList(),NxPriceRecycleEntity.class);
+            for(NxPriceRecycleEntity entitys : tableField114){
+                entitys.setId(RandomUtil.uuId());
+                entitys.setPriceId(entity.getId());
+                if(isSave){
+                }else{
+                }
+                nxPriceRecycleService.saveOrUpdate(entitys);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,327 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.NxProductMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.nxproduct.*;
+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;
+/**
+ *
+ * nxProduct
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Service
+public class NxProductServiceImpl extends ServiceImpl<NxProductMapper, NxProductEntity> implements NxProductService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<NxProductEntity> getList(NxProductPagination nxProductPagination){
+        return getTypeList(nxProductPagination,nxProductPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<NxProductEntity> getTypeList(NxProductPagination nxProductPagination,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 ? NxProductConstant.getAppColumnData() : NxProductConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int nxProductNum =0;
+        QueryWrapper<NxProductEntity> nxProductQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(nxProductPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = nxProductPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<NxProductEntity> nxProductSuperWrapper = new QueryWrapper<>();
+            nxProductSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxProductSuperWrapper,NxProductEntity.class,queryJson,"0"));
+            int nxProductNum1 = nxProductSuperWrapper.getExpression().getNormal().size();
+            if (nxProductNum1>0){
+                List<String> nxProductList =this.list(nxProductSuperWrapper).stream().map(NxProductEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(nxProductList);
+                intersectionSuperList.add(nxProductList);
+                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<NxProductEntity> nxProductSuperWrapper = new QueryWrapper<>();
+            nxProductSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxProductSuperWrapper,NxProductEntity.class,ruleJson,"0"));
+            int nxProductNum1 = nxProductSuperWrapper.getExpression().getNormal().size();
+            if (nxProductNum1>0){
+                List<String> nxProductList =this.list(nxProductSuperWrapper).stream().map(NxProductEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(nxProductList);
+                intersectionRuleList.add(nxProductList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = true;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxProductQueryWrapper,NxProductEntity.class,nxProductPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxProductObj)){
+        return new ArrayList<>();
+        } else {
+        nxProductQueryWrapper = (QueryWrapper<NxProductEntity>)nxProductObj;
+        if( nxProductQueryWrapper.getExpression().getNormal().size()>0){
+        nxProductNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object nxProductObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxProductQueryWrapper,NxProductEntity.class,nxProductPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(nxProductObj)){
+        return new ArrayList<>();
+        } else {
+        nxProductQueryWrapper = (QueryWrapper<NxProductEntity>)nxProductObj;
+        if( nxProductQueryWrapper.getExpression().getNormal().size()>0){
+        nxProductNum++;
+        }
+        }
+
+
+    }
+    }
+        if(isPc){
+            if(ObjectUtil.isNotEmpty(nxProductPagination.getCode())){
+            nxProductNum++;
+
+                String value = nxProductPagination.getCode() instanceof List ?
+                    JsonUtil.getObjectToString(nxProductPagination.getCode()) :
+                    String.valueOf(nxProductPagination.getCode());
+                nxProductQueryWrapper.lambda().like(NxProductEntity::getCode,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxProductPagination.getName())){
+            nxProductNum++;
+
+                String value = nxProductPagination.getName() instanceof List ?
+                    JsonUtil.getObjectToString(nxProductPagination.getName()) :
+                    String.valueOf(nxProductPagination.getName());
+                nxProductQueryWrapper.lambda().like(NxProductEntity::getName,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxProductPagination.getSpec())){
+            nxProductNum++;
+
+                String value = nxProductPagination.getSpec() instanceof List ?
+                    JsonUtil.getObjectToString(nxProductPagination.getSpec()) :
+                    String.valueOf(nxProductPagination.getSpec());
+                nxProductQueryWrapper.lambda().like(NxProductEntity::getSpec,value);
+
+            }
+
+            if(ObjectUtil.isNotEmpty(nxProductPagination.getUnit())){
+            nxProductNum++;
+
+        List<String> idList = new ArrayList<>();
+        try {
+        String[][] unit = JsonUtil.getJsonToBean(nxProductPagination.getUnit(),String[][].class);
+        for(int i=0;i<unit.length;i++){
+        if(unit[i].length>0){
+        idList.add(JsonUtil.getObjectToString(Arrays.asList(unit[i])));
+        }
+        }
+        }catch (Exception e1){
+        try {
+        List<String> unit = JsonUtil.getJsonToList(nxProductPagination.getUnit(),String.class);
+        if(unit.size()>0){
+            idList.addAll(unit);
+        }
+        }catch (Exception e2){
+        idList.add(String.valueOf(nxProductPagination.getUnit()));
+        }
+        }
+        nxProductQueryWrapper.lambda().and(t->{
+        idList.forEach(tt->{
+        t.like(NxProductEntity::getUnit, tt).or();
+        });
+        });
+
+            }
+
+        }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            nxProductQueryWrapper.lambda().in(NxProductEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            nxProductQueryWrapper.lambda().and(t->t.in(NxProductEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            nxProductQueryWrapper.lambda().and(t->t.in(NxProductEntity::getId, finalAllRuleIDlist));
+        }
+        //假删除标志
+        nxProductQueryWrapper.lambda().isNull(NxProductEntity::getDeleteMark);
+
+        //排序
+        if(StringUtil.isEmpty(nxProductPagination.getSidx())){
+            nxProductQueryWrapper.lambda().orderByDesc(NxProductEntity::getId);
+        }else{
+            try {
+                String sidx = nxProductPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                NxProductEntity nxProductEntity = new NxProductEntity();
+                Field declaredField = nxProductEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                nxProductQueryWrapper="asc".equals(nxProductPagination.getSort().toLowerCase())?nxProductQueryWrapper.orderByAsc(value):nxProductQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<NxProductEntity> page=new Page<>(nxProductPagination.getCurrentPage(), nxProductPagination.getPageSize());
+                IPage<NxProductEntity> userIPage=this.page(page, nxProductQueryWrapper);
+                return nxProductPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<NxProductEntity> list = new ArrayList();
+                return nxProductPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(nxProductQueryWrapper);
+        }
+    }
+    @Override
+    public NxProductEntity getInfo(String id){
+        QueryWrapper<NxProductEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(NxProductEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(NxProductEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, NxProductEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(NxProductEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(NxProductForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+                if(StringUtil.isEmpty(form.getName())){
+                    return "名称不能为空";
+                }
+                if(StringUtil.isEmpty(form.getSpec())){
+                    return "规格不能为空";
+                }
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param nxProductForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(NxProductForm nxProductForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        nxProductForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(NxProductConstant.getFormData(),nxProductForm),NxProductForm.class);
+        NxProductEntity entity = JsonUtil.getJsonToBean(nxProductForm, NxProductEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+        entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
+            entity.setId(mainId);
+            entity.setVersion(0);
+        }else{
+        entity.setCode(generaterSwapUtil.getBillNumber("prodcut", false));
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

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

@@ -0,0 +1,404 @@
+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.nxprice.*;
+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.web.multipart.MultipartFile;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import java.io.File;
+import jnpf.onlinedev.model.ExcelImFieldModel;
+import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
+import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
+import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
+import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
+import cn.xuyanwu.spring.file.storage.FileInfo;
+import lombok.Cleanup;
+import jnpf.model.visualJson.config.HeaderModel;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.base.util.VisualUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * nxPrice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Slf4j
+@RestController
+@Tag(name = "nxPrice" , description = "scm")
+@RequestMapping("/api/scm/NxPrice")
+public class NxPriceController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private NxPriceService nxPriceService;
+
+    @Autowired
+    private NxPriceProductService nxPriceProductService;
+    @Autowired
+    private NxPriceRecycleService nxPriceRecycleService;
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param nxPricePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody NxPricePagination nxPricePagination)throws IOException{
+        List<NxPriceEntity> list= nxPriceService.getList(nxPricePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (NxPriceEntity entity : list) {
+        Map<String, Object> nxPriceMap=JsonUtil.entityToMap(entity);
+        nxPriceMap.put("id", nxPriceMap.get("id"));
+        //副表数据
+        //子表数据
+        List<NxPriceProductEntity> nxPriceProductList = nxPriceService.getNxPriceProductList(entity.getId(),nxPricePagination);
+        nxPriceMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceProductList)));
+        List<NxPriceRecycleEntity> nxPriceRecycleList = nxPriceService.getNxPriceRecycleList(entity.getId(),nxPricePagination);
+        nxPriceMap.put("tableField114",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceRecycleList)));
+            realList.add(nxPriceMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, NxPriceConstant.getFormData(), NxPriceConstant.getColumnData(), nxPricePagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(nxPricePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param nxPriceForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid NxPriceForm nxPriceForm) {
+        String b = nxPriceService.checkForm(nxPriceForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            nxPriceService.saveOrUpdate(nxPriceForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody NxPricePagination nxPricePagination) throws IOException {
+        if (StringUtil.isEmpty(nxPricePagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<NxPriceEntity> list= nxPriceService.getList(nxPricePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (NxPriceEntity entity : list) {
+        Map<String, Object> nxPriceMap=JsonUtil.entityToMap(entity);
+        nxPriceMap.put("id", nxPriceMap.get("id"));
+        //副表数据
+        //子表数据
+        List<NxPriceProductEntity> nxPriceProductList = nxPriceService.getNxPriceProductList(entity.getId(),nxPricePagination);
+        nxPriceMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceProductList)));
+        List<NxPriceRecycleEntity> nxPriceRecycleList = nxPriceService.getNxPriceRecycleList(entity.getId(),nxPricePagination);
+        nxPriceMap.put("tableField114",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceRecycleList)));
+            realList.add(nxPriceMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, NxPriceConstant.getFormData(), NxPriceConstant.getColumnData(), nxPricePagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(nxPricePagination.getSelectKey())?nxPricePagination.getSelectKey():new String[0];
+        UserInfo userInfo=userProvider.get();
+            DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 导出表格方法
+    */
+    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
+        DownloadVO vo=DownloadVO.builder().build();
+        List<ExcelExportEntity> entitys=new ArrayList<>();
+        if(keys.length>0){
+            ExcelExportEntity tableField106ExcelEntity = new ExcelExportEntity("","tableField106");
+            List<ExcelExportEntity> tableField106List = new ArrayList<>();
+            ExcelExportEntity tableField114ExcelEntity = new ExcelExportEntity("","tableField114");
+            List<ExcelExportEntity> tableField114List = new ArrayList<>();
+            for(String key:keys){
+                switch(key){
+                    case "priceCode" :
+                    entitys.add(new ExcelExportEntity("价格编号" ,"priceCode"));
+                    break;
+                    case "buinessId" :
+                    entitys.add(new ExcelExportEntity("报价方" ,"buinessId"));
+                    break;
+                    case "priceType" :
+                    entitys.add(new ExcelExportEntity("价格类型" ,"priceType"));
+                    break;
+                    case "creatorUserId" :
+                    entitys.add(new ExcelExportEntity("创建用户" ,"creatorUserId"));
+                    break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
+                    break;
+                    case "lastModifyTime" :
+                    entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
+                    break;
+                    case "lastModifyUserId" :
+                    entitys.add(new ExcelExportEntity("修改用户" ,"lastModifyUserId"));
+                    break;
+                    case "remak" :
+                    entitys.add(new ExcelExportEntity("备注" ,"remak"));
+                    break;
+                    case "tableField106-productId":
+                    tableField106List.add(new ExcelExportEntity("商品名称" ,"productId"));
+                    break;
+                    case "tableField106-recoveryPrice":
+                    tableField106List.add(new ExcelExportEntity("回收价" ,"recoveryPrice"));
+                    break;
+                    case "tableField106-rewardPoints":
+                    tableField106List.add(new ExcelExportEntity("赠送积分" ,"rewardPoints"));
+                    break;
+                    case "tableField114-recycleId":
+                    tableField114List.add(new ExcelExportEntity("回收站" ,"recycleId"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+            if(tableField106List.size() > 0){
+                tableField106ExcelEntity.setList(tableField106List);
+                entitys.add(tableField106ExcelEntity);
+            }
+            if(tableField114List.size() > 0){
+                tableField114ExcelEntity.setList(tableField114List);
+                entitys.add(tableField114ExcelEntity);
+            }
+        }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            if (entitys.size()>0){
+                if (list.size()==0){
+                    list.add(new HashMap<>());
+                }
+                //去除空数据
+                List<Map<String, Object>> dataList = new ArrayList<>();
+                for (Map<String, Object> map : list) {
+                    int i = 0;
+                    for (String key : keys) {
+                        //子表
+                        if (key.toLowerCase().startsWith("tablefield")) {
+                            String tableField = key.substring(0, key.indexOf("-" ));
+                            String field = key.substring(key.indexOf("-" ) + 1);
+                            Object o = map.get(tableField);
+                            if (o != null) {
+                                List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
+                                for (Map<String, Object> childMap : childList) {
+                                    if (childMap.get(field) != null) {
+                                        i++;
+                                    }
+                                }
+                            }
+                        } else {
+                            Object o = map.get(key);
+                            if (o != null) {
+                                i++;
+                            }
+                        }
+                    }
+                    if (i > 0) {
+                        dataList.add(map);
+                    }
+                }
+                //复杂表头-表头和数据处理
+                ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(NxPriceConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    dataList =  VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
+                }
+
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
+            }
+            String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+    /**
+    * 批量删除
+    * @param ids
+    * @return
+    */
+    @DeleteMapping("/batchRemove")
+    @Transactional
+    @Operation(summary = "批量删除")
+    public ActionResult batchRemove(@RequestBody String ids){
+        List<String> idList = JsonUtil.getJsonToList(ids, String.class);
+        int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+        return ActionResult.fail("删除失败");
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param nxPriceForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid NxPriceForm nxPriceForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        nxPriceForm.setId(id);
+        if (!isImport) {
+            String b =  nxPriceService.checkForm(nxPriceForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        NxPriceEntity entity= nxPriceService.getInfo(id);
+        if(entity!=null){
+            try{
+                nxPriceService.saveOrUpdate(nxPriceForm,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){
+        NxPriceEntity entity= nxPriceService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            nxPriceService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        NxPriceEntity entity= nxPriceService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxPriceMap=JsonUtil.entityToMap(entity);
+        nxPriceMap.put("id", nxPriceMap.get("id"));
+        //副表数据
+        //子表数据
+        List<NxPriceProductEntity> nxPriceProductList = nxPriceService.getNxPriceProductList(entity.getId());
+        nxPriceMap.put("tableField106",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceProductList)));
+        List<NxPriceRecycleEntity> nxPriceRecycleList = nxPriceService.getNxPriceRecycleList(entity.getId());
+        nxPriceMap.put("tableField114",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceRecycleList)));
+        nxPriceMap = generaterSwapUtil.swapDataDetail(nxPriceMap,NxPriceConstant.getFormData(),"534371369878581509",false);
+        return ActionResult.success(nxPriceMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        NxPriceEntity entity= nxPriceService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxPriceMap=JsonUtil.entityToMap(entity);
+        nxPriceMap.put("id", nxPriceMap.get("id"));
+        //副表数据
+        //子表数据
+        List<NxPriceProductEntity> nxPriceProductList = nxPriceService.getNxPriceProductList(entity.getId());
+        nxPriceMap.put("nxPriceProductList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceProductList)));
+        List<NxPriceRecycleEntity> nxPriceRecycleList = nxPriceService.getNxPriceRecycleList(entity.getId());
+        nxPriceMap.put("nxPriceRecycleList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(nxPriceRecycleList)));
+        nxPriceMap = generaterSwapUtil.swapDataForm(nxPriceMap,NxPriceConstant.getFormData(),NxPriceConstant.TABLEFIELDKEY,NxPriceConstant.TABLERENAMES);
+        return ActionResult.success(nxPriceMap);
+    }
+
+}

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

@@ -0,0 +1,351 @@
+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.nxproduct.*;
+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.web.multipart.MultipartFile;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import java.io.File;
+import jnpf.onlinedev.model.ExcelImFieldModel;
+import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
+import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
+import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
+import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
+import cn.xuyanwu.spring.file.storage.FileInfo;
+import lombok.Cleanup;
+import jnpf.model.visualJson.config.HeaderModel;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.base.util.VisualUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * nxProduct
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Slf4j
+@RestController
+@Tag(name = "nxProduct" , description = "scm")
+@RequestMapping("/api/scm/NxProduct")
+public class NxProductController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private NxProductService nxProductService;
+
+
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    /**
+    * 列表
+    *
+    * @param nxProductPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody NxProductPagination nxProductPagination)throws IOException{
+        List<NxProductEntity> list= nxProductService.getList(nxProductPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (NxProductEntity entity : list) {
+        Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
+        nxProductMap.put("id", nxProductMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(nxProductMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, NxProductConstant.getFormData(), NxProductConstant.getColumnData(), nxProductPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(nxProductPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param nxProductForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid NxProductForm nxProductForm) {
+        String b = nxProductService.checkForm(nxProductForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            nxProductService.saveOrUpdate(nxProductForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @Operation(summary = "导出Excel")
+    @PostMapping("/Actions/Export")
+    public ActionResult Export(@RequestBody NxProductPagination nxProductPagination) throws IOException {
+        if (StringUtil.isEmpty(nxProductPagination.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        List<NxProductEntity> list= nxProductService.getList(nxProductPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (NxProductEntity entity : list) {
+        Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
+        nxProductMap.put("id", nxProductMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(nxProductMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, NxProductConstant.getFormData(), NxProductConstant.getColumnData(), nxProductPagination.getModuleId(),false);
+        String[]keys=!StringUtil.isEmpty(nxProductPagination.getSelectKey())?nxProductPagination.getSelectKey():new String[0];
+        UserInfo userInfo=userProvider.get();
+            DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 导出表格方法
+    */
+    public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
+        DownloadVO vo=DownloadVO.builder().build();
+        List<ExcelExportEntity> entitys=new ArrayList<>();
+        if(keys.length>0){
+            for(String key:keys){
+                switch(key){
+                    case "code" :
+                    entitys.add(new ExcelExportEntity("编码" ,"code"));
+                    break;
+                    case "name" :
+                    entitys.add(new ExcelExportEntity("名称" ,"name"));
+                    break;
+                    case "spec" :
+                    entitys.add(new ExcelExportEntity("规格" ,"spec"));
+                    break;
+                    case "unit" :
+                    entitys.add(new ExcelExportEntity("库存单位" ,"unit"));
+                    break;
+                    case "remak" :
+                    entitys.add(new ExcelExportEntity("备注" ,"remak"));
+                    break;
+                    default:
+                    break;
+                }
+            }
+        }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+            @Cleanup Workbook workbook = new HSSFWorkbook();
+            if (entitys.size()>0){
+                if (list.size()==0){
+                    list.add(new HashMap<>());
+                }
+                //去除空数据
+                List<Map<String, Object>> dataList = new ArrayList<>();
+                for (Map<String, Object> map : list) {
+                    int i = 0;
+                    for (String key : keys) {
+                        //子表
+                        if (key.toLowerCase().startsWith("tablefield")) {
+                            String tableField = key.substring(0, key.indexOf("-" ));
+                            String field = key.substring(key.indexOf("-" ) + 1);
+                            Object o = map.get(tableField);
+                            if (o != null) {
+                                List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
+                                for (Map<String, Object> childMap : childList) {
+                                    if (childMap.get(field) != null) {
+                                        i++;
+                                    }
+                                }
+                            }
+                        } else {
+                            Object o = map.get(key);
+                            if (o != null) {
+                                i++;
+                            }
+                        }
+                    }
+                    if (i > 0) {
+                        dataList.add(map);
+                    }
+                }
+                //复杂表头-表头和数据处理
+                ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(NxProductConstant.getColumnData(), ColumnDataModel.class);
+                List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
+                if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
+                    entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
+                    dataList =  VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
+                }
+
+                workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
+            }
+            String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+            MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
+            String temporaryFilePath = configValueUtil.getTemporaryFilePath();
+            FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
+            vo.setName(fileInfo.getFilename());
+            vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+    /**
+    * 批量删除
+    * @param ids
+    * @return
+    */
+    @DeleteMapping("/batchRemove")
+    @Transactional
+    @Operation(summary = "批量删除")
+    public ActionResult batchRemove(@RequestBody String ids){
+        List<String> idList = JsonUtil.getJsonToList(ids, String.class);
+        int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+        return ActionResult.fail("删除失败");
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param nxProductForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid NxProductForm nxProductForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        nxProductForm.setId(id);
+        if (!isImport) {
+            String b =  nxProductService.checkForm(nxProductForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        NxProductEntity entity= nxProductService.getInfo(id);
+        if(entity!=null){
+            try{
+                nxProductService.saveOrUpdate(nxProductForm,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){
+        NxProductEntity entity= nxProductService.getInfo(id);
+        if(entity!=null){
+            //假删除
+            entity.setDeleteMark(1);
+            nxProductService.update(id,entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        NxProductEntity entity= nxProductService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
+        nxProductMap.put("id", nxProductMap.get("id"));
+        //副表数据
+        //子表数据
+        nxProductMap = generaterSwapUtil.swapDataDetail(nxProductMap,NxProductConstant.getFormData(),"534635503241163013",false);
+        return ActionResult.success(nxProductMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        NxProductEntity entity= nxProductService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
+        nxProductMap.put("id", nxProductMap.get("id"));
+        //副表数据
+        //子表数据
+        nxProductMap = generaterSwapUtil.swapDataForm(nxProductMap,NxProductConstant.getFormData(),NxProductConstant.TABLEFIELDKEY,NxProductConstant.TABLERENAMES);
+        return ActionResult.success(nxProductMap);
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 价格表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+@TableName("nx_price")
+public class NxPriceEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "PRICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String priceCode;
+    @TableField(value = "BUINESS_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String buinessId;
+    @TableField(value = "PRICE_TYPE" , updateStrategy = FieldStrategy.IGNORED)
+    private String priceType;
+    @TableField(value = "REMAK" , updateStrategy = FieldStrategy.IGNORED)
+    private String remak;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

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

@@ -0,0 +1,46 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+/**
+ * 价格表价格信息
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+@TableName("nx_price_product")
+public class NxPriceProductEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("PRICE_ID")
+    private String priceId;
+    @TableField(value = "PRODUCT_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String productId;
+    @TableField("UNIT")
+    private String unit;
+    @TableField(value = "RECOVERY_PRICE" , updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal recoveryPrice;
+    @TableField(value = "REWARD_POINTS" , updateStrategy = FieldStrategy.IGNORED)
+    private String rewardPoints;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+}

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

@@ -0,0 +1,39 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 价格表适配回收站
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+@TableName("nx_price_recycle")
+public class NxPriceRecycleEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField("PRICE_ID")
+    private String priceId;
+    @TableField(value = "RECYCLE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String recycleId;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+}

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

@@ -0,0 +1,49 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+/**
+ * 商品回收类目
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+@TableName("nx_product")
+public class NxProductEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String code;
+    @TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String name;
+    @TableField(value = "SPEC" , updateStrategy = FieldStrategy.IGNORED)
+    private String spec;
+    @TableField(value = "UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String unit;
+    @TableField(value = "REMAK" , updateStrategy = FieldStrategy.IGNORED)
+    private String remak;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("F_VERSION")
+    private Integer version;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxprice/NxPriceForm.java

@@ -0,0 +1,53 @@
+package jnpf.model.nxprice;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * nxPrice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+public class NxPriceForm  {
+    /** 主键 */
+    private String id;
+    /** 子表数据 **/
+    @JsonProperty("nxPriceProductList")
+    private List<NxPriceProductModel> nxPriceProductList;
+    /** 子表数据 **/
+    @JsonProperty("nxPriceRecycleList")
+    private List<NxPriceRecycleModel> nxPriceRecycleList;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 价格编号 **/
+    @JsonProperty("priceCode")
+    private String priceCode;
+    /** 报价方 **/
+    @JsonProperty("buinessId")
+    private Object buinessId;
+    /** 价格类型 **/
+    @JsonProperty("priceType")
+    private Object priceType;
+    /** 创建用户 **/
+    @JsonProperty("creatorUserId")
+    private String creatorUserId;
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+    /** 修改用户 **/
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+    /** 备注 **/
+    @JsonProperty("remak")
+    private String remak;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxprice/NxPricePagination.java

@@ -0,0 +1,45 @@
+package jnpf.model.nxprice;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * nxPrice
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+public class NxPricePagination 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("priceCode")
+    private Object priceCode;
+    /** 报价方 */
+    @JsonProperty("buinessId")
+    private Object buinessId;
+    /** 价格类型 */
+    @JsonProperty("priceType")
+    private Object priceType;
+    /** 创建用户 */
+    @JsonProperty("creatorUserId")
+    private Object creatorUserId;
+    /** 创建时间 */
+    @JsonProperty("creatorTime")
+    private Object creatorTime;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxprice/NxPriceProductModel.java

@@ -0,0 +1,30 @@
+package jnpf.model.nxprice;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * nxPrice
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Data
+public class NxPriceProductModel  {
+    /** 商品名称 **/
+    @JSONField(name = "productId")
+    private String productId;
+    /** 回收价 **/
+    @JSONField(name = "recoveryPrice")
+    private String recoveryPrice;
+    /** 赠送积分 **/
+    @JSONField(name = "rewardPoints")
+    private String rewardPoints;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/nxprice/NxPriceRecycleModel.java

@@ -0,0 +1,24 @@
+package jnpf.model.nxprice;
+
+import lombok.Data;
+import java.util.List;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.alibaba.fastjson.annotation.JSONField;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ *
+ * nxPrice
+ * 版本： V3.5
+ * 版权: 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-03-05
+ */
+@Data
+public class NxPriceRecycleModel  {
+    /** 回收站 **/
+    @JSONField(name = "recycleId")
+    private String recycleId;
+}

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

@@ -0,0 +1,38 @@
+package jnpf.model.nxproduct;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * nxProduct
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+public class NxProductForm  {
+    /** 主键 */
+    private String id;
+    /** 乐观锁 **/
+    @JsonProperty("version")
+    private Integer version;
+
+    /** 编码 **/
+    @JsonProperty("code")
+    private String code;
+    /** 名称 **/
+    @JsonProperty("name")
+    private String name;
+    /** 规格 **/
+    @JsonProperty("spec")
+    private String spec;
+    /** 库存单位 **/
+    @JsonProperty("unit")
+    private Object unit;
+    /** 备注 **/
+    @JsonProperty("remak")
+    private String remak;
+}

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

@@ -0,0 +1,42 @@
+package jnpf.model.nxproduct;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * nxProduct
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-03-05
+ */
+@Data
+public class NxProductPagination 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("code")
+    private Object code;
+    /** 名称 */
+    @JsonProperty("name")
+    private Object name;
+    /** 规格 */
+    @JsonProperty("spec")
+    private Object spec;
+    /** 库存单位 */
+    @JsonProperty("unit")
+    private Object unit;
+}

jnpf-java-boot/jnpf-web/src/components/Jnpf/Upload/UploadImg.vue

@@ -1,17 +1,36 @@
 <template>
   <div class="UploadFile-container">
     <template v-if="fileList.length">
-      <transition-group class="el-upload-list el-upload-list--picture-card" tag="ul" name="el-list">
-        <li class="el-upload-list__item is-success" v-for="(file,index) in fileList"
-          :key="file.fileId">
-          <el-image :src="define.comUrl+file.url" class="el-upload-list__item-thumbnail"
-            :preview-src-list="getImgList(fileList)" :z-index="10000" :ref="'image'+index">
+      <transition-group
+        class="el-upload-list el-upload-list--picture-card"
+        tag="ul"
+        name="el-list"
+      >
+        <li
+          class="el-upload-list__item is-success"
+          v-for="(file, index) in fileList"
+          :key="file.fileId"
+        >
+          <el-image
+            :src="define.comUrl + file.url"
+            class="el-upload-list__item-thumbnail"
+            :preview-src-list="getImgList(fileList)"
+            :z-index="10000"
+            :ref="'image' + index"
+          >
           </el-image>
           <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(index)">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(index)"
+            >
               <i class="el-icon-zoom-in"></i>
             </span>
-            <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(index)">
+            <span
+              v-if="!disabled"
+              class="el-upload-list__item-delete"
+              @click="handleRemove(index)"
+            >
               <i class="el-icon-delete"></i>
             </span>
           </span>
@@ -19,10 +38,20 @@
       </transition-group>
     </template>
     <template v-if="!detailed">
-      <el-upload :action="define.comUploadUrl+'/'+type" :headers="uploadHeaders" :data="params"
-        ref="elUpload" :on-success="handleSuccess" :multiple="limit!==1" :show-file-list="false"
-        accept="image/*" :before-upload="beforeUpload" :disabled="disabled" list-type="picture-card"
-        class="upload-btn">
+      <el-upload
+        :action="define.comUploadUrl + '/' + type"
+        :headers="uploadHeaders"
+        :data="params"
+        ref="elUpload"
+        :on-success="handleSuccess"
+        :multiple="limit !== 1"
+        :show-file-list="false"
+        accept="image/*"
+        :before-upload="beforeUpload"
+        :disabled="disabled"
+        list-type="picture-card"
+        class="upload-btn"
+      >
         <i class="el-icon-plus"></i>
       </el-upload>
     </template>
@@ -33,150 +62,152 @@
 </template>
 
 <script>
-import emitter from 'element-ui/src/mixins/emitter'
-let { methods: { dispatch } } = emitter
+import emitter from "element-ui/src/mixins/emitter";
+let {
+  methods: { dispatch },
+} = emitter;
 const units = {
   KB: 1024,
   MB: 1024 * 1024,
-  GB: 1024 * 1024 * 1024
-}
+  GB: 1024 * 1024 * 1024,
+};
 export default {
-  name: 'UploadImg',
+  name: "UploadImg",
   props: {
     value: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     type: {
       type: String,
-      default: 'annexpic'
+      default: "annexpic",
     },
     disabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     detailed: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showTip: {
       type: Boolean,
-      default: false
+      default: false,
     },
     limit: {
       type: Number,
-      default: 0
+      default: 0,
     },
     accept: {
       type: String,
-      default: 'image/*'
+      default: "image/*",
     },
     sizeUnit: {
       type: String,
-      default: 'MB'
+      default: "MB",
     },
     pathType: {
       type: String,
-      default: 'defaultPath'
+      default: "defaultPath",
     },
     isAccount: {
       type: Number,
-      default: 0
+      default: 0,
     },
     folder: {
       type: String,
-      default: ''
+      default: "",
     },
     fileSize: {
-      default: 10
+      default: 10,
     },
     tipText: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
       fileList: [],
       uploadHeaders: { Authorization: this.$store.getters.token },
-    }
+    };
   },
   watch: {
     value: {
       immediate: true,
       handler(val) {
-        this.fileList = Array.isArray(val) ? val : []
-      }
-    }
+        this.fileList = Array.isArray(val) ? val : [];
+      },
+    },
   },
   computed: {
     params() {
       return {
         pathType: this.pathType,
         isAccount: this.isAccount,
-        folder: this.folder
-      }
-    }
+        folder: this.folder,
+      };
+    },
   },
   methods: {
     beforeUpload(file) {
       if (this.fileList.length >= this.limit) {
-        this.handleExceed()
-        return false
+        this.handleExceed();
+        return false;
       }
       const unitNum = units[this.sizeUnit];
-      if (!this.fileSize) return true
-      let isRightSize = file.size / unitNum < this.fileSize
+      if (!this.fileSize) return true;
+      let isRightSize = file.size / unitNum < this.fileSize;
       if (!isRightSize) {
-        this.$message.error(`图片大小超过${this.fileSize}${this.sizeUnit}`)
+        this.$message.error(`图片大小超过${this.fileSize}${this.sizeUnit}`);
         return isRightSize;
       }
-      let isAccept = new RegExp('image/*').test(file.type)
+      let isAccept = new RegExp("image/*").test(file.type);
       if (!isAccept) {
-        this.$message.error(`请上传图片`)
+        this.$message.error(`请上传图片`);
         return isAccept;
       }
       return isRightSize && isAccept;
     },
     handleSuccess(res, file, fileList) {
-      if (this.fileList.length >= this.limit) return this.handleExceed()
+      if (this.fileList.length >= this.limit) return this.handleExceed();
       if (res.code == 200) {
         this.fileList.push({
           name: file.name,
           fileId: res.data.name,
-          url: res.data.url
-        })
-        this.$emit('input', this.fileList)
-        this.$emit('change', this.fileList)
-        dispatch.call(this, 'ElFormItem', 'el.form.change', this.fileList)
+          url: res.data.url,
+        });
+        this.$emit("input", this.fileList);
+        this.$emit("change", this.fileList);
+        dispatch.call(this, "ElFormItem", "el.form.change", this.fileList);
       } else {
-        this.$refs.elUpload.uploadFiles.splice(fileList.length - 1, 1)
-        fileList.filter(o => o.uid != file.uid)
-        this.$emit('input', this.fileList)
-        this.$emit('change', this.fileList)
-        dispatch.call(this, 'ElFormItem', 'el.form.change', this.fileList)
-        this.$message({ message: res.msg, type: 'error', duration: 1500 })
+        this.$refs.elUpload.uploadFiles.splice(fileList.length - 1, 1);
+        fileList.filter((o) => o.uid != file.uid);
+        this.$emit("input", this.fileList);
+        this.$emit("change", this.fileList);
+        dispatch.call(this, "ElFormItem", "el.form.change", this.fileList);
+        this.$message({ message: res.msg, type: "error", duration: 1500 });
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`当前限制最多可以上传${this.limit}张图片`)
+      this.$message.warning(`当前限制最多可以上传${this.limit}张图片`);
     },
     handlePictureCardPreview(index) {
-      this.$refs['image' + index][0].clickHandler()
+      this.$refs["image" + index][0].clickHandler();
     },
     handleRemove(index) {
-      this.fileList.splice(index, 1)
-      this.$refs.elUpload.uploadFiles.splice(index, 1)
-      this.$emit("input", this.fileList)
-      this.$emit('change', this.fileList)
-      dispatch.call(this, 'ElFormItem', 'el.form.change', this.fileList)
+      this.fileList.splice(index, 1);
+      this.$refs.elUpload.uploadFiles.splice(index, 1);
+      this.$emit("input", this.fileList);
+      this.$emit("change", this.fileList);
+      dispatch.call(this, "ElFormItem", "el.form.change", this.fileList);
     },
     getImgList(list) {
-      const newList = list.map(o => this.define.comUrl + o.url)
-      return newList
-    }
-  }
-}
+      const newList = list.map((o) => this.define.comUrl + o.url);
+      return newList;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 >>> .el-upload-list--picture-card .el-upload-list__item {

jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

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

jnpf-java-boot/jnpf-web/src/views/login/regsiter.vue

@@ -14,156 +14,310 @@
       :show-close="false"
       :modal="false"
       :close-on-click-modal="false"
-      :visible="dialogVisible">
+      :visible="dialogVisible"
+    >
       <div class="cont">
         <div class="steps">
-          <el-steps :active="active" class="steps" align-center finish-status="success">
-              <el-step title="注册须知" description="确认注册须知内容"></el-step>
-              <el-step title="商户描述" description="完善商户基本信息"></el-step>
-              <el-step title="资质上传" description="确认商户开店资质"></el-step>
-            </el-steps>
+          <el-steps
+            :active="active"
+            class="steps"
+            align-center
+            finish-status="success"
+          >
+            <el-step title="注册须知" description="确认注册须知内容"></el-step>
+            <el-step title="商户描述" description="完善商户基本信息"></el-step>
+            <el-step title="资质上传" description="确认商户开店资质"></el-step>
+          </el-steps>
         </div>
         <div class="step step1" v-if="!active">
-          <div id="u9_text" class="text ">
-            <p style="font-size:15px;"><span style="font-family:&quot;Helvetica-Bold&quot;, &quot;Helvetica Bold&quot;, &quot;Helvetica&quot;, sans-serif;font-weight:700;">1</span><span style="font-family:&quot;PingFangSC-Semibold&quot;, &quot;PingFang SC Semibold&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:650;">、我在西夏聚宝回收已经开了个店了，我用别人的身份证再开一个店可以吗？</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:13px;"><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">答：不可以。未经西夏聚宝平台同意，将本人西夏聚宝回收账号提供给他人做开店使用，由此导致相关争议，诉讼及因店铺经营中的违法违规行为导致一切人身，财产权益损害，均由本人自行承担全部民事、行政及刑事责任。</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:15px;"><span style="font-family:&quot;Helvetica-Bold&quot;, &quot;Helvetica Bold&quot;, &quot;Helvetica&quot;, sans-serif;font-weight:700;">2</span><span style="font-family:&quot;PingFangSC-Semibold&quot;, &quot;PingFang SC Semibold&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:650;">、开企业店铺需要满足什么条件？</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:13px;"><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">答：企业开店需完成支付宝认证和责任人认证，店铺负责人需要对该西夏聚宝回收店铺的运营及管理全面负责，包含但不限于：该企业的法定代表人、股东、西夏聚宝回收店铺的运营人等，具体请参考：企业店铺开店流程。</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;">3</span><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">、我可以开多个店铺吗？</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:15px;"><span style="font-family:&quot;PingFangSC-Semibold&quot;, &quot;PingFang SC Semibold&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:650;">答：同一会员已开设的店铺均须同时满足以下要求，才能获得多店权益：</span></p><p style="font-size:13px;"><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">（一）近365天无出售假冒商品违规、严重违规、一般违规扣分达12分（含）以上等违规记录，且无其他风险特征；</span></p><p style="font-size:13px;"><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">（二）满足一定经营条件（如近365天确认收货金额&gt;=120万且近12个自然月持续有成交）</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:15px;"><span style="font-family:&quot;Helvetica-Bold&quot;, &quot;Helvetica Bold&quot;, &quot;Helvetica&quot;, sans-serif;font-weight:700;">4</span><span style="font-family:&quot;PingFangSC-Semibold&quot;, &quot;PingFang SC Semibold&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:650;">、我已经开过西夏聚宝回收店，现在想要注销原来的店铺重新开店，可以吗?</span></p><p style="font-size:13px;"><span style="font-family:&quot;Helvetica&quot;, sans-serif;font-weight:400;"><br></span></p><p style="font-size:13px;"><span style="font-family:&quot;PingFangSC-Regular&quot;, &quot;PingFang SC&quot;, sans-serif;font-weight:400;">答：满足条件就可以注销。具体请参考：如何注销西夏聚宝回收店铺。</span></p>
+          <div id="u9_text" class="text">
+            <p style="font-size: 15px">
+              <span
+                style="
+                  font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
+                    sans-serif;
+                  font-weight: 700;
+                "
+                >1</span
+              ><span
+                style="
+                  font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
+                    'PingFang SC', sans-serif;
+                  font-weight: 650;
+                "
+                >、我在西夏聚宝回收已经开了个店了，我用别人的身份证再开一个店可以吗？</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >答：不可以。未经西夏聚宝平台同意，将本人西夏聚宝回收账号提供给他人做开店使用，由此导致相关争议，诉讼及因店铺经营中的违法违规行为导致一切人身，财产权益损害，均由本人自行承担全部民事、行政及刑事责任。</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 15px">
+              <span
+                style="
+                  font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
+                    sans-serif;
+                  font-weight: 700;
+                "
+                >2</span
+              ><span
+                style="
+                  font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
+                    'PingFang SC', sans-serif;
+                  font-weight: 650;
+                "
+                >、开企业店铺需要满足什么条件？</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >答：企业开店需完成支付宝认证和责任人认证，店铺负责人需要对该西夏聚宝回收店铺的运营及管理全面负责，包含但不限于：该企业的法定代表人、股东、西夏聚宝回收店铺的运营人等，具体请参考：企业店铺开店流程。</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                >3</span
+              ><span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >、我可以开多个店铺吗？</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 15px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
+                    'PingFang SC', sans-serif;
+                  font-weight: 650;
+                "
+                >答：同一会员已开设的店铺均须同时满足以下要求，才能获得多店权益：</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >（一）近365天无出售假冒商品违规、严重违规、一般违规扣分达12分（含）以上等违规记录，且无其他风险特征；</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >（二）满足一定经营条件（如近365天确认收货金额&gt;=120万且近12个自然月持续有成交）</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 15px">
+              <span
+                style="
+                  font-family: 'Helvetica-Bold', 'Helvetica Bold', 'Helvetica',
+                    sans-serif;
+                  font-weight: 700;
+                "
+                >4</span
+              ><span
+                style="
+                  font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold',
+                    'PingFang SC', sans-serif;
+                  font-weight: 650;
+                "
+                >、我已经开过西夏聚宝回收店，现在想要注销原来的店铺重新开店，可以吗?</span
+              >
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="font-family: 'Helvetica', sans-serif; font-weight: 400"
+                ><br
+              /></span>
+            </p>
+            <p style="font-size: 13px">
+              <span
+                style="
+                  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+                  font-weight: 400;
+                "
+                >答：满足条件就可以注销。具体请参考：如何注销西夏聚宝回收店铺。</span
+              >
+            </p>
           </div>
         </div>
         <div class="step step2" v-if="active == 1">
-            <el-form :model="ruleForm1" :rules="rules1" ref="ruleForStep1" label-width="100px" class="demo-ruleForm">
-              <el-form-item label="手机号" prop="iphone">
-                 <el-input v-model="ruleForm1.iphone"></el-input>
-              </el-form-item>
-              <el-form-item label="验证码" prop="code">
-                  <el-input v-model="ruleForm1.code"></el-input>
-              </el-form-item>
-              <el-form-item label="商户名称" prop="name">
-                  <el-input v-model="ruleForm1.name"></el-input>
-              </el-form-item>
-              <el-form-item label="商户位置" prop="location">
-                  <el-input v-model="ruleForm1.location"></el-input>
-              </el-form-item>
-              <el-form-item label="商户LOGO" prop="logo">
-                <el-upload
-                  ref="upload"
-                  class="avatar-uploader"
-                  list-type="picture-card"
-                  action
-                  :file-list="fileList"
-                  :show-file-list="true"
-                  :limit="uploadLimit"
-                  :before-upload="beforeUpload"
-                  :http-request="uploadPicture"
-                  :class="{ hide: hideUploadEdit }"
-                >
-                  <i slot="default" class="el-icon-plus"></i>
-                  <div slot="file" slot-scope="{ file }">
-                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <i class="el-icon-zoom-in"></i>
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
-                    </span>
-                  </div>
-                </el-upload>
-              </el-form-item>
-            </el-form>
+          <el-form
+            :model="dataForm"
+            :rules="dataRule"
+            ref="ruleForStep1"
+            label-width="100px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="手机号" prop="iphone">
+              <el-input
+                v-model="dataForm.propertyJson.managerTelePhone"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="验证码" prop="code">
+              <el-input v-model="dataForm.code"></el-input>
+            </el-form-item>
+            <el-form-item label="商户名称" prop="name">
+              <el-input v-model="dataForm.fullName"></el-input>
+            </el-form-item>
+
+            <el-form-item label="商户编码" prop="enCode">
+              <el-input v-model="dataForm.enCode"></el-input>
+            </el-form-item>
+
+            <el-form-item label="商户位置" prop="location">
+              <el-input v-model="dataForm.propertyJson.address"></el-input>
+            </el-form-item>
+            <el-form-item label="商户LOGO" prop="logo">
+              <JnpfUploadImg
+                v-model="dataForm.pictures"
+                @change="changeData('stationImg', -1)"
+                :fileSize="10"
+                sizeUnit="MB"
+                :limit="2"
+                pathType="defaultPath"
+                :isAccount="0"
+              >
+              </JnpfUploadImg>
+            </el-form-item>
+          </el-form>
         </div>
         <div class="step step3" v-if="active == 2">
-            <el-form :model="ruleForm2" :rules="rules2" ref="ruleForStep2" label-width="160px" class="demo-ruleForm">
-              <el-form-item label="注册人姓名" prop="people">
-                 <el-input v-model="ruleForm2.iphone"></el-input>
-              </el-form-item>
-              <el-form-item label="注册人身份证号" prop="code">
-                  <el-input v-model="ruleForm2.code"></el-input>
-              </el-form-item>
-              <el-form-item label="注册名称" prop="name">
-                  <el-input v-model="ruleForm2.name"></el-input>
-              </el-form-item>
-              <el-form-item label="社会信用代码证号" prop="location">
-                  <el-input v-model="ruleForm2.location"></el-input>
-              </el-form-item>
-               <el-form-item label="注册地址" prop="location">
-                  <el-input v-model="ruleForm2.location"></el-input>
-              </el-form-item>
-              <el-form-item label="注册人手持身份证照片" prop="logo">
-                <el-upload
-                  ref="upload"
-                  class="avatar-uploader"
-                  list-type="picture-card"
-                  action
-                  :file-list="fileList"
-                  :show-file-list="true"
-                  :limit="uploadLimit"
-                  :before-upload="beforeUpload"
-                  :http-request="uploadPicture"
-                  :class="{ hide: hideUploadEdit }"
-                >
-                  <i slot="default" class="el-icon-plus"></i>
-                  <div slot="file" slot-scope="{ file }">
-                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <i class="el-icon-zoom-in"></i>
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
+          <el-form
+            :model="dataForm"
+            ref="ruleForStep2"
+            label-width="160px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="注册人姓名" prop="people">
+              <el-input v-model="dataForm.propertyJson.managerName"></el-input>
+            </el-form-item>
+            <el-form-item label="注册人身份证号" prop="code">
+              <el-input v-model="dataForm.propertyJson.idCard"></el-input>
+            </el-form-item>
+            <el-form-item label="注册名称" prop="name">
+              <el-input
+                v-model="dataForm.propertyJson.registeredName"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="社会信用代码证号" prop="location">
+              <el-input
+                v-model="dataForm.propertyJson.socialCreditCode"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="注册地址" prop="location">
+              <el-input
+                v-model="dataForm.propertyJson.registeredAddress"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="注册人手持身份证照片" prop="logo">
+              <!-- <el-upload
+                v-model="dataForm.societyPictures"
+                ref="upload"
+                class="avatar-uploader"
+                list-type="picture-card"
+                action
+                :file-list="fileList"
+                :show-file-list="true"
+                :limit="uploadLimit"
+                :before-upload="beforeUpload"
+                :http-request="uploadPicture"
+                :class="{ hide: hideUploadEdit }"
+              >
+                <i slot="default" class="el-icon-plus"></i>
+                <div slot="file" slot-scope="{ file }">
+                  <img
+                    class="el-upload-list__item-thumbnail"
+                    :src="file.url"
+                    alt=""
+                  />
+                  <span class="el-upload-list__item-actions">
+                    <span
+                      class="el-upload-list__item-preview"
+                      @click="handlePictureCardPreview(file)"
+                    >
+                      <i class="el-icon-zoom-in"></i>
                     </span>
-                  </div>
-                </el-upload>
-              </el-form-item>
-               <el-form-item label="社会信用代码证照片" prop="logo">
-                <el-upload
-                  ref="upload"
-                  class="avatar-uploader"
-                  list-type="picture-card"
-                  action
-                  :file-list="fileList"
-                  :show-file-list="true"
-                  :limit="uploadLimit"
-                  :before-upload="beforeUpload"
-                  :http-request="uploadPicture"
-                  :class="{ hide: hideUploadEdit }"
-                >
-                  <i slot="default" class="el-icon-plus"></i>
-                  <div slot="file" slot-scope="{ file }">
-                    <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <i class="el-icon-zoom-in"></i>
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
+                    <span
+                      v-if="!disabled"
+                      class="el-upload-list__item-delete"
+                      @click="handleRemove(file)"
+                    >
+                      <i class="el-icon-delete"></i>
                     </span>
-                  </div>
-                </el-upload>
-              </el-form-item>
-            </el-form>
+                  </span>
+                </div>
+              </el-upload> -->
+              <JnpfUploadImg
+                v-model="dataForm.societyPictures"
+                @change="changeData('stationImg', -1)"
+                :fileSize="10"
+                sizeUnit="MB"
+                :limit="2"
+                pathType="defaultPath"
+                :isAccount="0"
+              >
+              </JnpfUploadImg>
+            </el-form-item>
+            <el-form-item label="社会信用代码证照片" prop="logo">
+              <JnpfUploadImg
+                v-model="dataForm.registrantPictures"
+                @change="changeData('stationImg', -1)"
+                :fileSize="10"
+                sizeUnit="MB"
+                :limit="2"
+                pathType="defaultPath"
+                :isAccount="0"
+              >
+              </JnpfUploadImg>
+            </el-form-item>
+          </el-form>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -175,72 +329,112 @@
           <el-button @click="pre">上一步</el-button>
           <el-button type="primary" @click="next">下一步</el-button>
         </template>
-         <template v-if="active == 2">
+        <template v-if="active == 2">
           <el-button @click="pre">上一步</el-button>
-          <el-button type="primary" @click="complete">完成</el-button>
-        </template>
 
+          <el-button type="primary" :loading="btnLoading" @click="complete()"
+            >完成</el-button
+          >
+        </template>
       </span>
     </el-dialog>
-    <div class="foot">Copyright © 上海长江云息数字科技有限公司 © 2012 - 2023 All Rights Reserved 专业的数字信息解决方案专家</div>
+    <div class="foot">
+      Copyright © 上海长江云息数字科技有限公司 © 2012 - 2023 All Rights Reserved
+      专业的数字信息解决方案专家
+    </div>
   </div>
 </template>
 
 <script>
+import { createOrganize } from "@/api/permission/organize";
+
 export default {
-  name: 'login-regsiter',
+  name: "login-regsiter",
   mixins: [],
   components: {},
   data() {
     let validatePhone = (rule, value, callback) => {
       if (!value) {
-        callback(new Error('手机号不能为空'));
+        callback(new Error("手机号不能为空"));
       }
       //使用正则表达式进行验证手机号码
       if (!/^1[3456789]\d{9}$/.test(value)) {
-        callback(new Error('手机号不正确'));
+        callback(new Error("手机号不正确"));
       }
       //自定义校验规则 需要调用callback()函数！
       callback();
     };
     return {
+      btnLoading: false,
+
       dialogVisible: true,
-      active: 2,
+      active: 1,
+
+      dataForm: {
+        id: "",
+        parentId: "96240625-934F-490B-8AA6-0BC775B18468", //父id
+        fullName: "", // 公司名称
+        enCode: "", //机构编号
+        code: "", //验证码
+        pictures: [], //商户logo
+        societyPictures: [], //注册人手持身份证照片
+        registrantPictures: [], //照片2
+        enabledMark: 1,
+        sortCode: 0,
+        description: "",
+        propertyJson: {
+          shortName: "",
+          enterpriseNature: "",
+          industry: "",
+          foundedTime: "",
+          telePhone: "", //手机号
+          fax: "",
+          webSite: "",
+          address: "", //商户位置
+          managerName: "", //注册人姓名
+          managerTelePhone: "",
+          managerMobilePhone: "",
+          manageEmail: "",
+          bankName: "",
+          bankAccount: "",
+          businessscope: "",
+          idCard: "", //注册人身份证
+          registeredName: "", //注册名称
+          socialCreditCode: "", //社会信用代码证号
+          registeredAddress: "", //注册地址
+        },
+      },
+      parentId: "96240625-934F-490B-8AA6-0BC775B18468",
+
       ruleForm1: {
-        iphone: '',
-        code: '',
-        name: '',
-        location: '',
-        logo: ''
+        iphone: "",
+        code: "",
+        name: "",
+        location: "",
+        logo: "",
       },
+      ruleForm2: {},
       fileList: [],
-      fileInfo: '',
+      fileInfo: "",
       uploadLimit: 2,
       disabled: false,
       hideUploadEdit: false,
       rules1: {
-        iphone: [
-          { required: true, validator: validatePhone, trigger: 'blur' }
-        ],
+        iphone: [{ required: true, validator: validatePhone, trigger: "blur" }],
         code: [
-          { required: true, message: '请选择收入验证码', trigger: 'change' }
-        ],
-        name: [
-          { required: true, message: '请输入商户名称', trigger: 'change' }
+          { required: true, message: "请选择收入验证码", trigger: "change" },
         ],
-        location: [
-          {required: true, message: '请选择位置', trigger: 'change' }
+        fullName: [
+          { required: true, message: "请输入商户名称", trigger: "change" },
         ],
-        logo: [
-          {required: true, message: '请上传logo', trigger: 'change' }
-        ]
-      },
-      ruleForm2: {
+        // location: [
+        //   { required: true, message: "请选择位置", trigger: "change" },
+        // ],
+        // logo: [{ required: true, message: "请上传logo", trigger: "change" }],
       },
-      rules2: {
 
-      }
-    }
+      rules2: {},
+    };
   },
   methods: {
     async uploadPicture(param) {
@@ -249,7 +443,7 @@ export default {
       const fileInfo = this.fileInfo;
       // 缺少一个id，使用文件修改时间来减少被其他同名文件覆盖的可能
       const path = `xxxr/${fileInfo.lastModified}`;
-      console.log('path:', path);
+      console.log("path:", path);
       const formData = new FormData();
       formData.append(fileInfo.name, fileInfo);
       const res = await commonUploadFiles(path, formData);
@@ -262,12 +456,12 @@ export default {
       // console.log(file);
       // 1MB=1024*1024(1MB=1024KB 1KB=1024B)
       const isAllowSize = file.size / 1024 / 1024 < 10;
-      const allowType = ['jpeg', 'jpg', 'png'];
-      const isAllowType = allowType.some(e => 'image/' + e === file.type);
+      const allowType = ["jpeg", "jpg", "png"];
+      const isAllowType = allowType.some((e) => "image/" + e === file.type);
       if (!isAllowType) {
         this.$notify({
           message: `上传图片只能是 ${allowType} 格式!`,
-          type: 'warning'
+          type: "warning",
         });
         // 不能直接return 空值，不然就算格式不符合也会生成缩略图
         return Promise.reject();
@@ -275,7 +469,7 @@ export default {
       if (!isAllowSize) {
         this.$notify({
           message: `上传图片大小不能超过 2MB!`,
-          type: 'warning'
+          type: "warning",
         });
         return Promise.reject();
       }
@@ -283,7 +477,7 @@ export default {
       return isAllowType && isAllowSize;
     },
     fileChange(file) {
-      console.log('fileChange:', file);
+      console.log("fileChange:", file);
       // 单个图片直接赋值，如果需要多个图片，改为对象数组
       this.fileInfo = file;
       const url = URL.createObjectURL(file);
@@ -293,66 +487,88 @@ export default {
       this.hideUploadEdit = this.fileList.length >= this.uploadLimit;
     },
     pre(row) {
-      this.active -= 1
+      this.active -= 1;
     },
     next() {
-      if (this.active ==2) {
-        debugger
-        this.$refs['ruleForStep1'].validate((valid) => {
+      if (this.active == 2) {
+        debugger;
+        this.$refs["ruleForStep1"].validate((valid) => {
           if (valid) {
-           //
+            //
           } else {
             return false;
           }
         });
       } else {
-        this.active += 1
+        this.active += 1;
       }
     },
     reject() {
       this.$router.push({
-        path: '/login',
-        query: ''
-      })
+        path: "/login",
+        query: "",
+      });
     },
     handleRemove(file) {
       console.log(file);
       for (let i = 0; i < this.fileList.length; i++) {
-        if (this.fileList[i]['uid'] === file.uid) {
+        if (this.fileList[i]["uid"] === file.uid) {
           this.fileList.splice(i, 1);
           break;
         }
       }
       if (this.fileList.length <= 0) {
-        this.formData.logo = '';
+        this.formData.logo = "";
       }
       // 文件未到达上限后显示上传按钮
       this.hideUploadEdit = this.fileList.length > this.uploadLimit - 1;
-      console.log('handleRemove:', this.hideUploadEdit);
+      console.log("handleRemove:", this.hideUploadEdit);
     },
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
     complete() {
-      this.$router.push({
-        path: '/login',
-        query: ''
-      })
-    }
-  }
-}
+      // this.$router.push({
+      //   path: "/login",
+      //   query: "",
+      // });
+
+      this.btnLoading = true;
+      const formMethod = this.dataForm.id ? updateOrganize : createOrganize;
+      formMethod(this.dataForm)
+        .then((res) => {
+          this.$message({
+            message: res.msg,
+            type: "success",
+            duration: 1500,
+            onClose: () => {
+              this.visible = false;
+              this.btnLoading = false;
+              this.$store.commit("generator/SET_COMPANY_TREE", []);
+              this.$store.commit("generator/SET_DEP_TREE", []);
+              this.$emit("close", true);
+            },
+          });
+        })
+        .catch(() => {
+          this.btnLoading = false;
+        });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .JNPF-common-regsiter {
   width: 100vw;
   height: 100vh;
   position: fixed;
-  background: linear-gradient(90deg, #9064FF 3%, #5996FD 97%);
+  background: linear-gradient(90deg, #9064ff 3%, #5996fd 97%);
   padding: 40px;
 
-  >>>.el-dialog {
-    .el-dialog__body {}
+  >>> .el-dialog {
+    .el-dialog__body {
+    }
   }
   .step {
     margin: 40px 100px;
@@ -367,7 +583,7 @@ export default {
     //  height: 300px;
   }
   .step3 {
-     height: 600px;
+    height: 600px;
   }
   .foot {
     position: absolute;

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

@@ -0,0 +1,210 @@
+<template>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <Detail
+        v-if="detailVisible"
+        ref="Detail"
+        @close="detailVisible = false"
+      />
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" content="详情" />
+        <div class="options">
+          <el-button @click="goBack">取 消</el-button>
+        </div>
+      </div>
+      <el-row
+        :gutter="15"
+        class="main"
+        :style="{ margin: '0 auto', width: '100%' }"
+      >
+        <el-form
+          ref="formRef"
+          :model="dataForm"
+          size="small"
+          label-width="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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="价格编号" prop="priceCode">
+                <p>{{ dataForm.priceCode }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="报价方" prop="buinessId">
+                <p>{{ dataForm.buinessId }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="价格类型" prop="priceType">
+                <p>{{ dataForm.priceType }}</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>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.tableField106" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
+                  <el-table-column prop="productId" label="商品名称">
+                    <template slot-scope="scope">
+                      <p>{{ scope.row.productId }}</p>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="recoveryPrice" label="回收价">
+                    <template slot-scope="scope">
+                      <p>{{ scope.row.recoveryPrice }}</p>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="rewardPoints" label="赠送积分">
+                    <template slot-scope="scope">
+                      <p>{{ scope.row.rewardPoints }}</p>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <JnpfGroupTitle
+                  contentPosition="left"
+                  :closable="false"
+                  content="适配服务站"
+                >
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.tableField114" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
+                  <el-table-column prop="recycleId" label="回收站">
+                    <template slot-scope="scope">
+                      <p>{{ scope.row.recycleId }}</p>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="备注" prop="remak">
+                <p>{{ dataForm.remak }}</p>
+              </jnpf-form-tip-item>
+            </el-col>
+          </template>
+        </el-form>
+      </el-row>
+    </div>
+  </transition>
+</template>
+<script>
+import request from "@/utils/request";
+
+import { getConfigData } from "@/api/onlineDev/visualDev";
+import jnpf from "@/utils/jnpf";
+import Detail from "@/views/basic/dynamicModel/list/detail";
+import { thousandsFormat } from "@/components/Generator/utils/index";
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
+
+      dataForm: {
+        id: "",
+        priceCode: "",
+        buinessId: [],
+        priceType: "1",
+        creatorUserId: "",
+        creatorTime: "",
+        lastModifyTime: "",
+        lastModifyUserId: "",
+        remak: "",
+        nxpriceproductList: [],
+        nxpricerecycleList: [],
+      },
+      priceTypeOptions: [{ fullName: "回收价", id: "1" }],
+      priceTypeProps: { label: "fullName", value: "id" },
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return;
+      getConfigData(modelId).then((res) => {
+        if (!res.data || !res.data.formData) return;
+        let formData = JSON.parse(res.data.formData);
+        formData.popupType = "general";
+        this.detailVisible = true;
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue);
+        });
+      });
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll;
+      this.dataForm = _dataAll;
+    },
+
+    goBack() {
+      this.$emit("refresh");
+    },
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true;
+          request({
+            url: "/api/scm/NxPrice/detail/" + this.dataForm.id,
+            method: "get",
+          }).then((res) => {
+            this.dataInfo(res.data);
+            this.loading = false;
+          });
+        }
+      });
+    },
+  },
+};
+</script>

jnpf-java-boot/jnpf-web/src/views/nxprice/columnList.js

@@ -0,0 +1,2 @@
+const columnList = [{"jnpfKey":"billRule","fullName":"价格编号","label":"价格编号","sortable":true,"align":"left","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"priceCode","className":[],"label":"价格编号","trigger":"change","showLabel":true,"required":false,"tableName":"nx_price","renderKey":1709540345153,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"价格编号","tag":"JnpfInput","span":8},"readonly":true,"prop":"priceCode","width":0,"__vModel__":"priceCode","fixed":"none","style":{"width":"100%"},"id":"priceCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"organizeSelect","ableIds":[],"multiple":false,"fullName":"报价方","label":"报价方","sortable":true,"align":"left","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"organizeSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"报价方","trigger":"change","showLabel":true,"required":true,"tableName":"nx_price","renderKey":1709540533930,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-company","defaultCurrent":true,"tag":"JnpfOrganizeSelect","regList":[],"span":8},"prop":"buinessId","width":0,"__vModel__":"buinessId","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"buinessId","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"价格类型","label":"价格类型","sortable":true,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"价格类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_price","renderKey":1709540601261,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"priceType","width":0,"options":[{"fullName":"回收价","id":"1"}],"__vModel__":"priceType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"priceType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"jnpfKey":"createUser","fullName":"创建用户","label":"创建用户","sortable":true,"align":"left","type":"currUser","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","showLabel":true,"required":false,"tableName":"nx_price","renderKey":1709615835490,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorUserId","width":0,"__vModel__":"creatorUserId","fixed":"none","style":{"width":"100%"},"id":"creatorUserId","placeholder":""},{"jnpfKey":"createTime","fullName":"创建时间","label":"创建时间","sortable":true,"align":"left","type":"currTime","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建时间","showLabel":true,"required":false,"tableName":"nx_price","renderKey":1709615836211,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"id":"creatorTime","placeholder":""}]
+export default columnList

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

@@ -0,0 +1,852 @@
+
+
+
+    <template>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <div class="JNPF-common-page-header">
+        <el-page-header
+          @back="goBack"
+          :content="!dataForm.id ? '新建' : '编辑'"
+        />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width: 70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled="prevDis">
+                  {{ "上一条" }}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled="nextDis">
+                  {{ "下一条" }}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item
+                type="primary"
+                @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading"
+                :disabled="btnLoading"
+              >
+                {{
+                  !dataForm.id ? "确定并新增" : "确定并继续"
+                }}</el-dropdown-item
+              >
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-button
+            type="primary"
+            @click="dataFormSubmit()"
+            :loading="btnLoading"
+            :disabled="continueBtnLoading"
+          >
+            保 存</el-button
+          >
+          <el-button @click="goBack"> 取 消</el-button>
+        </div>
+      </div>
+      <el-row
+        :gutter="15"
+        class="main"
+        :style="{ margin: '0 auto', width: '100%' }"
+      >
+        <el-form
+          ref="formRef"
+          :model="dataForm"
+          :rules="dataRule"
+          size="small"
+          label-width="100px"
+          label-position="right"
+        >
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="基本信息" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="价格编号" prop="priceCode">
+                <JnpfInput
+                  v-model="dataForm.priceCode"
+                  @change="changeData('priceCode', -1)"
+                  placeholder="系统自动生成"
+                  readonly
+                  :style="{ width: '100%' }"
+                >
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="报价方" prop="buinessId">
+                <JnpfOrganizeSelect
+                  v-model="dataForm.buinessId"
+                  @change="changeData('buinessId', -1)"
+                  placeholder="请选择"
+                  selectType="all"
+                  :ableIds="ableAll.buinessIdableIds"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfOrganizeSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="8">
+              <jnpf-form-tip-item label="价格类型" prop="priceType">
+                <JnpfSelect
+                  v-model="dataForm.priceType"
+                  @change="changeData('priceType', -1)"
+                  placeholder="请选择"
+                  clearable
+                  :style="{ width: '100%' }"
+                  :options="priceTypeOptions"
+                  :props="priceTypeProps"
+                >
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="价格信息" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.nxPriceProductList" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
+                  <el-table-column label="商品名称" prop="productId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>商品名称
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfPopupSelect
+                        v-model="scope.row.productId"
+                        @change="changeProduct"
+                        :rowIndex="scope.$index"
+                        :formData="dataForm"
+                        :templateJson="interfaceRes.nxpriceproductproductId"
+                        placeholder="请选择"
+                        hasPage
+                        propsValue="id"
+                        popupWidth="800px"
+                        popupTitle="选择数据"
+                        popupType="dialog"
+                        relationField="name"
+                        :field="'productId' + scope.$index"
+                        interfaceId="534687918480949765"
+                        :pageSize="20"
+                        :columnOptions="nxpriceproductproductIdcolumnOptions"
+                        clearable
+                        :style="{ width: '100%' }"
+                      >
+                      </JnpfPopupSelect>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="单位" prop="units">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign"></span>单位
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput
+                        v-model="scope.row.units"
+                        disabled
+                        @change="
+                          changeData('nxpriceproduct-units', scope.$index)
+                        "
+                        placeholder="请输入"
+                        clearable
+                        :style="{ width: '100%' }"
+                      >
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="回收价" prop="recoveryPrice">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>回收价
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput
+                        v-model="scope.row.recoveryPrice"
+                        @change="
+                          changeData(
+                            'nxpriceproduct-recoveryPrice',
+                            scope.$index
+                          )
+                        "
+                        placeholder="请输入"
+                        clearable
+                        :style="{ width: '100%' }"
+                      >
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="赠送积分" prop="rewardPoints">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>赠送积分
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput
+                        v-model="scope.row.rewardPoints"
+                        @change="
+                          changeData(
+                            'nxpriceproduct-rewardPoints',
+                            scope.$index
+                          )
+                        "
+                        placeholder="请输入"
+                        clearable
+                        :style="{ width: '100%' }"
+                      >
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        class="JNPF-table-delBtn"
+                        @click="delnxpriceproductList(scope.$index)"
+                        >删除</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="table-actions" @click="addnxpriceproductList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="适配服务站" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.nxPriceRecycleList" size="mini">
+                  <el-table-column
+                    type="index"
+                    width="50"
+                    label="序号"
+                    align="center"
+                  />
+                  <el-table-column label="回收站" prop="recycleId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>回收站
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfPopupSelect
+                        v-model="scope.row.recycleId"
+                        @change="
+                          changeData('nxpricerecycle-recycleId', scope.$index)
+                        "
+                        :rowIndex="scope.$index"
+                        :formData="dataForm"
+                        :templateJson="interfaceRes.nxpricerecyclerecycleId"
+                        placeholder="请选择"
+                        hasPage
+                        propsValue="id"
+                        popupWidth="800px"
+                        popupTitle="选择数据"
+                        popupType="dialog"
+                        relationField="station_name"
+                        :field="'recycleId' + scope.$index"
+                        interfaceId="534688845753483781"
+                        :pageSize="20"
+                        :columnOptions="nxpricerecyclerecycleIdcolumnOptions"
+                        clearable
+                        :style="{ width: '100%' }"
+                      >
+                      </JnpfPopupSelect>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        class="JNPF-table-delBtn"
+                        @click="delnxpricerecycleList(scope.$index)"
+                        >删除</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="table-actions" @click="addnxpricerecycleList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="备注" prop="remak">
+                <JnpfInput
+                  v-model="dataForm.remak"
+                  @change="changeData('remak', -1)"
+                  placeholder="请输入"
+                  clearable
+                  :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>
+    </div>
+  </transition>
+</template>
+
+
+<script>
+import request from "@/utils/request";
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import { getDefaultCurrentValueUserId } from "@/api/permission/user";
+import { getDefaultCurrentValueDepartmentId } from "@/api/permission/organize";
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime,
+} from "@/components/Generator/utils/index.js";
+import { thousandsFormat } from "@/components/Generator/utils/index";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: "formRef",
+      setting: {},
+      eventType: "",
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+        nxPriceProductList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px",
+        },
+        nxPriceRecycleList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px",
+        },
+      },
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {
+        nxPriceProductList: {
+          productId: "",
+          productIdOptions: [],
+          recoveryPrice: "",
+          recoveryPriceOptions: [],
+          rewardPoints: "",
+          rewardPointsOptions: [],
+          enabledmark: undefined,
+        },
+        nxPriceRecycleList: {
+          recycleId: "",
+          recycleIdOptions: [],
+          enabledmark: undefined,
+        },
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        priceCode: undefined,
+        buinessId: [],
+        priceType: "1",
+        creatorUserId: undefined,
+        creatorTime: undefined,
+        lastModifyTime: undefined,
+        lastModifyUserId: undefined,
+        remak: undefined,
+        nxPriceProductList: [],
+        nxPriceRecycleList: [],
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule: {
+        buinessId: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
+        priceType: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
+      },
+      priceTypeOptions: [{ fullName: "回收价", id: "1" }],
+      priceTypeProps: { label: "fullName", value: "id" },
+      nxpriceproductproductIdcolumnOptions: [
+        { label: "编码", value: "code" },
+        { label: "名称", value: "name" },
+        { label: "规格", value: "spec" },
+      ],
+      nxpricerecyclerecycleIdcolumnOptions: [
+        { label: "回收站编号", value: "station_code" },
+        { label: "回收站名称", value: "station_name" },
+      ],
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        priceCode: [],
+        buinessId: [],
+        priceType: [],
+        creatorUserId: [],
+        creatorTime: [],
+        lastModifyTime: [],
+        lastModifyUserId: [],
+        remak: [],
+        nxpriceproductproductId: [],
+        nxpriceproductrecoveryPrice: [],
+        nxpriceproductrewardPoints: [],
+        nxpricerecyclerecycleId: [],
+      },
+    };
+  },
+  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/NxPrice/" + id,
+        method: "get",
+      }).then((res) => {
+        this.dataInfo(res.data);
+      });
+    },
+    goBack() {
+      this.visible = false;
+      this.$emit("refreshDataList", true);
+    },
+
+    changeProduct(model, row) {
+      row.productId = row.id;
+
+      this.dataForm.nxPriceProductList.push(row);
+      // debugger;
+      // console.log(this.dataForm.nxPriceProductList);
+      this.dataForm.nxPriceProductList.splice(-2, 1);
+
+      //   this.dataForm.units = row.units;
+    },
+
+    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() {},
+    nxpriceproductExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.nxPriceProductList.length; i++) {
+        const e = this.dataForm.nxPriceProductList[i];
+      }
+      return isOk;
+    },
+    nxpricerecycleExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.nxPriceRecycleList.length; i++) {
+        const e = this.dataForm.nxPriceRecycleList[i];
+      }
+      return isOk;
+    },
+    goBack() {
+      this.$emit("refresh");
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll));
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false;
+      this.nextDis = false;
+      this.allList = allList || [];
+      if (allList.length) {
+        this.index = this.allList.findIndex((item) => item.id === id);
+        if (this.index == 0) {
+          this.prevDis = true;
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true;
+        }
+      } else {
+        this.prevDis = true;
+        this.nextDis = true;
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true;
+          request({
+            url: "/api/scm/NxPrice/" + 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() {
+      if (
+        this.userInfo.organizeIdList instanceof Array &&
+        this.userInfo.organizeIdList.length > 0
+      ) {
+        this.dataForm.buinessId = this.userInfo.organizeIdList;
+      }
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0;
+      this.$refs["formRef"].validate((valid) => {
+        if (valid) {
+          if (!this.nxpriceproductExist()) return;
+          if (!this.nxpricerecycleExist()) return;
+          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/NxPrice",
+          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/NxPrice/" + 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;
+          });
+      }
+    },
+    addnxpriceproductList() {
+      let item = {
+        productId: "",
+        recoveryPrice: undefined,
+        rewardPoints: undefined,
+      };
+      this.getnxpriceproductList(item);
+    },
+    delnxpriceproductList(index) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          this.dataForm.nxPriceProductList.splice(index, 1);
+        })
+        .catch(() => {});
+    },
+    getnxpriceproductList(value) {
+      let item = { ...this.tableRows.nxPriceProductList, ...value };
+      this.dataForm.nxPriceProductList.push(item);
+      this.childIndex = this.dataForm.nxPriceProductList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
+    },
+    addnxpricerecycleList() {
+      let item = {
+        recycleId: "",
+      };
+      this.getnxpricerecycleList(item);
+    },
+    delnxpricerecycleList(index) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          this.dataForm.nxPriceRecycleList.splice(index, 1);
+        })
+        .catch(() => {});
+    },
+    getnxpricerecycleList(value) {
+      let item = { ...this.tableRows.nxPriceRecycleList, ...value };
+      this.dataForm.nxPriceRecycleList.push(item);
+      this.childIndex = this.dataForm.nxPriceRecycleList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
+    },
+    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();
+      for (let i = 0; i < _dataAll.nxPriceProductList.length; i++) {
+        this.childIndex = i;
+      }
+      for (let i = 0; i < _dataAll.nxPriceRecycleList.length; i++) {
+        this.childIndex = i;
+      }
+      this.childIndex = -1;
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,656 @@
+
+
+
+
+
+
+
+<template>
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="价格编号">
+              <el-input
+                v-model="query.priceCode"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报价方">
+              <JnpfOrganizeSelect
+                selectType="all"
+                v-model="query.buinessId"
+                placeholder="请选择
+                                        "
+                clearable
+                multiple
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="价格类型">
+              <JnpfSelect
+                v-model="query.priceType"
+                placeholder="请选择"
+                clearable
+                :options="priceTypeOptions"
+                :props="priceTypeProps"
+                multiple
+              >
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="创建用户">
+                <JnpfUserSelect
+                  v-model="query.creatorUserId"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <JnpfDateRangePicker
+                  v-model="query.creatorTime"
+                  format="yyyy-MM-dd"
+                  startPlaceholder="开始日期"
+                  endPlaceholder="结束日期"
+                />
+              </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"
+              v-has="'btn_add'"
+              @click="addOrUpdateHandle()"
+              >新增
+            </el-button>
+            <el-button
+              type="text"
+              icon="icon-ym icon-ym-btn-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
+            </el-button>
+            <el-button
+              type="text"
+              icon="icon-ym icon-ym-btn-clearn"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
+            </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"
+          has-c
+          @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            prop="priceCode"
+            label="价格编号"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="buinessId"
+            label="报价方"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            label="价格类型"
+            prop="priceType"
+            algin="left"
+            sortable="custom"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.priceType }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="creatorUserId"
+            label="创建用户"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="creatorTime"
+            label="创建时间"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
+              </el-button>
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)"
+                >删除
+              </el-button>
+              <el-button
+                type="text"
+                v-has="'btn_detail'"
+                @click="goDetail(scope.row.id)"
+                >详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
+      </div>
+    </div>
+    <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: {
+        priceCode: undefined,
+        buinessId: undefined,
+        priceType: undefined,
+        creatorUserId: undefined,
+        creatorTime: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+        isLeaf: "isLeaf",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      priceTypeOptions: [{ fullName: "回收价", id: "1" }],
+      priceTypeProps: { label: "fullName", value: "id" },
+      tableField106_productIdcolumnOptions: [
+        { label: "编码", value: "code" },
+        { label: "名称", value: "name" },
+        { label: "规格", value: "spec" },
+      ],
+      tableField114_recycleIdcolumnOptions: [
+        { label: "回收站编号", value: "station_code" },
+        { label: "回收站名称", value: "station_name" },
+      ],
+      interfaceRes: {
+        tableField106_productId: [],
+        tableField114_recycleId: [],
+      },
+    };
+  },
+  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: "534371369878581509",
+        type: 1,
+      };
+      request({
+        url: `/api/scm/NxPrice/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/NxPrice/${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/NxPrice");
+      });
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 1500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection;
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/scm/NxPrice/batchRemove`,
+            data: ids,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    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/NxPrice/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/nxproduct/Detail.vue

@@ -0,0 +1,130 @@
+<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="12">
+            <jnpf-form-tip-item label="编码" prop="code">
+              <p>{{ dataForm.code }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="名称" prop="name">
+              <p>{{ dataForm.name }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="规格" prop="spec">
+              <p>{{ dataForm.spec }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="库存单位" prop="unit">
+              <p>{{ dataForm.unit }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="备注" prop="remak">
+              <p>{{ dataForm.remak }}</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: "",
+        code: "",
+        name: "",
+        spec: "",
+        unit: "",
+        remak: "",
+        creatorTime: "",
+        creatorUserId: "",
+        lastModifyTime: "",
+        lastModifyUserId: "",
+      },
+      unitOptions: [
+        { fullName: "克", id: "1" },
+        { fullName: "千克", id: "2" },
+        { fullName: "吨", id: "3" },
+      ],
+      unitProps: { 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/NxProduct/detail/" + this.dataForm.id,
+            method: "get",
+          }).then((res) => {
+            this.dataInfo(res.data);
+            this.loading = false;
+          });
+        }
+      });
+    },
+  },
+};
+</script>

jnpf-java-boot/jnpf-web/src/views/nxproduct/columnList.js

@@ -0,0 +1,2 @@
+const columnList = [{"jnpfKey":"billRule","fullName":"编码","label":"编码","sortable":true,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"prodcut","className":[],"label":"编码","trigger":"change","showLabel":true,"required":false,"tableName":"nx_product","renderKey":1709603202538,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"商品回收类目编码","tag":"JnpfInput","span":12},"readonly":true,"prop":"code","width":0,"__vModel__":"code","fixed":"none","style":{"width":"100%"},"id":"code","placeholder":"系统自动生成"},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"名称","label":"名称","sortable":true,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603257974,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"name","showWordLimit":false,"width":0,"__vModel__":"name","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"name","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"规格","label":"规格","sortable":true,"align":"left","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"规格","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603269364,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"prop":"spec","showWordLimit":false,"width":0,"__vModel__":"spec","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"spec","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"库存单位","label":"库存单位","sortable":true,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"库存单位","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603304816,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"prop":"unit","width":0,"options":[{"fullName":"克","id":"1"},{"fullName":"千克","id":"2"},{"fullName":"吨","id":"3"}],"__vModel__":"unit","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"unit","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
+export default columnList

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

@@ -0,0 +1,515 @@
+
+
+
+    <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="12">
+            <jnpf-form-tip-item label="编码" prop="code">
+              <JnpfInput
+                v-model="dataForm.code"
+                @change="changeData('code', -1)"
+                placeholder="系统自动生成"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="名称" prop="name">
+              <JnpfInput
+                v-model="dataForm.name"
+                @change="changeData('name', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="规格" prop="spec">
+              <JnpfInput
+                v-model="dataForm.spec"
+                @change="changeData('spec', -1)"
+                placeholder="请输入"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="库存单位" prop="unit">
+              <JnpfSelect
+                v-model="dataForm.unit"
+                @change="changeData('unit', -1)"
+                placeholder="请选择"
+                clearable
+                :style="{ width: '100%' }"
+                :options="unitOptions"
+                :props="unitProps"
+              >
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="备注" prop="remak">
+              <JnpfInput
+                v-model="dataForm.remak"
+                @change="changeData('remak', -1)"
+                placeholder="请输入"
+                clearable
+                :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: {
+        code: undefined,
+        name: undefined,
+        spec: undefined,
+        unit: undefined,
+        remak: undefined,
+        creatorTime: undefined,
+        creatorUserId: undefined,
+        lastModifyTime: undefined,
+        lastModifyUserId: undefined,
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule: {
+        name: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        spec: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
+        unit: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
+      },
+      unitOptions: [
+        { fullName: "克", id: "1" },
+        { fullName: "千克", id: "2" },
+        { fullName: "吨", id: "3" },
+      ],
+      unitProps: { label: "fullName", value: "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        code: [],
+        name: [],
+        spec: [],
+        unit: [],
+        remak: [],
+        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/NxProduct/" + 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/NxProduct/" + 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/NxProduct",
+          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/NxProduct/" + 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/nxproduct/index.vue

@@ -0,0 +1,618 @@
+
+
+
+
+
+
+
+<template>
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="编码">
+              <el-input v-model="query.code" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称">
+              <el-input v-model="query.name" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格">
+              <el-input v-model="query.spec" placeholder="请输入" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="库存单位">
+                <JnpfSelect
+                  v-model="query.unit"
+                  placeholder="请选择"
+                  clearable
+                  :options="unitOptions"
+                  :props="unitProps"
+                  multiple
+                >
+                </JnpfSelect>
+              </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"
+              v-has="'btn_add'"
+              @click="addOrUpdateHandle()"
+              >新增
+            </el-button>
+            <el-button
+              type="text"
+              icon="icon-ym icon-ym-btn-download"
+              @click="exportData()"
+              v-has="'btn_download'"
+              >导出
+            </el-button>
+            <el-button
+              type="text"
+              icon="icon-ym icon-ym-btn-clearn"
+              @click="handleBatchRemoveDel()"
+              v-has="'btn_batchRemove'"
+              >批量删除
+            </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"
+          has-c
+          @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column
+            prop="code"
+            label="编码"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="名称"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="spec"
+            label="规格"
+            align="left"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            label="库存单位"
+            prop="unit"
+            algin="left"
+            sortable="custom"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.unit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="addOrUpdateHandle(scope.row)"
+                v-has="'btn_edit'"
+                >编辑
+              </el-button>
+              <el-button
+                type="text"
+                class="JNPF-table-delBtn"
+                v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)"
+                >删除
+              </el-button>
+              <el-button
+                type="text"
+                v-has="'btn_detail'"
+                @click="goDetail(scope.row.id)"
+                >详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+        />
+      </div>
+    </div>
+    <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: {
+        code: undefined,
+        name: undefined,
+        spec: undefined,
+        unit: undefined,
+      },
+      treeProps: {
+        children: "children",
+        label: "fullName",
+        value: "id",
+        isLeaf: "isLeaf",
+      },
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      unitOptions: [
+        { fullName: "克", id: "1" },
+        { fullName: "千克", id: "2" },
+        { fullName: "吨", id: "3" },
+      ],
+      unitProps: { label: "fullName", value: "id" },
+      interfaceRes: {},
+    };
+  },
+  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: "534635503241163013",
+        type: 1,
+      };
+      request({
+        url: `/api/scm/NxProduct/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/NxProduct/${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/NxProduct");
+      });
+    },
+    handleSelectionChange(val) {
+      const res = val.map((item) => item.id);
+      this.multipleSelection = res;
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: "error",
+          message: "请选择一条数据",
+          duration: 1500,
+        });
+        return;
+      }
+      const ids = this.multipleSelection;
+      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/scm/NxProduct/batchRemove`,
+            data: ids,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    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/NxProduct/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/nxproduct/superQueryJson.js

@@ -0,0 +1,2 @@
+const superQueryJson = [{"__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"prodcut","className":[],"label":"编码","trigger":"change","showLabel":true,"required":false,"tableName":"nx_product","renderKey":1709603202538,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"商品回收类目编码","tag":"JnpfInput","span":12},"readonly":true,"__vModel__":"code","fullName":"编码","style":{"width":"100%"},"id":"code","placeholder":"系统自动生成"},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"名称","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"名称","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603257974,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"name","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"name","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"规格","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"规格","trigger":"blur","showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603269364,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":12},"readonly":false,"showWordLimit":false,"__vModel__":"spec","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"spec","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"库存单位","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"库存单位","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"nx_product","renderKey":1709603304816,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":12},"options":[{"fullName":"克","id":"1"},{"fullName":"千克","id":"2"},{"fullName":"吨","id":"3"}],"__vModel__":"unit","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"unit","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"备注","addonAfter":"","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"nx_product","renderKey":1709603355148,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"remak","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"remak","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}]
+export default superQueryJson

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

@@ -12,25 +12,45 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="回收站">
-              <JnpfSelect v-model="query.stationId" placeholder="请选择" clearable
-                :options="stationIdOptions" :props="stationIdProps" multiple>
+              <JnpfSelect
+                v-model="query.stationId"
+                placeholder="请选择"
+                clearable
+                :options="stationIdOptions"
+                :props="stationIdProps"
+                multiple
+              >
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="回收员姓名">
-              <el-input v-model="query.staffsName" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.staffsName"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="回收员手机">
-              <el-input v-model="query.mobilePhone" placeholder="请输入" clearable> </el-input>
+              <el-input
+                v-model="query.mobilePhone"
+                placeholder="请输入"
+                clearable
+              >
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search()"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh-right" @click="reset()"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-form>
@@ -38,22 +58,40 @@
       <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
+              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-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
+              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">
+        <JNPF-table
+          v-loading="listLoading"
+          :data="list"
+          @sort-change="sortChange"
+          :span-method="arraySpanMethod"
+        >
           <el-table-column prop="stationId" label="回收站" align="left">
           </el-table-column>
           <el-table-column prop="staffsName" label="回收员姓名" align="left">
@@ -62,79 +100,103 @@
           </el-table-column>
           <el-table-column label="性别" prop="gender" algin="left">
             <template slot-scope="scope">
-              {{ scope.row.gender}}
+              {{ scope.row.gender }}
             </template>
           </el-table-column>
           <el-table-column prop="birthday" label="生日" align="left">
           </el-table-column>
           <el-table-column prop="autoEnabled" label="自动接单" align="left">
             <template slot-scope="scope">
-              <div v-if="scope.row.autoEnabled == '开'" style="display: flex;align-items: center;">
+              <div
+                v-if="scope.row.autoEnabled == '开'"
+                style="display: flex; align-items: center"
+              >
                 <div class="green"></div>
-                <span style="margin-left:10px;">开</span>
+                <span style="margin-left: 10px">开</span>
               </div>
-              <div v-else style="display: flex;align-items: center;">
+              <div v-else style="display: flex; align-items: center">
                 <div class="red"></div>
-                <span style="margin-left:10px;color:#8898AA;">关</span>
+                <span style="margin-left: 10px; color: #8898aa">关</span>
               </div>
             </template>
           </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 type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <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 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" />
+        <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" />
+    <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 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'
+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
+    ExportBox,
+    ToFormDetail,
+    SuperQuery,
   },
   data() {
     return {
-
-      keyword: '',
+      keyword: "",
       expandsTree: true,
       refreshTree: true,
       toFormDetailVisible: false,
@@ -154,17 +216,17 @@ export default {
         staffsName: undefined,
       },
       treeProps: {
-        children: 'children',
-        label: 'fullName',
-        value: 'id',
-        isLeaf: 'isLeaf'
+        children: "children",
+        label: "fullName",
+        value: "id",
+        isLeaf: "isLeaf",
       },
       list: [],
       listLoading: true,
       total: 0,
       queryData: {},
       listQuery: {
-        superQueryJson: '',
+        superQueryJson: "",
         currentPage: 1,
         pageSize: 20,
         sort: "desc",
@@ -176,197 +238,198 @@ export default {
       flowList: [],
       exportBoxVisible: false,
       stationIdOptions: [],
-      stationIdProps: { "label": "station_name", "value": "id" },
-      genderOptions: [{ "fullName": "男", "id": "1" }, { "fullName": "女", "id": "2" }],
-      genderProps: { "label": "fullName", "value": "id" },
-      interfaceRes: {
-      },
-    }
+      stationIdProps: { label: "station_name", value: "id" },
+      genderOptions: [
+        { fullName: "男", id: "1" },
+        { fullName: "女", id: "2" },
+      ],
+      genderProps: { label: "fullName", value: "id" },
+      interfaceRes: {},
+    };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(["userInfo"]),
     menuId() {
-      return this.$route.meta.modelId || ''
-    }
+      return this.$route.meta.modelId || "";
+    },
   },
   created() {
-    this.getColumnList(),
-      this.initSearchDataAndListData()
+    this.getColumnList(), this.initSearchDataAndListData();
     this.getstationIdOptions();
-    this.queryData = JSON.parse(JSON.stringify(this.query))
+    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
+      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)
-        })
-      })
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue);
+        });
+      });
     },
     toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
+      this.refreshTree = false;
+      this.expandsTree = expands;
       this.$nextTick(() => {
-        this.refreshTree = true
+        this.refreshTree = true;
         this.$nextTick(() => {
-          this.$refs.treeBox.setCurrentKey(null)
-        })
-      })
+          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 nodeData = node.data;
       const config = {
         treeInterfaceId: "",
-        treeTemplateJson: []
-      }
+        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] || ''
+            element.defaultValue = nodeData[element.relationField] || "";
           }
         }
         //参数
         let query = {
           paramList: config.treeTemplateJson || [],
-        }
+        };
         //接口
-        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-          let data = res.data
+        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)
+      this.columnOptions = this.transformColumnList(this.columnList);
     },
     transformColumnList(columnList) {
-      let list = []
+      let list = [];
       for (let i = 0; i < columnList.length; i++) {
         const e = columnList[i];
-        if (!e.prop.includes('-')) {
-          list.push(e)
+        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 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)
+            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
+              list[i].children.push(e);
+              break;
             }
           }
         }
       }
-      this.getMergeList(list)
-      this.getExportList(list)
-      return list
+      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]
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan];
         }
       }
     },
     getMergeList(list) {
-      let newList = JSON.parse(JSON.stringify(list))
-      newList.forEach(item => {
+      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)
+            prop: item.prop + "-child-first",
+          };
+          item.children.unshift(child);
         }
-      })
-      newList.forEach(item => {
+      });
+      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
-              })
+                colspan: item.children.length,
+              });
             } else {
               this.mergeList.push({
                 prop: child.prop,
                 rowspan: 0,
-                colspan: 0
-              })
+                colspan: 0,
+              });
             }
-          })
+          });
         } else {
           this.mergeList.push({
             prop: item.prop,
             rowspan: 1,
-            colspan: 1
-          })
+            colspan: 1,
+          });
         }
-      })
+      });
     },
     getExportList(list) {
-      let exportList = []
+      let exportList = [];
       for (let i = 0; i < list.length; i++) {
-        if (list[i].jnpfKey === 'table') {
+        if (list[i].jnpfKey === "table") {
           for (let j = 0; j < list[i].children.length; j++) {
-            exportList.push(list[i].children[j])
+            exportList.push(list[i].children[j]);
           }
         } else {
-          exportList.push(list[i])
+          exportList.push(list[i]);
         }
       }
-      this.exportList = exportList
+      this.exportList = exportList;
     },
     getstationIdOptions() {
-      getDataInterfaceRes('520259300875047493').then(res => {
-        let data = res.data
-        this.stationIdOptions = data
-      })
+      getDataInterfaceRes("520259300875047493").then((res) => {
+        let data = res.data;
+        this.stationIdOptions = data;
+      });
     },
     goDetail(id) {
-      this.detailVisible = true
+      this.detailVisible = true;
       this.$nextTick(() => {
-        this.$refs.Detail.init(id)
-      })
+        this.$refs.Detail.init(id);
+      });
     },
     sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-      this.listQuery.sidx = !order ? '' : prop
-      this.initData()
+      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
+      this.listQuery.sidx = !order ? "" : prop;
+      this.initData();
     },
     async initSearchDataAndListData() {
-      await this.initSearchData()
-      this.initData()
+      await this.initSearchData();
+      this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {
-    },
+    async initSearchData() {},
     initData() {
       this.listLoading = true;
       let _query = {
@@ -375,106 +438,112 @@ export default {
         keyword: this.keyword,
         dataType: 0,
         menuId: this.menuId,
-        moduleId: '520258938264883781',
+        moduleId: "520258938264883781",
         type: 1,
       };
       request({
         url: `/api/scm/RecycleStationStaff/getList`,
-        method: 'post',
-        data: _query
-      }).then(res => {
+        method: "post",
+        data: _query,
+      }).then((res) => {
         var _list = res.data.list;
-        this.list = _list.map(o => ({
+        this.list = _list.map((o) => ({
           ...o,
           ...this.expandObj,
-        }))
-        this.total = res.data.pagination.total
-        this.listLoading = false
-      })
+        }));
+        this.total = res.data.pagination.total;
+        this.listLoading = false;
+      });
     },
     handleDel(id) {
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        type: 'warning'
-      }).then(() => {
-        request({
-          url: `/api/scm/RecycleStationStaff/${id}`,
-          method: 'DELETE'
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          request({
+            url: `/api/scm/RecycleStationStaff/${id}`,
+            method: "DELETE",
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.initData();
+              },
+            });
           });
         })
-      }).catch(() => {
-      });
+        .catch(() => {});
     },
     handelUpload() {
-      this.uploadBoxVisible = true
+      this.uploadBoxVisible = true;
       this.$nextTick(() => {
-        this.$refs.UploadBox.init("", "scm/RecycleStationStaff")
-      })
+        this.$refs.UploadBox.init("", "scm/RecycleStationStaff");
+      });
     },
     openSuperQuery() {
-      this.superQueryVisible = true
+      this.superQueryVisible = true;
       this.$nextTick(() => {
-        this.$refs.SuperQuery.init()
-      })
+        this.$refs.SuperQuery.init();
+      });
     },
     superQuery(queryJson) {
-      this.listQuery.superQueryJson = queryJson
-      this.listQuery.currentPage = 1
-      this.initData()
+      this.listQuery.superQueryJson = queryJson;
+      this.listQuery.currentPage = 1;
+      this.initData();
     },
     addOrUpdateHandle(row, isDetail) {
-      let id = row ? row.id : ""
-      this.formVisible = true
+      let id = row ? row.id : "";
+      this.formVisible = true;
       this.$nextTick(() => {
-        this.$refs.JNPFForm.init(id, isDetail, this.list)
-      })
+        this.$refs.JNPFForm.init(id, isDetail, this.list);
+      });
     },
     exportData() {
-      this.exportBoxVisible = true
+      this.exportBoxVisible = true;
       this.$nextTick(() => {
-        this.$refs.ExportBox.init(this.exportList)
-      })
+        this.$refs.ExportBox.init(this.exportList);
+      });
     },
     download(data) {
-      let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
       request({
         url: `/api/scm/RecycleStationStaff/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
-      })
+        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()
+      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()
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
     },
     reset() {
-      this.query = JSON.parse(JSON.stringify(this.queryData))
-      this.search()
+      this.query = JSON.parse(JSON.stringify(this.queryData));
+      this.search();
     },
     colseFlow(isrRefresh) {
-      this.flowVisible = false
-      if (isrRefresh) this.reset()
+      this.flowVisible = false;
+      if (isrRefresh) this.reset();
     },
-  }
-}
+  },
+};
 </script>
 <style scoped>
 .green {