From 4235510e26873d30943e46e4b8b6b34af8ed0cc4 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 14 Dec 2023 11:07:20 +0800
Subject: [PATCH] =?UTF-8?q?12616=20=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=A9=9A=E5=A7=BB=E7=8A=B6=E5=86=B5?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB=E5=8A=A0=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PersonManager/user/components/add.vue  | 2 +-
 src/views/PersonManager/user/components/edit.vue | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/PersonManager/user/components/add.vue b/src/views/PersonManager/user/components/add.vue
index 230f7f2..8da6fb2 100644
--- a/src/views/PersonManager/user/components/add.vue
+++ b/src/views/PersonManager/user/components/add.vue
@@ -236,7 +236,6 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位名称(工种)" prop="POST_ID" class="input-width">
-              <!--    20230612改成输入框    -->
               <el-input v-model="form.POST_ID" placeholder="这里输入岗位名称(工种)..."/>
             </el-form-item>
           </el-col>
@@ -529,6 +528,7 @@ export default {
         HKLOCAL: [{ required: false, message: '请输入户口所在地', trigger: 'blur' }],
         ADDRESS: [{ required: false, message: '请输入现住址', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '请选择文化程度', trigger: 'blur' }],
+        MARITALSTATUS: [{ required: true, message: '婚姻状况必选', trigger: 'blur' }],
         CORP_START_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
         POST_ID: [{ required: true, message: '请输入岗位名称(工种)', trigger: 'blur' }],
         ENTRY_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
diff --git a/src/views/PersonManager/user/components/edit.vue b/src/views/PersonManager/user/components/edit.vue
index e827175..1c9ae2d 100644
--- a/src/views/PersonManager/user/components/edit.vue
+++ b/src/views/PersonManager/user/components/edit.vue
@@ -162,7 +162,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="婚姻状况" prop="MARITALSTATUS" class="input-width">
+            <el-form-item label="婚姻状况" prop="MARITALSTATUS">
               <el-radio-group v-model="form.MARITALSTATUS" >
                 <el-radio v-model="form.MARITALSTATUS" label="1">已婚</el-radio>
                 <el-radio v-model="form.MARITALSTATUS" label="0">未婚</el-radio>
@@ -239,7 +239,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位名称(工种)" prop="POST_ID">
-              <el-input v-model="form.POST_ID" placeholder="这里输入岗位..."/>
+              <el-input v-model="form.POST_ID" placeholder="这里输入这里输入岗位名称(工种)..."/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -280,6 +280,7 @@
             </el-form-item>
             <el-alert
               v-show="whetherHaveCertificate"
+              :closable="false"
               title="请提示该用户去相关方app端完善特种证书信息"
               type="error"
               class="alertClass"
@@ -531,8 +532,9 @@ export default {
         HKLOCAL: [{ required: false, message: '请输入户口所在地', trigger: 'blur' }],
         ADDRESS: [{ required: false, message: '请输入现住址', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '请选择文化程度', trigger: 'blur' }],
+        MARITALSTATUS: [{ required: true, message: '婚姻状况必选', trigger: 'blur' }],
         CORP_START_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
-        POST_ID: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
+        POST_ID: [{ required: true, message: '请输入岗位名称(工种)', trigger: 'blur' }],
         // PERSON_WORK_TYPE: [{ required: true, message: '请输入工种', trigger: 'blur' }],
         ENTRY_DATE: [{ required: false, message: '请选择日期', trigger: 'blur' }],
         PHONE: [