From eb443365f2793c02e20c9e9fd3d611618cd30cba Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 15 四月 2026 15:31:31 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 23 +++++++++++++----------
src/views/followvisit/record/detailpage/index.vue | 3 +++
src/views/login-sy.vue | 1 -
src/views/patient/propaganda/particty.vue | 2 ++
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 65aeb31..d8ae58d 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -2023,6 +2023,9 @@
}
item.patid = this.patid;
item.templateid = item.templateID;
+ if (item.nextScriptno == null) {
+ item.nextScriptno = index == dataToSubmit.length - 1 ? 0 : index + 2;
+ }
});
console.log("c", 3);
diff --git a/src/views/login-sy.vue b/src/views/login-sy.vue
index 0408a34..2bb661e 100644
--- a/src/views/login-sy.vue
+++ b/src/views/login-sy.vue
@@ -169,7 +169,6 @@
if (res.code == 200) {
this.options = res.rows.map((item) => ({
value: item.medicalCode,
- // value: item.medicalCode,
label: item.organizationName,
}));
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 323aebe..63e4d1e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -169,6 +169,7 @@
this.options = res.rows.map((item) => ({
value: item.orgid,
label: item.organizationName,
+ campusid: item.organizationID,
}));
}
});
@@ -207,16 +208,18 @@
const selectedOrg = this.options.find(
(item) => item.value === this.loginForm.orgid
);
- if (selectedOrg) {
- if (selectedOrg.label.includes("婀栨花")) {
- this.loginForm.campusid = 1;
- } else if (selectedOrg.label.includes("鍚村北")) {
- this.loginForm.campusid = 2;
- } else {
- this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
- }
- }
-
+ this.loginForm.campusid = selectedOrg.campusid || 1;
+ // 甯備竴澶勭悊-----------------
+ // if (selectedOrg) {
+ // if (selectedOrg.label.includes("婀栨花")) {
+ // this.loginForm.campusid = 1;
+ // } else if (selectedOrg.label.includes("鍚村北")) {
+ // this.loginForm.campusid = 2;
+ // } else {
+ // this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
+ // }
+ // }
+ // --------------------------------
this.$store
.dispatch("Login", this.loginForm)
.then((res) => {
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 9b982b7..72cfd93 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -2329,6 +2329,8 @@
this.form.libtemplateid = this.objyl.id;
this.objyl.isoperation = 1;
+ console.log(this.objyl,'this.objyl');
+
this.objyl.ivrLibaTemplateScriptVOList.forEach((item) => {
item.ivrTaskScriptTargetoptionList =
item.ivrLibaScriptTargetoptionList;
--
Gitblit v1.9.3