From 15794ec534b23747b812f6e479ab53420be46fdf Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 21 十月 2024 18:00:30 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- admin/src/views/system/user.vue | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue index 9d0513e..73d74f4 100644 --- a/admin/src/views/system/user.vue +++ b/admin/src/views/system/user.vue @@ -11,6 +11,9 @@ <el-form-item label="鎵嬫満鍙风爜" prop="mobile"> <el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/> </el-form-item> + <el-form-item label="缁勭粐" prop="companyName"> + <el-input v-model="searchForm.companyName" v-trim placeholder="璇疯緭鍏ョ粍缁�" @keypress.enter.native="search"/> + </el-form-item> <!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">--> <!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>--> <!-- </el-form-item>--> @@ -45,6 +48,7 @@ <el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column> <el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column> <el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column> + <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column> <!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">--> <!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>--> <!-- </el-table-column>--> @@ -129,6 +133,7 @@ realname: '', // 濮撳悕 rootDeptId: null, // 閮ㄩ棬ID positionId: null, // 宀椾綅ID + companyName: null, // 浼佷笟鍚嶇О mobile: '' // 鎵嬫満鍙风爜 } } -- Gitblit v1.9.3