taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx

Browse Source
This commit is contained in:
ljx
2025-09-09 10:18:14 +08:00
parent 7be3859988 16fda90d96
commit 9cb43687c4
3 changed files with 424 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/layout/components/Sidebar/SidebarItem.vue
View File

@ -17,7 +17,7 @@
<template v-if="item.meta" #title> <template v-if="item.meta" #title>
<svg-icon :icon-class="item.meta ? item.meta.icon : ''" /> <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
<span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span> <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
<span class="bage" v-if="item.meta?.title == '我的任务' && total > 0">{{ total }}</span> <span class="bage" v-if="item.meta?.title == '我的任务' && total + totalChao > 0">{{ total + totalChao }}</span>
</template> </template>
<sidebar-item <sidebar-item
@ -61,6 +61,7 @@ const totalChao = ref(0);
onMounted(() => { onMounted(() => {
if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') { if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
getWaitingList(); getWaitingList();
getChaoList();
} }
if (onlyOneChild.value.meta?.title == '我的抄送') { if (onlyOneChild.value.meta?.title == '我的抄送') {
getChaoList(); getChaoList();

1029
src/views/materials/overallPlanMaterialSupply/index.vue
View File

File diff suppressed because it is too large Load Diff

3
src/views/system/user/index.vue
View File

@ -27,6 +27,9 @@
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>