manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
gaoxq
2025-11-29 00:08:49 +08:00
parent 489b2314ab
commit 44dbcb48a6
26 changed files with 859 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web-api/src/main/java/com/jeesite/modules/biz/entity/BizCities.java
View File

@@ -42,6 +42,12 @@ import java.io.Serial;
@Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false),
@Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = BizProvince.class, attrName = "this", alias = "b",
on = "a.province_code = b.province_code",
columns = {
@Column(name = "province_name", attrName = "provinceName", label = "省份名称"),
}),
}, orderBy = "a.id DESC"
)
@Data
@@ -62,16 +68,19 @@ public class BizCities extends DataEntity<BizCities> implements Serializable {
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
private String provinceName;
@ExcelFields({
@ExcelField(title = "id", attrName = "id", align = Align.CENTER, sort = 10),
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 20, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "省份编码", attrName = "provinceCode", align = Align.CENTER, sort = 30),
@ExcelField(title = "省份名称", attrName = "provinceName", align = Align.CENTER, sort = 30),
@ExcelField(title = "市区编码", attrName = "cityCode", align = Align.CENTER, sort = 40),
@ExcelField(title = "市区名称", attrName = "cityName", align = Align.CENTER, sort = 50),
@ExcelField(title = "市区区号", attrName = "areaCode", align = Align.CENTER, sort = 60),
@ExcelField(title = "市区级别", attrName = "areaType", align = Align.CENTER, sort = 70),
@ExcelField(title = "更新时间", attrName = "updateTime", align = Align.CENTER, sort = 80, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "数据状态", attrName = "dataStatus", align = Align.CENTER, sort = 90),
@ExcelField(title = "数据状态", attrName = "dataStatus", dictType = "ustatus", align = Align.CENTER, sort = 90),
})
public BizCities() {
this(null);

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizCompany.java
View File

@@ -43,7 +43,7 @@ import java.io.Serial;
@Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false),
@Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true),
}, orderBy = "a.company_id DESC"
}, orderBy = "a.create_time DESC"
)
@Data
public class BizCompany extends DataEntity<BizCompany> implements Serializable {

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizListItem.java
View File

@@ -45,7 +45,7 @@ import java.io.Serial;
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.id DESC"
}, orderBy="a.create_time DESC"
)
@Data
public class BizListItem extends DataEntity<BizListItem> implements Serializable {

20
web-api/src/main/java/com/jeesite/modules/biz/entity/BizMunicipalities.java
View File

@@ -45,7 +45,18 @@ import java.io.Serial;
@Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false),
@Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true),
}, orderBy = "a.id DESC"
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = BizProvince.class, attrName = "this", alias = "b",
on = "a.province_code = b.province_code",
columns = {
@Column(name = "province_name", attrName = "provinceName", label = "省份名称"),
}),
@JoinTable(type = Type.LEFT_JOIN, entity = BizCities.class, attrName = "this", alias = "c",
on = "a.province_code = c.province_code AND a.city_code = c.city_code",
columns = {
@Column(name = "city_name", attrName = "cityName", label = "市区名称"),
}),
}, orderBy = "a.create_time DESC"
)
@Data
public class BizMunicipalities extends DataEntity<BizMunicipalities> implements Serializable {
@@ -68,12 +79,17 @@ public class BizMunicipalities extends DataEntity<BizMunicipalities> implements
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
private String provinceName;
private String cityName;
@ExcelFields({
@ExcelField(title = "id", attrName = "id", align = Align.CENTER, sort = 10),
@ExcelField(title = "唯一标识", attrName = "id", align = Align.CENTER, sort = 10),
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 20, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "县区名称", attrName = "countyName", align = Align.CENTER, sort = 30),
@ExcelField(title = "省份编码", attrName = "provinceCode", align = Align.CENTER, sort = 40),
@ExcelField(title = "省份名称", attrName = "provinceName", align = Align.CENTER, sort = 40),
@ExcelField(title = "市区编码", attrName = "cityCode", align = Align.CENTER, sort = 50),
@ExcelField(title = "市区名称", attrName = "cityName", align = Align.CENTER, sort = 50),
@ExcelField(title = "县区编码", attrName = "countyCode", align = Align.CENTER, sort = 60),
@ExcelField(title = "街道名称", attrName = "townName", align = Align.CENTER, sort = 70),
@ExcelField(title = "街道编号", attrName = "townCode", align = Align.CENTER, sort = 80),

174
web-api/src/main/java/com/jeesite/modules/biz/entity/BizProjectReport.java
View File

@@ -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;
@@ -22,90 +23,111 @@ import java.io.Serial;
/**
* 汇报信息Entity
*
* @author gaoxq
* @version 2025-11-27
*/
@EqualsAndHashCode(callSuper = true)
@Table(name="biz_project_report", alias="a", label="汇报信息信息", columns={
@Column(name="create_time", attrName="createTime", label="记录时间", isUpdate=false, isUpdateForce=true),
@Column(name="report_id", attrName="reportId", label="汇报标识", isPK=true),
@Column(name="report_cycle", attrName="reportCycle", label="汇报周期"),
@Column(name="work_title", attrName="workTitle", label="汇报主题", queryType=QueryType.LIKE),
@Column(name="work_content", attrName="workContent", label="本期内容", isQuery=false),
@Column(name="progress_percent", attrName="progressPercent", label="项目进度", isQuery=false),
@Column(name="problem_desc", attrName="problemDesc", label="存在问题", isQuery=false),
@Column(name="solution_plan", attrName="solutionPlan", label="解决方案", isQuery=false),
@Column(name="next_plan", attrName="nextPlan", label="下期计划", isQuery=false),
@Column(name="report_time", attrName="reportTime", label="提交时间", isQuery=false, isUpdateForce=true),
@Column(name="approval_status", attrName="approvalStatus", label="汇报状态"),
@Column(name="project_id", attrName="projectId", label="项目编号"),
@Column(name="employee_id", attrName="employeeId", label="人员编号"),
@Column(name="f_tenant_id", attrName="ftenantId", label="租户id", isUpdate=false, isQuery=false),
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.report_id DESC"
@Table(name = "biz_project_report", alias = "a", label = "汇报信息信息", columns = {
@Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true),
@Column(name = "report_id", attrName = "reportId", label = "汇报标识", isPK = true),
@Column(name = "report_cycle", attrName = "reportCycle", label = "汇报周期"),
@Column(name = "work_title", attrName = "workTitle", label = "汇报主题", queryType = QueryType.LIKE),
@Column(name = "work_content", attrName = "workContent", label = "本期内容", isQuery = false),
@Column(name = "progress_percent", attrName = "progressPercent", label = "项目进度", isQuery = false),
@Column(name = "problem_desc", attrName = "problemDesc", label = "存在问题", isQuery = false),
@Column(name = "solution_plan", attrName = "solutionPlan", label = "解决方案", isQuery = false),
@Column(name = "next_plan", attrName = "nextPlan", label = "下期计划", isQuery = false),
@Column(name = "report_time", attrName = "reportTime", label = "提交时间", isQuery = false, isUpdateForce = true),
@Column(name = "approval_status", attrName = "approvalStatus", label = "汇报状态"),
@Column(name = "project_id", attrName = "projectId", label = "项目编号"),
@Column(name = "employee_id", attrName = "employeeId", label = "人员编号"),
@Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false),
@Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true),
}, joinTable = {
@JoinTable(type = Type.LEFT_JOIN, entity = BizResumeEmployee.class, attrName = "this", alias = "b",
on = "a.employee_id = b.employee_id",
columns = {
@Column(name = "employee_name", attrName = "employeeName", label = "员工姓名"),
@Column(name = "employee_code", attrName = "employeeCode", label = "员工编号"),
}),
@JoinTable(type = Type.LEFT_JOIN, entity = BizProjectInfo.class, attrName = "this", alias = "c",
on = "a.project_id = c.project_id",
columns = {
@Column(name = "project_code", attrName = "projectCode", label = "项目编码"),
@Column(name = "project_name", attrName = "projectName", label = "项目名称"),
}),
}, orderBy = "a.create_time DESC"
)
@Data
public class BizProjectReport extends DataEntity<BizProjectReport> implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Date createTime; // 记录时间
private String reportId; // 汇报标识
private String reportCycle; // 汇报周期
private String workTitle; // 汇报主题
private String workContent; // 本期内容
private String progressPercent; // 项目进度
private String problemDesc; // 存在问题
private String solutionPlan; // 解决方案
private String nextPlan; // 下期计划
private Date reportTime; // 提交时间
private String approvalStatus; // 汇报状态
private String projectId; // 项目编号
private String employeeId; // 人员编号
private String ftenantId; // 租户id
private String fflowId; // 流程id
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
@ExcelFields({
@ExcelField(title="记录时间", attrName="createTime", align=Align.CENTER, sort=10, dataFormat="yyyy-MM-dd hh:mm"),
@ExcelField(title="汇报标识", attrName="reportId", align=Align.CENTER, sort=20),
@ExcelField(title="汇报周期", attrName="reportCycle", align=Align.CENTER, sort=30),
@ExcelField(title="汇报主题", attrName="workTitle", align=Align.CENTER, sort=40),
@ExcelField(title="本期内容", attrName="workContent", align=Align.CENTER, sort=50),
@ExcelField(title="项目进度", attrName="progressPercent", align=Align.CENTER, sort=60),
@ExcelField(title="存在问题", attrName="problemDesc", align=Align.CENTER, sort=70),
@ExcelField(title="解决方案", attrName="solutionPlan", align=Align.CENTER, sort=80),
@ExcelField(title="下期计划", attrName="nextPlan", align=Align.CENTER, sort=90),
@ExcelField(title="提交时间", attrName="reportTime", align=Align.CENTER, sort=100, dataFormat="yyyy-MM-dd hh:mm"),
@ExcelField(title="汇报状态", attrName="approvalStatus", align=Align.CENTER, sort=110),
@ExcelField(title="项目编号", attrName="projectId", align=Align.CENTER, sort=120),
@ExcelField(title="人员编号", attrName="employeeId", align=Align.CENTER, sort=130),
})
public BizProjectReport() {
this(null);
}
public BizProjectReport(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 reportId; // 汇报标识
private String reportCycle; // 汇报周期
private String workTitle; // 汇报主题
private String workContent; // 本期内容
private String progressPercent; // 项目进度
private String problemDesc; // 存在问题
private String solutionPlan; // 解决方案
private String nextPlan; // 下期计划
private Date reportTime; // 提交时间
private String approvalStatus; // 汇报状态
private String projectId; // 项目编号
private String employeeId; // 人员编号
private String ftenantId; // 租户id
private String fflowId; // 流程id
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
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 employeeName;
private String employeeCode;
private String projectCode;
private String projectName;
@ExcelFields({
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 10, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "汇报标识", attrName = "reportId", align = Align.CENTER, sort = 20),
@ExcelField(title = "汇报周期", attrName = "reportCycle", align = Align.CENTER, sort = 30),
@ExcelField(title = "汇报主题", attrName = "workTitle", align = Align.CENTER, sort = 40),
@ExcelField(title = "本期内容", attrName = "workContent", align = Align.CENTER, sort = 50),
@ExcelField(title = "项目进度", attrName = "progressPercent", align = Align.CENTER, sort = 60),
@ExcelField(title = "存在问题", attrName = "problemDesc", align = Align.CENTER, sort = 70),
@ExcelField(title = "解决方案", attrName = "solutionPlan", align = Align.CENTER, sort = 80),
@ExcelField(title = "下期计划", attrName = "nextPlan", align = Align.CENTER, sort = 90),
@ExcelField(title = "提交时间", attrName = "reportTime", align = Align.CENTER, sort = 100, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "汇报状态", attrName = "approvalStatus", align = Align.CENTER, sort = 110),
@ExcelField(title = "项目编号", attrName = "projectCode", align = Align.CENTER, sort = 120),
@ExcelField(title = "项目名称", attrName = "projectName", align = Align.CENTER, sort = 120),
@ExcelField(title = "人员名称", attrName = "employeeName", align = Align.CENTER, sort = 130),
})
public BizProjectReport() {
this(null);
}
public BizProjectReport(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);
}
}

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizProjectRequirements.java
View File

