From 60e60cc647fe696a68f211d25d563d677f8b27c2 Mon Sep 17 00:00:00 2001
From: batman <978517621@qq.com>
Date: 星期三, 08 三月 2023 10:54:48 +0800
Subject: [PATCH] 新修改添加页面

---
 src/views/system/user/component/userDialog.vue |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/system/user/component/userDialog.vue b/src/views/system/user/component/userDialog.vue
index a72f115..fae4942 100644
--- a/src/views/system/user/component/userDialog.vue
+++ b/src/views/system/user/component/userDialog.vue
@@ -26,6 +26,13 @@
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+                      <el-form-item label="职务" prop="positionId">
+                        <el-select v-model="userForm.positionId" placeholder="请选择" clearable class="w100">
+                          <el-option v-for="item in dutyData" :key="item.positionId" :label="item.positionName" :value="item.positionId"> </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                         <el-form-item label="手机号" prop="phone">
                             <el-input v-model.trim="userForm.phone" placeholder="请输入手机号" clearable></el-input>
                         </el-form-item>
@@ -58,7 +65,13 @@
                             </el-input>
                         </el-form-item>
                     </el-col>
-
+                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+                        <el-form-item label="用户类型" prop="type">
+                            <el-select v-model="userForm.type" placeholder="请选择" clearable class="w100">
+                                <el-option v-for="item in userTypeList.filter(item => userForm.type === 1 ? item.id === 1 : item.id !== 1)" :key="item.id" :label="item.name" :value="item.id"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
                     <!--						<el-form-item label="用户状态">-->
                     <!--							<el-switch v-model="userForm.status" inline-prompt active-value = 1 inactive-value= 0 active-text="启" inactive-text="禁"></el-switch>-->
@@ -84,6 +97,7 @@
 // 定义接口来定义对象的类型
 interface DeptData {}
 interface roleData {}
+interface dutyData {}
 interface sexData {}
 interface UserState {
     title: string;
@@ -94,10 +108,10 @@
         realName: string;
         roleId: number | null;
         depId: number | null;
+        positionId: number | null;
         phone: string;
         email: string;
         gender: number | null;
-        positionId: number | null;
         password: string;
         expireTime: string;
         status: number;
@@ -108,6 +122,7 @@
     },
     departmentData: Array<DeptData>;
     roleData: Array<roleData>;
+    dutyData: Array<dutyData>;
     sexList: Array<sexData>;
 }
 
@@ -129,7 +144,7 @@
                 identify: '',
                 gender: null, // 性别
                 password: '', // 账户密码
-                positionId: 1, // 岗位
+                positionId: null, // 岗位
                 expireTime: '', // 账户过期
                 status: 1 // 用户状态
             },
@@ -138,6 +153,7 @@
                 realName: [{ required: true, message: '请填写真实姓名', trigger: 'blur' }],
                 roleId: [{ required: true, message: '请选择用户角色', trigger: 'change' }],
                 depId: [{ required: true, message: '请选择部门', trigger: 'change' }],
+                positionId: [{ required: true, message: '请选择职务', trigger: 'change' }],
                 phone: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
                 gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
                 expireTime: [{ required: true, message: '请输入账户过期时间', trigger: 'blur' }],
@@ -145,16 +161,18 @@
             },
             departmentData: [], // 部门数据
             roleData: [], //角色数据
+            dutyData:[], //职务数据
             sexList: [
                 { id: 1, name: '男' },
                 { id: 0, name: '女' }
             ]
         });
         // 打开弹窗
-        const openDialog = (type: string, value: any, departmentList: [], roleList: []) => {
+        const openDialog = (type: string, value: any, departmentList: [], roleList: [], dutyList:[]) => {
             state.isShowUserDialog = true;
             state.departmentData = departmentList;
             state.roleData = roleList;
+            state.dutyData = dutyList
             if (type === '新增') {
                 state.disabled = false
                 state.title = '新增用户';
@@ -166,7 +184,7 @@
                     phone: '',
                     email: '',
                     identify: '',
-                    positionId: 1,
+                    positionId: null,
                     gender: null,
                     password: '',
                     expireTime: '',

--
Gitblit v1.9.2