From e1cc9da6b0ba4b4fd7dd88446d475ee10d1ba816 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 6 Aug 2021 12:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/teacher/index.vue |  4 ++--
 ruoyi-ui/src/views/system/user/index.vue    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/system/teacher/index.vue b/ruoyi-ui/src/views/system/teacher/index.vue
index 54fa35f21..23fca9b86 100644
--- a/ruoyi-ui/src/views/system/teacher/index.vue
+++ b/ruoyi-ui/src/views/system/teacher/index.vue
@@ -241,7 +241,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="参加工作日期" prop="cjgzrq">
+        <el-form-item label="入职日期" prop="cjgzrq">
           <el-date-picker
             clearable
             size="small"
@@ -250,7 +250,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             :picker-options="pickerOptions0"
-            placeholder="选择参加工作日期"
+            placeholder="选择入职日期"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="创建人" prop="createuserid" v-show="false">
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 8a62cfe58..55b09337e 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -289,14 +289,22 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
+               <el-select v-model="form.status" placeholder="请选择">
+               <el-option
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+              <!-- <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
                   >{{ dict.dictLabel }}</el-radio
                 >
-              </el-radio-group>
+              </el-radio-group> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">