@@ -45,7 +45,7 @@ import java.io.Serial;
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.requirement_id DESC"
}, orderBy="a.create_time DESC"
)
@Data
public class BizProjectRequirements extends DataEntity<BizProjectRequirements> implements Serializable {

122
web-api/src/main/java/com/jeesite/modules/biz/entity/BizProvince.java
View File

@@ -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;
@@ -22,73 +23,74 @@ import java.io.Serial;
/**
* 省份信息Entity
*
* @author gaoxq
* @version 2025-11-27
*/
@Table(name="biz_province", alias="a", label="省份信息信息", columns={
@Column(name="id", attrName="id", label="id", isPK=true),
@Column(name="create_time", attrName="createTime", label="记录时间", isUpdate=false, isUpdateForce=true),
@Column(name="province_name", attrName="provinceName", label="省份名称", queryType=QueryType.LIKE),
@Column(name="province_code", attrName="provinceCode", label="省份编码"),
@Column(name="url_addr", attrName="urlAddr", label="请求地址", queryType=QueryType.LIKE),
@Column(name="sorting", attrName="sorting", label="省份序号", isQuery=false),
@Column(name="req_code", attrName="reqCode", label="请求状态"),
@Column(name="data_status", attrName="dataStatus", label="数据状态"),
@Column(name="f_tenant_id", attrName="ftenantId", label="租户id", isUpdate=false, isQuery=false),
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.id DESC"
@Table(name = "biz_province", alias = "a", label = "省份信息信息", columns = {
@Column(name = "id", attrName = "id", label = "id", isPK = true),
@Column(name = "create_time", attrName = "createTime", label = "记录时间", isUpdate = false, isUpdateForce = true),
@Column(name = "province_name", attrName = "provinceName", label = "省份名称", queryType = QueryType.LIKE),
@Column(name = "province_code", attrName = "provinceCode", label = "省份编码"),
@Column(name = "url_addr", attrName = "urlAddr", label = "请求地址", queryType = QueryType.LIKE),
@Column(name = "sorting", attrName = "sorting", label = "省份序号", isQuery = false),
@Column(name = "req_code", attrName = "reqCode", label = "请求状态"),
@Column(name = "data_status", attrName = "dataStatus", label = "数据状态"),
@Column(name = "f_tenant_id", attrName = "ftenantId", label = "租户id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_id", attrName = "fflowId", label = "流程id", isUpdate = false, isQuery = false),
@Column(name = "f_flow_task_id", attrName = "fflowTaskId", label = "流程任务主键", isUpdate = false, isQuery = false),
@Column(name = "f_flow_state", attrName = "fflowState", label = "流程任务状态", isUpdate = false, isQuery = false, isUpdateForce = true),
}, orderBy = "a.create_time DESC"
)
@Data
public class BizProvince extends DataEntity<BizProvince> implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Date createTime; // 记录时间
private String provinceName; // 省份名称
private String provinceCode; // 省份编码
private String urlAddr; // 请求地址
private Integer sorting; // 省份序号
private String reqCode; // 请求状态
private String dataStatus; // 数据状态
private String ftenantId; // 租户id
private String fflowId; // 流程id
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
@ExcelFields({
@ExcelField(title="id", attrName="id", align=Align.CENTER, sort=10),
@ExcelField(title="记录时间", attrName="createTime", align=Align.CENTER, sort=20, dataFormat="yyyy-MM-dd hh:mm"),
@ExcelField(title="省份名称", attrName="provinceName", align=Align.CENTER, sort=30),
@ExcelField(title="省份编码", attrName="provinceCode", align=Align.CENTER, sort=40),
@ExcelField(title="请求地址", attrName="urlAddr", align=Align.CENTER, sort=50),
@ExcelField(title="省份序号", attrName="sorting", align=Align.CENTER, sort=60),
@ExcelField(title="请求状态", attrName="reqCode", align=Align.CENTER, sort=70),
@ExcelField(title="数据状态", attrName="dataStatus", align=Align.CENTER, sort=80),
})
public BizProvince() {
this(null);
}
public BizProvince(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 provinceName; // 省份名称
private String provinceCode; // 省份编码
private String urlAddr; // 请求地址
private Integer sorting; // 省份序号
private String reqCode; // 请求状态
private String dataStatus; // 数据状态
private String ftenantId; // 租户id
private String fflowId; // 流程id
private String fflowTaskId; // 流程任务主键
private Integer fflowState; // 流程任务状态
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 = "id", attrName = "id", align = Align.CENTER, sort = 10),
@ExcelField(title = "记录时间", attrName = "createTime", align = Align.CENTER, sort = 20, dataFormat = "yyyy-MM-dd hh:mm"),
@ExcelField(title = "省份名称", attrName = "provinceName", align = Align.CENTER, sort = 30),
@ExcelField(title = "省份编码", attrName = "provinceCode", align = Align.CENTER, sort = 40),
@ExcelField(title = "请求地址", attrName = "urlAddr", align = Align.CENTER, sort = 50),
@ExcelField(title = "省份序号", attrName = "sorting", align = Align.CENTER, sort = 60),
@ExcelField(title = "请求状态", attrName = "reqCode", align = Align.CENTER, sort = 70),
@ExcelField(title = "数据状态", attrName = "dataStatus", dictType = "ustatus", align = Align.CENTER, sort = 80),
})
public BizProvince() {
this(null);
}
public BizProvince(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);
}
}

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizQuickLogin.java
View File

