From a5faf6e7b42f1e358ee8396c77452a07d9f976e8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 12 二月 2025 13:54:12 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 3b58d3a..9e7b2f7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- <h3 class="title">娴欎腑鍖诲ぇ浜岄櫌鏅烘収闅忚骞冲彴</h3>
+ <h3 class="title">鏅畞浜烘皯鍖婚櫌鏅烘収闅忚骞冲彴</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@@ -37,8 +37,13 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
+<<<<<<< HEAD
+ <el-form-item prop="orgid">
+ <el-select style="width: 100%;" v-model="loginForm.orgid" placeholder="璇烽�夋嫨闄㈠尯">
+=======
<!-- <el-form-item prop="orgid">
<el-select style="width: 100%;" v-model="loginForm.orgid" placeholder="璇烽�夋嫨闄㈠尯">
+>>>>>>> master
<el-option
v-for="item in options"
:key="item.value"
@@ -48,7 +53,7 @@
</el-option>
<i slot="prefix" class="el-icon-mobile"></i>
</el-select>
- </el-form-item> -->
+ </el-form-item>
<!-- <el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="loginForm.code"
@@ -112,7 +117,12 @@
password: "",
rememberMe: false,
code: "",
+<<<<<<< HEAD
+ uuid: "",
orgid:'1',
+=======
+ orgid:'1',
+>>>>>>> master
},
options: [
{ value: "1", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
@@ -125,7 +135,11 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
+<<<<<<< HEAD
+ orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+=======
// orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+>>>>>>> master
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
--
Gitblit v1.9.3