From 03c275439949875a857538df89a41696642c42b3 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 01 九月 2025 17:15:39 +0800
Subject: [PATCH] '首页公告与详情'
---
src/views/mine/index.vue | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/views/mine/index.vue b/src/views/mine/index.vue
index ae9cac0..f2fa258 100644
--- a/src/views/mine/index.vue
+++ b/src/views/mine/index.vue
@@ -12,14 +12,29 @@
import { Edit } from "@element-plus/icons-vue";
import { enterpriseTypes } from "@/api/register/index";
import { initRouter, getTopMenu, handleAliveRoute } from "@/router/utils";
-
+const isManager = useUserStoreHook().isManager;
+import { type CusExtendDto } from "@/utils/auth";
const ruleFormRef = ref<FormInstance>();
const isLoading = ref(false);
const showDialog = ref(false);
const nowRole = computed(() => {
- return useUserStoreHook()?.nowRole;
+ if (!state?.ruleForm?.exRoles) {
+ return {};
+ }
+ let nowRoleLiet;
+ let obj = {};
+ let nowRole = useUserStoreHook()?.nowRole;
+ if (state?.ruleForm?.exRoles.length > 1) {
+ nowRoleLiet = state.ruleForm.exRoles.find(item => {
+ return item.exRoleId == nowRole.id;
+ });
+ obj = Object.assign(nowRole, nowRoleLiet);
+ } else {
+ obj = Object.assign(nowRole, state.ruleForm.exRoles[0]);
+ }
+ return obj;
});
-const userInfo = computed(() => {
+const userInfo = computed<CusExtendDto>(() => {
let obj = useUserStoreHook().enterpriseInfo;
return obj;
});
@@ -79,7 +94,8 @@
bankName: null, // string锛屽彲绌�
// 浼佷笟閾惰璐﹀彿
bankAccount: null, // string锛屽彲绌�
- bankAccountIMG: null
+ bankAccountIMG: null,
+ exRoles: null
},
enterpriseList: [],
type: "",
@@ -164,13 +180,13 @@
message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
trigger: "blur"
}
- ],
- bankName: [
- { required: true, message: "璇疯緭鍏ヤ紒涓氬紑鎴疯", trigger: "blur" }
- ],
- bankAccount: [
- { required: true, message: "璇疯緭鍏ヤ紒涓氶摱琛岃处鍙�", trigger: "blur" }
]
+ // bankName: [
+ // { required: true, message: "璇疯緭鍏ヤ紒涓氬紑鎴疯", trigger: "blur" }
+ // ],
+ // bankAccount: [
+ // { required: true, message: "璇疯緭鍏ヤ紒涓氶摱琛岃处鍙�", trigger: "blur" }
+ // ]
},
loading: {
signIn: false
@@ -196,10 +212,19 @@
// nowRole.value = useUserStoreHook()?.nowRole;
if (nowRole.value) {
state.ruleForm.transactionCode = nowRole.value.code;
+ // let nowRoleLiet;
+ // if (state.ruleForm.exRoles.length > 1) {
+ // nowRoleLiet = state.ruleForm.exRoles.find(item => {
+ // return item.exRoleId == nowRole.value.id;
+ // });
+ // nowRole.value = Object.assign(nowRole.value, nowRoleLiet);
+ // } else {
+ // nowRole.value = Object.assign(nowRole.value, state.ruleForm.exRoles[0]);
+ // }
// state.userInfo.transactionName = nowRole.value.name;
} else {
- state.ruleForm.transactionCode = route.query.code;
- state.userInfo.enterpriseTypeName = route.query.name;
+ state.ruleForm.transactionCode = route.query.code as string;
+ // state.userInfo.enterpriseTypeName = route.query.name;
}
let restypes = await enterpriseTypes();
state.enterpriseList = restypes?.result;
@@ -365,7 +390,7 @@
<el-descriptions
v-if="state.userInfo.enterpriseName"
class="margin-top"
- title="浼佷笟璧勬枡"
+ title=""
:column="3"
border
>
@@ -377,8 +402,8 @@
<div class="cell-item">浜ゆ槗涓讳綋</div>
</template>
{{ nowRole?.name }}
- <el-tag v-if="userInfo.steps == 2" type="success">瀹℃牳宸查�氳繃 </el-tag>
- <el-tag v-else-if="userInfo.steps == 3" type="danger"
+ <el-tag v-if="nowRole.steps == 2" type="success">瀹℃牳宸查�氳繃 </el-tag>
+ <el-tag v-else-if="nowRole.steps == 3" type="danger"
>璧勬枡鏈�氳繃
</el-tag>
<el-tag v-else type="warning">璧勬枡瀹℃牳涓� </el-tag>
@@ -505,7 +530,7 @@
</span>
</el-descriptions-item>
</el-descriptions>
- <div class="m-5">
+ <div v-if="isManager" class="m-5">
<el-button type="primary" :icon="Edit" @click="() => (showDialog = true)"
>淇敼璧勬枡</el-button
>
--
Gitblit v1.9.1