Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

hanchaolong 21 stundas atpakaļ
vecāks
revīzija
f6f510ea31
1 mainītis faili ar 20 papildinājumiem un 11 dzēšanām
  1. 20 11
      jd-logistics-ui-v3/src/views/system/user/index.vue

+ 20 - 11
jd-logistics-ui-v3/src/views/system/user/index.vue

@@ -81,7 +81,7 @@
               <el-table-column label="组织" align="center" key="deptName" prop="dept.deptName"
                                v-if="columns.deptName.visible" :show-overflow-tooltip="true"/>
               <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" width="120"/>
-<!--              <el-table-column label="邮箱" align="center" key="email" prop="email" width="120"/>-->
+              <el-table-column label="邮箱" align="center" key="email" prop="email" width="120"/>
               <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
                 <template #default="scope">
                   <el-switch
@@ -172,6 +172,11 @@
 <!--        </el-row>-->
 
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
@@ -180,16 +185,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{
-                    dict.label
-                  }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -209,6 +205,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{
+                    dict.label
+                  }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">