修改员工属性

enterprise-manager-ui/admin/src/components/SearchForm.vue

@@ -30,6 +30,7 @@
 
         <el-select
           v-model="form[item.name]"
+          :placeholder=" item.placeholder ? item.placeholder : '请输入' + item.label"
           :filterable="item.filterable"
           :multiple="item.multiple"
           clearable="true"

enterprise-manager-ui/admin/src/views/staff/drawershow.vue

@@ -9,13 +9,13 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                             <Field :span="20" label="员工姓名" prop="name" v-model="form.name" placeholder="请输入员工姓名"/>
-              <Field label="所属公司" prop="companyIds" v-model="form.companyIds" :multiple="true" type="select" :enum-data="dict.companyId" placeholder="请输入所属公司"/>
-              <Field label="职位" prop="positionId" v-model="form.positionId" type="select" placeholder="请输入职位ID"/>
-              <Field label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/>
-              <Field label="头像" prop="photoPath"  placeholder="请输入照片"><imageUpload v-model="form.photoPath" prePath="/file/preview"/> </Field>
-              <Field label="邮件地址" prop="Email" v-model="form.Email" placeholder="请输入邮件地址"/>
+              <Field :span="20" label="所属公司" prop="companyIds" v-model="form.companyIds" :multiple="true" type="select" :enum-data="dict.companyId" placeholder="请输入所属公司"/>
+              <Field :span="20" label="职位" prop="positionId" v-model="form.positionId" type="select" :enum-data="dict.positionId" placeholder="请输入职位ID"/>
+              <Field :span="20" label="联系电话" prop="phoneNumber" v-model="form.phoneNumber" placeholder="请输入联系电话"/>
+              <Field :span="20" label="头像" prop="photoPath"  placeholder="请输入照片"><imageUpload v-model="form.photoPath" prePath="/file/preview"/> </Field>
+              <Field :span="20" label="邮件地址" prop="Email" v-model="form.Email" placeholder="请输入邮件地址"/>
 
-                            <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
+                            <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>
 
@@ -50,6 +50,7 @@
                     "staffType",
                     "staffStatus",
                     "source",
+                    "positionId"
                 ],
                 toArrays:["companyIds"],
 

enterprise-manager-ui/admin/src/views/staff/list.vue

@@ -44,12 +44,14 @@
                       {
                         name: "companyId",
                         type: "select",
+                        placeholder:"请选择所属企业",
                         label: "所属企业"
                       },
 
                       {
                         name: "name",
                         type: "text",
+                        placeholder:"请输入员工姓名",
                         label: "员工姓名"
                       },
 

enterprise-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -137,9 +137,9 @@ public class StaffEntity extends StaffVo {
             this.phoneNumber = "";
             this.idCard = "";
             this.workNum = "";
-            this.companyIds = "";
+            this.companyIds = null;
             this.companyName = "";
-            this.positionId = 0L;
+            this.positionId = null;
             this.positionName = "";
             this.staffType = 1;
             this.staffStatus = 1;