合并

src/views/HumanResources/form.vue

@@ -16,22 +16,16 @@
                   <el-input v-model="form.realName" size="mini" placeholder="请输入姓名"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>年龄</th>
+              <th class="description-label">年龄</th>
               <td class="description-content">
-                <el-form-item
-                  prop="age"
-                  :rules="[
-                    { required: true, message: '请输入年龄', trigger: 'blur' }
-                  ]"
-                >
+                <el-form-item prop="age">
                   <el-input v-model="form.age" size="mini" type="number" min="1" step="1" placeholder="请输入年龄"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>性别</th>
+              <th class="description-label">性别</th>
               <td class="description-content">
                 <el-form-item
                   prop="gender"
-                  :rules="{ required: true, message: '请选择性别', trigger: 'change' }"
                 >
                   <el-select size="mini" v-model.trim="form.gender"
                               clearable
@@ -101,38 +95,34 @@
                   <span class="close">
                     <i v-if="index === 0" @click="addEducation" class="el-icon-circle-plus-outline"/>
                     <i v-else @click="removeEducation(index)" class="el-icon-remove-outline"/>
-                  </span><i class="requiredStar">*</i>学历</th>
+                  </span>学历</th>
                 <td class="description-content">
                   <el-form-item
                     :prop="'educations.' + index + '.level'"
-                    :rules="{ required: true, message: '请输入学历', trigger: 'blur' }"
                   >
                     <el-input v-model="form.educations[index].level" size="mini" placeholder="请输入学历"/>
                   </el-form-item>
                 </td>
-                <th class="description-label"><i class="requiredStar">*</i>学校</th>
+                <th class="description-label">学校</th>
                 <td class="description-content">
                   <el-form-item
                     :prop="'educations.' + index + '.school'"
-                    :rules="{ required: true, message: '请输入学校', trigger: 'blur' }"
                   >
                     <el-input size="mini" v-model="form.educations[index].school" placeholder="请输入学校"/>
                   </el-form-item>
                 </td>
-                <th class="description-label"><i class="requiredStar">*</i>专业</th>
+                <th class="description-label">专业</th>
                 <td class="description-content">
                   <el-form-item
                     :prop="'educations.' + index + '.subject'"
-                    :rules="{ required: true, message: '请输入专业', trigger: 'blur' }"
                   >
                     <el-input size="mini" v-model="form.educations[index].subject" placeholder="请输入专业"/>
                   </el-form-item>
                 </td>
-                <th class="description-label"><i class="requiredStar">*</i>毕业时间</th>
+                <th class="description-label">毕业时间</th>
                 <td class="description-content">
                   <el-form-item
                     :prop="'educations.' + index + '.year'"
-                    :rules="{ required: true, message: '请选择毕业时间', trigger: 'blur' }"
                   >
                     <el-date-picker
                       type="month"
@@ -154,27 +144,23 @@
         <table class="description-table">
           <tbody>
              <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar">*</i>所在城市</th>
+              <th class="description-label">所在城市</th>
               <td class="description-content">
                 <el-form-item prop="liveCity"
-                  :rules="[{ required: true, message: '请输入所在城市', trigger: 'blur' }]"
                 >
                   <el-input size="mini" v-model.trim="form.liveCity" placeholder="请输入所在城市"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>意向城市</th>
+              <th class="description-label">意向城市</th>
               <td class="description-content"
-                :rules="[{ required: true, message: '请输入意向城市', trigger: 'blur' }]"
               >
                 <el-form-item prop="intentionCity">
                   <el-input size="mini" v-model.trim="form.intentionCity" placeholder="请输入意向城市"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>意向合作模式</th>
+              <th class="description-label">意向合作模式</th>
               <td class="description-content">
-                <el-form-item prop="jobNature"
-                  :rules="[{ required: true, message: '请选择意向合作模式', trigger: 'blur' }]"
-                >
+                <el-form-item prop="jobNature">
                   <el-select size="mini" v-model.trim="form.jobNature"
                               clearable
                               filterable
@@ -188,11 +174,9 @@
               </td>
             </tr>
             <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar">*</i>岗位类别</th>
+              <th class="description-label">岗位类别</th>
               <td class="description-content">