@@ -40,7 +40,7 @@ import java.io.Serial;
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.id DESC"
}, orderBy="a.create_time DESC"
)
@Data
public class BizQuickLogin extends DataEntity<BizQuickLogin> implements Serializable {

2
web-api/src/main/java/com/jeesite/modules/biz/entity/BizResumeEmployee.java
View File

@@ -41,7 +41,7 @@ import java.io.Serial;
@Column(name="f_flow_id", attrName="fflowId", label="流程id", isUpdate=false, isQuery=false),
@Column(name="f_flow_task_id", attrName="fflowTaskId", label="流程任务主键", isUpdate=false, isQuery=false),
@Column(name="f_flow_state", attrName="fflowState", label="流程任务状态", isUpdate=false, isQuery=false, isUpdateForce=true),
}, orderBy="a.employee_id DESC"
}, orderBy="a.create_time DESC"
)
@Data
public class BizResumeEmployee extends DataEntity<BizResumeEmployee> implements Serializable {

216
web-api/src/main/java/com/jeesite/modules/biz/web/BizCitiesController.java
View File

@@ -1,6 +1,7 @@
package com.jeesite.modules.biz.web;
import java.util.List;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,6 +27,7 @@ import com.jeesite.modules.biz.service.BizCitiesService;
/**
* 市区信息Controller
*
* @author gaoxq
* @version 2025-11-27
*/
@@ -33,114 +35,120 @@ import com.jeesite.modules.biz.service.BizCitiesService;
@RequestMapping(value = "${adminPath}/biz/cities")
public class BizCitiesController extends BaseController {
private final BizCitiesService bizCitiesService;
private final BizCitiesService bizCitiesService;
public BizCitiesController(BizCitiesService bizCitiesService) {
this.bizCitiesService = bizCitiesService;
}
/**
* 获取数据
*/
@ModelAttribute
public BizCities get(String id, boolean isNewRecord) {
return bizCitiesService.get(id, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = {"list", ""})
public String list(BizCities bizCities, Model model) {
model.addAttribute("bizCities", bizCities);
return "modules/biz/bizCitiesList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<BizCities> listData(BizCities bizCities, HttpServletRequest request, HttpServletResponse response) {
bizCities.setPage(new Page<>(request, response));
Page<BizCities> page = bizCitiesService.findPage(bizCities);
return page;
}
public BizCitiesController(BizCitiesService bizCitiesService) {
this.bizCitiesService = bizCitiesService;
}
/**
* 查看编辑表单
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "form")
public String form(BizCities bizCities, Model model) {
model.addAttribute("bizCities", bizCities);
return "modules/biz/bizCitiesForm";
}
/**
* 获取数据
*/
@ModelAttribute
public BizCities get(String id, boolean isNewRecord) {
return bizCitiesService.get(id, isNewRecord);
}
/**
* 保存数据
*/
@RequiresPermissions("biz:cities:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizCities bizCities) {
bizCitiesService.save(bizCities);
return renderResult(Global.TRUE, text("保存市区信息成功！"));
}
/**
* 查询列表
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = {"list", ""})
public String list(BizCities bizCities, Model model) {
model.addAttribute("bizCities", bizCities);
return "modules/biz/bizCitiesList";
}
/**
* 导出数据
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "exportData")
public void exportData(BizCities bizCities, HttpServletResponse response) {
List<BizCities> list = bizCitiesService.findList(bizCities);
String fileName = "市区信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("市区信息", BizCities.class)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表数据
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<BizCities> listData(BizCities bizCities, HttpServletRequest request, HttpServletResponse response) {
bizCities.setPage(new Page<>(request, response));
Page<BizCities> page = bizCitiesService.findPage(bizCities);
return page;
}
/**
* 下载模板
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
BizCities bizCities = new BizCities();
List<BizCities> list = ListUtils.newArrayList(bizCities);
String fileName = "市区信息模板.xlsx";
try(ExcelExport ee = new ExcelExport("市区信息", BizCities.class, Type.IMPORT)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查看编辑表单
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "form")
public String form(BizCities bizCities, Model model) {
model.addAttribute("bizCities", bizCities);
return "modules/biz/bizCitiesForm";
}
/**
* 保存数据
*/
@RequiresPermissions("biz:cities:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizCities bizCities) {
bizCitiesService.save(bizCities);
return renderResult(Global.TRUE, text("保存市区信息成功！"));
}
/**
* 导出数据
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "exportData")
public void exportData(BizCities bizCities, HttpServletResponse response) {
List<BizCities> list = bizCitiesService.findList(bizCities);
String fileName = "市区信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("市区信息", BizCities.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("biz:cities:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
BizCities bizCities = new BizCities();
List<BizCities> list = ListUtils.newArrayList(bizCities);
String fileName = "市区信息模板.xlsx";
try (ExcelExport ee = new ExcelExport("市区信息", BizCities.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("biz:cities:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = bizCitiesService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("biz:cities:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizCities bizCities) {
bizCitiesService.delete(bizCities);
return renderResult(Global.TRUE, text("删除市区信息成功！"));
}
@RequestMapping(value = "listAll")
@ResponseBody
public List<BizCities> listAll(BizCities bizCities) {
return bizCitiesService.findList(bizCities);
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("biz:cities:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = bizCitiesService.importData(file);
return renderResult(Global.TRUE, "posfull:"+message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("biz:cities:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizCities bizCities) {
bizCitiesService.delete(bizCities);
return renderResult(Global.TRUE, text("删除市区信息成功！"));
}
}

216
web-api/src/main/java/com/jeesite/modules/biz/web/BizProvinceController.java
View File

@@ -1,6 +1,7 @@
package com.jeesite.modules.biz.web;
import java.util.List;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,6 +27,7 @@ import com.jeesite.modules.biz.service.BizProvinceService;
/**
* 省份信息Controller
*
* @author gaoxq
* @version 2025-11-27
*/
@@ -33,114 +35,120 @@ import com.jeesite.modules.biz.service.BizProvinceService;
@RequestMapping(value = "${adminPath}/biz/province")
public class BizProvinceController extends BaseController {
private final BizProvinceService bizProvinceService;
private final BizProvinceService bizProvinceService;
public BizProvinceController(BizProvinceService bizProvinceService) {
this.bizProvinceService = bizProvinceService;
}
/**
* 获取数据
*/
@ModelAttribute
public BizProvince get(String id, boolean isNewRecord) {
return bizProvinceService.get(id, isNewRecord);
}
/**
* 查询列表
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = {"list", ""})
public String list(BizProvince bizProvince, Model model) {
model.addAttribute("bizProvince", bizProvince);
return "modules/biz/bizProvinceList";
}
/**
* 查询列表数据
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<BizProvince> listData(BizProvince bizProvince, HttpServletRequest request, HttpServletResponse response) {
bizProvince.setPage(new Page<>(request, response));
Page<BizProvince> page = bizProvinceService.findPage(bizProvince);
return page;
}
public BizProvinceController(BizProvinceService bizProvinceService) {
this.bizProvinceService = bizProvinceService;
}
/**
* 查看编辑表单
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "form")
public String form(BizProvince bizProvince, Model model) {
model.addAttribute("bizProvince", bizProvince);
return "modules/biz/bizProvinceForm";
}
/**
* 获取数据
*/
@ModelAttribute
public BizProvince get(String id, boolean isNewRecord) {
return bizProvinceService.get(id, isNewRecord);
}
/**
* 保存数据
*/
@RequiresPermissions("biz:province:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizProvince bizProvince) {
bizProvinceService.save(bizProvince);
return renderResult(Global.TRUE, text("保存省份信息成功！"));
}
/**
* 查询列表
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = {"list", ""})
public String list(BizProvince bizProvince, Model model) {
model.addAttribute("bizProvince", bizProvince);
return "modules/biz/bizProvinceList";
}
/**
* 导出数据
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "exportData")
public void exportData(BizProvince bizProvince, HttpServletResponse response) {
List<BizProvince> list = bizProvinceService.findList(bizProvince);
String fileName = "省份信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("省份信息", BizProvince.class)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查询列表数据
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "listData")
@ResponseBody
public Page<BizProvince> listData(BizProvince bizProvince, HttpServletRequest request, HttpServletResponse response) {
bizProvince.setPage(new Page<>(request, response));
Page<BizProvince> page = bizProvinceService.findPage(bizProvince);
return page;
}
/**
* 下载模板
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
BizProvince bizProvince = new BizProvince();
List<BizProvince> list = ListUtils.newArrayList(bizProvince);
String fileName = "省份信息模板.xlsx";
try(ExcelExport ee = new ExcelExport("省份信息", BizProvince.class, Type.IMPORT)){
ee.setDataList(list).write(response, fileName);
}
}
/**
* 查看编辑表单
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "form")
public String form(BizProvince bizProvince, Model model) {
model.addAttribute("bizProvince", bizProvince);
return "modules/biz/bizProvinceForm";
}
/**
* 保存数据
*/
@RequiresPermissions("biz:province:edit")
@PostMapping(value = "save")
@ResponseBody
public String save(@Validated BizProvince bizProvince) {
bizProvinceService.save(bizProvince);
return renderResult(Global.TRUE, text("保存省份信息成功！"));
}
/**
* 导出数据
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "exportData")
public void exportData(BizProvince bizProvince, HttpServletResponse response) {
List<BizProvince> list = bizProvinceService.findList(bizProvince);
String fileName = "省份信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try (ExcelExport ee = new ExcelExport("省份信息", BizProvince.class)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 下载模板
*/
@RequiresPermissions("biz:province:view")
@RequestMapping(value = "importTemplate")
public void importTemplate(HttpServletResponse response) {
BizProvince bizProvince = new BizProvince();
List<BizProvince> list = ListUtils.newArrayList(bizProvince);
String fileName = "省份信息模板.xlsx";
try (ExcelExport ee = new ExcelExport("省份信息", BizProvince.class, Type.IMPORT)) {
ee.setDataList(list).write(response, fileName);
}
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("biz:province:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = bizProvinceService.importData(file);
return renderResult(Global.TRUE, "posfull:" + message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:" + ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("biz:province:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizProvince bizProvince) {
bizProvinceService.delete(bizProvince);
return renderResult(Global.TRUE, text("删除省份信息成功！"));
}
@RequestMapping(value = "listAll")
@ResponseBody
public List<BizProvince> listAll(BizProvince bizProvince) {
return bizProvinceService.findList(bizProvince);
}
/**
* 导入数据
*/
@ResponseBody
@RequiresPermissions("biz:province:edit")
@PostMapping(value = "importData")
public String importData(MultipartFile file) {
try {
String message = bizProvinceService.importData(file);
return renderResult(Global.TRUE, "posfull:"+message);
} catch (Exception ex) {
return renderResult(Global.FALSE, "posfull:"+ex.getMessage());
}
}
/**
* 删除数据
*/
@RequiresPermissions("biz:province:edit")
@RequestMapping(value = "delete")
@ResponseBody
public String delete(BizProvince bizProvince) {
bizProvinceService.delete(bizProvince);
return renderResult(Global.TRUE, text("删除省份信息成功！"));
}
}

3
web-vue/packages/biz/api/biz/cities.ts
View File

@@ -30,6 +30,9 @@ export interface BizCities extends BasicModel<BizCities> {
export const bizCitiesList = (params?: BizCities | any) =>
defHttp.get<BizCities>({ url: adminPath + '/biz/cities/list', params });
export const bizCitiesListAll = (params?: BizCities | any) =>
defHttp.get<BizCities[]>({ url: adminPath + '/biz/cities/listAll', params });
export const bizCitiesListData = (params?: BizCities | any) =>
defHttp.post<Page<BizCities>>({ url: adminPath + '/biz/cities/listData', params });

3
web-vue/packages/biz/api/biz/province.ts
View File

@@ -28,6 +28,9 @@ export interface BizProvince extends BasicModel<BizProvince> {
export const bizProvinceList = (params?: BizProvince | any) =>
defHttp.get<BizProvince>({ url: adminPath + '/biz/province/list', params });
export const bizProvinceListAll = (params?: BizProvince | any) =>
defHttp.get<BizProvince[]>({ url: adminPath + '/biz/province/listAll', params });
export const bizProvinceListData = (params?: BizProvince | any) =>
defHttp.post<Page<BizProvince>>({ url: adminPath + '/biz/province/listData', params });

23
web-vue/packages/biz/views/biz/cities/form.vue
View File

@@ -42,15 +42,16 @@
}));
const inputFormSchemas: FormSchema<BizCities>[] = [
{
label: t('省份编码'),
field: 'provinceCode',
component: 'Input',
componentProps: {
maxlength: 24,
},
required: true,
},
{
label: t('省份名称'),
field: 'provinceCode',
fieldLabel: 'provinceName',
component: 'ListSelect',
componentProps: {
selectType: 'bizProvSelect',
},
required: true,
},
{
label: t('市区编码'),
field: 'cityCode',
@@ -83,7 +84,7 @@
field: 'areaType',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'area_type',
allowClear: true,
},
required: true,
@@ -93,7 +94,7 @@
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
required: true,

55
web-vue/packages/biz/views/biz/cities/list.vue
View File

@@ -14,16 +14,13 @@
<a-button type="default" :loading="loading" @click="handleExport()">
<Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
</a-button>
<a-button type="default" @click="handleImport()">
<Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
</a-button>
<a-button type="primary" @click="handleForm({})" v-auth="'biz:cities:edit'">
<Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
</a-button>
</template>
<template #firstColumn="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.createTime">
{{ record.createTime }}
<template #slotBizKey="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.cityName">
{{ record.cityName }}
</a>
</template>
</BasicTable>
@@ -80,12 +77,16 @@
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('省份编码'),
field: 'provinceCode',
component: 'Input',
},
},
{
label: t('省份名称'),
field: 'provinceCode',
fieldLabel: 'provinceName',
component: 'ListSelect',
componentProps: {
selectType: 'bizProvSelect',
},
},
{
label: t('市区编码'),
field: 'cityCode',
@@ -101,7 +102,7 @@
field: 'areaType',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'area_type',
allowClear: true,
},
},
@@ -110,7 +111,7 @@
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
},
@@ -123,9 +124,8 @@
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
width: 180,
align: 'left',
slot: 'firstColumn',
},
{
title: t('省份编码'),
@@ -135,6 +135,14 @@
width: 130,
align: 'left',
},
{
title: t('省份名称'),
dataIndex: 'provinceName',
key: 'b.province_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区编码'),
dataIndex: 'cityCode',
@@ -150,6 +158,7 @@
sorter: true,
width: 130,
align: 'left',
slot: 'slotBizKey',
},
{
title: t('市区区号'),
@@ -166,14 +175,14 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'area_type',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
width: 180,
align: 'center',
},
{
@@ -183,28 +192,30 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'ustatus',
},
];
const actionColumn: BasicColumn<BizCities> = {
width: 160,
align: 'center',
actions: (record: BizCities) => [
{
icon: 'i-clarity:note-edit-line',
title: t('编辑市区信息'),
title: t('编辑'),
onClick: handleForm.bind(this, { id: record.id }),
auth: 'biz:cities:edit',
},
{
icon: 'i-ant-design:delete-outlined',
color: 'error',
title: t('删除市区信息'),
title: t('删除'),
popConfirm: {
title: t('是否确认删除市区信息'),
title: t('是否确认删除市区?'),
confirm: handleDelete.bind(this, record),
},
auth: 'biz:cities:edit',
ifShow: record.dataStatus == '0'
},
],
};

