fix(bug修复): 在职员工界面调整

luoyb

2021-03-05 ee889cb636e31db7c481140509db350adbeae1f4

fix(bug修复): 在职员工界面调整

1.在职员工列表在籍贯后面增加了员工类型，在员工状态后面增加了入职类型

 src/views/user/Informationinput.vue

@@ -89,7 +89,7 @@
          <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
          <el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
          <el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
          <el-table-column show-overflow-tooltip prop="education" label="最高学历" width="80" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
          <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
          <el-table-column prop="insuranceType" show-overflow-tooltip label="保险类型" width="80" :formatter="insuranceTypeFormat" />
          <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
@@ -642,8 +642,8 @@
                    />
                  </el-select>
                </el-form-item>
                <el-form-item label="最高学历" prop="education">
                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
                <el-form-item label="学历" prop="education">
                  <el-select v-model="empBaseInfoForm.education" placeholder="请选择学历">
                    <el-option
                      v-for="dict in educationOptions"
                      :key="dict.dicItemCode"

 src/views/user/inemployees.vue

@@ -222,6 +222,7 @@
          <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="80" />
          <el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="100" :formatter="educationFormat" />
          <el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
          <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" />
          <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" />
          <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
          <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="100">
@@ -229,6 +230,7 @@
              {{ transEmpStatus(row.empStatus) }}
            </template>
          </el-table-column>
          <el-table-column prop="entryTypeName" label="入职类型" />
        </el-table>
        <pagination
          v-show="total>0"