xiaozhang/xinli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

必填项

Browse Source
This commit is contained in:
green 2025-11-27 18:37:42 +08:00
parent ef2f7da636
commit aad78df34b
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java
View File

@ -34,7 +34,7 @@ public class PsyUserProfile extends BaseEntity
private String profileData;
/** 姓名 */
@Excel(name = "罪犯姓名", sort = 2)
@Excel(name = "罪犯姓名（必填）", sort = 2)
private String userName;
/** 电话 */
@ -42,14 +42,15 @@ public class PsyUserProfile extends BaseEntity
/** 生日 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出生日期", sort = 6, width = 20, dateFormat = "yyyy-MM-dd")
private java.util.Date birthday;
/** 监狱 */
@Excel(name = "监狱", sort = 3)
@Excel(name = "监狱（必填）", sort = 3)
private String prison;
/** 监区 */
@Excel(name = "监区", sort = 4)
@Excel(name = "监区（必填）", sort = 4)
private String prisonArea;
/** 性别 */
@ -57,38 +58,38 @@ public class PsyUserProfile extends BaseEntity
private String gender;
/** 民族 */
@Excel(name = "民族", sort = 6)
@Excel(name = "民族", sort = 7)
private String nation;
/** 文化程度 */
@Excel(name = "文化程度", sort = 7)
@Excel(name = "文化程度", sort = 8)
private String educationLevel;
/** 罪名 */
@Excel(name = "罪名", sort = 8)
@Excel(name = "罪名", sort = 9)
private String crimeName;
/** 刑期 */
@Excel(name = "刑期", sort = 9)
@Excel(name = "刑期", sort = 10)
private String sentenceTerm;
/** 刑期起日 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "刑期起日", sort = 10, width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "刑期起日", sort = 11, width = 30, dateFormat = "yyyy-MM-dd")
private java.util.Date sentenceStartDate;
/** 刑期止日 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "刑期止日", sort = 11, width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "刑期止日", sort = 12, width = 30, dateFormat = "yyyy-MM-dd")
private java.util.Date sentenceEndDate;
/** 入监时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "入监时间", sort = 12, width = 30, dateFormat = "yyyy-MM-dd")
@Excel(name = "入监时间", sort = 13, width = 30, dateFormat = "yyyy-MM-dd")
private java.util.Date entryDate;
/** 用户状态（0在押 1释放 2外出 3假释） */
@Excel(name = "状态", sort = 13, readConverterExp = "0=在押,1=释放,2=外出,3=假释")
@Excel(name = "状态", sort = 14, readConverterExp = "0=在押,1=释放,2=外出,3=假释")
private String status;
/** 部门ID */
@ -98,7 +99,7 @@ public class PsyUserProfile extends BaseEntity
private String deptName;
/** 信息编号 */
@Excel(name = "信息编号", sort = 1)
@Excel(name = "信息编号（必填）", sort = 1)
private String infoNumber;
public Long getProfileId()

21
xinli-ui/src/views/psychology/profile/index.vue
View File

@ -114,6 +114,11 @@
<span v-else>{{ scope.row.gender || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="出生日期" align="center" prop="birthday" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="民族" align="center" prop="nation" width="80">
<template slot-scope="scope">
<span>{{ scope.row.nation || '-' }}</span>
@ -243,6 +248,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生日期" prop="birthday">
<el-date-picker
v-model="form.birthday"
type="date"
placeholder="选择出生日期"
value-format="yyyy-MM-dd"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<el-input v-model="form.nation" placeholder="请输入民族" />
@ -814,6 +832,7 @@ export default {
prison: undefined,
prisonArea: undefined,
gender: undefined,
birthday: undefined,
nation: undefined,
educationLevel: undefined,
crimeName: undefined,
@ -1073,6 +1092,8 @@ export default {
prison: (row && row.prison) || undefined,
prisonArea: (row && row.prisonArea) || undefined,
gender: (row && row.gender) || undefined,
birthday: (row && row.birthday) || undefined,
birthday: (row && row.birthday) || undefined,
nation: (row && row.nation) || undefined,
educationLevel: (row && row.educationLevel) || undefined,
crimeName: (row && row.crimeName) || undefined,