jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:40cf397199e2522b3f89648de678b4eb4c7f5bdc
Branches Tags
jiangyq:dev_xd
jiangyq:main
...
compare: jiangyq:060632dd8288b35dd915ad8b8ed8842aef809182
Branches Tags
jiangyq:dev_xd
jiangyq:main

3 Commits
40cf397199 ... 060632dd82

Author SHA1 Message Date
haha 060632dd82 在系统管理添加用户的时候输入完用户名和手机号点查询，会弹出提示框未找到数据，然后数据被清空了，不应该被清空 2025-04-01 23:50:37 +08:00
haha af47403143 Merge remote-tracking branch 'origin/dev_xd' into dev_xd 2025-04-01 22:33:52 +08:00
haha 3d260f7134 修改大屏考勤人员对话框 2025-04-01 00:14:12 +08:00
2 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
yanzhu-bigscreen/src/views/detail/attendanceInfoDlg.vue
View File

@ -10,8 +10,8 @@
<el-table v-loading="loading" :data="dataList" v-if="type == 0" class="data-list" :height="tbHeight"> <el-table v-loading="loading" :data="dataList" v-if="type == 0" class="data-list" :height="tbHeight">
<el-table-column label="头像" align="center"> <el-table-column label="头像" align="center">
<template #default="scope"> <template #default="scope">
<el-image :src="scope.row.user.userPicture" :preview-teleported="true" class="att-img" <el-image :src="scope.row.userPicture" :preview-teleported="true" class="att-img"
:preview-src-list="[scope.row.user.userPicture]"></el-image> :preview-src-list="[scope.row.userPicture]"></el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="userName" /> <el-table-column label="姓名" align="center" prop="userName" />

7
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -184,7 +184,7 @@
<el-form-item label="用户状态"> <el-form-item label="用户状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -445,9 +445,10 @@ function doQueryUser() {
{ {
if (!d.data) { if (!d.data) {
proxy.$modal.msgError("未找到数据！") proxy.$modal.msgError("未找到数据！")
} else {
data.editUser = d.data || null;
showEditUserData();
} }
data.editUser = d.data || null;
showEditUserData();
} }
}); });
} }