From 52042abcb6a1d8c1691d455b5145d297ca2b3f76 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Sat, 21 Mar 2026 00:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/modules/ApiApplication.java | 11 +- .../jeesite/modules/biz/entity/MyCompany.java | 2 +- .../jeesite/modules/biz/entity/MyNotes.java | 132 +++++++-------- .../jeesite/modules/biz/entity/MyPerson.java | 151 ++++++++++-------- .../modules/biz/entity/MyWebsiteStorage.java | 4 +- .../packages/biz/views/biz/myCompany/form.vue | 4 +- .../packages/biz/views/biz/myCompany/list.vue | 4 +- .../packages/biz/views/biz/myNotes/form.vue | 19 ++- .../packages/biz/views/biz/myNotes/list.vue | 25 ++- .../packages/biz/views/biz/myPerson/form.vue | 25 +-- .../packages/biz/views/biz/myPerson/list.vue | 36 +++-- .../biz/views/biz/myWebsiteStorage/form.vue | 13 +- .../biz/views/biz/myWebsiteStorage/list.vue | 33 +++- .../src/selectType/bizCompSelect.ts} | 82 ++-------- .../ListSelect/src/selectType/userSelect.ts | 19 --- .../workbench/components/WorkbenchHeader.vue | 2 +- 16 files changed, 276 insertions(+), 286 deletions(-) rename web-vue/packages/{biz/views/biz/myCompany/select.ts => core/components/ListSelect/src/selectType/bizCompSelect.ts} (65%) diff --git a/web-api/src/main/java/com/jeesite/modules/ApiApplication.java b/web-api/src/main/java/com/jeesite/modules/ApiApplication.java index 4a97882..c24ca5a 100644 --- a/web-api/src/main/java/com/jeesite/modules/ApiApplication.java +++ b/web-api/src/main/java/com/jeesite/modules/ApiApplication.java @@ -19,23 +19,14 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer */ @SpringBootApplication public class ApiApplication extends SpringBootServletInitializer { - - private static final Logger logger = LoggerFactory.getLogger(ApiApplication.class); public static void main(String[] args) { SpringApplication.run(ApiApplication.class, args); - logger.info( - "\n\n==============================================================\n" - + "\n 启动完成，接口地址：http://127.0.0.1:{}\n" - + "\n 默认管理账号： system 密码： admin\n" - + "\n==============================================================\n", - Global.getProperty("server.port") + FileUtils.path("/" - + Global.getProperty("server.servlet.context-path"))); } @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - this.setRegisterErrorPageFilter(false); // 错误页面有容器来处理，而不是SpringBoot + this.setRegisterErrorPageFilter(false); return builder.sources(ApiApplication.class); } diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyCompany.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyCompany.java index 117ce9f..31cc93f 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyCompany.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyCompany.java @@ -78,7 +78,7 @@ public class MyCompany extends DataEntity implements Serializable { @ExcelField(title = "经营范围", attrName = "businessScope", align = Align.CENTER, sort = 120), @ExcelField(title = "公司电话", attrName = "contactPhone", align = Align.CENTER, sort = 130), @ExcelField(title = "公司邮箱", attrName = "contactEmail", align = Align.CENTER, sort = 140), - @ExcelField(title = "数据状态", attrName = "ustatus", align = Align.CENTER, sort = 150), + @ExcelField(title = "数据状态", attrName = "ustatus",dictType = "biz_status", align = Align.CENTER, sort = 150), @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 160, dataFormat = "yyyy-MM-dd hh:mm"), }) public MyCompany() { diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyNotes.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyNotes.java index 9fd3f55..8d6f040 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyNotes.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyNotes.java @@ -2,6 +2,7 @@ package com.jeesite.modules.biz.entity; import java.io.Serializable; import java.util.Date; + import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.fasterxml.jackson.annotation.JsonFormat; @@ -23,79 +24,80 @@ import java.io.Serial; /** * 便签信息 Entity + * * @author gaoxq * @version 2026-03-20 */ @EqualsAndHashCode(callSuper = true) -@Table(name="my_notes", alias="a", label="便签信息", columns={ - @Column(name="create_time", attrName="createTime", label="记录时间", isUpdate=false, isUpdateForce=true), - @Column(name="note_id", attrName="noteId", label="唯一标识", isPK=true), - @Column(name="title", attrName="title", label="标题", queryType=QueryType.LIKE), - @Column(name="content", attrName="content", label="内容", queryType=QueryType.LIKE), - @Column(name="priority", attrName="priority", label="级别"), - @Column(name="ustatus", attrName="ustatus", label="状态"), - @Column(name="start_time", attrName="startTime", label="开始时间", isQuery=false, isUpdateForce=true), - @Column(name="end_time", attrName="endTime", label="结束时间", isQuery=false, isUpdateForce=true), - @Column(name="type", attrName="type", label="类型"), - @Column(name="deadline", attrName="deadline", label="截至时间", isQuery=false), - @Column(name="update_time", attrName="updateTime", label="更新时间", isInsert=false, isQuery=false, isUpdateForce=true), - @Column(name="create_user", attrName="createUser", label="创建用户", isQuery=false), - }, orderBy="a.note_id DESC" +@Table(name = "my_notes", alias = "a", label = "便签信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true), + @Column(name = "note_id", attrName = "noteId", label = "唯一标识", isPK = true), + @Column(name = "title", attrName = "title", label = "标题", queryType = QueryType.LIKE), + @Column(name = "content", attrName = "content", label = "内容", queryType = QueryType.LIKE), + @Column(name = "priority", attrName = "priority", label = "级别"), + @Column(name = "ustatus", attrName = "ustatus", label = "状态"), + @Column(name = "start_time", attrName = "startTime", label = "开始时间", isQuery = false, isUpdateForce = true), + @Column(name = "end_time", attrName = "endTime", label = "结束时间", isQuery = false, isUpdateForce = true), + @Column(name = "type", attrName = "type", label = "类型"), + @Column(name = "deadline", attrName = "deadline", label = "截至时间", isQuery = false), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isInsert = false, isQuery = false, isUpdateForce = true), + @Column(name = "create_user", attrName = "createUser", label = "创建用户", isUpdate = false, isUpdateForce = true), +}, orderBy = "a.create_time DESC" ) @Data public class MyNotes extends DataEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - private Date createTime; // 记录时间 - private String noteId; // 唯一标识 - private String title; // 标题 - private String content; // 内容 - private String priority; // 级别 - private String ustatus; // 状态 - private Date startTime; // 开始时间 - private Date endTime; // 结束时间 - private String type; // 类型 - private Date deadline; // 截至时间 - private Date updateTime; // 更新时间 - private String createUser; // 创建用户 - @ExcelFields({ - @ExcelField(title="记录时间", attrName="createTime", align=Align.CENTER, sort=10, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="唯一标识", attrName="noteId", align=Align.CENTER, sort=20), - @ExcelField(title="标题", attrName="title", align=Align.CENTER, sort=30), - @ExcelField(title="内容", attrName="content", align=Align.CENTER, sort=40), - @ExcelField(title="级别", attrName="priority", align=Align.CENTER, sort=50), - @ExcelField(title="状态", attrName="ustatus", align=Align.CENTER, sort=60), - @ExcelField(title="开始时间", attrName="startTime", align=Align.CENTER, sort=70, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="结束时间", attrName="endTime", align=Align.CENTER, sort=80, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="类型", attrName="type", align=Align.CENTER, sort=90), - @ExcelField(title="截至时间", attrName="deadline", align=Align.CENTER, sort=100, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="更新时间", attrName="updateTime", align=Align.CENTER, sort=110, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="创建用户", attrName="createUser", align=Align.CENTER, sort=120), - }) - public MyNotes() { - this(null); - } - - public MyNotes(String id){ - super(id); - } - - public Date getCreateTime_gte() { - return sqlMap.getWhere().getValue("create_time", QueryType.GTE); - } + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 记录时间 + private String noteId; // 唯一标识 + private String title; // 标题 + private String content; // 内容 + private String priority; // 级别 + private String ustatus; // 状态 + private Date startTime; // 开始时间 + private Date endTime; // 结束时间 + private String type; // 类型 + private Date deadline; // 截至时间 + private Date updateTime; // 更新时间 + private String createUser; // 创建用户 - public void setCreateTime_gte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); - } - - public Date getCreateTime_lte() { - return sqlMap.getWhere().getValue("create_time", QueryType.LTE); - } + @ExcelFields({ + @ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "唯一标识", attrName = "noteId", align = Align.CENTER, sort = 20), + @ExcelField(title = "标题", attrName = "title", align = Align.CENTER, sort = 30), + @ExcelField(title = "内容", attrName = "content", align = Align.CENTER, sort = 40), + @ExcelField(title = "级别", attrName = "priority", dictType = "biz_priority", align = Align.CENTER, sort = 50), + @ExcelField(title = "状态", attrName = "ustatus", dictType = "note_status", align = Align.CENTER, sort = 60), + @ExcelField(title = "开始时间", attrName = "startTime", align = Align.CENTER, sort = 70, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "结束时间", attrName = "endTime", align = Align.CENTER, sort = 80, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "类型", attrName = "type", align = Align.CENTER, sort = 90), + @ExcelField(title = "截至时间", attrName = "deadline", align = Align.CENTER, sort = 100, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 110, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "创建用户", attrName = "createUser", align = Align.CENTER, sort = 120), + }) + public MyNotes() { + this(null); + } + + public MyNotes(String id) { + super(id); + } + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } - public void setCreateTime_lte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); - } - } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyPerson.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyPerson.java index 06bc600..97f15a4 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyPerson.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyPerson.java @@ -2,6 +2,7 @@ package com.jeesite.modules.biz.entity; import java.io.Serializable; import java.util.Date; + import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.fasterxml.jackson.annotation.JsonFormat; @@ -23,84 +24,94 @@ import java.io.Serial; /** * 人员信息 Entity + * * @author gaoxq * @version 2026-03-20 */ @EqualsAndHashCode(callSuper = true) -@Table(name="my_person", alias="a", label="人员信息", columns={ - @Column(name="create_time", attrName="createTime", label="记录时间", isUpdate=false, isUpdateForce=true), - @Column(name="person_id", attrName="personId", label="唯一主键", isPK=true), - @Column(name="person_name", attrName="personName", label="姓名", queryType=QueryType.LIKE), - @Column(name="gender", attrName="gender", label="性别"), - @Column(name="id_card", attrName="idCard", label="身份证号"), - @Column(name="phone", attrName="phone", label="手机号码", isQuery=false), - @Column(name="email", attrName="email", label="邮箱", isQuery=false), - @Column(name="birth_date", attrName="birthDate", label="出生日期", isQuery=false), - @Column(name="address", attrName="address", label="居住地址", isQuery=false), - @Column(name="department", attrName="department", label="所属部门", isQuery=false), - @Column(name="position_name", attrName="positionName", label="职位", isQuery=false), - @Column(name="ustatus", attrName="ustatus", label="状态"), - @Column(name="company_id", attrName="companyId", label="公司编号"), - @Column(name="update_time", attrName="updateTime", label="更新时间", isInsert=false, isQuery=false, isUpdateForce=true), - }, orderBy="a.create_time DESC" +@Table(name = "my_person", alias = "a", label = "人员信息", columns = { + @Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true), + @Column(name = "person_id", attrName = "personId", label = "唯一主键", isPK = true), + @Column(name = "person_name", attrName = "personName", label = "姓名", queryType = QueryType.LIKE), + @Column(name = "gender", attrName = "gender", label = "性别"), + @Column(name = "id_card", attrName = "idCard", label = "身份证号"), + @Column(name = "phone", attrName = "phone", label = "手机号码", isQuery = false), + @Column(name = "email", attrName = "email", label = "邮箱", isQuery = false), + @Column(name = "birth_date", attrName = "birthDate", label = "出生日期", isQuery = false), + @Column(name = "address", attrName = "address", label = "居住地址", isQuery = false), + @Column(name = "department", attrName = "department", label = "所属部门", isQuery = false), + @Column(name = "position_name", attrName = "positionName", label = "职位", isQuery = false), + @Column(name = "ustatus", attrName = "ustatus", label = "状态"), + @Column(name = "company_id", attrName = "companyId", label = "公司编号"), + @Column(name = "update_time", attrName = "updateTime", label = "更新时间", isInsert = false, isQuery = false, isUpdateForce = true), +}, joinTable = { + @JoinTable(type = Type.LEFT_JOIN, entity = MyCompany.class, alias = "b", + on = "a.company_id = b.company_id", attrName = "this", + columns = { + @Column(name = "company_name", attrName = "companyName", label = "公司全称"), + }), +}, orderBy = "a.create_time DESC" ) @Data public class MyPerson extends DataEntity implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - private Date createTime; // 记录时间 - private String personId; // 唯一主键 - private String personName; // 姓名 - private String gender; // 性别 - private String idCard; // 身份证号 - private String phone; // 手机号码 - private String email; // 邮箱 - private Date birthDate; // 出生日期 - private String address; // 居住地址 - private String department; // 所属部门 - private String positionName; // 职位 - private String ustatus; // 状态 - private String companyId; // 公司编号 - private Date updateTime; // 更新时间 - @ExcelFields({ - @ExcelField(title="记录时间", attrName="createTime", align=Align.CENTER, sort=10, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="唯一主键", attrName="personId", align=Align.CENTER, sort=20), - @ExcelField(title="姓名", attrName="personName", align=Align.CENTER, sort=30), - @ExcelField(title="性别", attrName="gender", align=Align.CENTER, sort=40), - @ExcelField(title="身份证号", attrName="idCard", align=Align.CENTER, sort=50), - @ExcelField(title="手机号码", attrName="phone", align=Align.CENTER, sort=60), - @ExcelField(title="邮箱", attrName="email", align=Align.CENTER, sort=70), - @ExcelField(title="出生日期", attrName="birthDate", align=Align.CENTER, sort=80, dataFormat="yyyy-MM-dd hh:mm"), - @ExcelField(title="居住地址", attrName="address", align=Align.CENTER, sort=90), - @ExcelField(title="所属部门", attrName="department", align=Align.CENTER, sort=100), - @ExcelField(title="职位", attrName="positionName", align=Align.CENTER, sort=110), - @ExcelField(title="状态", attrName="ustatus", align=Align.CENTER, sort=120), - @ExcelField(title="公司编号", attrName="companyId", align=Align.CENTER, sort=130), - @ExcelField(title="更新时间", attrName="updateTime", align=Align.CENTER, sort=140, dataFormat="yyyy-MM-dd hh:mm"), - }) - public MyPerson() { - this(null); - } - - public MyPerson(String id){ - super(id); - } - public Date getCreateTime_gte() { - return sqlMap.getWhere().getValue("create_time", QueryType.GTE); - } + @Serial + private static final long serialVersionUID = 1L; + private Date createTime; // 记录时间 + private String personId; // 唯一主键 + private String personName; // 姓名 + private String gender; // 性别 + private String idCard; // 身份证号 + private String phone; // 手机号码 + private String email; // 邮箱 + private Date birthDate; // 出生日期 + private String address; // 居住地址 + private String department; // 所属部门 + private String positionName; // 职位 + private String ustatus; // 状态 + private String companyId; // 公司编号 + private Date updateTime; // 更新时间 - public void setCreateTime_gte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); - } - - public Date getCreateTime_lte() { - return sqlMap.getWhere().getValue("create_time", QueryType.LTE); - } + private String companyName; + + @ExcelFields({ + @ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "唯一主键", attrName = "personId", align = Align.CENTER, sort = 20), + @ExcelField(title = "姓名", attrName = "personName", align = Align.CENTER, sort = 30), + @ExcelField(title = "性别", attrName = "gender", align = Align.CENTER, sort = 40), + @ExcelField(title = "身份证号", attrName = "idCard", align = Align.CENTER, sort = 50), + @ExcelField(title = "手机号码", attrName = "phone", align = Align.CENTER, sort = 60), + @ExcelField(title = "邮箱", attrName = "email", align = Align.CENTER, sort = 70), + @ExcelField(title = "出生日期", attrName = "birthDate", align = Align.CENTER, sort = 80, dataFormat = "yyyy-MM-dd hh:mm"), + @ExcelField(title = "居住地址", attrName = "address", align = Align.CENTER, sort = 90), + @ExcelField(title = "所属部门", attrName = "department", align = Align.CENTER, sort = 100), + @ExcelField(title = "职位", attrName = "positionName", align = Align.CENTER, sort = 110), + @ExcelField(title = "状态", attrName = "ustatus", dictType = "biz_status", align = Align.CENTER, sort = 120), + @ExcelField(title = "公司名称", attrName = "companyName", align = Align.CENTER, sort = 130), + @ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 140, dataFormat = "yyyy-MM-dd hh:mm"), + }) + public MyPerson() { + this(null); + } + + public MyPerson(String id) { + super(id); + } + + public Date getCreateTime_gte() { + return sqlMap.getWhere().getValue("create_time", QueryType.GTE); + } + + public void setCreateTime_gte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.GTE, createTime); + } + + public Date getCreateTime_lte() { + return sqlMap.getWhere().getValue("create_time", QueryType.LTE); + } + + public void setCreateTime_lte(Date createTime) { + sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); + } - public void setCreateTime_lte(Date createTime) { - sqlMap.getWhere().and("create_time", QueryType.LTE, createTime); - } - } \ No newline at end of file diff --git a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyWebsiteStorage.java b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyWebsiteStorage.java index 515bf41..96ff706 100644 --- a/web-api/src/main/java/com/jeesite/modules/biz/entity/MyWebsiteStorage.java +++ b/web-api/src/main/java/com/jeesite/modules/biz/entity/MyWebsiteStorage.java @@ -30,7 +30,7 @@ import java.io.Serial; @Column(name = "web_account", attrName = "webAccount", label = "登录账号", isQuery = false), @Column(name = "web_password", attrName = "webPassword", label = "登录密码", isQuery = false), @Column(name = "remarks", attrName = "remarks", label = "说明事项", isQuery = false), - @Column(name = "login_user", attrName = "loginUser", label = "所属账户", isUpdate = false, isQuery = false, isUpdateForce = true), + @Column(name = "login_user", attrName = "loginUser", label = "所属账户", isUpdate = false, isUpdateForce = true), @Column(name = "ustatus", attrName = "ustatus", label = "状态"), }, orderBy = "a.create_time DESC" ) @@ -57,7 +57,7 @@ public class MyWebsiteStorage extends DataEntity implements Se @ExcelField(title = "登录密码", attrName = "webPassword", align = Align.CENTER, sort = 60), @ExcelField(title = "说明事项", attrName = "remarks", align = Align.CENTER, sort = 70), @ExcelField(title = "所属账户", attrName = "loginUser", align = Align.CENTER, sort = 80), - @ExcelField(title = "状态", attrName = "ustatus", dictType = "sys_status", align = Align.CENTER, sort = 90), + @ExcelField(title = "状态", attrName = "ustatus", dictType = "biz_status", align = Align.CENTER, sort = 90), }) public MyWebsiteStorage() { this(null); diff --git a/web-vue/packages/biz/views/biz/myCompany/form.vue b/web-vue/packages/biz/views/biz/myCompany/form.vue index b8c41c3..6d49c25 100644 --- a/web-vue/packages/biz/views/biz/myCompany/form.vue +++ b/web-vue/packages/biz/views/biz/myCompany/form.vue @@ -28,6 +28,7 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { MyCompany, myCompanySave, myCompanyForm } from '@jeesite/biz/api/biz/myCompany'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; const emit = defineEmits(['success', 'register']); @@ -158,7 +159,7 @@ field: 'ustatus', component: 'Select', componentProps: { - dictType: '', + dictType: 'biz_status', allowClear: true, }, required: true, @@ -189,6 +190,7 @@ isNewRecord: record.value.isNewRecord, companyId: record.value.companyId || data.companyId, }; + data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date()); // console.log('submit', params, data, record); const res = await myCompanySave(params, data); showMessage(res.message); diff --git a/web-vue/packages/biz/views/biz/myCompany/list.vue b/web-vue/packages/biz/views/biz/myCompany/list.vue index 62d7a26..7ea44d5 100644 --- a/web-vue/packages/biz/views/biz/myCompany/list.vue +++ b/web-vue/packages/biz/views/biz/myCompany/list.vue @@ -101,7 +101,7 @@ field: 'ustatus', component: 'Select', componentProps: { - dictType: '', + dictType: 'biz_status', allowClear: true, }, }, @@ -222,7 +222,7 @@ sorter: true, width: 130, align: 'left', - dictType: '', + dictType: 'biz_status', }, { title: t('更新时间'), diff --git a/web-vue/packages/biz/views/biz/myNotes/form.vue b/web-vue/packages/biz/views/biz/myNotes/form.vue index 3662845..5983816 100644 --- a/web-vue/packages/biz/views/biz/myNotes/form.vue +++ b/web-vue/packages/biz/views/biz/myNotes/form.vue @@ -28,6 +28,11 @@ import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form'; import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer'; import { MyNotes, myNotesSave, myNotesForm } from '@jeesite/biz/api/biz/myNotes'; + import { formatToDateTime } from '@jeesite/core/utils/dateUtil'; + import { useUserStore } from '@jeesite/core/store/modules/user'; + + const userStore = useUserStore(); + const userinfo = computed(() => userStore.getUserInfo); const emit = defineEmits(['success', 'register']); @@ -70,7 +75,7 @@ field: 'priority', component: 'Select', componentProps: { - dictType: '', + dictType: 'biz_priority', allowClear: true, }, required: true, @@ -80,7 +85,7 @@ field: 'ustatus', component: 'Select', componentProps: { - dictType: '', + dictType: 'note_status', allowClear: true, }, required: true, @@ -104,11 +109,11 @@ }, }, { - label: t('类型'), + label: t('便签类型'), field: 'type', component: 'Select', componentProps: { - dictType: '', + dictType: 'note_type', allowClear: true, }, required: true, @@ -149,6 +154,12 @@ isNewRecord: record.value.isNewRecord, noteId: record.value.noteId || data.noteId, }; + + if(record.value.isNewRecord){ + data.createUser = userinfo.value.loginCode; + } + + data[record.value.isNewRecord ? 'createTime' : 'updateTime'] = formatToDateTime(new Date()); // console.log('submit', params, data, record); const res = await myNotesSave(params, data); showMessage(res.message); diff --git a/web-vue/packages/biz/views/biz/myNotes/list.vue b/web-vue/packages/biz/views/biz/myNotes/list.vue index 08c2d4b..9c8b63f 100644 --- a/web-vue/packages/biz/views/biz/myNotes/list.vue +++ b/web-vue/packages/biz/views/biz/myNotes/list.vue @@ -28,7 +28,7 @@