From 5a554d0121b2b0491142a18edbcbaa0cebe30ab3 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 04 二月 2026 14:13:01 +0800
Subject: [PATCH] 测试完成
---
src/store/modules/user.js | 6 ++++--
src/views/login-ls.vue | 14 ++++----------
src/views/login.vue | 14 ++++++++++----
vue.config.js | 2 +-
shiyi.zip | 0
src/views/patient/propaganda/particty.vue | 10 +++++-----
6 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/shiyi.zip b/shiyi.zip
new file mode 100644
index 0000000..fa8a243
--- /dev/null
+++ b/shiyi.zip
Binary files differ
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1b3ddd8..bf1e9b3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -128,6 +128,8 @@
const campusid = userInfo.campusid;
const orgid = userInfo.orgid;
+ console.log(orgid, campusid, "88");
+
return new Promise((resolve, reject) => {
login(username, password, code, orgid, campusid)
.then((res) => {
@@ -206,13 +208,13 @@
localStorage.setItem("deptCode", "");
localStorage.setItem("YongHuID", "1512710152715767808");
localStorage.setItem("YongHuXM", "LDRMYY");
- } else if (orgid == "1"&&campusid==1) {
+ } else if (orgid == "1" && campusid == 1) {
localStorage.setItem("orgname", "鏉窞甯傜涓�浜烘皯鍖婚櫌婀栨花闄㈠尯");
localStorage.setItem("ZuHuID", "");
localStorage.setItem("deptCode", "");
localStorage.setItem("YongHuID", "");
localStorage.setItem("YongHuXM", "");
- } else if (orgid == "2"&&campusid==2) {
+ } else if (orgid == "1" && campusid == 2) {
localStorage.setItem("orgname", "鏉窞甯傜涓�浜烘皯鍖婚櫌鍚村北闄㈠尯");
localStorage.setItem("ZuHuID", "");
localStorage.setItem("deptCode", "");
diff --git a/src/views/login-sy.vue b/src/views/login-ls.vue
similarity index 95%
rename from src/views/login-sy.vue
rename to src/views/login-ls.vue
index 0515b81..1260bd7 100644
--- a/src/views/login-sy.vue
+++ b/src/views/login-ls.vue
@@ -37,10 +37,10 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
- <el-form-item prop="medicalCode">
+ <el-form-item prop="orgid">
<el-select
style="width: 100%"
- v-model="loginForm.medicalCode"
+ v-model="loginForm.orgid"
placeholder="璇烽�夋嫨闄㈠尯"
>
<el-option
@@ -168,8 +168,7 @@
getorganization().then((res) => {
if (res.code == 200) {
this.options = res.rows.map((item) => ({
- value: item.medicalCode,
- // value: item.medicalCode,
+ value: item.orgid,
label: item.organizationName,
}));
}
@@ -206,19 +205,14 @@
}
// 鍔ㄦ�佽缃� campusid 鍙傛暟
- const selectedOrg = this.options.find(item => item.value === this.loginForm.medicalCode);
- console.log(selectedOrg);
-
+ const selectedOrg = this.options.find(item => item.value === this.loginForm.orgid);
if (selectedOrg) {
if (selectedOrg.label.includes('婀栨花')) {
this.loginForm.campusid = 1;
- this.loginForm.orgid = 1;
} else if (selectedOrg.label.includes('鍚村北')) {
this.loginForm.campusid = 2;
- this.loginForm.orgid = 1;
} else {
this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
- this.loginForm.orgid = 1;
}
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 1260bd7..0515b81 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -37,10 +37,10 @@
</el-input>
</el-form-item>
<!-- 涓�===================姘� -->
- <el-form-item prop="orgid">
+ <el-form-item prop="medicalCode">
<el-select
style="width: 100%"
- v-model="loginForm.orgid"
+ v-model="loginForm.medicalCode"
placeholder="璇烽�夋嫨闄㈠尯"
>
<el-option
@@ -168,7 +168,8 @@
getorganization().then((res) => {
if (res.code == 200) {
this.options = res.rows.map((item) => ({
- value: item.orgid,
+ value: item.medicalCode,
+ // value: item.medicalCode,
label: item.organizationName,
}));
}
@@ -205,14 +206,19 @@
}
// 鍔ㄦ�佽缃� campusid 鍙傛暟
- const selectedOrg = this.options.find(item => item.value === this.loginForm.orgid);
+ const selectedOrg = this.options.find(item => item.value === this.loginForm.medicalCode);
+ console.log(selectedOrg);
+
if (selectedOrg) {
if (selectedOrg.label.includes('婀栨花')) {
this.loginForm.campusid = 1;
+ this.loginForm.orgid = 1;
} else if (selectedOrg.label.includes('鍚村北')) {
this.loginForm.campusid = 2;
+ this.loginForm.orgid = 1;
} else {
this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
+ this.loginForm.orgid = 1;
}
}
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 255a030..20612be 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -1309,7 +1309,7 @@
};
this.currenttype = this.$route.query.type;
this.title = "闅忚鍐呭鍒楄〃";
- this.tableLabel = this.tableLabelwj;
+ this.tableLabel = this.tableLabelwj||[];
if (this.form.serviceType == 1) {
this.checkboxlist = [
{
@@ -1478,8 +1478,8 @@
this.leavehospitaldistrictcodes = [];
}
if (this.checkList) {
- this.form.preachform = this.checkList.join(",");
- this.form.preachformList = this.selectedOrder;
+ this.form.preachform = this.checkList.join(",")||[];
+ this.form.preachformList = this.selectedOrder||[];
} else {
this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷");
this.submitLoading = false;
@@ -1937,7 +1937,7 @@
: [];
this.overallCase = this.form.patTaskRelevances.concat();
this.checkList = this.form.preachform.split(",") || [];
- this.selectedOrder = this.form.preachformList;
+ this.selectedOrder = this.form.preachformList||[];
this.overallCase.forEach((item) => {
if (item.endtime) {
@@ -2284,7 +2284,7 @@
});
},
checkSelectionChange(selectedValues, selectedOrder) {
- this.selectedOrder = selectedValues;
+ this.selectedOrder = selectedValues||[];
console.log("褰撳墠閫変腑:", selectedValues);
console.log("閫変腑椤哄簭:", selectedOrder);
},
diff --git a/vue.config.js b/vue.config.js
index 7ce923e..24e835b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://www.health-y.cn/lssf`,
- // target: `http://192.168.100.10:8096`,
+ // target: `http://192.168.100.10:8098`,
// target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
// target: `http://192.168.100.10:8095`,//鏂板崕
target:`http://localhost:8095`,
--
Gitblit v1.9.3