Merge remote-tracking branch 'origin/master'

src/views/people/archive/index.vue

@@ -121,7 +121,7 @@ const tableColumn = [
     {key: 'carAddr', name: '身份证地址', width: 120},
     {key: 'marriageStatusName', name: '婚姻状况', width: 100},
     {key: 'domicileAddr', name: '户籍', width: 100},
-    {key: 'political', name: '政治面貌', width: 100},
+    {key: 'politicalName', name: '政治面貌', width: 100},
     {key: 'educationName', name: '学历', width: 100},
     {key: 'speciality', name: '专业', width: 100},
     {key: 'bankNum', name: '银行卡号', width: 120},

src/views/people/archive/info.vue

@@ -124,7 +124,7 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="学历:">
-                        <el-select block v-model="formModel.education">
+                        <el-select block v-model="formModel.educationType">
                             <el-option v-for="item in dictData.education_type" :label="item.dictName" :value="item.dictValue"/>
                         </el-select>
                     </el-form-item>
@@ -146,7 +146,7 @@
                 </el-col>
                 <el-col :span="8">
                     <el-form-item label="政治面貌:">
-                        <el-select block v-model="formModel.political" placeholder="请选择">
+                        <el-select block v-model="formModel.politicalType" placeholder="请选择">
                             <el-option v-for="item in dictData.political_type" :label="item.dictName" :value="item.dictValue"/>
                         </el-select>
                     </el-form-item>