89
web-vue/packages/biz/views/biz/municipalities/form.vue
View File

@@ -27,6 +27,8 @@
import { Icon } from '@jeesite/core/components/Icon';
import { BasicForm, FormSchema, useForm } from '@jeesite/core/components/Form';
import { BasicDrawer, useDrawerInner } from '@jeesite/core/components/Drawer';
import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
import { BizMunicipalities, bizMunicipalitiesSave, bizMunicipalitiesForm } from '@jeesite/biz/api/biz/municipalities';
const emit = defineEmits(['success', 'register']);
@@ -35,6 +37,8 @@
const { showMessage } = useMessage();
const { meta } = unref(router.currentRoute);
const record = ref<BizMunicipalities>({} as BizMunicipalities);
const provListParams = ref<Recordable>({ provinceCode: '' });
const getTitle = computed(() => ({
icon: meta.icon || 'i-ant-design:book-outlined',
@@ -42,35 +46,54 @@
}));
const inputFormSchemas: FormSchema<BizMunicipalities>[] = [
{
label: t('省份名称'),
field: 'provinceCode',
component: 'Select',
componentProps: {
api: bizProvinceListAll,
params: {},
fieldNames: { label: 'provinceName', value: 'provinceCode' },
immediate: true,
allowClear: true,
onChange: (value: string) => {
provListParams.value.provinceCode = value;
},
required: true,
},
colProps: { md: 24, lg: 24 },
},
{
label: t('县区名称'),
field: 'countyName',
component: 'Input',
componentProps: {
maxlength: 65,
},
required: true,
},
{
label: t('省份编码'),
field: 'provinceCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('市区编码'),
field: 'cityCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
label: t('市区名称'),
field: 'cityCode',
component: 'Select',
componentProps: {
api: bizCitiesListAll,
params: provListParams.value,
fieldNames: { label: 'cityName', value: 'cityCode' },
allowClear: true,
},
required: true,
},
{
label: t('数据状态'),
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: 'ustatus',
allowClear: true,
},
required: true,
},
{
label: t('县区名称'),
field: 'countyName',
component: 'Input',
componentProps: {
maxlength: 65,
},
required: true,
},
{
label: t('县区编码'),
field: 'countyCode',
@@ -116,16 +139,6 @@
},
required: true,
},
{
label: t('数据状态'),
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
];
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm<BizMunicipalities>({

105
web-vue/packages/biz/views/biz/municipalities/list.vue
View File

@@ -14,16 +14,13 @@
<a-button type="default" :loading="loading" @click="handleExport()">
<Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
</a-button>
<a-button type="default" @click="handleImport()">
<Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
</a-button>
<a-button type="primary" @click="handleForm({})" v-auth="'biz:municipalities:edit'">
<Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
</a-button>
</template>
<template #firstColumn="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.createTime">
{{ record.createTime }}
<template #slotBizKey="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.villageName">
{{ record.villageName }}
</a>
</template>
</BasicTable>
@@ -42,6 +39,8 @@
import { BasicTable, BasicColumn, useTable } from '@jeesite/core/components/Table';
import { BizMunicipalities, bizMunicipalitiesList } from '@jeesite/biz/api/biz/municipalities';
import { bizMunicipalitiesDelete, bizMunicipalitiesListData } from '@jeesite/biz/api/biz/municipalities';
import { bizCitiesListAll } from '@jeesite/biz/api/biz/cities';
import { bizProvinceListAll } from '@jeesite/biz/api/biz/province';
import { useDrawer } from '@jeesite/core/components/Drawer';
import { useModal } from '@jeesite/core/components/Modal';
import { FormProps } from '@jeesite/core/components/Form';
@@ -52,6 +51,8 @@
const { showMessage } = useMessage();
const { meta } = unref(router.currentRoute);
const record = ref<BizMunicipalities>({} as BizMunicipalities);
const provListParams = ref<Recordable>({ provinceCode: '' });
const getTitle = {
icon: meta.icon || 'i-ant-design:book-outlined',
@@ -81,18 +82,19 @@
showTime: { format: 'HH:mm' },
},
},
{
label: t('县区名称'),
field: 'countyName',
component: 'Input',
},
{
label: t('省份编码'),
field: 'provinceCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
api: bizProvinceListAll,
params: {},
fieldNames: { label: 'provinceName', value: 'provinceCode' },
immediate: true,
allowClear: true,
onChange: (value: string) => {
provListParams.value.provinceCode = value;
},
},
},
{
@@ -100,10 +102,17 @@
field: 'cityCode',
component: 'Select',
componentProps: {
dictType: '',
api: bizCitiesListAll,
params: provListParams.value,
fieldNames: { label: 'cityName', value: 'cityCode' },
allowClear: true,
},
},
{
label: t('县区名称'),
field: 'countyName',
component: 'Input',
},
{
label: t('县区编码'),
field: 'countyCode',
@@ -134,7 +143,7 @@
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
},
@@ -147,27 +156,33 @@
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('县区名称'),
dataIndex: 'countyName',
key: 'a.county_name',
sorter: true,
width: 130,
width: 180,
align: 'left',
},
{
title: t('省份编码'),
dataIndex: 'provinceCode',
key: 'a.province_code',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('省份名称'),
dataIndex: 'provinceName',
key: 'b.province_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('省份编码'),
dataIndex: 'provinceCode',
key: 'a.province_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区名称'),
dataIndex: 'cityName',
key: 'c.city_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('市区编码'),
dataIndex: 'cityCode',
@@ -175,8 +190,15 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('县区名称'),
dataIndex: 'countyName',
key: 'a.county_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('县区编码'),
dataIndex: 'countyCode',
@@ -208,6 +230,7 @@
sorter: true,
width: 130,
align: 'left',
slot: 'slotBizKey',
},
{
title: t('社区编号'),
@@ -222,7 +245,7 @@
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
width: 180,
align: 'center',
},
{
@@ -232,28 +255,30 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'ustatus',
},
];
const actionColumn: BasicColumn<BizMunicipalities> = {
width: 160,
align: 'center',
actions: (record: BizMunicipalities) => [
{
icon: 'i-clarity:note-edit-line',
title: t('编辑地市信息'),
title: t('编辑'),
onClick: handleForm.bind(this, { id: record.id }),
auth: 'biz:municipalities:edit',
},
{
icon: 'i-ant-design:delete-outlined',
color: 'error',
title: t('删除地市信息'),
title: t('删除'),
popConfirm: {
title: t('是否确认删除地市信息'),
title: t('是否确认删除地市?'),
confirm: handleDelete.bind(this, record),
},
auth: 'biz:municipalities:edit',
ifShow: record.dataStatus == '0'
},
],
};

