From 8aa05921c15a69886c75bd68183bf9b0fd98c780 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 12 二月 2025 13:54:25 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 9e7b2f7..81a3a84 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,13 +37,8 @@
</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"
@@ -117,12 +112,7 @@
password: "",
rememberMe: false,
code: "",
-<<<<<<< HEAD
- uuid: "",
orgid:'1',
-=======
- orgid:'1',
->>>>>>> master
},
options: [
{ value: "1", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
@@ -135,11 +125,7 @@
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