-                <el-form-item prop="jobType"
-                  :rules="[{ required: true, message: '请选择岗位类别', trigger: 'blur' }]"
-                >
+                <el-form-item prop="jobType">
                   <el-select size="mini" v-model.trim="form.jobType"
                               clearable
                               filterable
@@ -206,11 +190,9 @@
                   </el-select>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="form.jobType == 'ADVISER'">*</i>声部</th>
+              <th class="description-label">声部</th>
               <td class="description-content" colspan="3">
-                <el-form-item prop="subjectIdList"
-                  :rules="[{ required: form.jobType == 'ADVISER', message: '请选择声部', trigger: 'blur' }]"
-                >
+                <el-form-item prop="subjectIdList">
                   <el-select
                   size="mini"
                     v-model.trim="form.subjectIdList"
@@ -231,11 +213,9 @@
               </td>
             </tr>
             <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar">*</i>信息来源</th>
+              <th class="description-label">信息来源</th>
               <td class="description-content">
-                <el-form-item prop="sourceFrom"
-                  :rules="[{ required: true, message: '请选择信息来源', trigger: 'blur' }]"
-                >
+                <el-form-item prop="sourceFrom">
                   <el-select v-model.trim="form.sourceFrom"
                               clearable
                               filterable
@@ -250,11 +230,9 @@
                   </el-select>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>人员状态</th>
+              <th class="description-label">人员状态</th>
               <td class="description-content">
-                <el-form-item prop="status"
-                  :rules="[{ required: true, message: '请选择人员状态', trigger: 'blur' }]"
-                >
+                <el-form-item prop="status">
                   <el-select size="mini" v-model.trim="form.status"
                               clearable
                               filterable
@@ -276,11 +254,9 @@
                   </el-select>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar">*</i>HRBP</th>
+              <th class="description-label">HRBP</th>
               <td class="description-content">
-                <el-form-item prop="hrbp"
-                  :rules="[{ required: true, message: '请选择HRBP', trigger: 'blur' }]"
-                >
+                <el-form-item prop="hrbp">
                 <el-select
                   size="mini"
                     v-model.trim="form.hrbp"
@@ -309,11 +285,10 @@
         <table class="description-table">
           <tbody>
             <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>入职日期</th>
+              <th class="description-label">入职日期</th>
               <td class="description-content">
                 <el-form-item
                   prop="entryDate"
-                  :rules="{ required: propRequred, message: '请选择入职日期', trigger: 'change' }"
                 >
                   <el-date-picker
                     type="date"
@@ -323,11 +298,10 @@
                   />
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="form.status === 'DIMISSION'">*</i>离职日期</th>
+              <th class="description-label">离职日期</th>
               <td class="description-content">
                 <el-form-item
                   prop="resignationDate"
-                  :rules="[{ required: form.status === 'DIMISSION', message: '请选择离职日期', trigger: 'change' }]"
                 >
                   <el-date-picker
                     type="date"
@@ -337,22 +311,20 @@
                   />
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="form.resignationDate">*</i>离职原因</th>
+              <th class="description-label">离职原因</th>
               <td class="description-content">
                 <el-form-item
                   prop="resignationReason"
-                  :rules="[{ required: form.resignationDate ? true : false, message: '请输入离职原因', trigger: 'blur' }]"
                 >
                   <el-input size="mini" v-model.trim="form.resignationReason" placeholder="请输入离职原因"/>
                 </el-form-item>
               </td>
             </tr>
             <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>分部</th>
+              <th class="description-label">分部</th>
               <td class="description-content">
                 <el-form-item
                   prop="organId"
-                  :rules="[{ required: propRequred, message: '请选择分部', trigger: 'change' }]"
                 >
                   <el-select v-model.trim="form.organId"
                       placeholder='请选择分部'
@@ -369,11 +341,10 @@
                     </el-select>
                   </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>职位</th>
+              <th class="description-label">职位</th>
               <td class="description-content">
                 <el-form-item
                   prop="position"
-                  :rules="[{ required: propRequred, message: '请输入职位', trigger: 'change' }]"
                 >
                   <el-select v-model.trim="form.position"
                             clearable