205
web-vue/packages/biz/views/biz/municipalities/select.ts
View File

@@ -1,205 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizMunicipalities, bizMunicipalitiesListData } from '@jeesite/biz/api/biz/municipalities';
const { t } = useI18n('biz.municipalities');
const modalProps = {
title: t('地市信息选择'),
};
const searchForm: FormProps<BizMunicipalities> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('记录时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('记录时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('县区名称'),
field: 'countyName',
component: 'Input',
},
{
label: t('省份编码'),
field: 'provinceCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('市区编码'),
field: 'cityCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('县区编码'),
field: 'countyCode',
component: 'Input',
},
{
label: t('街道名称'),
field: 'townName',
component: 'Input',
},
{
label: t('街道编号'),
field: 'townCode',
component: 'Input',
},
{
label: t('社区名称'),
field: 'villageName',
component: 'Input',
},
{
label: t('社区编号'),
field: 'villageCode',
component: 'Input',
},
{
label: t('数据状态'),
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizMunicipalities>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('县区名称'),
dataIndex: 'countyName',
key: 'a.county_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('省份编码'),
dataIndex: 'provinceCode',
key: 'a.province_code',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('市区编码'),
dataIndex: 'cityCode',
key: 'a.city_code',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('县区编码'),
dataIndex: 'countyCode',
key: 'a.county_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('街道名称'),
dataIndex: 'townName',
key: 'a.town_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('街道编号'),
dataIndex: 'townCode',
key: 'a.town_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('社区名称'),
dataIndex: 'villageName',
key: 'a.village_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('社区编号'),
dataIndex: 'villageCode',
key: 'a.village_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('更新时间'),
dataIndex: 'updateTime',
key: 'a.update_time',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('数据状态'),
dataIndex: 'dataStatus',
key: 'a.data_status',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
];
const tableProps: BasicTableProps = {
api: bizMunicipalitiesListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'id',
};
export default {
modalProps,
tableProps,
itemCode: 'id',
itemName: 'id',
isShowCode: false,
};

