From 55d25cf1648310cc60bb9a412b4ed3e886d732e1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 30 六月 2025 11:49:53 +0800
Subject: [PATCH] 提交
---
admin/src/views/system/user.vue | 18 ++++++++++++++++--
h5/pages/staff/snapshot.vue | 13 +++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 0c7edf7..1e69dc9 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -14,6 +14,11 @@
<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="roleId">
+ <el-select v-model="searchForm.roleId" placeholder="璇烽�夋嫨瑙掕壊" @change="search">
+ <el-option :label="item.name" :value="item.id" v-for="(item, index) in rolesList" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
<!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
<!-- </el-form-item>-->
@@ -122,7 +127,7 @@
import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
import DepartmentSelect from '@/components/common/DepartmentSelect'
import PositionSelect from '@/components/common/PositionSelect'
-
+import { fetchAll as fetchAllRoles, fetchAll } from '@/api/system/role'
export default {
name: 'SystemUser',
extends: BaseTable,
@@ -136,8 +141,10 @@
rootDeptId: null, // 閮ㄩ棬ID
positionId: null, // 宀椾綅ID
companyName: null, // 浼佷笟鍚嶇О
+ roleId: null, // 瑙掕壊
mobile: '' // 鎵嬫満鍙风爜
- }
+ },
+ rolesList: []
}
},
created () {
@@ -151,6 +158,13 @@
}]
})
this.search()
+ fetchAllRoles()
+ .then(records => {
+ this.rolesList = records
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
}
}
</script>
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index 32bfe7d..4b9f690 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -13,6 +13,19 @@
<u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
</view>
</view>
+
+ <view class="line">
+ <view class="label">
+ <text>*</text>
+ <text>妫�鏌ョ被鍨�</text>
+ </view>
+ <view class="value" @click="openArea">
+ <text class="mr6"
+ :style="{ color: param.areaName ? '#000000' : '#999999' }">{{ param.areaName ? param.areaName : "璇烽�夋嫨" }}</text>
+ <u-icon name="arrow-right" color="#CCCCCC" size="20"></u-icon>
+ </view>
+ </view>
+
<view class="line">
<view class="label">
<text>*</text>
--
Gitblit v1.9.3