diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalEntity.java index 7f8175ad..e4f423a7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalEntity.java @@ -9,8 +9,8 @@ import java.util.Date; /** + * 自然人 * - * 自然人 * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 @@ -18,7 +18,7 @@ import java.util.Date; */ @Data @TableName("jg_natural") -public class Jg_naturalEntity { +public class Jg_naturalEntity { @TableId("ID") private String id; @@ -68,4 +68,19 @@ public class Jg_naturalEntity { @TableField("CONTACT") private String contact; + @TableField("IDENTITY") + private String identity; + + @TableField("BANK_ACCOUNT") + private String bankAccount; + + @TableField("BANK") + private String bank; + + @TableField("BANK_NO") + private String bankNo; + + @TableField("PHOTOS") + private String photos; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalMobileEntity.java index f5c16737..a6ef4a5c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalMobileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/entity/Jg_naturalMobileEntity.java @@ -62,8 +62,23 @@ public class Jg_naturalMobileEntity { @TableField("CONTACT") private String contact; -//运输总量 + + @TableField("IDENTITY") + private String identity; + + @TableField("BANK_ACCOUNT") + private String bankAccount; + + @TableField("BANK") + private String bank; + + @TableField("BANK_NO") + private String bankNo; + + @TableField("PHOTOS") + private String photos; + //运输总量 private Integer naturalSum; -// 总次数 + // 总次数 private Integer naturalCount; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalCrForm.java index 758dec1f..2a25ab65 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalCrForm.java @@ -7,36 +7,72 @@ import lombok.Data; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 * @日期: 2023-02-01 */ @Data -public class Jg_naturalCrForm { +public class Jg_naturalCrForm { - /** 姓名 **/ + /** + * 姓名 + **/ @JsonProperty("name") private String name; - /** 地址 **/ + /** + * 地址 + **/ @JsonProperty("adress") private String adress; - /** 手机号 **/ + /** + * 手机号 + **/ @JsonProperty("contact") private String contact; - /** 录入人 **/ + /** + * 身份证 + **/ + @JsonProperty("identity") + private String identity; + + /** + * 银行账户 + **/ + @JsonProperty("bankAccount") + private String bankAccount; + + /** + * 开户行 + **/ + @JsonProperty("bank") + private String bank; + + /** + * 行号 + **/ + @JsonProperty("bankNo") + private String bankNo; + + /** + * 证件照 + **/ + @JsonProperty("photos") + private String photos; + /** + * 录入人 + **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建时间 **/ + /** + * 创建时间 + **/ @JsonProperty("creatorTime") private String creatorTime; - } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalInfoVO.java index b778b1d6..200e620e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalInfoVO.java @@ -8,39 +8,80 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.util.Date; + /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 * @日期: 2023-02-01 */ @Data -public class Jg_naturalInfoVO{ - /** 主键 **/ - @JsonProperty("id") - private String id; - - /** 姓名 **/ - @JsonProperty("name") - private String name; - - /** 地址 **/ - @JsonProperty("adress") - private String adress; - - /** 手机号 **/ - @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; +public class Jg_naturalInfoVO { + /** + * 主键 + **/ + @JsonProperty("id") + private String id; + + /** + * 姓名 + **/ + @JsonProperty("name") + private String name; + + /** + * 地址 + **/ + @JsonProperty("adress") + private String adress; + + /** + * 手机号 + **/ + @JsonProperty("contact") + private String contact; + + /** + * 身份证 + **/ + @JsonProperty("identity") + private String identity; + + /** + * 银行账户 + **/ + @JsonProperty("bankAccount") + private String bankAccount; + + /** + * 开户行 + **/ + @JsonProperty("bank") + private String bank; + + /** + * 行号 + **/ + @JsonProperty("bankNo") + private String bankNo; + + /** + * 证件照 + **/ + @JsonProperty("photos") + private String photos; + + /** + * 录入人 + **/ + @JsonProperty("creatorUserName") + private String creatorUserName; + + /** + * 创建时间 + **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonProperty("creatorTime") + private Date creatorTime; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListQuery.java index cb45f9de..b9eee658 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListQuery.java @@ -4,8 +4,6 @@ import jnpf.base.Pagination; import lombok.Data; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 @@ -14,13 +12,21 @@ import lombok.Data; @Data public class Jg_naturalListQuery extends Pagination { - /** 姓名 */ - private String name; + /** + * 姓名 + */ + private String name; - /** 手机号 */ - private String contact; - /** - * 菜单id - */ + /** + * 手机号 + */ + private String contact; + /** + * 银行账户 + */ + private String bankAccount; + /** + * 菜单id + */ private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java index f349a365..a22f77da 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalListVO.java @@ -10,44 +10,86 @@ import lombok.Data; import java.util.Date; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 * @日期: 2023-02-01 */ @Data -public class Jg_naturalListVO{ +public class Jg_naturalListVO { - /** 主键 */ + /** + * 主键 + */ private String id; - /** 姓名 **/ + /** + * 姓名 + **/ @JsonProperty("name") private String name; - /** 地址 **/ + /** + * 地址 + **/ @JsonProperty("adress") private String adress; - /** 手机号 **/ + /** + * 手机号 + **/ @JsonProperty("contact") private String contact; + /** + * 身份证 + **/ + @JsonProperty("identity") + private String identity; - /** 录入人 **/ + + /** + * 银行账户 + **/ + @JsonProperty("bankAccount") + private String bankAccount; + + + /** + * 开户行 + **/ + @JsonProperty("bank") + private String bank; + + + /** + * 行号 + **/ + @JsonProperty("bankNo") + private String bankNo; + + + /** + * 证件照 + **/ + @JsonProperty("photos") + private String photos; + /** + * 录入人 + **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + /** + * 创建时间 + **/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonProperty("creatorTime") - private Date creatorTime; + private Date creatorTime; //运输总量 @JsonProperty("naturalSum") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPagination.java index 2de6fbe2..7b5b7396 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPagination.java @@ -5,8 +5,6 @@ import jnpf.base.Pagination; import lombok.Data; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 @@ -15,13 +13,21 @@ import lombok.Data; @Data public class Jg_naturalPagination extends Pagination { - /** 姓名 */ - private String name; + /** + * 姓名 + */ + private String name; - /** 手机号 */ - private String contact; - /** - * 菜单id - */ - private String menuId; + /** + * 手机号 + */ + private String contact; + /** + * 银行账户 + */ + private String bankAccount; + /** + * 菜单id + */ + private String menuId; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java index fe22e60b..b0339413 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalPaginationExportModel.java @@ -4,8 +4,6 @@ import jnpf.base.Pagination; import lombok.Data; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 @@ -21,9 +19,17 @@ public class Jg_naturalPaginationExportModel extends Pagination { private String dataType; - /** 姓名 */ + /** + * 姓名 + */ private String name; - /** 手机号 */ + /** + * 手机号 + */ private String contact; + /** + * 银行账户 + */ + private String bankAccount; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalUpForm.java index 5f789b69..64efa397 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/Jg_natural/jg_natural/Jg_naturalUpForm.java @@ -6,40 +6,84 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; /** - * - * * @版本: V3.2.0 * @版权: LINKAGE-BOOT * @作者: LINKAGE-BOOT研发团队 * @日期: 2023-02-01 */ @Data -public class Jg_naturalUpForm{ - /** 主键 */ +public class Jg_naturalUpForm { + /** + * 主键 + */ private String id; - /** 姓名 **/ + /** + * 姓名 + **/ @JsonProperty("name") private String name; - /** 地址 **/ + /** + * 地址 + **/ @JsonProperty("adress") private String adress; - /** 手机号 **/ + /** + * 手机号 + **/ @JsonProperty("contact") private String contact; + /** + * 身份证 + **/ + @JsonProperty("identity") + private String identity; - /** 录入人 **/ + + /** + * 银行账户 + **/ + @JsonProperty("bankAccount") + private String bankAccount; + + + /** + * 开户行 + **/ + @JsonProperty("bank") + private String bank; + + + /** + * 行号 + **/ + @JsonProperty("bankNo") + private String bankNo; + + + /** + * 证件照 + **/ + @JsonProperty("photos") + private String photos; + + + /** + * 录入人 + **/ @JsonProperty("creatorUserName") private String creatorUserName; - /** 创建时间 **/ + /** + * 创建时间 + **/ @JsonProperty("creatorTime") private String creatorTime; diff --git a/SC-web/src/views/scm/basicInformation/natural/Detail.vue b/SC-web/src/views/scm/basicInformation/natural/Detail.vue index 2fe14793..0891020e 100644 --- a/SC-web/src/views/scm/basicInformation/natural/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/natural/Detail.vue @@ -4,7 +4,7 @@ :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px"> - + @@ -69,6 +96,11 @@ name : '', adress : '', contact : '', + identity : '', + bankAccount : '', + bank : '', + bankNo : '', + photos : [], creatorUserName : '', creatorTime : "", }, @@ -84,6 +116,7 @@ methods: { dataInfo(dataAll){ let _dataAll =dataAll + _dataAll.photos = _dataAll.photos ? JSON.parse( _dataAll.photos):[] this.dataForm = _dataAll }, diff --git a/SC-web/src/views/scm/basicInformation/natural/Form.vue b/SC-web/src/views/scm/basicInformation/natural/Form.vue index 86a63f93..df4d933a 100644 --- a/SC-web/src/views/scm/basicInformation/natural/Form.vue +++ b/SC-web/src/views/scm/basicInformation/natural/Form.vue @@ -1,203 +1,221 @@ diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue index c855d480..46700a86 100644 --- a/SC-web/src/views/scm/basicInformation/natural/index.vue +++ b/SC-web/src/views/scm/basicInformation/natural/index.vue @@ -1,264 +1,283 @@