From 46d9d268858f59a9c2e1362b253e4c5971ed1626 Mon Sep 17 00:00:00 2001
From: zhouhaibin <zhouhaibin@qq.com>
Date: Mon, 11 Aug 2025 14:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=A8=E5=86=8C=E4=B8=8E?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/configs/contractTaskConfigs.json       |   2 +-
 src/api/auth/index.ts                         |  45 ++++++
 src/views/auth/login/ForgetPasswordForm.vue   | 150 ++++++++++++++++--
 src/views/auth/login/LoginForm.vue            |   4 +-
 src/views/auth/login/RegisterForm.vue         | 117 +++++++++++++-
 src/views/auth/login/useLogin.ts              |   4 +
 .../TenderTask/TenderTask.data.ts             |   4 +-
 src/views/tenderReview/TenderTask/index.vue   |   2 +-
 8 files changed, 310 insertions(+), 18 deletions(-)

diff --git a/public/configs/contractTaskConfigs.json b/public/configs/contractTaskConfigs.json
index 2b649f9..4a02413 100644
--- a/public/configs/contractTaskConfigs.json
+++ b/public/configs/contractTaskConfigs.json
@@ -89,7 +89,7 @@
               "dataType": "json",
               "displayType": "markdown",
               "jsonConfig": {
-                "extractFields": ["review_points"],
+                "extractFields": ["relevant_articles"],
                 "separator": "：",
                 "fieldProcessors": {
                   "review_points": "arrayJoin"
diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index fb65df7..dead9a6 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -13,6 +13,8 @@ import { useGlobSetting } from '@/hooks/setting';
 enum Api {
   Login = '/auth/login',
   Logout = '/auth/logout',
+  Register = '/auth/register',
+  ResetPassword = '/auth/resetPassword',
   TenantList = '/auth/tenant/list',
   authBinding = '/auth/binding',
   authUnbinding = '/auth/unlock',
@@ -88,6 +90,49 @@ export function authCallback(data: OAuthLoginParams) {
   return defHttp.post<void>({ url: Api.authCallback, data });
 }
 
+/**
+ * 用户注册
+ * @param params 注册参数
+ * @returns
+ */
+export function registerApi(params: {
+  username: string;
+  password: string;
+  mobile: string;
+  code: string;
+  uuid?: string;
+  tenantId?: string;
+  userType?: string;
+}) {
+  return defHttp.post<void>({
+    url: Api.Register,
+    data: params,
+  }, {
+    encrypt: true,
+  });
+}
+
+/**
+ * 重置密码
+ * @param params 重置密码参数
+ * @returns
+ */
+export function resetPasswordApi(params: {
+  username: string;
+  password: string;
+  mobile: string;
+  code: string;
+  uuid?: string;
+  tenantId?: string;
+}) {
+  return defHttp.post<void>({
+    url: Api.ResetPassword,
+    data: params,
+  }, {
+    encrypt: true,
+  });
+}
+
 /**
  * 用户登出
  * @returns
diff --git a/src/views/auth/login/ForgetPasswordForm.vue b/src/views/auth/login/ForgetPasswordForm.vue
index 2e4548a..53974af 100644
--- a/src/views/auth/login/ForgetPasswordForm.vue
+++ b/src/views/auth/login/ForgetPasswordForm.vue
@@ -2,6 +2,17 @@
   <template v-if="getShow">
     <LoginFormTitle class="enter-x" />
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
+      <FormItem name="tenantId" class="enter-x" v-if="tenant.tenantEnabled">
+        <Select v-model:value="formData.tenantId" size="large" @change="handleTenantChange">
+          <template #suffixIcon>
+            <Icon icon="mdi:company" />
+          </template>
+          <SelectOption v-for="item in tenant.voList" :key="item.tenantId" :value="item.tenantId">{{
+            item.companyName
+          }}</SelectOption>
+        </Select>
+      </FormItem>
+      
       <FormItem name="account" class="enter-x">
         <Input
           size="large"
@@ -18,14 +29,31 @@
           size="large"
           v-model:value="formData.sms"
           :placeholder="t('sys.login.smsCode')"
+          :sendCodeApi="handleSendSmsCode"
+        />
+      </FormItem>
+
+      <FormItem name="password" class="enter-x">
+        <StrengthMeter
+          size="large"
+          v-model:value="formData.password"
+          :placeholder="t('sys.login.password')"
+        />
+      </FormItem>
+      <FormItem name="confirmPassword" class="enter-x">
+        <InputPassword
+          size="large"
+          visibilityToggle
+          v-model:value="formData.confirmPassword"
+          :placeholder="t('sys.login.confirmPassword')"
         />
       </FormItem>
 
       <FormItem class="enter-x">
-        <Button type="primary" size="large" block @click="handleReset" :loading="loading">
+        <Button type="primary" size="large" block class="enter-x" @click="handleReset" :loading="loading">
           {{ t('common.resetText') }}
         </Button>
-        <Button size="large" block class="mt-4" @click="handleBackLogin">
+        <Button size="large" block class="mt-4 enter-x" @click="handleBackLogin">
           {{ t('sys.login.backSignIn') }}
         </Button>
       </FormItem>
@@ -33,32 +61,136 @@
   </template>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, computed, unref } from 'vue';
+  import { reactive, ref, computed, unref, onMounted } from 'vue';
+  import { message } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-  import { Form, Input, Button } from 'ant-design-vue';
+  import { Form, Input, Button, Select, SelectOption } from 'ant-design-vue';
   import { CountdownInput } from '@/components/CountDown';
+  import { StrengthMeter } from '@/components/StrengthMeter';
   import { useI18n } from '@/hooks/web/useI18n';
-  import { useLoginState, useFormRules, LoginStateEnum } from './useLogin';
+  import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
+  import { sendSmsCode } from '@/api/auth/captcha';
+  import { resetPasswordApi, tenantList } from '@/api/auth';
+  import { TenantResp } from '@/api/auth/model';
+  import { useLocalStorage } from '@vueuse/core';
+  import { SelectValue } from 'ant-design-vue/es/select';
+  import Icon from '@/components/Icon/Icon.vue';
 
   const FormItem = Form.Item;
+  const InputPassword = Input.Password;
   const { t } = useI18n();
   const { handleBackLogin, getLoginState } = useLoginState();
-  const { getFormRules } = useFormRules();
 
   const formRef = ref();
   const loading = ref(false);
 
+  // 默认租户ID
+  const defaultTenantId = '000000';
+  const localTenantId = useLocalStorage('tenantId', defaultTenantId);
+
   const formData = reactive({
     account: '',
     mobile: '',
     sms: '',
+    password: '',
+    confirmPassword: '',
+    tenantId: defaultTenantId,
+  });
+
+  // 租户信息
+  const tenant = reactive<TenantResp & { loadSuccess: boolean }>({
+    tenantEnabled: false,
+    voList: [],
+    loadSuccess: false,
   });
 
+  const { getFormRules } = useFormRules(formData);
+  const { validForm } = useFormValid(formRef);
+
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.RESET_PASSWORD);
 
+  // 处理租户变更
+  function handleTenantChange(tenantId: SelectValue) {
+    localTenantId.value = tenantId as string;
+  }
+
+  // 初始化租户选择
+  async function tenantSelectInit() {
+    try {
+      const ret = await tenantList();
+      const { tenantEnabled, voList } = ret;
+      if (tenantEnabled) {
+        const currentTenantId = voList.length ? voList[0].tenantId : defaultTenantId;
+        formData.tenantId = currentTenantId;
+        localTenantId.value = currentTenantId;
+      }
+      Object.assign(tenant, ret);
+      tenant.loadSuccess = true;
+    } catch (e) {
+      console.error('租户选择异常');
+      tenant.loadSuccess = false;
+    }
+  }
+
+  // 发送短信验证码
+  const handleSendSmsCode = async (): Promise<boolean> => {
+    // 验证手机号是否填写
+    if (!formData.mobile) {
+      message.error('请先填写手机号码');
+      return false;
+    }
+    
+    // 验证手机号格式
+    const mobileRegex = /^1[3-9]\d{9}$/;
+    if (!mobileRegex.test(formData.mobile)) {
+      message.error('请输入正确的手机号码');
+      return false;
+    }
+
+    try {
+      await sendSmsCode(formData.mobile);
+      message.success('验证码发送成功');
+      return true;
+    } catch (error) {
+      message.error('验证码发送失败，请重试');
+      return false;
+    }
+  };
+
   async function handleReset() {
-    const form = unref(formRef);
-    if (!form) return;
-    await form.resetFields();
+    const data = await validForm();
+    if (!data) return;
+
+    // 验证密码确认
+    if (formData.password !== formData.confirmPassword) {
+      message.error('两次输入的密码不一致');
+      return;
+    }
+
+    loading.value = true;
+    try {
+      const res = await resetPasswordApi({
+        username: formData.account,
+        password: formData.password,
+        mobile: formData.mobile,
+        code: formData.sms,
+        uuid: formData.mobile, // 使用手机号作为uuid，用于短信验证码验证
+        tenantId: formData.tenantId,
+      });
+      console.log(res);
+      message.success('密码重置成功！');
+      // 重置成功后跳转到登录页面
+      handleBackLogin();
+    } catch (error) {
+      console.error('密码重置失败:', error);
+      message.error('密码重置失败，请重试');
+    } finally {
+      loading.value = false;
+    }
   }
+
+  onMounted(async () => {
+    // 初始化租户选择
+    await tenantSelectInit();
+  });
 </script>
diff --git a/src/views/auth/login/LoginForm.vue b/src/views/auth/login/LoginForm.vue
index 7a3e5db..b2be1c8 100644
--- a/src/views/auth/login/LoginForm.vue
+++ b/src/views/auth/login/LoginForm.vue
@@ -57,7 +57,7 @@
         <FormItem :style="{ 'text-align': 'right' }">
           <!-- No logic, you need to deal with it yourself -->
           <Button
-            :disabled="true"
+            :disabled="false"
             type="link"
             size="small"
             @click="setLoginState(LoginStateEnum.RESET_PASSWORD)"
@@ -95,7 +95,7 @@
         </Button>
       </ACol>
       <ACol :md="8" :xs="24">
-        <Button block @click="setLoginState(LoginStateEnum.REGISTER)" disabled>
+        <Button block @click="setLoginState(LoginStateEnum.REGISTER)" >
           {{ t('sys.login.registerButton') }}
         </Button>
       </ACol>
diff --git a/src/views/auth/login/RegisterForm.vue b/src/views/auth/login/RegisterForm.vue
index c940651..3542b02 100644
--- a/src/views/auth/login/RegisterForm.vue
+++ b/src/views/auth/login/RegisterForm.vue
@@ -2,6 +2,17 @@
   <div v-if="getShow">
     <LoginFormTitle class="enter-x" />
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
+      <FormItem name="tenantId" class="enter-x" v-if="tenant.tenantEnabled">
+        <Select v-model:value="formData.tenantId" size="large" @change="handleTenantChange">
+          <template #suffixIcon>
+            <Icon icon="mdi:company" />
+          </template>
+          <SelectOption v-for="item in tenant.voList" :key="item.tenantId" :value="item.tenantId">{{
+            item.companyName
+          }}</SelectOption>
+        </Select>
+      </FormItem>
+      
       <FormItem name="account" class="enter-x">
         <Input
           class="fix-auto-fill"
@@ -24,6 +35,7 @@
           class="fix-auto-fill"
           v-model:value="formData.sms"
           :placeholder="t('sys.login.smsCode')"
+          :sendCodeApi="handleSendSmsCode"
         />
       </FormItem>
       <FormItem name="password" class="enter-x">
@@ -66,13 +78,20 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { reactive, ref, unref, computed } from 'vue';
+  import { reactive, ref, unref, computed, onMounted } from 'vue';
+  import { message } from 'ant-design-vue';
   import LoginFormTitle from './LoginFormTitle.vue';
-  import { Form, Input, Button, Checkbox } from 'ant-design-vue';
+  import { Form, Input, Button, Checkbox, Select, SelectOption } from 'ant-design-vue';
   import { StrengthMeter } from '@/components/StrengthMeter';
   import { CountdownInput } from '@/components/CountDown';
+  import Icon from '@/components/Icon/Icon.vue';
   import { useI18n } from '@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
+  import { sendSmsCode } from '@/api/auth/captcha';
+  import { registerApi, tenantList } from '@/api/auth';
+  import { TenantResp } from '@/api/auth/model';
+  import { useLocalStorage } from '@vueuse/core';
+  import { SelectValue } from 'ant-design-vue/es/select';
 
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
@@ -82,6 +101,10 @@
   const formRef = ref();
   const loading = ref(false);
 
+  // 默认租户ID
+  const defaultTenantId = '000000';
+  const localTenantId = useLocalStorage('tenantId', defaultTenantId);
+
   const formData = reactive({
     account: '',
     password: '',
@@ -89,6 +112,14 @@
     mobile: '',
     sms: '',
     policy: false,
+    tenantId: defaultTenantId,
+  });
+
+  // 租户信息
+  const tenant = reactive<TenantResp & { loadSuccess: boolean }>({
+    tenantEnabled: false,
+    voList: [],
+    loadSuccess: false,
   });
 
   const { getFormRules } = useFormRules(formData);
@@ -96,9 +127,89 @@
 
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER);
 
+  // 处理租户变更
+  function handleTenantChange(tenantId: SelectValue) {
+    localTenantId.value = tenantId as string;
+  }
+
+  // 初始化租户选择
+  async function tenantSelectInit() {
+    try {
+      const ret = await tenantList();
+      const { tenantEnabled, voList } = ret;
+      if (tenantEnabled) {
+        const currentTenantId = voList.length ? voList[0].tenantId : defaultTenantId;
+        formData.tenantId = currentTenantId;
+        localTenantId.value = currentTenantId;
+      }
+      Object.assign(tenant, ret);
+      tenant.loadSuccess = true;
+    } catch (e) {
+      console.error('租户选择异常');
+      tenant.loadSuccess = false;
+    }
+  }
+
+  // 发送短信验证码
+  const handleSendSmsCode = async (): Promise<boolean> => {
+    // 验证手机号是否填写
+    if (!formData.mobile) {
+      message.error('请先填写手机号码');
+      return false;
+    }
+    
+    // 验证手机号格式
+    const mobileRegex = /^1[3-9]\d{9}$/;
+    if (!mobileRegex.test(formData.mobile)) {
+      message.error('请输入正确的手机号码');
+      return false;
+    }
+
+    try {
+      await sendSmsCode(formData.mobile);
+      message.success('验证码发送成功');
+      return true;
+    } catch (error) {
+      message.error('验证码发送失败，请重试');
+      return false;
+    }
+  };
+
   async function handleRegister() {
     const data = await validForm();
     if (!data) return;
-    console.log(data);
+    
+    // 检查是否同意隐私政策
+    if (!formData.policy) {
+      message.error('请先同意隐私政策');
+      return;
+    }
+
+    loading.value = true;
+    try {
+      await registerApi({
+        username: formData.account,
+        password: formData.password,
+        mobile: formData.mobile,
+        code: formData.sms,
+        uuid: formData.mobile, // 使用手机号作为uuid，用于短信验证码验证
+        tenantId: formData.tenantId,
+        userType: 'sys_user',
+      });
+      
+      message.success('注册成功！');
+      // 注册成功后跳转到登录页面
+      handleBackLogin();
+    } catch (error) {
+      console.error('注册失败:', error);
+      // message.error('注册失败，请重试');
+    } finally {
+      loading.value = false;
+    }
   }
+
+  onMounted(async () => {
+    // 初始化租户选择
+    await tenantSelectInit();
+  });
 </script>
diff --git a/src/views/auth/login/useLogin.ts b/src/views/auth/login/useLogin.ts
index c6f7c68..a1ff9d2 100644
--- a/src/views/auth/login/useLogin.ts
+++ b/src/views/auth/login/useLogin.ts
@@ -105,6 +105,10 @@ export function useFormRules(formData?: Recordable) {
       case LoginStateEnum.RESET_PASSWORD:
         return {
           account: accountFormRule,
+          password: passwordFormRule,
+          confirmPassword: [
+            { validator: validateConfirmPassword(formData?.password), trigger: 'change' },
+          ],
           ...mobileRule,
         };
 
diff --git a/src/views/tenderReview/TenderTask/TenderTask.data.ts b/src/views/tenderReview/TenderTask/TenderTask.data.ts
index 5988089..c15641e 100644
--- a/src/views/tenderReview/TenderTask/TenderTask.data.ts
+++ b/src/views/tenderReview/TenderTask/TenderTask.data.ts
@@ -110,7 +110,7 @@ export const modalSchemas: FormSchema[] = [
     component: 'Upload',
     componentProps: {
       accept: ['.docx', '.pdf'],
-      maxSize: 1000,
+      maxSize: 10000,
       multiple: false,
       resultField: 'ossId',
       // api: uploadTenderDocument,
@@ -123,7 +123,7 @@ export const modalSchemas: FormSchema[] = [
     component: 'Upload',
     componentProps: {
       accept: ['.zip','.docx', '.pdf'],
-      maxSize: 1000,
+      maxSize: 10000,
       multiple: false,
       resultField: 'ossId',
       // api: uploadTenderDocument,
diff --git a/src/views/tenderReview/TenderTask/index.vue b/src/views/tenderReview/TenderTask/index.vue
index 5315e16..4f439e8 100644
--- a/src/views/tenderReview/TenderTask/index.vue
+++ b/src/views/tenderReview/TenderTask/index.vue
@@ -28,7 +28,7 @@
           <a-button
             type="primary"
             @click="handleAdd"
-            v-auth="'productManagement:TenderTask:add'"
+            v-auth="'tender:tasks:add'"
             >新增</a-button
           >
         </div>