From 447ac8696eb82c65d7e231a96679e0ca04943751 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 21 四月 2026 15:24:08 +0800
Subject: [PATCH] 测试完成
---
src/store/modules/permission.js | 4
src/router/index.js | 64 ++++----
src/views/login-sy.vue | 115 ++++++++--------
ls&nh&sy&sltd外链.zip | 0
src/views/outsideChainnew.vue | 18 ++
/dev/null | 0
src/views/login.vue | 117 ++++++++--------
src/views/patient/propaganda/index.vue | 16 +-
src/components/TopNav/index.vue | 2
外链.zip | 0
src/App.vue | 4
src/views/patient/propaganda/particty.vue | 22 +-
src/views/outsideChainwtnew.vue | 5
13 files changed, 195 insertions(+), 172 deletions(-)
diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip"
deleted file mode 100644
index f74de21..0000000
--- "a/dist \0502\051.zip"
+++ /dev/null
Binary files differ
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 814a68f..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git "a/dist \0503\051.zip" "b/ls&nh&sy&sltd\345\244\226\351\223\276.zip"
similarity index 94%
copy from "dist \0503\051.zip"
copy to "ls&nh&sy&sltd\345\244\226\351\223\276.zip"
index 02f34e6..bdd2253 100644
--- "a/dist \0503\051.zip"
+++ "b/ls&nh&sy&sltd\345\244\226\351\223\276.zip"
Binary files differ
diff --git "a/sltd&ls&\345\215\227\345\215\216.zip" "b/sltd&ls&\345\215\227\345\215\216.zip"
deleted file mode 100644
index 1fcbf17..0000000
--- "a/sltd&ls&\345\215\227\345\215\216.zip"
+++ /dev/null
Binary files differ
diff --git a/src/App.vue b/src/App.vue
index 83f295c..25aaecd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,13 +3,13 @@
<router-view />
<theme-picker />
<!-- <Assistant v-if="routertf" /> -->
- <Assistant
+ <!-- <Assistant
v-if="Assvite"
:initial-position="{ x: 50, y: 200 }"
:auto-hide="false"
:hide-delay="3000"
primary-color="#1890ff"
- />
+ /> -->
</div>
</template>
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index aec393d..307953e 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -93,7 +93,7 @@
childrenMenus.push(router.children[item]);
}
});
- return constantRoutes.concat(childrenMenus);
+ return constantRoutes;
},
// 榛樿婵�娲荤殑鑿滃崟
activeMenu() {
diff --git a/src/router/index.js b/src/router/index.js
index b96f433..d97166d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -106,38 +106,38 @@
component: () => import("@/views/error/401"),
hidden: true,
},
- {
- path: "",
- component: Layout,
- redirect: "index",
- children: [
- {
- path: "index",
- component: () => import("@/views/index"),
- name: "Index",
- meta: {
- title: "棣栭〉",
- icon: "dashboard",
- affix: true,
- roles: ["admin", "sysadmin"],
- },
- },
- ],
- },
- {
- path: "/user",
- component: Layout,
- hidden: true,
- redirect: "noredirect",
- children: [
- {
- path: "profile",
- component: () => import("@/views/system/user/profile/index"),
- name: "Profile",
- meta: { title: "涓汉涓績", icon: "user" },
- },
- ],
- },
+ // {
+ // path: "",
+ // component: Layout,
+ // redirect: "index",
+ // children: [
+ // {
+ // path: "index",
+ // component: () => import("@/views/index"),
+ // name: "Index",
+ // meta: {
+ // title: "棣栭〉",
+ // icon: "dashboard",
+ // affix: true,
+ // roles: ["admin", "sysadmin"],
+ // },
+ // },
+ // ],
+ // },
+ // {
+ // path: "/user",
+ // component: Layout,
+ // hidden: true,
+ // redirect: "noredirect",
+ // children: [
+ // {
+ // path: "profile",
+ // component: () => import("@/views/system/user/profile/index"),
+ // name: "Profile",
+ // meta: { title: "涓汉涓績", icon: "user" },
+ // },
+ // ],
+ // },
];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 5c07e5a..ce08064 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -17,10 +17,10 @@
mutations: {
SET_ROUTES: (state, routes) => {
state.addRoutes = routes;
- state.routes = constantRoutes.concat(routes);
+ state.routes = constantRoutes;
},
SET_DEFAULT_ROUTES: (state, routes) => {
- state.defaultRoutes = constantRoutes.concat(routes);
+ state.defaultRoutes = constantRoutes;
},
SET_TOPBAR_ROUTES: (state, routes) => {
state.topbarRouters = routes;
diff --git a/src/views/login-ls.vue b/src/views/login-sy.vue
similarity index 76%
rename from src/views/login-ls.vue
rename to src/views/login-sy.vue
index 63e4d1e..2bb661e 100644
--- a/src/views/login-ls.vue
+++ b/src/views/login-sy.vue
@@ -36,11 +36,11 @@
/>
</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
@@ -118,7 +118,8 @@
code: "",
orgid: "H41010500003",
},
- options: [],
+ options: [
+ ],
loginRules: {
username: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
@@ -167,9 +168,8 @@
getorganization({ pageSize: 30 }).then((res) => {
if (res.code == 200) {
this.options = res.rows.map((item) => ({
- value: item.orgid,
+ value: item.medicalCode,
label: item.organizationName,
- campusid: item.organizationID,
}));
}
});
@@ -186,60 +186,61 @@
};
},
handleLogin() {
- this.$refs.loginForm.validate((valid) => {
- if (valid) {
- this.loading = true;
+ this.$refs.loginForm.validate((valid) => {
+ if (valid) {
+ this.loading = true;
- if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", encrypt(this.loginForm.password), {
- expires: 30,
- });
- Cookies.set("rememberMe", this.loginForm.rememberMe, {
- expires: 30,
- });
- } else {
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove("rememberMe");
- }
+ if (this.loginForm.rememberMe) {
+ Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("password", encrypt(this.loginForm.password), {
+ expires: 30,
+ });
+ Cookies.set("rememberMe", this.loginForm.rememberMe, {
+ expires: 30,
+ });
+ } else {
+ Cookies.remove("username");
+ Cookies.remove("password");
+ Cookies.remove("rememberMe");
+ }
- // 鍔ㄦ�佽缃� campusid 鍙傛暟
- const selectedOrg = this.options.find(
- (item) => item.value === this.loginForm.orgid
- );
- 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) => {
- if (this.loginForm.username == "admin") {
- this.$router.push({ path: "/index" }).catch(() => {});
- } else {
- this.$router
- .push({ path: "/followvisit/discharge" })
- .catch(() => {});
- }
- })
- .catch(() => {
- this.loading = false;
- if (this.captchaEnabled) {
- this.getCode();
- }
- });
+ // 鍔ㄦ�佽缃� campusid 鍙傛暟
+ 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;
}
- });
- },
+ }
+
+ this.$store
+ .dispatch("Login", this.loginForm)
+ .then((res) => {
+ if (this.loginForm.username == "admin") {
+ this.$router.push({ path: "/index" }).catch(() => {});
+ } else {
+ this.$router
+ .push({ path: "/followvisit/discharge" })
+ .catch(() => {});
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ if (this.captchaEnabled) {
+ this.getCode();
+ }
+ });
+ }
+ });
+}
},
};
</script>
diff --git a/src/views/login.vue b/src/views/login.vue
index 2bb661e..4caef87 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -36,11 +36,11 @@
/>
</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
@@ -118,8 +118,7 @@
code: "",
orgid: "H41010500003",
},
- options: [
- ],
+ options: [],
loginRules: {
username: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
@@ -168,8 +167,9 @@
getorganization({ pageSize: 30 }).then((res) => {
if (res.code == 200) {
this.options = res.rows.map((item) => ({
- value: item.medicalCode,
+ value: item.orgid,
label: item.organizationName,
+ campusid: item.organizationID,
}));
}
});
@@ -186,61 +186,62 @@
};
},
handleLogin() {
- this.$refs.loginForm.validate((valid) => {
- if (valid) {
- this.loading = true;
+ this.$refs.loginForm.validate((valid) => {
+ if (valid) {
+ this.loading = true;
- if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", encrypt(this.loginForm.password), {
- expires: 30,
- });
- Cookies.set("rememberMe", this.loginForm.rememberMe, {
- expires: 30,
- });
- } else {
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove("rememberMe");
- }
-
- // 鍔ㄦ�佽缃� campusid 鍙傛暟
- 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;
- }
- }
-
- this.$store
- .dispatch("Login", this.loginForm)
- .then((res) => {
- if (this.loginForm.username == "admin") {
- this.$router.push({ path: "/index" }).catch(() => {});
+ if (this.loginForm.rememberMe) {
+ Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("password", encrypt(this.loginForm.password), {
+ expires: 30,
+ });
+ Cookies.set("rememberMe", this.loginForm.rememberMe, {
+ expires: 30,
+ });
} else {
- this.$router
- .push({ path: "/followvisit/discharge" })
- .catch(() => {});
+ Cookies.remove("username");
+ Cookies.remove("password");
+ Cookies.remove("rememberMe");
}
- })
- .catch(() => {
- this.loading = false;
- if (this.captchaEnabled) {
- this.getCode();
- }
- });
- }
- });
-}
+
+ // 鍔ㄦ�佽缃� campusid 鍙傛暟
+ const selectedOrg = this.options.find(
+ (item) => item.value === this.loginForm.orgid
+ );
+ console.log(selectedOrg,'selectedOrg');
+
+ 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) => {
+ if (this.loginForm.username == "admin") {
+ this.$router.push({ path: "/index" }).catch(() => {});
+ } else {
+ this.$router
+ .push({ path: "/followvisit/discharge" })
+ .catch(() => {});
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ if (this.captchaEnabled) {
+ this.getCode();
+ }
+ });
+ }
+ });
+ },
},
};
</script>
diff --git a/src/views/outsideChainnew.vue b/src/views/outsideChainnew.vue
index b9e39b1..1e83bb8 100644
--- a/src/views/outsideChainnew.vue
+++ b/src/views/outsideChainnew.vue
@@ -8,7 +8,9 @@
{{
kcb
? kcb
- : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸" +
+ localStorage.getItem("orgname") +
+ "鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
}}
<!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
@@ -82,7 +84,11 @@
</div>
</div>
<!-- 濉┖ -->
- <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4||item.scriptType == 3">
+ <div
+ class="scriptTopic-dev"
+ :key="index"
+ v-if="item.scriptType == 4 || item.scriptType == 3"
+ >
<div class="dev-text">
{{ index + 1 }}銆�<span style="line-height: 1.5"
>{{ item.scriptContent
@@ -163,6 +169,7 @@
kcb: "",
excep: "",
taskname: "",
+ param6: null,
questionList: [
// {
// scriptType: 1,
@@ -288,12 +295,14 @@
geturlinfo(url).then((res) => {
if (res.code == 200) {
+
this.getQuestionnaire(
res.data.param1,
res.data.param2,
res.data.param3,
res.data.param5
);
+ this.param6 = res.data.param6;
}
});
},
@@ -385,10 +394,12 @@
let form = {
param1: this.taskid,
param2: this.patid,
+ param6: this.param6,
excep: this.excep,
type: this.type,
serviceSubtaskDetailList: [],
};
+
const arr = structuredClone(this.questionList);
// arr.forEach((item) => {
// item.asrtext = JSON.stringify(item.questionResult);
@@ -413,13 +424,14 @@
let form = {
param1: this.taskid,
param2: this.patid,
+ param6: this.param6,
type: this.type,
ivrTaskTemplateScriptVOList: [],
};
const arr = structuredClone(this.questionList);
console.log(arr, "srr");
arr.forEach((item, index) => {
- if (item.scriptType == 3||item.scriptType == 4) return;
+ if (item.scriptType == 3 || item.scriptType == 4) return;
var obj = item.ivrTaskScriptTargetoptionList.find(
(items) => items.targetvalue == item.questionResult
);
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 205e6d2..0dcd0dd 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -179,6 +179,7 @@
isabnormal: 0,
taskname: "",
questionList: [],
+ param6:null,
jsy: null,
dialogVisible: false,
Endornot: true,
@@ -231,6 +232,8 @@
res.data.param3,
res.data.param5
);
+ this.param6 = res.data.param6;
+
}
});
},
@@ -319,6 +322,7 @@
let form = {
param1: this.taskid,
param2: this.patid,
+ param6: this.param6,
excep: this.excep,
isabnormal: this.isabnormal,
serviceSubtaskDetailList: [],
@@ -349,6 +353,7 @@
let form = {
param1: this.taskid,
param2: this.patid,
+ param6: this.param6,
svyTaskTemplateScriptVOS: [],
};
const arr = structuredClone(this.questionList);
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index d930a80..ae2df75 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -37,7 +37,7 @@
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
></el-input>
</el-form-item>
- <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
+ <!-- <el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
<el-select
v-model="topqueryParams.searchscope"
placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
@@ -50,7 +50,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
<el-cascader
v-model="topqueryParams.scopetype"
@@ -751,9 +751,9 @@
pageNum: 1,
pageSize: 10,
serviceType: 4,
- searchscope: 2,
+ searchscope: 3,
sendstate: 2,
- leaveldeptcodes: [],
+ leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
},
propss: { multiple: true },
@@ -776,7 +776,7 @@
value: 4,
label: "涓嶆墽琛�",
},
- {
+ {
value: 5,
label: "鍙戦�佸け璐�",
},
@@ -784,7 +784,7 @@
value: 6,
label: "宸插畬鎴�",
},
- {
+ {
value: 7,
label: "瓒呮椂",
},
@@ -845,8 +845,8 @@
store.getters.belongWards.map((obj) => obj.districtCode);
}
this.loading = true;
- console.log(this.topqueryParams.leavehospitaldistrictcodes);
- console.log(this.topqueryParams.leaveldeptcodes);
+ console.log(this.topqueryParams.leavehospitaldistrictcodes,'123');
+ console.log(this.topqueryParams.leaveldeptcodes,'344');
if (
this.topqueryParams.leavehospitaldistrictcodes[0] &&
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index dd705ab..9ef35f0 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 = [
{
@@ -1329,9 +1329,13 @@
label: "寰俊鍏紬鍙�",
},
];
- } else if (this.form.serviceType == 6) {
+ } else if (
+ this.form.serviceType == 6 ||
+ this.form.serviceType == 14 ||
+ this.form.serviceType == 15
+ ) {
this.checkboxlist = [
- {
+ {
value: "1",
label: "浜哄伐",
},
@@ -1482,8 +1486,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;
@@ -1615,7 +1619,7 @@
// 鐤剧梾
this.getillness(this.form.libtemplateid);
- selectInfoByCondition({id:this.form.templateid} ).then((res) => {
+ selectInfoByCondition({ id: this.form.templateid }).then((res) => {
if (res.code == 200) {
this.previewtf = true;
this.previewtftype = 1;
@@ -1941,7 +1945,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) {
@@ -2288,7 +2292,7 @@
});
},
checkSelectionChange(selectedValues, selectedOrder) {
- this.selectedOrder = selectedValues||[];
+ this.selectedOrder = selectedValues || [];
console.log("褰撳墠閫変腑:", selectedValues);
console.log("閫変腑椤哄簭:", selectedOrder);
},
@@ -2329,7 +2333,7 @@
this.form.libtemplateid = this.objyl.id;
this.objyl.isoperation = 1;
- console.log(this.objyl,'this.objyl');
+ console.log(this.objyl, "this.objyl");
this.objyl.ivrLibaTemplateScriptVOList.forEach((item) => {
item.ivrTaskScriptTargetoptionList =
diff --git "a/dist \0503\051.zip" "b/\345\244\226\351\223\276.zip"
similarity index 94%
rename from "dist \0503\051.zip"
rename to "\345\244\226\351\223\276.zip"
index 02f34e6..6247b74 100644
--- "a/dist \0503\051.zip"
+++ "b/\345\244\226\351\223\276.zip"
Binary files differ
--
Gitblit v1.9.3