From 14f7d39b1885442de42bdd81806774151baddd4f Mon Sep 17 00:00:00 2001 From: zhangwei <1504152376@qq.com> Date: 星期二, 22 七月 2025 15:37:03 +0800 Subject: [PATCH] 'ts报红部分解决' --- src/views/register/registernav.vue | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/register/registernav.vue b/src/views/register/registernav.vue index f3973cc..71e7ddf 100644 --- a/src/views/register/registernav.vue +++ b/src/views/register/registernav.vue @@ -390,7 +390,7 @@ <div v-if="active !== 3" class="mx-auto pt-2 pb-5 flex justify-center"> <el-button :disabled="active == 1" @click="backStep">涓婁竴姝�</el-button> <el-button type="primary" @click="nextStep(ruleFormRef)" - ><span v-if="active == 1">鍚屾剰</span>涓嬩竴姝�</el-button + ><span v-if="active == 0">鍚屾剰</span>涓嬩竴姝�</el-button > </div> </div> @@ -398,6 +398,8 @@ </template> <script setup lang="tsx"> import { h, ref, reactive, onMounted } from "vue"; +import { useNav } from "@/layout/hooks/useNav"; +import { useUserStoreHook } from "@/store/modules/user"; import type { FormInstance, FormRules, UploadProps } from "element-plus"; import { message } from "@/utils/message"; import { baseUrlApi } from "@/api/util"; @@ -410,12 +412,12 @@ import { enterpriseTypes, createrExRolsInformation -} from "@/api/register/index.ts"; +} from "@/api/register/index"; import { cloneDeep } from "@pureadmin/utils"; import { getToken } from "@/utils/auth"; import { useRoute, useRouter } from "vue-router"; const router = useRouter(); -const route = useRoute(); +const { route } = useNav(); defineOptions({ name: "RegisterNav" @@ -483,13 +485,6 @@ enterpriseType: [ { required: true, message: "璇烽�夋嫨浼佷笟绫诲瀷", trigger: "change" } ], - // transactionCode: [ - // { required: true, message: "璇疯緭鍏ヤ氦鏄撲富浣撲唬鐮�", trigger: "blur" }, - // { min: 1, message: "浜ゆ槗涓讳綋浠g爜鏈�灏忛暱搴︿负1", trigger: "blur" } - // ], - // transactionName: [ - // { required: true, message: "璇疯緭鍏ヤ氦鏄撲富浣撳悕绉�", trigger: "blur" } - // ], businessLicense: [ { required: true, message: "璇蜂笂浼犺惀涓氭墽鐓�", trigger: "change" } ], @@ -596,13 +591,20 @@ }; // 椤甸潰鍒濆鍖� onMounted(async () => { - state.ruleForm.transactionCode = route.query.code; - // 浼佷笟绫诲瀷 + let nowRole = useUserStoreHook()?.exRoles; + if (nowRole.length >= 1 && !route.query.code) { + state.ruleForm.transactionCode = nowRole[0].code; + } else { + state.ruleForm.transactionCode = route.query.code; + } + let res = await enterpriseTypes(); state.enterpriseList = res?.result; }); let active = ref(0); const nextStep = async (formEl: FormInstance | undefined) => { + console.log(state.ruleForm); + if (active.value >= 1) { if (!formEl) return; await formEl.validate((valid, fields) => { -- Gitblit v1.9.1