Merge branch 'master-V32-XuHaoJie' into 'master'

杭州-乙方运维-用户添加政治面貌



See merge request !120

@@ -107,6 +107,11 @@
 
 
             <el-row :gutter="5">
             <el-row :gutter="5">
                 <el-col :span="8">
                 <el-col :span="8">
+                    <el-form-item label="政治面貌" prop="politicsStatus" class="form-class">
+                        <el-input v-model="ruleForm.politicsStatus"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
                     <el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
                     <el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
                         <el-radio-group v-model="ruleForm.state">
                         <el-radio-group v-model="ruleForm.state">
                             <el-radio :label="1">在职</el-radio>
                             <el-radio :label="1">在职</el-radio>

@@ -235,7 +235,8 @@ export default {
             quitTime: '',
             quitTime: '',
             state: '',
             state: '',
             tel: '',
             tel: '',
-            idcard:''
+            idcard:'',
+            politicsStatus:''
         })
         })
 
 
         // 获取表格数据
         // 获取表格数据
@@ -259,7 +260,10 @@ export default {
 
 
         // 保存用户信息
         // 保存用户信息
         let saveUser = () => {
         let saveUser = () => {
-
+            if(!ruleForm.value.politicsStatus){
+                proxy.$global.showMsg('政治面貌不能为空！',"warning");
+                return false;
+            }
             proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {
             proxy.$http.post("/api-web/bOpsPerson/saveOrUpdate", ruleForm.value, function (res) {
                 if (res && res.code == 0) {
                 if (res && res.code == 0) {
                     proxy.$global.showMsg('保存成功！');
                     proxy.$global.showMsg('保存成功！');