Merge branch 'master' into online

src/utils/vueFilter.js

@@ -566,8 +566,8 @@ Vue.filter('hrStatus', value => {
     'NOT_EMPLOYED': "未录用",
     'INTERVIEWING': "面试中",
     'RESERVE': "储备",
-    'PART_TIME': "全职",
-    'FULL_TIME': "兼职",
+    'PART_TIME': "兼职",
+    'FULL_TIME': "全职",
     'DIMISSION': "离职",
   }
   return template[value]

src/views/HumanResources/form.vue

@@ -137,9 +137,9 @@
                                 value="INTERVIEWING"></el-option>
                     <el-option label="储备"
                                 value="RESERVE"></el-option>
-                    <el-option label="全职"
-                                value="PART_TIME"></el-option>
                     <el-option label="兼职"
+                                value="PART_TIME"></el-option>
+                    <el-option label="全职"
                                 value="FULL_TIME"></el-option>
                     <el-option label="离职"
                                 value="DIMISSION"></el-option>

src/views/HumanResources/index.vue

@@ -33,9 +33,9 @@
                         value="INTERVIEWING"></el-option>
             <el-option label="储备"
                         value="RESERVE"></el-option>
-            <el-option label="全职"
-                        value="PART_TIME"></el-option>
             <el-option label="兼职"
+                        value="PART_TIME"></el-option>
+            <el-option label="全职"
                         value="FULL_TIME"></el-option>
             <el-option label="离职"
                         value="DIMISSION"></el-option>
@@ -355,7 +355,7 @@ export default {
     },
     openEducation(row) {
       try {
-        this.educationList = JSON.parse(row.educationalBackground)
+        this.educationList = row.educationalBackground ? JSON.parse(row.educationalBackground) : []
         this.educationVisible = true
       } catch (error) {
         this.$message.error('数据解析失败')