57
web-vue/packages/biz/views/biz/projectInfo/select.ts
View File

@@ -12,24 +12,6 @@ const searchForm: FormProps<BizProjectInfo> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('记录时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('记录时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('项目编码'),
field: 'projectCode',
@@ -40,30 +22,12 @@ const searchForm: FormProps<BizProjectInfo> = {
field: 'projectName',
component: 'Input',
},
{
label: t('员工列表'),
field: 'employeeId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('项目类型'),
field: 'projectType',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('项目状态'),
field: 'projectStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'project_status',
allowClear: true,
},
},
@@ -76,7 +40,7 @@ const tableColumns: BasicColumn<BizProjectInfo>[] = [
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
width: 180,
align: 'left',
slot: 'firstColumn',
},
@@ -128,15 +92,6 @@ const tableColumns: BasicColumn<BizProjectInfo>[] = [
width: 130,
align: 'center',
},
{
title: t('员工列表'),
dataIndex: 'employeeId',
key: 'a.employee_id',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('项目类型'),
dataIndex: 'projectType',
@@ -144,7 +99,7 @@ const tableColumns: BasicColumn<BizProjectInfo>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'project_type',
},
{
title: t('项目状态'),
@@ -153,7 +108,7 @@ const tableColumns: BasicColumn<BizProjectInfo>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'project_status',
},
];
@@ -172,6 +127,6 @@ export default {
modalProps,
tableProps,
itemCode: 'projectId',
itemName: 'projectId',
isShowCode: false,
itemName: 'projectName',
isShowCode: true,
};

