diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java index a798573b..c9a4b91c 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/domain/BmsCustomerCompany.java @@ -2,6 +2,8 @@ package com.ruoyi.customer.customerinfo.domain; import java.math.BigDecimal; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -55,12 +57,15 @@ public class BmsCustomerCompany extends BaseEntity private BigDecimal paidInCapital; /** 成立日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date establishDate; /** 营业期限起始日 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date businessTermStart; /** 营业期限终止日 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date businessTermEnd; /** 是否长期有效(0否 1是) */ diff --git a/bms-front/src/components/CustomerSelect/index.vue b/bms-front/src/components/CustomerSelect/index.vue new file mode 100644 index 00000000..3a1c425d --- /dev/null +++ b/bms-front/src/components/CustomerSelect/index.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/bms-front/src/main.js b/bms-front/src/main.js index a77e923d..bfda28ec 100644 --- a/bms-front/src/main.js +++ b/bms-front/src/main.js @@ -48,6 +48,8 @@ import BasicForm from '@/components/BasicForm' // 公共表格组件 import BasicTable from '@/components/BasicTable' import SimpleTable from '@/components/SimpleTable' +// 客户/供应商下拉选择组件 +import CustomerSelect from '@/components/CustomerSelect' const app = createApp(App) @@ -73,6 +75,7 @@ app.component('Editor', Editor) app.component('BasicForm', BasicForm) app.component('BasicTable', BasicTable) app.component('SimpleTable', SimpleTable) +app.component('CustomerSelect', CustomerSelect) app.use(router) app.use(store)