From 2daa54cc53396fb5f5b64a6b0a5b5c814b2bae2d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 27 三月 2025 17:56:02 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 9e7b2f7..b3cfc30 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,16 +112,11 @@
password: "",
rememberMe: false,
code: "",
-<<<<<<< HEAD
- uuid: "",
- orgid:'1',
-=======
- orgid:'1',
->>>>>>> master
+ orgid:'47255004333112711A1001',
},
options: [
- { value: "1", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
- { value: "2", label: "涓芥按甯備腑鍖婚櫌" },
+ { value: "47255004333112711A1001", label: "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" },
+ { value: "47231022633110211A2101", label: "涓芥按甯備腑鍖婚櫌" },
],
loginRules: {
username: [
@@ -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,
// 楠岃瘉鐮佸紑鍏�
@@ -204,12 +190,12 @@
Cookies.remove("password");
Cookies.remove("rememberMe");
}
- this.loginForm.orgid = '1',
+ // this.loginForm.orgid = '1',
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
// this.$router.push({ path: this.redirect || "/" }).catch(() => {});
- this.$router.push({ path:"/patient/patient" }).catch(() => {});
+ this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
})
.catch(() => {
this.loading = false;
--
Gitblit v1.9.3