Merge remote-tracking branch 'origin/main'

SC-boot/docker/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 FROM java:8
-VOLUME /tmp/jnpf-boot
+VOLUME /tmp/linkage-boot
-ADD jnpf-admin-3.4.1-RELEASE.jar jnpf-boot.jar
+ADD linkage-admin-3.4.1-RELEASE.jar jnpf-boot.jar
 EXPOSE 30000
 ENTRYPOINT ["java","-jar", "/jnpf-boot.jar"]

SC-boot/docker/Dockerfile-preview

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
 FROM java:8
-VOLUME /tmp/jnpf-boot
+VOLUME /tmp/linkage-boot
-ADD jnpf-admin-3.4.1-RELEASE.jar jnpf-boot.jar
+ADD linkage-admin-3.4.1-RELEASE.jar jnpf-boot.jar
 EXPOSE 30000
 ENTRYPOINT ["java","-jar", "-Dspring.profiles.active=preview", "/jnpf-boot.jar"]
 

SC-boot/docker/Dockerfile-pro

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
 FROM java:8
-VOLUME /tmp/jnpf-boot
+VOLUME /tmp/linkage-boot
-ADD jnpf-admin-3.4.1-RELEASE.jar jnpf-boot.jar
+ADD linkage-admin-3.4.1-RELEASE.jar jnpf-boot.jar
 EXPOSE 30000
 ENTRYPOINT ["java","-jar", "-Dspring.profiles.active=pro", "/jnpf-boot.jar"]
 

SC-boot/docker/Dockerfile-test

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
 FROM java:8
-VOLUME /tmp/jnpf-boot
+VOLUME /tmp/linkage-boot
-ADD jnpf-admin-3.4.1-RELEASE.jar jnpf-boot.jar
+ADD linkage-admin-3.4.1-RELEASE.jar jnpf-boot.jar
 EXPOSE 30000
 ENTRYPOINT ["java","-jar", "-Dspring.profiles.active=test", "/jnpf-boot.jar"]
 

SC-boot/linkage-admin/src/main/java/jnpf/filter/TokenInterceptor.java

@@ -58,7 +58,7 @@ public class TokenInterceptor implements HandlerInterceptor {
 //                ServletUtil.renderString(response, JsonUtil.getObjectToString(result));
 //                return false;
 //            }
-//            //是否过期
+            //是否过期
 //            Date exp = JwtUtil.getExp(token);
 //            if (exp.getTime() < System.currentTimeMillis()) {
 //                ActionResult result = ActionResult.fail(ActionResultCode.SessionOverdue.getCode(), ActionResultCode.SessionOverdue.getMessage());
@@ -77,7 +77,7 @@ public class TokenInterceptor implements HandlerInterceptor {
                 }
             }
             //增加在线过期时间
-            ///tokenTimeout(userInfo);
+            //tokenTimeout(userInfo);
         }
         return true;
     }

SC-boot/linkage-scm/src/main/java/jnpf/customer/controller/CustomerJGController.java

@@ -0,0 +1,347 @@
+
+
+package jnpf.customer.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jnpf.base.ActionResult;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.UserInfo;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.exception.DataException;
+import org.springframework.transaction.annotation.Transactional;
+import jnpf.base.entity.ProvinceEntity;
+import jnpf.customer.model.customer.*;
+import jnpf.customer.model.customer.CustomerPagination;
+import jnpf.customer.entity.*;
+import jnpf.util.*;
+import jnpf.base.util.*;
+import jnpf.base.vo.ListVO;
+import jnpf.util.context.SpringContext;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import lombok.Cleanup;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import jnpf.customer.entity.CustomerJGEntity;
+import jnpf.customer.service.CustomerJGService;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import jnpf.util.GeneraterSwapUtil;
+import java.util.*;
+
+import jnpf.util.file.UploadUtil;
+import jnpf.util.enums.FileTypeEnum;
+
+/**
+ *
+ * 客户档案
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Slf4j
+@RestController
+@Api(tags = "客户档案" , value = "customer")
+@RequestMapping("/api/customer/Customer")
+public class CustomerJGController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private CustomerJGService customerService;
+
+
+
+
+    /**
+     * 列表
+     *
+     * @param customerPagination
+     * @return
+     */
+	@PostMapping("/getList")
+    public ActionResult list(@RequestBody CustomerPagination customerPagination)throws IOException{
+        List<CustomerJGEntity> list= customerService.getList(customerPagination);
+        //处理id字段转名称，若无需转或者为空可删除
+    for(CustomerJGEntity entity:list){
+            entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"2"));
+    }
+	List<CustomerListVO> listVO=JsonUtil.getJsonToList(list,CustomerListVO.class);
+    for(CustomerListVO customerVO:listVO){
+            }
+
+
+        PageListVO vo=new PageListVO();
+        vo.setList(listVO);
+        PaginationVO page=JsonUtil.getJsonToBean(customerPagination,PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+
+
+    /**
+     * 创建
+     *
+     * @param customerCrForm
+     * @return
+     */
+    @PostMapping
+    @Transactional
+    public ActionResult create(@RequestBody @Valid CustomerCrForm customerCrForm) throws DataException {
+        String mainId =RandomUtil.uuId();
+        UserInfo userInfo=userProvider.get();
+        CustomerJGEntity entity = JsonUtil.getJsonToBean(customerCrForm, CustomerJGEntity.class);
+				entity.setId(mainId);
+                customerService.save(entity);
+
+
+        return ActionResult.success("创建成功");
+}
+
+
+
+    /**
+    * 模板下载
+    *
+    * @return
+    */
+    @ApiOperation("模板下载")
+    @GetMapping("/templateDownload")
+    public ActionResult<DownloadVO>  TemplateDownload(){
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=DownloadVO.builder().build();
+        try{
+            vo.setName("职员信息.xlsx");
+            vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
+        }catch(Exception e){
+            log.error("信息导出Excel错误:{}" ,e.getMessage());
+        }
+        return ActionResult.success(vo);
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @ApiOperation("导出Excel")
+    @GetMapping("/Actions/Export")
+    public ActionResult Export(CustomerPaginationExportModel customerPaginationExportModel) throws IOException {
+        if (StringUtil.isEmpty(customerPaginationExportModel.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        CustomerPagination customerPagination=JsonUtil.getJsonToBean(customerPaginationExportModel, CustomerPagination.class);
+        List<CustomerJGEntity> list=  customerService.getTypeList(customerPagination,customerPaginationExportModel.getDataType());
+        //处理id字段转名称，若无需转或者为空可删除
+    for(CustomerJGEntity entity:list){
+            entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"2"));
+    }
+	List<CustomerListVO> listVO=JsonUtil.getJsonToList(list,CustomerListVO.class);
+    for(CustomerListVO customerVO:listVO){
+            }
+
+        //转换为map输出
+        List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
+        String[]keys=!StringUtil.isEmpty(customerPaginationExportModel.getSelectKey())?customerPaginationExportModel.getSelectKey().split(","):new String[0];
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,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 "supplierCd" :
+                    entitys.add(new ExcelExportEntity("客户编码" ,"supplierCd"));
+                    break;
+                    case "supplierNm" :
+                    entitys.add(new ExcelExportEntity("客户名称" ,"supplierNm"));
+                    break;
+                    case "orgId" :
+                    entitys.add(new ExcelExportEntity("所属公司ID" ,"orgId"));
+                    break;
+                    case "orgName" :
+                    entitys.add(new ExcelExportEntity("公司代码" ,"orgName"));
+                    break;
+                    case "customerLevel" :
+                    entitys.add(new ExcelExportEntity("客户等级" ,"customerLevel"));
+                    break;
+                    case "contactName" :
+                    entitys.add(new ExcelExportEntity("联系人" ,"contactName"));
+                    break;
+                    case "address" :
+                    entitys.add(new ExcelExportEntity("地址" ,"address"));
+                    break;
+                    case "contactPhone" :
+                    entitys.add(new ExcelExportEntity("电话" ,"contactPhone"));
+                    break;
+                    case "status" :
+                    entitys.add(new ExcelExportEntity("是否启用" ,"status"));
+                    break;
+            default:
+                    break;
+                    }
+                }
+            }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+		@Cleanup Workbook workbook = new HSSFWorkbook();
+        if (entitys.size()>0){
+            workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
+        }
+        String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+
+        String fileName = configValueUtil.getTemporaryFilePath() + name;
+        @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
+        workbook.write(output);
+        //上传文件
+        UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
+
+        vo.setName(name);
+        vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/batchRemove/{ids}")
+    @Transactional
+    public ActionResult batchRemove(@PathVariable("ids") String ids){
+        String[] idList = ids.split(",");
+		int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+            return ActionResult.fail("删除失败");
+        }
+            return ActionResult.success("删除成功");
+    }
+
+
+    /**
+    * 信息
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/{id}")
+    public ActionResult<CustomerInfoVO> info(@PathVariable("id") String id){
+        CustomerJGEntity entity= customerService.getInfo(id);
+        CustomerInfoVO vo=JsonUtil.getJsonToBean(entity, CustomerInfoVO.class);
+
+    //子表
+    //副表
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 表单信息(详情页)
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/detail/{id}")
+    public ActionResult<CustomerInfoVO> detailInfo(@PathVariable("id") String id){
+        CustomerJGEntity entity= customerService.getInfo(id);
+        CustomerInfoVO vo=JsonUtil.getJsonToBean(entity, CustomerInfoVO.class);
+
+ //子表数据转换
+
+ //附表数据转换
+
+//添加到详情表单对象中
+            vo.setStatus(generaterSwapUtil.switchSelectValue(vo.getStatus() ,"1" ,"2"));
+
+        return ActionResult.success(vo);
+		}
+
+
+
+
+   /**
+    * 更新
+    *
+    * @param id
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Transactional
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid CustomerUpForm customerUpForm) throws DataException {
+        UserInfo userInfo=userProvider.get();
+        CustomerJGEntity entity= customerService.getInfo(id);
+        if(entity!=null){
+            CustomerJGEntity subentity=JsonUtil.getJsonToBean(customerUpForm, CustomerJGEntity.class);
+            customerService.update(id, subentity);
+        return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+
+
+
+   /**
+    * 删除
+    *
+    * @param id
+    * @return
+    */
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        CustomerJGEntity entity= customerService.getInfo(id);
+        if(entity!=null){
+            customerService.delete(entity);
+
+        }
+        return ActionResult.success("删除成功");
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerJGEntity.java