109
web-vue/packages/biz/views/biz/projectReport/form.vue
View File

@@ -42,16 +42,6 @@
}));
const inputFormSchemas: FormSchema<BizProjectReport>[] = [
{
label: t('汇报周期'),
field: 'reportCycle',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('汇报主题'),
field: 'workTitle',
@@ -60,80 +50,91 @@
maxlength: 52,
},
required: true,
colProps: { md: 24, lg: 24 },
},
{
label: t('汇报周期'),
field: 'reportCycle',
component: 'Select',
componentProps: {
dictType: 'report_cycle',
allowClear: true,
},
required: true,
},
{
label: t('提交时间'),
field: 'reportTime',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('项目名称'),
field: 'projectId',
fieldLabel: 'projectName',
component: 'ListSelect',
componentProps: {
selectType: 'bizProjectSelect',
},
required: true,
},
{
label: t('汇报人员'),
field: 'employeeId',
fieldLabel: 'employeeName',
component: 'ListSelect',
componentProps: {
selectType: 'bizEmpSelect',
},
required: true,
},
{
label: t('本期内容'),
field: 'workContent',
component: 'Input',
component: 'InputTextArea',
required: true,
colProps: { md: 24, lg: 24 },
},
{
label: t('项目进度'),
field: 'progressPercent',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 12,
},
required: true,
},
{
label: t('汇报状态'),
field: 'approvalStatus',
component: 'Select',
componentProps: {
dictType: 'approval_status',
allowClear: true,
},
required: true,
},
{
label: t('存在问题'),
field: 'problemDesc',
component: 'Input',
component: 'InputTextArea',
colProps: { md: 24, lg: 24 },
},
{
label: t('解决方案'),
field: 'solutionPlan',
component: 'Input',
component: 'InputTextArea',
colProps: { md: 24, lg: 24 },
},
{
label: t('下期计划'),
field: 'nextPlan',
component: 'Input',
component: 'InputTextArea',
colProps: { md: 24, lg: 24 },
},
{
label: t('提交时间'),
field: 'reportTime',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('汇报状态'),
field: 'approvalStatus',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('项目编号'),
field: 'projectId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('人员编号'),
field: 'employeeId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
required: true,
},
{
label: t('附件上传'),
field: 'dataMap',

107
web-vue/packages/biz/views/biz/projectReport/list.vue
View File

@@ -78,47 +78,47 @@
showTime: { format: 'HH:mm' },
},
},
{
label: t('汇报主题'),
field: 'workTitle',
component: 'Input',
},
{
label: t('汇报周期'),
field: 'reportCycle',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('汇报主题'),
field: 'workTitle',
component: 'Input',
},
{
label: t('汇报状态'),
field: 'approvalStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'report_cycle',
allowClear: true,
},
},
{
label: t('项目编号'),
field: 'projectId',
component: 'Select',
fieldLabel: 'projectName',
component: 'ListSelect',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('人员编号'),
field: 'employeeId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
selectType: 'bizProjectSelect',
},
},
{
label: t('所属人员'),
field: 'employeeId',
fieldLabel: 'employeeName',
component: 'ListSelect',
componentProps: {
selectType: 'bizEmpSelect',
},
},
{
label: t('汇报状态'),
field: 'approvalStatus',
component: 'Select',
componentProps: {
dictType: 'approval_status',
allowClear: true,
},
},
],
};
@@ -128,7 +128,7 @@
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
width: 180,
align: 'left',
slot: 'firstColumn',
},
@@ -139,16 +139,40 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'report_cycle',
},
{
title: t('汇报主题'),
dataIndex: 'workTitle',
key: 'a.work_title',
sorter: true,
width: 130,
width: 200,
align: 'left',
},
{
title: t('汇报人员'),
dataIndex: 'employeeName',
key: 'b.employee_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('项目编码'),
dataIndex: 'projectCode',
key: 'c.project_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('项目名称'),
dataIndex: 'projectName',
key: 'c.project_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('本期内容'),
dataIndex: 'workContent',
@@ -194,7 +218,7 @@
dataIndex: 'reportTime',
key: 'a.report_time',
sorter: true,
width: 130,
width: 180,
align: 'center',
},
{
@@ -204,30 +228,13 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('项目编号'),
dataIndex: 'projectId',
key: 'a.project_id',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('人员编号'),
dataIndex: 'employeeId',
key: 'a.employee_id',
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'approval_status',
},
];
const actionColumn: BasicColumn<BizProjectReport> = {
width: 160,
align: 'center',
actions: (record: BizProjectReport) => [
{
icon: 'i-clarity:note-edit-line',

198
web-vue/packages/biz/views/biz/projectReport/select.ts
View File

@@ -1,198 +0,0 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizProjectReport, bizProjectReportListData } from '@jeesite/biz/api/biz/projectReport';
const { t } = useI18n('biz.projectReport');
const modalProps = {
title: t('汇报信息选择'),
};
const searchForm: FormProps<BizProjectReport> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('记录时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('记录时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('汇报周期'),
field: 'reportCycle',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('汇报主题'),
field: 'workTitle',
component: 'Input',
},
{
label: t('汇报状态'),
field: 'approvalStatus',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('项目编号'),
field: 'projectId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('人员编号'),
field: 'employeeId',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizProjectReport>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
align: 'left',
slot: 'firstColumn',
},
{
title: t('汇报周期'),
dataIndex: 'reportCycle',
key: 'a.report_cycle',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('汇报主题'),
dataIndex: 'workTitle',
key: 'a.work_title',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('本期内容'),
dataIndex: 'workContent',
key: 'a.work_content',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('项目进度'),
dataIndex: 'progressPercent',
key: 'a.progress_percent',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('存在问题'),
dataIndex: 'problemDesc',
key: 'a.problem_desc',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('解决方案'),
dataIndex: 'solutionPlan',
key: 'a.solution_plan',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('下期计划'),
dataIndex: 'nextPlan',
key: 'a.next_plan',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('提交时间'),
dataIndex: 'reportTime',
key: 'a.report_time',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('汇报状态'),
dataIndex: 'approvalStatus',
key: 'a.approval_status',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('项目编号'),
dataIndex: 'projectId',
key: 'a.project_id',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
{
title: t('人员编号'),
dataIndex: 'employeeId',
key: 'a.employee_id',
sorter: true,
width: 130,
align: 'left',
dictType: '',
},
];
const tableProps: BasicTableProps = {
api: bizProjectReportListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'reportId',
};
export default {
modalProps,
tableProps,
itemCode: 'reportId',
itemName: 'reportId',
isShowCode: false,
};

6
web-vue/packages/biz/views/biz/province/form.vue
View File

@@ -71,7 +71,7 @@
{
label: t('省份序号'),
field: 'sorting',
component: 'Input',
component: 'InputNumber',
componentProps: {
maxlength: 9,
},
@@ -82,7 +82,7 @@
field: 'reqCode',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'req_code',
allowClear: true,
},
},
@@ -91,7 +91,7 @@
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
required: true,

31
web-vue/packages/biz/views/biz/province/list.vue
View File

@@ -14,16 +14,13 @@
<a-button type="default" :loading="loading" @click="handleExport()">
<Icon icon="i-ant-design:download-outlined" /> {{ t('导出') }}
</a-button>
<a-button type="default" @click="handleImport()">
<Icon icon="i-ant-design:import-outlined" /> {{ t('导入') }}
</a-button>
<a-button type="primary" @click="handleForm({})" v-auth="'biz:province:edit'">
<Icon icon="i-fluent:add-12-filled" /> {{ t('新增') }}
</a-button>
</template>
<template #firstColumn="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.createTime">
{{ record.createTime }}
<template #slotBizKey="{ record }">
<a @click="handleForm({ id: record.id })" :title="record.provinceName">
{{ record.provinceName }}
</a>
</template>
</BasicTable>
@@ -101,7 +98,7 @@
field: 'reqCode',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'req_code',
allowClear: true,
},
},
@@ -110,7 +107,7 @@
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
},
@@ -123,17 +120,17 @@
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
width: 180,
align: 'left',
slot: 'firstColumn',
},
{
title: t('省份名称'),
dataIndex: 'provinceName',
key: 'a.province_name',
sorter: true,
width: 130,
width: 200,
align: 'left',
slot: 'slotBizKey',
},
{
title: t('省份编码'),
@@ -166,7 +163,7 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'req_code',
},
{
title: t('数据状态'),
@@ -175,28 +172,30 @@
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'ustatus',
},
];
const actionColumn: BasicColumn<BizProvince> = {
width: 160,
align: 'center',
actions: (record: BizProvince) => [
{
icon: 'i-clarity:note-edit-line',
title: t('编辑省份信息'),
title: t('编辑'),
onClick: handleForm.bind(this, { id: record.id }),
auth: 'biz:province:edit',
},
{
icon: 'i-ant-design:delete-outlined',
color: 'error',
title: t('删除省份信息'),
title: t('删除'),
popConfirm: {
title: t('是否确认删除省份信息'),
title: t('是否确认删除省份?'),
confirm: handleDelete.bind(this, record),
},
auth: 'biz:province:edit',
ifShow: record.dataStatus == '0'
},
],
};

