diff --git a/attendance-performance-manager-ui/admin/src/views/dept/drawershow.vue b/attendance-performance-manager-ui/admin/src/views/dept/drawershow.vue index 91c7d899da91c586d4bfa0b6c4c2ef705d815448..7eb4edce96b75367b70a2c17121e8e18b727d681 100644 --- a/attendance-performance-manager-ui/admin/src/views/dept/drawershow.vue +++ b/attendance-performance-manager-ui/admin/src/views/dept/drawershow.vue @@ -7,9 +7,9 @@ size="50%"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-row> - <Field label="閮ㄩ棬鍚嶇О" prop="deptName" v-model="form.deptName" type="textarea" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :maxLength="15"/> - <Field label="涓婄骇閮ㄩ棬" prop="parentId" v-model="form.parentId" type="select" :enumData="dict.deptName" placeholder="璇烽€夋嫨涓婄骇閮ㄩ棬"/> - <Field label="璐熻矗浜�" prop="workId" v-model="form.workId" type="select" :enumData="dict.workName" placeholder="璇烽€夋嫨鍛樺伐"/> + <Field :span="20" label="閮ㄩ棬鍚嶇О" prop="deptName" v-model="form.deptName" type="textarea" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :maxLength="15"/> + <Field :span="20" label="涓婄骇閮ㄩ棬" prop="parentId" v-model="form.parentId" type="select" :enumData="dict.deptName" placeholder="璇烽€夋嫨涓婄骇閮ㄩ棬"/> + <Field :span="20" label="璐熻矗浜�" prop="workId" v-model="form.workId" type="select" :enumData="dict.workName" placeholder="璇烽€夋嫨鍛樺伐"/> </el-row> <form-buttons @submit='submitForm' noCancelBtn /> diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java index a859649aa18acbe8ac08e43025fcf5736d2c7144..76674a7fd7b4bdb71687d3e247ced5bfa341d244 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptEntity.java @@ -79,7 +79,7 @@ public class DeptEntity extends DeptVo { public void initAttrValue(){ - this.parentId = -1L; + this.parentId = null; this.ancestors = ""; @@ -93,7 +93,7 @@ public class DeptEntity extends DeptVo { this.personNum = 0; - this.workId = -1L; + this.workId = null; this.workName = "";