Merge branch 'master-500-dev-xwx' into 'master-500-dev'

乙方运维在职状态修改为必填项，录入时头像设置为添加用户成功之后添加



See merge request !583

@@ -180,7 +180,7 @@ export default {
         let total = Vue.ref(0);
         let total = Vue.ref(0);
 
 
         let add=()=>{
         let add=()=>{
-            title.value = "运维人员录入";
+            title.value = "个人信息录入";
             componentName.value = "USER";
             componentName.value = "USER";
             isAdd.value = true;
             isAdd.value = true;
             showDialog(true);
             showDialog(true);

@@ -99,7 +99,7 @@
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
                 <el-col :span="8">
                 <el-col :span="8">
-                    <el-form-item label="在职状态" prop="certificate" :readonly="true" class="form-class">
+                    <el-form-item label="在职状态" prop="state" :readonly="true" class="form-class">
                         <el-radio-group v-model="ruleForm.state" :disabled="whether">
                         <el-radio-group v-model="ruleForm.state" :disabled="whether">
                             <el-radio :label="1">在职</el-radio>
                             <el-radio :label="1">在职</el-radio>
                             <el-radio :label="2">离职</el-radio>
                             <el-radio :label="2">离职</el-radio>

@@ -187,10 +187,12 @@ const assets = (props, {attrs, slots, emit}) => {
     let showDialog = (flg) => {
     let showDialog = (flg) => {
         if (!props.isAdd){
         if (!props.isAdd){
             op.value = flg;
             op.value = flg;
-        }
+        }else {
             proxy.$global.showMsg("请先添加用户！","error");
             proxy.$global.showMsg("请先添加用户！","error");
         }
         }
 
 
+    }
+
     let okFunc = () => {
     let okFunc = () => {
         let flg = btnType.value.flg;
         let flg = btnType.value.flg;
         if (flg == 'add') {
         if (flg == 'add') {
@@ -350,6 +352,9 @@ export default {
             ],
             ],
             entryTime: [
             entryTime: [
                 { required: true,message:'请选择入职时间', trigger: 'blur'}
                 { required: true,message:'请选择入职时间', trigger: 'blur'}
+            ],
+            state: [
+                { required: true,message:'请选择在职状态', trigger: 'blur'}
             ]
             ]
         });
         });
 
 
@@ -380,6 +385,7 @@ export default {
 
 
 
 
         let getFile = (param) => {
         let getFile = (param) => {
+            if (!props.isAdd){
                 let fileObj = param.file
                 let fileObj = param.file
                 let params = {
                 let params = {
                     file: fileObj,
                     file: fileObj,
@@ -392,6 +398,10 @@ export default {
                     }
                     }
                 })
                 })
                 imageUrl.value = URL.createObjectURL(fileObj);
                 imageUrl.value = URL.createObjectURL(fileObj);
+            }else {
+                proxy.$global.showMsg("请先添加用户！","error");
+            }
+
         }
         }
 
 
         let beforeAvatarUpload = (file) => {
         let beforeAvatarUpload = (file) => {