132
web-vue/packages/core/components/ListSelect/src/selectType/bizProjectSelect.ts Normal file
View File

@@ -0,0 +1,132 @@
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { BasicColumn, BasicTableProps, FormProps } from '@jeesite/core/components/Table';
import { BizProjectInfo, bizProjectInfoListData } from '@jeesite/biz/api/biz/projectInfo';
const { t } = useI18n('biz.projectInfo');
const modalProps = {
title: t('项目信息选择'),
};
const searchForm: FormProps<BizProjectInfo> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('项目编码'),
field: 'projectCode',
component: 'Input',
},
{
label: t('项目名称'),
field: 'projectName',
component: 'Input',
},
{
label: t('项目状态'),
field: 'projectStatus',
component: 'Select',
componentProps: {
dictType: 'project_status',
allowClear: true,
},
},
],
};
const tableColumns: BasicColumn<BizProjectInfo>[] = [
{
title: t('记录时间'),
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 180,
align: 'left',
slot: 'firstColumn',
},
{
title: t('项目编码'),
dataIndex: 'projectCode',
key: 'a.project_code',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('项目名称'),
dataIndex: 'projectName',
key: 'a.project_name',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('项目描述'),
dataIndex: 'projectDesc',
key: 'a.project_desc',
sorter: true,
width: 130,
align: 'left',
},
{
title: t('开始日期'),
dataIndex: 'startDate',
key: 'a.start_date',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('预计结束日期'),
dataIndex: 'endDate',
key: 'a.end_date',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('实际结束日期'),
dataIndex: 'actualEndDate',
key: 'a.actual_end_date',
sorter: true,
width: 130,
align: 'center',
},
{
title: t('项目类型'),
dataIndex: 'projectType',
key: 'a.project_type',
sorter: true,
width: 130,
align: 'left',
dictType: 'project_type',
},
{
title: t('项目状态'),
dataIndex: 'projectStatus',
key: 'a.project_status',
sorter: true,
width: 130,
align: 'left',
dictType: 'project_status',
},
];
const tableProps: BasicTableProps = {
api: bizProjectInfoListData,
beforeFetch: (params) => {
params['isAll'] = true;
return params;
},
columns: tableColumns,
formConfig: searchForm,
rowKey: 'projectId',
};
export default {
modalProps,
tableProps,
itemCode: 'projectId',
itemName: 'projectName',
isShowCode: true,
};

47
web-vue/packages/biz/views/biz/province/select.ts → web-vue/packages/core/components/ListSelect/src/selectType/bizProvSelect.ts
View File

@@ -12,24 +12,6 @@ const searchForm: FormProps<BizProvince> = {
baseColProps: { md: 8, lg: 6 },
labelWidth: 90,
schemas: [
{
label: t('记录时间起'),
field: 'createTime_gte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('记录时间止'),
field: 'createTime_lte',
component: 'DatePicker',
componentProps: {
format: 'YYYY-MM-DD HH:mm',
showTime: { format: 'HH:mm' },
},
},
{
label: t('省份名称'),
field: 'provinceName',
@@ -40,26 +22,12 @@ const searchForm: FormProps<BizProvince> = {
field: 'provinceCode',
component: 'Input',
},
{
label: t('请求地址'),
field: 'urlAddr',
component: 'Input',
},
{
label: t('请求状态'),
field: 'reqCode',
component: 'Select',
componentProps: {
dictType: '',
allowClear: true,
},
},
{
label: t('数据状态'),
field: 'dataStatus',
component: 'Select',
componentProps: {
dictType: '',
dictType: 'ustatus',
allowClear: true,
},
},
@@ -72,9 +40,8 @@ const tableColumns: BasicColumn<BizProvince>[] = [
dataIndex: 'createTime',
key: 'a.create_time',
sorter: true,
width: 230,
width: 180,
align: 'left',
slot: 'firstColumn',
},
{
title: t('省份名称'),
@@ -115,7 +82,7 @@ const tableColumns: BasicColumn<BizProvince>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'req_code',
},
{
title: t('数据状态'),
@@ -124,7 +91,7 @@ const tableColumns: BasicColumn<BizProvince>[] = [
sorter: true,
width: 130,
align: 'left',
dictType: '',
dictType: 'ustatus',
},
];
@@ -142,7 +109,7 @@ const tableProps: BasicTableProps = {
export default {
modalProps,
tableProps,
itemCode: 'id',
itemName: 'id',
isShowCode: false,
itemCode: 'provinceCode',
itemName: 'provinceName',
isShowCode: true,
};