@@ -0,0 +1,100 @@
+package jnpf.customer.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 客户档案 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+@TableName("jg_customer")
+public class CustomerJGEntity  {
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("F_CREATORUSERID")
+    private String creatoruserid;
+
+    @TableField("F_CREATORUSERNAME")
+    private String creatorusername;
+
+    @TableField("F_CREATORTIME")
+    private Date creatortime;
+
+    @TableField("F_LASTMODIFYUSERID")
+    private String lastmodifyuserid;
+
+    @TableField("F_LASTMODIFYUSERNAME")
+    private String lastmodifyusername;
+
+    @TableField("F_LASTMODIFYTIME")
+    private Date lastmodifytime;
+
+    @TableField("F_DELETEUSERID")
+    private String deleteuserid;
+
+    @TableField("F_DELETEUSERNAME")
+    private String deleteusername;
+
+    @TableField("F_DELETETIME")
+    private Date deletetime;
+
+    @TableField("F_DELETEMARK")
+    private String deletemark;
+
+    @TableField("orgnize_id")
+    private String originId;
+
+    @TableField("department_id")
+    private String deptId;
+
+    @TableField("SUPPLIER_CD")
+    private String supplierCd;
+
+    @TableField("SUPPLIER_NM")
+    private String supplierNm;
+
+    @TableField("SUPPLIER_SITE_ID")
+    private String supplierSiteId;
+
+    @TableField("SUPPLIER_SITE_CODE")
+    private String supplierSiteCode;
+
+    @TableField("ORG_ID")
+    private String orgId;
+
+    @TableField("ORG_NAME")
+    private String orgName;
+
+    @TableField("VAT_REGISTRATION_NUM")
+    private String vatRegistrationNum;
+
+    @TableField("CUSTOMER_LEVEL")
+    private String customerLevel;
+
+    @TableField("CONTACT_NAME")
+    private String contactName;
+
+    @TableField("CONTACT_PHONE")
+    private String contactPhone;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("ADDRESS")
+    private String address;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/mapper/CustomerJGMapper.java

@@ -0,0 +1,17 @@
+package jnpf.customer.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.customer.entity.CustomerJGEntity;
+
+/**
+ *
+ * 客户档案
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-04
+ */
+public interface CustomerJGMapper extends BaseMapper<CustomerJGEntity> {
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerCrForm.java

@@ -0,0 +1,60 @@
+
+
+package jnpf.customer.model.customer;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerCrForm  {
+
+    /** 客户编码 **/
+    @JsonProperty("supplierCd")
+    private String supplierCd;
+
+    /** 客户名称 **/
+    @JsonProperty("supplierNm")
+    private String supplierNm;
+
+    /** 所属公司ID **/
+    @JsonProperty("orgId")
+    private String orgId;
+
+    /** 公司代码 **/
+    @JsonProperty("orgName")
+    private String orgName;
+
+    /** 客户等级 **/
+    @JsonProperty("customerLevel")
+    private String customerLevel;
+
+    /** 联系人 **/
+    @JsonProperty("contactName")
+    private String contactName;
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+    /** 电话 **/
+    @JsonProperty("contactPhone")
+    private String contactPhone;
+
+    /** 是否启用 **/
+    @JsonProperty("status")
+    private String status;
+
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerInfoVO.java

@@ -0,0 +1,62 @@
+
+
+
+package jnpf.customer.model.customer;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerInfoVO{
+        /** 主键 **/
+        @JsonProperty("id")
+        private String id;
+
+        /** 客户编码 **/
+        @JsonProperty("supplierCd")
+        private String supplierCd;
+
+        /** 客户名称 **/
+        @JsonProperty("supplierNm")
+        private String supplierNm;
+
+        /** 所属公司ID **/
+        @JsonProperty("orgId")
+        private String orgId;
+
+        /** 公司代码 **/
+        @JsonProperty("orgName")
+        private String orgName;
+
+        /** 客户等级 **/
+        @JsonProperty("customerLevel")
+        private String customerLevel;
+
+        /** 联系人 **/
+        @JsonProperty("contactName")
+        private String contactName;
+
+        /** 地址 **/
+        @JsonProperty("address")
+        private String address;
+
+        /** 电话 **/
+        @JsonProperty("contactPhone")
+        private String contactPhone;
+
+        /** 是否启用 **/
+        @JsonProperty("status")
+        private String status;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListQuery.java

@@ -0,0 +1,27 @@
+package jnpf.customer.model.customer;
+
+import lombok.Data;
+import java.util.Date;
+import jnpf.base.Pagination;
+import java.util.List;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerListQuery extends Pagination {
+
+        /** 客户编码 */
+        private String supplierCd;
+
+        /** 客户名称 */
+        private String supplierNm;
+	/**
+    * 菜单id
+    */
+    private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerListVO.java

@@ -0,0 +1,72 @@
+
+
+package jnpf.customer.model.customer;
+
+
+import lombok.Data;
+import java.sql.Time;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerListVO{
+
+    /** 主键 */
+    private String id;
+
+
+    /** 客户编码 **/
+    @JsonProperty("supplierCd")
+    private String supplierCd;
+
+
+    /** 客户名称 **/
+    @JsonProperty("supplierNm")
+    private String supplierNm;
+
+
+    /** 所属公司ID **/
+    @JsonProperty("orgId")
+    private String orgId;
+
+
+    /** 公司代码 **/
+    @JsonProperty("orgName")
+    private String orgName;
+
+
+    /** 客户等级 **/
+    @JsonProperty("customerLevel")
+    private String customerLevel;
+
+
+    /** 联系人 **/
+    @JsonProperty("contactName")
+    private String contactName;
+
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+
+    /** 电话 **/
+    @JsonProperty("contactPhone")
+    private String contactPhone;
+
+
+    /** 是否启用 **/
+    @JsonProperty("status")
+    private String status;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPagination.java

@@ -0,0 +1,28 @@
+package jnpf.customer.model.customer;
+
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerPagination extends Pagination {
+
+        /** 客户编码 */
+        private String supplierCd;
+
+        /** 客户名称 */
+        private String supplierNm;
+	/**
+    * 菜单id
+    */
+	private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerPaginationExportModel.java

@@ -0,0 +1,29 @@
+package jnpf.customer.model.customer;
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.*;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerPaginationExportModel extends Pagination {
+
+    private String selectKey;
+
+    private String json;
+
+    private String dataType;
+
+
+			/** 客户编码 */
+    private String supplierCd;
+
+			/** 客户名称 */
+    private String supplierNm;
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/model/customer/CustomerUpForm.java

@@ -0,0 +1,71 @@
+
+
+package jnpf.customer.model.customer;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-04
+ */
+@Data
+public class CustomerUpForm{
+    /** 主键 */
+    private String id;
+
+
+    /** 客户编码 **/
+    @JsonProperty("supplierCd")
+    private String supplierCd;
+
+
+    /** 客户名称 **/
+    @JsonProperty("supplierNm")
+    private String supplierNm;
+
+
+    /** 所属公司ID **/
+    @JsonProperty("orgId")
+    private String orgId;
+
+
+    /** 公司代码 **/
+    @JsonProperty("orgName")
+    private String orgName;
+
+
+    /** 客户等级 **/
+    @JsonProperty("customerLevel")
+    private String customerLevel;
+
+
+    /** 联系人 **/
+    @JsonProperty("contactName")
+    private String contactName;
+
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+
+    /** 电话 **/
+    @JsonProperty("contactPhone")
+    private String contactPhone;
+
+
+    /** 是否启用 **/
+    @JsonProperty("status")
+    private String status;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/service/CustomerJGService.java

@@ -0,0 +1,35 @@
+package jnpf.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.customer.entity.CustomerJGEntity;
+import jnpf.customer.model.customer.CustomerPagination;
+
+import java.util.*;
+/**
+ *
+ * 客户档案
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-04
+ */
+public interface CustomerJGService extends IService<CustomerJGEntity> {
+
+    List<CustomerJGEntity> getList(CustomerPagination customerPagination);
+
+    List<CustomerJGEntity> getTypeList(CustomerPagination customerPagination, String dataType);
+
+
+
+    CustomerJGEntity getInfo(String id);
+
+    void delete(CustomerJGEntity entity);
+
+    void create(CustomerJGEntity entity);
+
+    boolean update(String id, CustomerJGEntity entity);
+    
+//  子表方法
+
+    //列表子表数据方法
+}

SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerJGServiceImpl.java

@@ -0,0 +1,232 @@
+package jnpf.customer.service.impl;
+
+import jnpf.customer.entity.*;
+import jnpf.customer.mapper.CustomerJGMapper;
+import jnpf.customer.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.util.RandomUtil;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+
+
+import jnpf.customer.model.customer.CustomerPagination;
+
+import jnpf.permission.service.AuthorizeService;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.stream.Collectors;
+
+
+
+
+
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.*;
+
+/**
+ *
+ * 客户档案
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-04
+ */
+@Service
+public class CustomerJGServiceImpl extends ServiceImpl<CustomerJGMapper, CustomerJGEntity> implements CustomerJGService{
+
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+
+
+
+
+    @Override
+    public List<CustomerJGEntity> getList(CustomerPagination customerPagination){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        int total=0;
+		int customerNum =0;
+        QueryWrapper<CustomerJGEntity> customerQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
+            if (ObjectUtil.isEmpty(customerObj)){
+                return new ArrayList<>();
+            } else {
+                customerQueryWrapper = (QueryWrapper<CustomerJGEntity>)customerObj;
+                customerNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
+            if (ObjectUtil.isEmpty(customerObj)){
+                return new ArrayList<>();
+            } else {
+            customerQueryWrapper = (QueryWrapper<CustomerJGEntity>)customerObj;
+             customerNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(customerPagination.getSupplierCd())){
+            customerNum++;
+            customerQueryWrapper.lambda().like(CustomerJGEntity::getSupplierCd,customerPagination.getSupplierCd());
+                    }
+
+			if(StringUtil.isNotEmpty(customerPagination.getSupplierNm())){
+            customerNum++;
+            customerQueryWrapper.lambda().like(CustomerJGEntity::getSupplierNm,customerPagination.getSupplierNm());
+                    }
+
+        if(AllIdList.size()>0){
+            customerQueryWrapper.lambda().in(CustomerJGEntity::getId, AllIdList);
+        }
+        //排序
+        if(StringUtil.isEmpty(customerPagination.getSidx())){
+        customerQueryWrapper.lambda().orderByDesc(CustomerJGEntity::getSupplierCd);
+        }else{
+            try {
+                String sidx = customerPagination.getSidx();
+                CustomerJGEntity customerEntity = new CustomerJGEntity();
+                Field declaredField = customerEntity.getClass().getDeclaredField(sidx);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                customerQueryWrapper="asc".equals(customerPagination.getSort().toLowerCase())?customerQueryWrapper.orderByAsc(value):customerQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if((total>0 && AllIdList.size()>0) || total==0){
+        Page<CustomerJGEntity> page=new Page<>(customerPagination.getCurrentPage(), customerPagination.getPageSize());
+        IPage<CustomerJGEntity> userIPage=this.page(page, customerQueryWrapper);
+        return customerPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+        }else{
+            List<CustomerJGEntity> list = new ArrayList();
+            return customerPagination.setData(list, list.size());
+        }
+    }
+    @Override
+    public List<CustomerJGEntity> getTypeList(CustomerPagination customerPagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+		int total=0;
+		int customerNum =0;
+        QueryWrapper<CustomerJGEntity> customerQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
+            if (ObjectUtil.isEmpty(customerObj)){
+                return new ArrayList<>();
+            } else {
+                customerQueryWrapper = (QueryWrapper<CustomerJGEntity>)customerObj;
+                customerNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object customerObj=authorizeService.getCondition(new AuthorizeConditionModel(customerQueryWrapper,customerPagination.getMenuId(),"customer"));
+            if (ObjectUtil.isEmpty(customerObj)){
+                return new ArrayList<>();
+            } else {
+            customerQueryWrapper = (QueryWrapper<CustomerJGEntity>)customerObj;
+             customerNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(customerPagination.getSupplierCd())){
+            customerNum++;
+            customerQueryWrapper.lambda().like(CustomerJGEntity::getSupplierCd,customerPagination.getSupplierCd());
+                    }
+
+			if(StringUtil.isNotEmpty(customerPagination.getSupplierNm())){
+            customerNum++;
+            customerQueryWrapper.lambda().like(CustomerJGEntity::getSupplierNm,customerPagination.getSupplierNm());
+                    }
+
+		if(AllIdList.size()>0){
+        customerQueryWrapper.lambda().in(CustomerJGEntity::getId, AllIdList);
+				}
+        //排序
+        if(StringUtil.isEmpty(customerPagination.getSidx())){
+        customerQueryWrapper.lambda().orderByDesc(CustomerJGEntity::getSupplierCd);
+        }else{
+            try {
+            	String sidx = customerPagination.getSidx();
+                CustomerJGEntity customerEntity = new CustomerJGEntity();
+				Field declaredField = customerEntity.getClass().getDeclaredField(sidx);
+				declaredField.setAccessible(true);
+				String value = declaredField.getAnnotation(TableField.class).value();
+                 customerQueryWrapper="asc".equals(customerPagination.getSort().toLowerCase())?customerQueryWrapper.orderByAsc(value):customerQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<CustomerJGEntity> page=new Page<>(customerPagination.getCurrentPage(), customerPagination.getPageSize());
+                IPage<CustomerJGEntity> userIPage=this.page(page, customerQueryWrapper);
+                return customerPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<CustomerJGEntity> list = new ArrayList();
+                return customerPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(customerQueryWrapper);
+        }
+    }
+
+    @Override
+    public CustomerJGEntity getInfo(String id){
+        QueryWrapper<CustomerJGEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(CustomerJGEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+
+    @Override
+    public void create(CustomerJGEntity entity){
+        this.save(entity);
+    }
+
+    @Override
+    public boolean update(String id, CustomerJGEntity entity){
+        entity.setId(id);
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(CustomerJGEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    //子表方法
+
+    //列表子表数据方法
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java

@@ -0,0 +1,342 @@
+
+
+package jnpf.vehicle.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jnpf.base.ActionResult;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.UserInfo;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.exception.DataException;
+import jnpf.vehicle.entity.VehicleEntity;
+import jnpf.vehicle.model.vehicle.*;
+import jnpf.vehicle.service.VehicleService;
+import org.springframework.transaction.annotation.Transactional;
+import jnpf.base.entity.ProvinceEntity;
+
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.base.util.*;
+import jnpf.base.vo.ListVO;
+import jnpf.util.context.SpringContext;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import lombok.Cleanup;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.multipart.MultipartFile;
+import javax.validation.Valid;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import jnpf.util.GeneraterSwapUtil;
+import java.util.*;
+
+import jnpf.util.file.UploadUtil;
+import jnpf.util.enums.FileTypeEnum;
+
+/**
+ *
+ * vehicle
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Slf4j
+@RestController
+@Api(tags = "vehicle" , value = "example")
+@RequestMapping("/api/example/Vehicle")
+public class VehicleController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private ConfigValueUtil configValueUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private VehicleService vehicleService;
+
+
+
+
+    /**
+     * 列表
+     *
+     * @param vehiclePagination
+     * @return
+     */
+	@PostMapping("/getList")
+    public ActionResult list(@RequestBody VehiclePagination vehiclePagination)throws IOException{
+        List<VehicleEntity> list= vehicleService.getList(vehiclePagination);
+        //处理id字段转名称，若无需转或者为空可删除
+    for(VehicleEntity entity:list){
+            entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos()));
+    }
+	List<VehicleListVO> listVO=JsonUtil.getJsonToList(list,VehicleListVO.class);
+    for(VehicleListVO vehicleVO:listVO){
+            }
+
+
+        PageListVO vo=new PageListVO();
+        vo.setList(listVO);
+        PaginationVO page=JsonUtil.getJsonToBean(vehiclePagination,PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+
+
+    /**
+     * 创建
+     *
+     * @param vehicleCrForm
+     * @return
+     */
+    @PostMapping
+    @Transactional
+    public ActionResult create(@RequestBody @Valid VehicleCrForm vehicleCrForm) throws DataException {
+        String mainId =RandomUtil.uuId();
+        UserInfo userInfo=userProvider.get();
+        vehicleCrForm.setCreatortime(DateUtil.getNow());
+        VehicleEntity entity = JsonUtil.getJsonToBean(vehicleCrForm, VehicleEntity.class);
+				entity.setId(mainId);
+                vehicleService.save(entity);
+
+
+        return ActionResult.success("创建成功");
+}
+
+
+
+    /**
+    * 模板下载
+    *
+    * @return
+    */
+    @ApiOperation("模板下载")
+    @GetMapping("/templateDownload")
+    public ActionResult<DownloadVO>  TemplateDownload(){
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=DownloadVO.builder().build();
+        try{
+            vo.setName("职员信息.xlsx");
+            vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
+        }catch(Exception e){
+            log.error("信息导出Excel错误:{}" ,e.getMessage());
+        }
+        return ActionResult.success(vo);
+    }
+    /**
+    * 导出Excel
+    *
+    * @return
+    */
+    @ApiOperation("导出Excel")
+    @GetMapping("/Actions/Export")
+    public ActionResult Export(VehiclePaginationExportModel vehiclePaginationExportModel) throws IOException {
+        if (StringUtil.isEmpty(vehiclePaginationExportModel.getSelectKey())){
+            return ActionResult.fail("请选择导出字段");
+        }
+        VehiclePagination vehiclePagination=JsonUtil.getJsonToBean(vehiclePaginationExportModel, VehiclePagination.class);
+        List<VehicleEntity> list=  vehicleService.getTypeList(vehiclePagination,vehiclePaginationExportModel.getDataType());
+        //处理id字段转名称，若无需转或者为空可删除
+    for(VehicleEntity entity:list){
+            entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos()));
+    }
+	List<VehicleListVO> listVO=JsonUtil.getJsonToList(list,VehicleListVO.class);
+    for(VehicleListVO vehicleVO:listVO){
+            }
+
+        //转换为map输出
+        List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
+        String[]keys=!StringUtil.isEmpty(vehiclePaginationExportModel.getSelectKey())?vehiclePaginationExportModel.getSelectKey().split(","):new String[0];
+        UserInfo userInfo=userProvider.get();
+        DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,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 "creatoruserid" :
+                    entitys.add(new ExcelExportEntity("ID" ,"creatoruserid"));
+                    break;
+                    case "ticketno" :
+                    entitys.add(new ExcelExportEntity("车牌号" ,"ticketno"));
+                    break;
+                    case "drivername" :
+                    entitys.add(new ExcelExportEntity("司机名称" ,"drivername"));
+                    break;
+                    case "vehiclephotos" :
+                    entitys.add(new ExcelExportEntity("车辆照片" ,"vehiclephotos"));
+                    break;
+                    case "contact" :
+                    entitys.add(new ExcelExportEntity("手机号" ,"contact"));
+                    break;
+                    case "creatorusername" :
+                    entitys.add(new ExcelExportEntity("录入人" ,"creatorusername"));
+                    break;
+                    case "creatortime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatortime"));
+                    break;
+            default:
+                    break;
+                    }
+                }
+            }
+
+        ExportParams exportParams = new ExportParams(null, "表单信息");
+        exportParams.setType(ExcelType.XSSF);
+        try{
+		@Cleanup Workbook workbook = new HSSFWorkbook();
+        if (entitys.size()>0){
+            workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
+        }
+        String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
+
+        String fileName = configValueUtil.getTemporaryFilePath() + name;
+        @Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
+        workbook.write(output);
+        //上传文件
+        UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
+
+        vo.setName(name);
+        vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
+        } catch (Exception e) {
+            log.error("信息导出Excel错误:{}", e.getMessage());
+            e.printStackTrace();
+        }
+        return vo;
+    }
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/batchRemove/{ids}")
+    @Transactional
+    public ActionResult batchRemove(@PathVariable("ids") String ids){
+        String[] idList = ids.split(",");
+		int i =0;
+        for (String allId : idList){
+            this.delete(allId);
+            i++;
+        }
+        if (i == 0 ){
+            return ActionResult.fail("删除失败");
+        }
+            return ActionResult.success("删除成功");
+    }
+
+
+    /**
+    * 信息
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/{id}")
+    public ActionResult<VehicleInfoVO> info(@PathVariable("id") String id){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        VehicleInfoVO vo=JsonUtil.getJsonToBean(entity, VehicleInfoVO.class);
+        if(vo.getCreatortime()!=null){
+            vo.setCreatortime(vo.getCreatortime());
+        }
+
+    //子表
+    //副表
+        return ActionResult.success(vo);
+    }
+
+    /**
+    * 表单信息(详情页)
+    *
+    * @param id
+    * @return
+    */
+    @GetMapping("/detail/{id}")
+    public ActionResult<VehicleInfoVO> detailInfo(@PathVariable("id") String id){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        VehicleInfoVO vo=JsonUtil.getJsonToBean(entity, VehicleInfoVO.class);
+
+ //子表数据转换
+
+ //附表数据转换
+
+//添加到详情表单对象中
+            vo.setVehiclephotos(generaterSwapUtil.getFileNameInJson(vo.getVehiclephotos()));
+
+        return ActionResult.success(vo);
+		}
+
+
+
+
+   /**
+    * 更新
+    *
+    * @param id
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Transactional
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid VehicleUpForm vehicleUpForm) throws DataException {
+        UserInfo userInfo=userProvider.get();
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity!=null){
+            VehicleEntity subentity=JsonUtil.getJsonToBean(vehicleUpForm, VehicleEntity.class);
+					subentity.setCreatortime(entity.getCreatortime());
+            vehicleService.update(id, subentity);
+        return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+
+
+
+   /**
+    * 删除
+    *
+    * @param id
+    * @return
+    */
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        VehicleEntity entity= vehicleService.getInfo(id);
+        if(entity!=null){
+            vehicleService.delete(entity);
+
+        }
+        return ActionResult.success("删除成功");
+    }
+
+
+
+
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java

@@ -0,0 +1,76 @@
+package jnpf.vehicle.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 车辆信息 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+@TableName("jg_vehicle")
+public class VehicleEntity  {
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("F_CREATORUSERID")
+    private String creatoruserid;
+
+    @TableField("F_CREATORUSERNAME")
+    private String creatorusername;
+
+    @TableField("F_CREATORTIME")
+    private Date creatortime;
+
+    @TableField("F_LASTMODIFYUSERID")
+    private String lastmodifyuserid;
+
+    @TableField("F_LASTMODIFYUSERNAME")
+    private String lastmodifyusername;
+
+    @TableField("F_LASTMODIFYTIME")
+    private Date lastmodifytime;
+
+    @TableField("F_DELETEUSERID")
+    private String deleteuserid;
+
+    @TableField("F_DELETEUSERNAME")
+    private String deleteusername;
+
+    @TableField("F_DELETETIME")
+    private Date deletetime;
+
+    @TableField("F_DELETEMARK")
+    private String deletemark;
+
+    @TableField("ORGNIZE_ID")
+    private String orgnizeId;
+
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+
+    @TableField("TICKETNO")
+    private String ticketno;
+
+    @TableField("VEHICLEPHOTOS")
+    private String vehiclephotos;
+
+    @TableField("DRIVERNAME")
+    private String drivername;
+
+    @TableField("CONTACT")
+    private String contact;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java

@@ -0,0 +1,17 @@
+package jnpf.vehicle.mapper;
+
+
+import jnpf.vehicle.entity.VehicleEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * vehicle
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-05
+ */
+public interface VehicleMapper extends BaseMapper<VehicleEntity> {
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleCrForm.java

@@ -0,0 +1,52 @@
+
+
+package jnpf.vehicle.model.vehicle;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehicleCrForm  {
+
+    /** ID **/
+    @JsonProperty("creatoruserid")
+    private String creatoruserid;
+
+    /** 车牌号 **/
+    @JsonProperty("ticketno")
+    private String ticketno;
+
+    /** 司机名称 **/
+    @JsonProperty("drivername")
+    private String drivername;
+
+    /** 车辆照片 **/
+    @JsonProperty("vehiclephotos")
+    private String vehiclephotos;
+
+    /** 手机号 **/
+    @JsonProperty("contact")
+    private String contact;
+
+    /** 录入人 **/
+    @JsonProperty("creatorusername")
+    private String creatorusername;
+
+    /** 创建时间 **/
+    @JsonProperty("creatortime")
+    private String creatortime;
+
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleInfoVO.java

@@ -0,0 +1,55 @@
+
+
+
+package jnpf.vehicle.model.vehicle;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehicleInfoVO{
+        /** 主键 **/
+        @JsonProperty("id")
+        private String id;
+
+        /** ID **/
+        @JsonProperty("creatoruserid")
+        private String creatoruserid;
+
+        /** 车牌号 **/
+        @JsonProperty("ticketno")
+        private String ticketno;
+
+        /** 司机名称 **/
+        @JsonProperty("drivername")
+        private String drivername;
+
+        /** 车辆照片 **/
+        @JsonProperty("vehiclephotos")
+        private String vehiclephotos;
+
+        /** 手机号 **/
+        @JsonProperty("contact")
+        private String contact;
+
+        /** 录入人 **/
+        @JsonProperty("creatorusername")
+        private String creatorusername;
+
+        /** 创建时间 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("creatortime")
+        private Date  creatortime;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListQuery.java

@@ -0,0 +1,27 @@
+package jnpf.vehicle.model.vehicle;
+
+import lombok.Data;
+import java.util.Date;
+import jnpf.base.Pagination;
+import java.util.List;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehicleListQuery extends Pagination {
+
+        /** 车牌号 */
+        private String ticketno;
+
+        /** 司机名称 */
+        private String drivername;
+	/**,,,
+    * 菜单id
+    */
+    private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleListVO.java

@@ -0,0 +1,63 @@
+
+
+package jnpf.vehicle.model.vehicle;
+
+
+import lombok.Data;
+import java.sql.Time;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehicleListVO{
+
+    /** 主键 */
+    private String id;
+
+
+    /** ID **/
+    @JsonProperty("creatoruserid")
+    private String creatoruserid;
+
+
+    /** 车牌号 **/
+    @JsonProperty("ticketno")
+    private String ticketno;
+
+
+    /** 司机名称 **/
+    @JsonProperty("drivername")
+    private String drivername;
+
+
+    /** 车辆照片 **/
+    @JsonProperty("vehiclephotos")
+    private String vehiclephotos;
+
+
+    /** 手机号 **/
+    @JsonProperty("contact")
+    private String contact;
+
+
+    /** 录入人 **/
+    @JsonProperty("creatorusername")
+    private String creatorusername;
+
+
+    /** 创建时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("creatortime")
+    private Date  creatortime;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePagination.java

@@ -0,0 +1,28 @@
+package jnpf.vehicle.model.vehicle;
+
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehiclePagination extends Pagination {
+
+        /** 车牌号 */
+        private String ticketno;
+
+        /** 司机名称 */
+        private String drivername;
+	/**
+    * 菜单id
+    */
+	private String menuId;
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehiclePaginationExportModel.java

@@ -0,0 +1,29 @@
+package jnpf.vehicle.model.vehicle;
+
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.*;
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehiclePaginationExportModel extends Pagination {
+
+    private String selectKey;
+
+    private String json;
+
+    private String dataType;
+
+
+			/** 车牌号 */
+    private String ticketno;
+
+			/** 司机名称 */
+    private String drivername;
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/model/vehicle/VehicleUpForm.java

@@ -0,0 +1,61 @@
+
+
+package jnpf.vehicle.model.vehicle;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+/**
+ *
+ * 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-01-05
+ */
+@Data
+public class VehicleUpForm{
+    /** 主键 */
+    private String id;
+
+
+    /** ID **/
+    @JsonProperty("creatoruserid")
+    private String creatoruserid;
+
+
+    /** 车牌号 **/
+    @JsonProperty("ticketno")
+    private String ticketno;
+
+
+    /** 司机名称 **/
+    @JsonProperty("drivername")
+    private String drivername;
+
+
+    /** 车辆照片 **/
+    @JsonProperty("vehiclephotos")
+    private String vehiclephotos;
+
+
+    /** 手机号 **/
+    @JsonProperty("contact")
+    private String contact;
+
+
+    /** 录入人 **/
+    @JsonProperty("creatorusername")
+    private String creatorusername;
+
+
+    /** 创建时间 **/
+    @JsonProperty("creatortime")
+    private String creatortime;
+
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java

@@ -0,0 +1,37 @@
+package jnpf.vehicle.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import jnpf.vehicle.entity.VehicleEntity;
+import jnpf.vehicle.model.vehicle.VehiclePagination;
+
+import java.util.*;
+/**
+ *
+ * vehicle
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-05
+ */
+public interface VehicleService extends IService<VehicleEntity> {
+
+    List<VehicleEntity> getList(VehiclePagination vehiclePagination);
+
+    List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,String dataType);
+
+
+
+    VehicleEntity getInfo(String id);
+
+    void delete(VehicleEntity entity);
+
+    void create(VehicleEntity entity);
+
+    boolean update( String id, VehicleEntity entity);
+    
+//  子表方法
+
+    //列表子表数据方法
+}

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java

@@ -0,0 +1,233 @@
+package jnpf.vehicle.service.impl;
+
+import jnpf.entity.*;
+
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.util.RandomUtil;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+
+
+
+
+import jnpf.permission.service.AuthorizeService;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.stream.Collectors;
+
+
+import jnpf.vehicle.entity.VehicleEntity;
+
+import jnpf.vehicle.mapper.VehicleMapper;
+import jnpf.vehicle.model.vehicle.VehiclePagination;
+import jnpf.vehicle.service.VehicleService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.*;
+
+/**
+ *
+ * vehicle
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-01-05
+ */
+@Service
+public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity> implements VehicleService {
+
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+
+
+
+
+    @Override
+    public List<VehicleEntity> getList(VehiclePagination vehiclePagination){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        int total=0;
+		int vehicleNum =0;
+        QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+            if (ObjectUtil.isEmpty(vehicleObj)){
+                return new ArrayList<>();
+            } else {
+                vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+                vehicleNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+            if (ObjectUtil.isEmpty(vehicleObj)){
+                return new ArrayList<>();
+            } else {
+            vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+             vehicleNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(vehiclePagination.getTicketno())){
+            vehicleNum++;
+            vehicleQueryWrapper.lambda().like(VehicleEntity::getTicketno,vehiclePagination.getTicketno());
+                    }
+
+			if(StringUtil.isNotEmpty(vehiclePagination.getDrivername())){
+            vehicleNum++;
+            vehicleQueryWrapper.lambda().like(VehicleEntity::getDrivername,vehiclePagination.getDrivername());
+                    }
+
+        if(AllIdList.size()>0){
+            vehicleQueryWrapper.lambda().in(VehicleEntity::getId, AllIdList);
+        }
+        //排序
+        if(StringUtil.isEmpty(vehiclePagination.getSidx())){
+        vehicleQueryWrapper.lambda().orderByDesc(VehicleEntity::getId);
+        }else{
+            try {
+                String sidx = vehiclePagination.getSidx();
+                VehicleEntity vehicleEntity = new VehicleEntity();
+                Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if((total>0 && AllIdList.size()>0) || total==0){
+        Page<VehicleEntity> page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize());
+        IPage<VehicleEntity> userIPage=this.page(page, vehicleQueryWrapper);
+        return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+        }else{
+            List<VehicleEntity> list = new ArrayList();
+            return vehiclePagination.setData(list, list.size());
+        }
+    }
+    @Override
+    public List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+		int total=0;
+		int vehicleNum =0;
+        QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+    if(isPc && pcPermission){
+		if (!userProvider.get().getIsAdministrator()){
+				Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+            if (ObjectUtil.isEmpty(vehicleObj)){
+                return new ArrayList<>();
+            } else {
+                vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+                vehicleNum++;
+            }
+        }
+    }
+    if(!isPc && appPermission){
+		if (!userProvider.get().getIsAdministrator()){
+			Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"vehicle"));
+            if (ObjectUtil.isEmpty(vehicleObj)){
+                return new ArrayList<>();
+            } else {
+            vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+             vehicleNum++;
+			}
+
+
+		}
+    }
+			if(StringUtil.isNotEmpty(vehiclePagination.getTicketno())){
+            vehicleNum++;
+            vehicleQueryWrapper.lambda().like(VehicleEntity::getTicketno,vehiclePagination.getTicketno());
+                    }
+
+			if(StringUtil.isNotEmpty(vehiclePagination.getDrivername())){
+            vehicleNum++;
+            vehicleQueryWrapper.lambda().like(VehicleEntity::getDrivername,vehiclePagination.getDrivername());
+                    }
+
+		if(AllIdList.size()>0){
+        vehicleQueryWrapper.lambda().in(VehicleEntity::getId, AllIdList);
+				}
+        //排序
+        if(StringUtil.isEmpty(vehiclePagination.getSidx())){
+        vehicleQueryWrapper.lambda().orderByDesc(VehicleEntity::getId);
+        }else{
+            try {
+            	String sidx = vehiclePagination.getSidx();
+                VehicleEntity vehicleEntity = new VehicleEntity();
+				Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx);
+				declaredField.setAccessible(true);
+				String value = declaredField.getAnnotation(TableField.class).value();
+                 vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<VehicleEntity> page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize());
+                IPage<VehicleEntity> userIPage=this.page(page, vehicleQueryWrapper);
+                return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<VehicleEntity> list = new ArrayList();
+                return vehiclePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(vehicleQueryWrapper);
+        }
+    }
+
+    @Override
+    public VehicleEntity getInfo(String id){
+        QueryWrapper<VehicleEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(VehicleEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+
+    @Override
+    public void create(VehicleEntity entity){
+        this.save(entity);
+    }
+
+    @Override
+    public boolean update(String id, VehicleEntity entity){
+        entity.setId(id);
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(VehicleEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    //子表方法
+
+    //列表子表数据方法
+
+
+}

SC-boot/linkage-scm/src/main/resources/CustomerMapper.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.customer.mapper.CustomerJGMapper">
+
+
+
+</mapper>

SC-boot/linkage-scm/src/main/resources/VehicleMapper.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.vehicle.mapper.VehicleMapper">
+
+
+
+</mapper>

SC-web/src/views/scm/basicInformation/customer/Detail.vue

@@ -0,0 +1,132 @@
+<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="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="12" >
+                <el-form-item  label="客户编码"  
+ prop="supplierCd" >
+                        <p>{{dataForm.supplierCd}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="客户名称"  
+ prop="supplierNm" >
+                        <p>{{dataForm.supplierNm}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="所属公司ID"  
+ prop="orgId" >
+                        <p>{{dataForm.orgId}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="公司代码"  
+ prop="orgName" >
+                        <p>{{dataForm.orgName}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="客户等级"  
+ prop="customerLevel" >
+                         <p>{{ dataForm.customerLevel | dynamicText(customerLevelOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="联系人"  
+ prop="contactName" >
+                        <p>{{dataForm.contactName}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="地址"  
+ prop="address" >
+                        <p>{{dataForm.address}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="电话"  
+ prop="contactPhone" >
+                        <p>{{dataForm.contactPhone}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否启用"  
+ prop="status" >
+                        <p>{{dataForm.status}}</p>
+                </el-form-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+    import PrintBrowse from '@/components/PrintBrowse'
+    import jnpf from '@/utils/jnpf'
+    export default {
+        components: {PrintBrowse},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                loading: false,
+                printBrowseVisible: false,
+                printId: '',
+            dataForm: {
+                id :'',
+                            supplierCd : '',
+                            supplierNm : '',
+                            orgId : '',
+                            orgName : '',
+                            customerLevel : "1",
+                            contactName : '',
+                            address : '',
+                            contactPhone : '',
+                            status : 1,
+            },
+                                customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            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/customer/Customer/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

SC-web/src/views/scm/basicInformation/customer/ExportBox.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.checkAll = true
+      this.isIndeterminate = false
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>

SC-web/src/views/scm/basicInformation/customer/Form.vue

@@ -0,0 +1,241 @@
+<template>
+<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+           :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="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+            <el-col :span="12" >
+                <el-form-item  label="客户编码"  
+ prop="supplierCd" >
+                    <el-input    v-model="dataForm.supplierCd"
+ placeholder="请输入客户编码"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="客户名称"  
+ prop="supplierNm" >
+                    <el-input    v-model="dataForm.supplierNm"
+ placeholder="请输入客户名称"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="所属公司ID"  
+ prop="orgId" >
+                    <el-input    v-model="dataForm.orgId"
+ placeholder="请输入所属公司ID"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="公司代码"  
+ prop="orgName" >
+                    <el-input    v-model="dataForm.orgName"
+ placeholder="请输入公司代码"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="客户等级"  
+ prop="customerLevel" >
+                    <el-select    v-model="dataForm.customerLevel"
+ placeholder="请选择客户等级"  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in customerLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+
+                </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="联系人"  
+ prop="contactName" >
+                    <el-input    v-model="dataForm.contactName"
+ placeholder="请输入联系人"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="地址"  
+ prop="address" >
+                    <el-input    v-model="dataForm.address"
+ placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="电话"  
+ prop="contactPhone" >
+                    <el-input    v-model="dataForm.contactPhone"
+ placeholder="请输入电话"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否启用"  
+ prop="status" >
+                    <el-switch    v-model="dataForm.status"
+ :active-value="1"  :inactive-value="0" >
+
+                </el-switch>
+                </el-form-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    export default {
+        components: {},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                loading: false,
+                isDetail: false,
+            dataForm: {
+                            supplierCd : '',
+                            supplierNm : '',
+                            orgId : '',
+                            orgName : '',
+                            customerLevel : "1",
+                            contactName : '',
+                            address : '',
+                            contactPhone : '',
+                            status : 1,
+            },
+            rules:
+            {
+                            supplierCd: [
+                                {
+                                    required: true,
+                                    message: '请输入客户编码',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            supplierNm: [
+                                {
+                                    required: true,
+                                    message: '请输入客户名称',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            contactPhone: [
+                        ],
+            },
+                        customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+        },
+        mounted() {},
+        methods: {
+            clearData(data){
+                for (let key in data) {
+                    if (data[key] instanceof Array) {
+                        data[key] = [];
+                    } else if (data[key] instanceof Object) {
+                        this.clearData(data[key]);
+                    } else {
+                        data[key] = "";
+                    }
+                }
+            },
+            init(id, isDetail) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+                this.$nextTick(() => {
+                    this.$refs['elForm'].resetFields();
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/customer/Customer/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                       this.clearData(this.dataForm)
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            // 表单提交
+            dataFormSubmit() {
+                this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                            this.request()
+                    }
+                })
+            },
+            request() {
+                var _data =this.dataList()
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/customer/Customer',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                this.visible = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    })
+                }else{
+                    request({
+                        url: '/api/customer/Customer/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                this.visible = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    })
+                }
+            },
+            dataList(){
+                var _data = JSON.parse(JSON.stringify(this.dataForm));
+                        _data.status = parseInt(_data.status)
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                        _dataAll.status = parseInt( _dataAll.status)
+                this.dataForm = _dataAll
+            },
+        },
+    }
+
+</script>

SC-web/src/views/scm/basicInformation/customer/index.vue

@@ -0,0 +1,277 @@
+<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.supplierCd" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="客户名称">
+                                        <el-input v-model="query.supplierNm" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
+                                    </el-button>
+                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                        <el-tooltip effect="dark" content="刷新" placement="top">
+                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                     @click="reset()"/>
+                        </el-tooltip>
+                        <screenfull isContainer/>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
+                            <el-table-column prop="supplierCd" label="客户编码" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="supplierNm" label="客户名称" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="orgId" label="所属公司ID" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="orgName" label="公司代码" width="0" align="left"
+ sortable="custom" />
+                                <el-table-column label="客户等级" width="0" prop="customerLevel" algin="left"
+ sortable="custom" >
+                                    <template slot-scope="scope">
+                                        {{ scope.row.customerLevel | dynamicText(customerLevelOptions) }}
+                                    </template>
+                                </el-table-column>
+                            <el-table-column prop="contactName" label="联系人" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="address" label="地址" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="contactPhone" label="电话" width="0" align="left"
+ sortable="custom" />
+                            <el-table-column prop="status" label="是否启用" width="0" align="left"
+/>
+                        <el-table-column label="操作" fixed="right"
+width="150" >
+                            <template slot-scope="scope">
+                                        <el-button type="text"
+                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                                        </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                                        <el-button type="text"  
+                                                   @click="goDetail(scope.row.id)">详情
+                                        </el-button>
+                            </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"/>
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    </div>
+</template>
+
+<script>
+    import request from '@/utils/request'
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './Form'
+    import ExportBox from './ExportBox'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import Detail from './Detail'
+
+    export default {
+        components: {JNPFForm, ExportBox,Detail},
+        data() {
+            return {
+                detailVisible: false,
+                query: {
+                                supplierCd:undefined,
+                                supplierNm:undefined,
+                },
+                treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id'
+                },
+                list: [],
+                listLoading: true,
+ multipleSelection: [],                    total: 0,
+                listQuery: {
+                        currentPage: 1,
+                        pageSize: 20,
+                    sort: "desc",
+                    sidx: "supplierCd",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    {prop: 'supplierCd', label: '客户编码'},
+                    {prop: 'supplierNm', label: '客户名称'},
+                    {prop: 'orgId', label: '所属公司ID'},
+                    {prop: 'orgName', label: '公司代码'},
+                    {prop: 'customerLevel', label: '客户等级'},
+                    {prop: 'contactName', label: '联系人'},
+                    {prop: 'address', label: '地址'},
+                    {prop: 'contactPhone', label: '电话'},
+                    {prop: 'status', label: '是否启用'},
+                ],
+                                customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
+                            customerLevelProps:{"label":"fullName","value":"id"},
+            }
+        },
+        computed: {
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                this.initData()
+        },
+        methods: {
+            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()
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                    menuId:this.menuId
+                };
+                request({
+                    url: `/api/customer/Customer/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =[];
+                    for(let i=0;i<res.data.list.length;i++){
+                        let _data = res.data.list[i];
+                        _list.push(_data)
+                    }
+                    this.list = _list
+                        this.total = res.data.pagination.total
+
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/customer/Customer/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+                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.join()
+                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                        type: 'warning'
+                    }).then(() => {
+                        request({
+                            url: `/api/customer/Customer/batchRemove/${ids}`,
+                            method: 'DELETE'
+                        }).then(res => {
+                            this.$message({
+                                type: 'success',
+                                message: res.msg,
+                                onClose: () => {
+                                    this.initData()
+                                }
+                            });
+                        })
+                    }).catch(() => {
+                    })
+                },
+            addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.columnList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/customer/Customer/Actions/Export`,
+                    method: 'GET',
+                    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,
+                        pageSize: 20,
+                    sort: "desc",
+                    sidx: "supplierCd",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.search()
+            }
+        }
+    }
+</script>

SC-web/src/views/scm/basicInformation/supplier/index.vue

@@ -65,8 +65,18 @@
                                 </el-table-column>
                             <el-table-column prop="address" label="地址" width="0" align="left"
  sortable="custom" />
-                            <el-table-column prop="status" label="启用" width="0" align="left"
+<!--                            <el-table-column prop="status" label="启用" width="0" align="left"
- sortable="custom" />
+ sortable="custom" /> -->
+ 
+ <el-table-column prop="status" label="状态" width="0" align="left">
+             <template slot-scope="scope">
+               <el-tag type="success" disable-transitions v-if="scope.row.status == 1">启用
+               </el-tag>
+               <el-tag type="danger" disable-transitions v-else>禁用</el-tag>
+             </template>
+           </el-table-column>
+		   
+		   
                         <el-table-column label="操作" fixed="right"
 width="150" >
                             <template slot-scope="scope">

SC-web/src/views/scm/basicInformation/vehicle/Detail.vue

@@ -0,0 +1,121 @@
+<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="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+	    <el-col :span="24" >
+		<el-form-item  label-width="0">
+		<JNPF-Text  :style='{"width":"100%"}'
+ :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息">
+		</JNPF-Text>
+	</el-form-item>
+	</el-col>
+            <el-col :span="24" >
+                <el-form-item  label="车牌号"  
+ prop="ticketno" >
+                        <p>{{dataForm.ticketno}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="司机名称"  
+ prop="drivername" >
+                        <p>{{dataForm.drivername}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="手机号"  
+ prop="contact" >
+                        <p>{{dataForm.contact}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="车辆照片"  
+ prop="vehiclephotos" >
+                    <JNPF-UploadImg    v-model="dataForm.vehiclephotos"
+ disabled
+ detailed  :fileSize="5"  sizeUnit="MB"  :limit="9"  >
+                </JNPF-UploadImg>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="录入人"  
+ prop="creatorusername" >
+                        <p>{{dataForm.creatorusername}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="创建时间"  
+ prop="creatortime" >
+                        <p>{{dataForm.creatortime}}</p>
+                </el-form-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+    import PrintBrowse from '@/components/PrintBrowse'
+    import jnpf from '@/utils/jnpf'
+    export default {
+        components: {PrintBrowse},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                loading: false,
+                printBrowseVisible: false,
+                printId: '',
+            dataForm: {
+                id :'',
+                            ticketno : '',
+                            drivername : '',
+                            contact : '',
+                            vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}],
+                            creatorusername : '',
+                            creatortime : "",
+            },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+
+        },
+        mounted() {},
+        methods: {
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                        _dataAll.vehiclephotos = _dataAll.vehiclephotos ? JSON.parse( _dataAll.vehiclephotos):[]
+                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/example/Vehicle/detail/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        })
+                    }
+
+                })
+            },
+        },
+    }
+
+</script>

SC-web/src/views/scm/basicInformation/vehicle/ExportBox.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-dialog title="导出数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
+    <el-form label-position="top" label-width="80px">
+      <el-form-item label="数据选择">
+        <el-radio-group v-model="type">
+          <el-radio :label="0">当前页面数据</el-radio>
+          <el-radio :label="1">全部页面数据</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出字段">
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
+          @change="handleCheckAllChange">全选</el-checkbox>
+        <el-checkbox-group v-model="columns" @change="handleCheckedChange">
+          <el-checkbox v-for="item in columnList" :label="item.prop" :key="item.prop">
+            {{item.label}}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible=false">取 消</el-button>
+      <el-button type="primary" @click="downLoad">导 出</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      btnLoading: false,
+      type: 0,
+      columns: [],
+      checkAll: true,
+      isIndeterminate: false,
+      columnList: []
+    }
+  },
+  methods: {
+    init(columnList) {
+      this.visible = true
+      this.checkAll = true
+      this.isIndeterminate = false
+      this.columnList = columnList
+      this.columns = columnList.map(o => o.prop)
+    },
+    handleCheckAllChange(val) {
+      this.columns = val ? this.columnList.map(o => o.prop) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.columnList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.columnList.length;
+    },
+    downLoad() {
+      this.$emit('download', { dataType: this.type, selectKey: this.columns.join(',') })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  padding: 20px !important;
+}
+</style>

SC-web/src/views/scm/basicInformation/vehicle/Form.vue

@@ -0,0 +1,214 @@
+<template>
+<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+           :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="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+    <template v-if="!loading">
+	    <el-col :span="24" >
+		<el-form-item  label-width="0">
+		<JNPF-Text  :style='{"width":"100%"}'
+ :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="车辆信息">
+		</JNPF-Text>
+	</el-form-item>
+	</el-col>
+            <el-col :span="24" >
+                <el-form-item  label="车牌号"  
+ prop="ticketno" >
+                    <el-input    v-model="dataForm.ticketno"
+ placeholder="请输入车牌号"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="司机名称"  
+ prop="drivername" >
+                    <el-input    v-model="dataForm.drivername"
+ placeholder="请输入司机名称"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="手机号"  
+ prop="contact" >
+                    <el-input    v-model="dataForm.contact"
+ placeholder="请输入手机号"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="24" >
+                <el-form-item  label="车辆照片"  
+ prop="vehiclephotos" >
+                    <JNPF-UploadImg    v-model="dataForm.vehiclephotos"
+ :fileSize="5"    sizeUnit="MB"  :limit="9" >
+
+                </JNPF-UploadImg>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="录入人"  
+ prop="creatorusername" >
+                    <el-input    v-model="dataForm.creatorusername"
+ placeholder="请输入录入人"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="创建时间"  
+ prop="creatortime" >
+                    <el-input    v-model="dataForm.creatortime"
+ placeholder="系统自动生成"  readonly >
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+    </template>
+</el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="visible = false"> 取 消</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+    </span>
+    </el-dialog>
+</template>
+<script>
+    import request from '@/utils/request'
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    export default {
+        components: {},
+        props: [],
+        data() {
+            return {
+                visible: false,
+                loading: false,
+                isDetail: false,
+            dataForm: {
+                            ticketno : '',
+                            drivername : '',
+                            contact : '',
+                            vehiclephotos : [{"name":"006-1 (3).jpg","url":"/api/file/Image/annex/20230105_380637081082287813.jpg","fileId":"20230105_380637081082287813.jpg"},{"name":"微信图片_20220617141029.jpg","url":"/api/file/Image/annex/20230105_380637561959241413.jpg","fileId":"20230105_380637561959241413.jpg"}],
+                            creatorusername : '',
+                            creatortime : "",
+            },
+            rules:
+            {
+                            ticketno: [
+                                {
+                                    required: true,
+                                    message: '请输入车牌号',
+                                    trigger: 'blur'
+                                },
+                        ],
+                            drivername: [
+                                {
+                                    required: true,
+                                    message: '请输入司机名称',
+                                    trigger: 'blur'
+                                },
+                        ],
+            },
+
+        }
+        },
+        computed: {},
+        watch: {},
+        created() {
+        },
+        mounted() {},
+        methods: {
+            clearData(data){
+                for (let key in data) {
+                    if (data[key] instanceof Array) {
+                        data[key] = [];
+                    } else if (data[key] instanceof Object) {
+                        this.clearData(data[key]);
+                    } else {
+                        data[key] = "";
+                    }
+                }
+            },
+            init(id, isDetail) {
+                this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+                this.$nextTick(() => {
+                    this.$refs['elForm'].resetFields();
+                    if(this.dataForm.id){
+                        this.loading = true
+                        request({
+                            url: '/api/example/Vehicle/'+this.dataForm.id,
+                            method: 'get'
+                        }).then(res => {
+                            this.dataInfo(res.data)
+                            this.loading = false
+                        });
+                    }else{
+                       this.clearData(this.dataForm)
+                    }
+                });
+                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+            },
+            // 表单提交
+            dataFormSubmit() {
+                this.$refs['elForm'].validate((valid) => {
+                    if (valid) {
+                            this.request()
+                    }
+                })
+            },
+            request() {
+                var _data =this.dataList()
+                if (!this.dataForm.id) {
+                    request({
+                        url: '/api/example/Vehicle',
+                        method: 'post',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                this.visible = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    })
+                }else{
+                    request({
+                        url: '/api/example/Vehicle/'+this.dataForm.id,
+                        method: 'PUT',
+                        data: _data
+                    }).then((res) => {
+                        this.$message({
+                            message: res.msg,
+                            type: 'success',
+                            duration: 1000,
+                            onClose: () => {
+                                this.visible = false
+                                this.$emit('refresh', true)
+                            }
+                        })
+                    })
+                }
+            },
+            dataList(){
+                var _data = JSON.parse(JSON.stringify(this.dataForm));
+                        _data.vehiclephotos = JSON.stringify(_data.vehiclephotos)
+                return _data;
+            },
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                        _dataAll.vehiclephotos = JSON.parse( _dataAll.vehiclephotos)
+                this.dataForm = _dataAll
+            },
+        },
+    }
+
+</script>

SC-web/src/views/scm/basicInformation/vehicle/index.vue

@@ -0,0 +1,260 @@
+<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.ticketno" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="司机名称">
+                                        <el-input v-model="query.drivername" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-form>
+            </el-row>
+            <div class="JNPF-common-layout-main JNPF-flex-main">
+                <div class="JNPF-common-head">
+                    <div>
+                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
+                                    </el-button>
+                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
+                                    </el-button>
+                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
+                                    </el-button>
+                    </div>
+                    <div class="JNPF-common-head-right">
+                        <el-tooltip effect="dark" content="刷新" placement="top">
+                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                                     @click="reset()"/>
+                        </el-tooltip>
+                        <screenfull isContainer/>
+                    </div>
+                </div>
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
+                            <el-table-column prop="id" label="ID" width="0" align="left"
+/>
+                  <el-table-column prop="ticketno" label="车牌号" width="0" align="left"
+                  />
+                            <el-table-column prop="drivername" label="司机名称" width="0" align="left"
+/>
+                            <el-table-column prop="contact" label="手机号" width="0" align="left"
+/>
+                  <el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="left"
+                  />
+                            <el-table-column prop="creatorusername" label="录入人" width="0" align="left"
+/>
+                            <el-table-column prop="creatortime" label="创建时间" width="0" align="left"
+/>
+                        <el-table-column label="操作" fixed="right"
+                                         width="100" >
+                            <template slot-scope="scope">
+                                        <el-button type="text"
+                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                                        </el-button>
+                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
+                                        </el-button>
+                            </template>
+                        </el-table-column>
+                </JNPF-table>
+                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+            </div>
+        </div>
+        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    </div>
+</template>
+
+<script>
+    import request from '@/utils/request'
+    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+    import JNPFForm from './Form'
+    import ExportBox from './ExportBox'
+    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+    import Detail from './Detail'
+
+    export default {
+        components: {JNPFForm, ExportBox,Detail},
+        data() {
+            return {
+                detailVisible: false,
+                query: {
+                                ticketno:undefined,
+                                drivername:undefined,
+                },
+                treeProps: {
+                    children: 'children',
+                    label: 'fullName',
+                    value: 'id'
+                },
+                list: [],
+                listLoading: true,
+ multipleSelection: [],                    total: 0,
+                listQuery: {
+                        currentPage: 1,
+                        pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                },
+                formVisible: false,
+                exportBoxVisible: false,
+                columnList: [
+                    {prop: 'ticketno', label: '车牌号'},
+                    {prop: 'drivername', label: '司机名称'},
+                    {prop: 'contact', label: '手机号'},
+                    {prop: 'creatorusername', label: '录入人'},
+                    {prop: 'creatortime', label: '创建时间'},
+                ],
+            }
+        },
+        computed: {
+            menuId() {
+                return this.$route.meta.modelId || ''
+            }
+        },
+        created() {
+                this.initData()
+        },
+        methods: {
+            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()
+            },
+            initData() {
+                this.listLoading = true;
+                let _query = {
+                    ...this.listQuery,
+                    ...this.query,
+                    menuId:this.menuId
+                };
+                request({
+                    url: `/api/example/Vehicle/getList`,
+                    method: 'post',
+                    data: _query
+                }).then(res => {
+                    var _list =[];
+                    for(let i=0;i<res.data.list.length;i++){
+                        let _data = res.data.list[i];
+                        _list.push(_data)
+                    }
+                    this.list = _list
+                        this.total = res.data.pagination.total
+
+                    this.listLoading = false
+                })
+            },
+            handleDel(id) {
+                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                    request({
+                        url: `/api/example/Vehicle/${id}`,
+                        method: 'DELETE'
+                    }).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.msg,
+                            onClose: () => {
+                                this.initData()
+                            }
+                        });
+                    })
+                }).catch(() => {
+                });
+            },
+                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.join()
+                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+                        type: 'warning'
+                    }).then(() => {
+                        request({
+                            url: `/api/example/Vehicle/batchRemove/${ids}`,
+                            method: 'DELETE'
+                        }).then(res => {
+                            this.$message({
+                                type: 'success',
+                                message: res.msg,
+                                onClose: () => {
+                                    this.initData()
+                                }
+                            });
+                        })
+                    }).catch(() => {
+                    })
+                },
+            addOrUpdateHandle(id, isDetail) {
+                this.formVisible = true
+                this.$nextTick(() => {
+                    this.$refs.JNPFForm.init(id, isDetail)
+                })
+            },
+            exportData() {
+                this.exportBoxVisible = true
+                this.$nextTick(() => {
+                    this.$refs.ExportBox.init(this.columnList)
+                })
+            },
+            download(data) {
+                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+                request({
+                    url: `/api/example/Vehicle/Actions/Export`,
+                    method: 'GET',
+                    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,
+                        pageSize: 20,
+                    sort: "desc",
+                    sidx: "",
+                }
+                this.initData()
+            },
+            refresh(isrRefresh) {
+                this.formVisible = false
+                if (isrRefresh) this.reset()
+            },
+            reset() {
+                for (let key in this.query) {
+                    this.query[key] = undefined
+                }
+                this.search()
+            }
+        }
+    }
+</script>