@@ -389,10 +360,9 @@
                   </el-select>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="form.position == 'ADVISER'">*</i>声部</th>
+              <th class="description-label">声部</th>
               <td class="description-content">
                 <el-form-item prop="jobSubjectIdList"
-                  :rules="[{ required: form.position == 'ADVISER', message: '请选择声部', trigger: 'change' }]"
                 >
                   <el-select
                     size="mini"
@@ -414,16 +384,15 @@
               </td>
             </tr>
             <tr class="description-tr">
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>紧急联系人姓名</th>
+              <th class="description-label">紧急联系人姓名</th>
               <td class="description-content">
                 <el-form-item
                   prop="emergencyContactName"
-                  :rules="{ required: propRequred, message: '请输入紧急联系人姓名', trigger: 'blur' }"
                 >
                   <el-input size="mini" v-model.trim="form.emergencyContactName" placeholder="请输入紧急联系人姓名"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>紧急联系人关系</th>
+              <th class="description-label">紧急联系人关系</th>
               <td class="description-content">
                 <el-form-item
                   prop="emergencyContactRelation"
@@ -432,12 +401,11 @@
                   <el-input size="mini" v-model.trim="form.emergencyContactRelation" placeholder="请输入紧急联系人关系"/>
                 </el-form-item>
               </td>
-              <th class="description-label"><i class="requiredStar" v-if="propRequred">*</i>紧急联系人电话</th>
+              <th class="description-label">紧急联系人电话</th>
               <td class="description-content">
                 <el-form-item
                   prop="emergencyContactPhone"
                   :rules="[
-                    { required: propRequred, message: '请输入紧急联系人电话', trigger: 'blur' },
                     { min: 11, max: 11, message: '请输入正确的手机号码', trigger: 'blur' }
                   ]"
                 >
@@ -569,33 +537,33 @@ export default {
         educations: [{level: '', school: '', year: ''}]
       },
       rules: {
-        birthdate: [
-          { required: true, message: '请输入生日', trigger: 'blur' },
-        ],
-        sourceFrom: [
-          { required: true, message: '请选择信息来源', trigger: 'change' },
-        ],
-        intentionCity: [
-          { required: true, message: '请输入工作意向', trigger: 'blur' },
-        ],
-        status: [
-          { required: true, message: '请选择员工状态', trigger: 'change' },
-        ],
-        liveCity: [
-          { required: true, message: '请输入所在城市', trigger: 'blur' },
-        ],
-        otherComment: [
-          { required: true, message: '请输入其他综合情况', trigger: 'blur' },
-        ],
-        position: [
-          { required: true, message: '请输入职位', trigger: 'blur' },
-        ],
-        realName: [
-          { required: true, message: '请输入姓名', trigger: 'blur' },
-        ],
-        subjectIdList: [
-          { required: true, message: '请选择声部', trigger: 'change' },
-        ],
+        // birthdate: [
+        //   { required: true, message: '请输入生日', trigger: 'blur' },
+        // ],
+        // sourceFrom: [
+        //   { required: true, message: '请选择信息来源', trigger: 'change' },
+        // ],
+        // intentionCity: [
+        //   { required: true, message: '请输入工作意向', trigger: 'blur' },
+        // ],
+        // status: [
+        //   { required: true, message: '请选择员工状态', trigger: 'change' },
+        // ],
+        // liveCity: [
+        //   { required: true, message: '请输入所在城市', trigger: 'blur' },
+        // ],
+        // otherComment: [
+        //   { required: true, message: '请输入其他综合情况', trigger: 'blur' },
+        // ],
+        // position: [
+        //   { required: true, message: '请输入职位', trigger: 'blur' },
+        // ],
+        // realName: [
+        //   { required: true, message: '请输入姓名', trigger: 'blur' },
+        // ],
+        // subjectIdList: [
+        //   { required: true, message: '请选择声部', trigger: 'change' },
+        // ],
       },
       tableList: [],
     }
@@ -780,6 +748,9 @@ export default {
     /deep/ .el-form-item{
       margin-bottom: 0;
       &.is-error {
+        .el-input__inner {
+          color: red;
+        }
         input::-webkit-input-placeholder {
           color: red;
         }