From 5c1875efb49b6b73422aa9cb134029681ce64f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 9 Apr 2024 15:47:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/agency/index.vue | 50 ++++++++-------- src/views/system/agencyCategory/index.vue | 13 +++-- src/views/system/department/index.vue | 71 +++++++++++++++++------ src/views/system/subdivision/index.vue | 1 + src/views/system/user/index.vue | 37 ++++++------ 5 files changed, 105 insertions(+), 67 deletions(-) diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index 6b30007..61bb73b 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -83,13 +83,11 @@ :filter-node-method="filterNode" ref="tree" highlight-current - node-key="id" @node-click="handleNodeClick" :render-content="renderContent" /> - @@ -154,14 +152,12 @@ : "" }} - {{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{ + {{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{ agencyList.regionName }}-{{ agencyList.streetName }}-{{ agencyList.communityName }} - - + - @@ -358,7 +361,7 @@ export default { categoryName: null, categoryCode: null, categoryLevel: null, - categorySort: null, + categorySort: undefined, categoryRemark: null, createBy: null, createTime: null, @@ -452,6 +455,6 @@ export default { diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 439483b..cb0983d 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -19,7 +19,6 @@ :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" - default-expand-all highlight-current @node-click="handleNodeClick" /> @@ -418,7 +417,7 @@ v-model="form.agencyId" :show-all-levels="false" :placeholder=" - form.agencyName ? form.agencyName : '请选择上级机构' + form.agencyName ? form.agencyName : '请选择所属机构' " ref="cascader" :key="isResouceShow" @@ -477,10 +476,11 @@ @@ -533,6 +534,7 @@ @@ -721,6 +723,9 @@ export default { id: "", // 表单校验 rules: { + agencyName: [ + { required: true, message: "所属机构不能为空", trigger: "blur" }, + ], departmentName: [ { required: true, message: "科室名称不能为空", trigger: "blur" }, ], @@ -744,6 +749,19 @@ export default { }, }; }, + // 默认选中第一行 + watch: { + deptOptions: { + handler(val) { + if (val) { + this.$nextTick(() => { + document.querySelector(".el-tree-node__content").click(); + }); + } + }, + immediate: true, + }, + }, created() { this.getList(); this.gettreelist(); @@ -755,6 +773,14 @@ export default { this.infocompare(); }, methods: { + optionsubdivision(e) { + console.log(e); + // this.form.subdivisionCategoryId = this.optionsubdivisionCategory.find( + // (e) => e.id == this.form.subdivisionCategoryId + // ).subdivisionCategoryName; +// console.log(this.form.subdivisionCategoryName) + + }, // 上级科室 changeparentDepartment(e) { this.form.parentDepartmentId = e; @@ -968,23 +994,30 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { - if (valid) { - if (this.form.id != null) { - updateDepartment(this.form).then((response) => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); - }); - } else { - addDepartment(this.form).then((response) => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); - }); - } + let reg = new RegExp("-", "g"); + if (this.form.establishDate && this.form.revokeDate && new Date(this.form.establishDate.replace(reg, "/")) > + new Date(this.form.revokeDate.replace(reg, "/"))) { + this.$message.error("撤销日期要大于成立日期"); } - }); + else { + this.$refs["form"].validate((valid) => { + if (valid) { + if (this.form.id != null) { + updateDepartment(this.form).then((response) => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + }); + } else { + addDepartment(this.form).then((response) => { + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.getList(); + }); + } + } + }); + } }, /** 删除按钮操作 */ handleDelete(row) { diff --git a/src/views/system/subdivision/index.vue b/src/views/system/subdivision/index.vue index 3f6b3eb..0612d67 100644 --- a/src/views/system/subdivision/index.vue +++ b/src/views/system/subdivision/index.vue @@ -171,6 +171,7 @@ diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 1253719..1db1fe2 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -398,6 +398,23 @@ + + + + + + + @@ -464,23 +481,7 @@ - - - - - - - + From 779c63844a3b170e1e036b25a3cec369a79f23d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 9 Apr 2024 16:15:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/project/index.vue | 6 +++++- src/views/manage/projectdevice/index.vue | 4 +++- src/views/manage/projectgroup/index.vue | 1 + src/views/system/compare/index.vue | 12 +++++++++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/views/manage/project/index.vue b/src/views/manage/project/index.vue index 92b99bf..563096a 100644 --- a/src/views/manage/project/index.vue +++ b/src/views/manage/project/index.vue @@ -324,7 +324,11 @@ /> - + - + - + - + + @@ -398,7 +404,7 @@ export default { departmentName: null, normCompareName: null, normCompareCode: null, - normCompareSort: null, + normCompareSort: undefined, normCompareRemark: null, createBy: null, createTime: null, From 10dd6bb358d88bf4bdad0bd70ffe0ddb55d69fa3 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 9 Apr 2024 16:20:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E9=9A=8F=E8=AE=BF?= =?UTF-8?q?=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/followupsee.js | 22 ++ src/store/modules/user.js | 6 + src/views/system/followup/index.vue | 102 ++++++- src/views/system/followupsee/index.vue | 381 ++++++++++++++++++++++--- 4 files changed, 457 insertions(+), 54 deletions(-) create mode 100644 src/api/system/followupsee.js diff --git a/src/api/system/followupsee.js b/src/api/system/followupsee.js new file mode 100644 index 0000000..787cca8 --- /dev/null +++ b/src/api/system/followupsee.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' +export function selectFollowPatientInfo(id) { + return request({ + url: '/manage/signroute/selectFollowPatientInfo/'+id, + method: 'get', + }) +} +// 问卷量表 +export function question(id) { + return request({ + url: '/system/question/'+id, + method: 'get', + }) +} +//保存 +export function addPatientQuestionResult(data) { + return request({ + url: '/manage/signroute/addPatientQuestionResult', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 324c99f..ba84d65 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,6 @@ import { login, logout, getInfo } from '@/api/login' import { getToken, setToken, removeToken } from '@/utils/auth' +import Cookies from 'js-cookie' const user = { state: { @@ -51,6 +52,11 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user + console.log(user,'user') + Cookies.set("userId",user.userId) + Cookies.set("userName",user.userName) + + // localStorage.setItem("userId",user.userId); const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; localStorage.setItem('user', JSON.stringify(user)) if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue index f593c54..ecb538d 100644 --- a/src/views/system/followup/index.vue +++ b/src/views/system/followup/index.vue @@ -128,13 +128,21 @@ v-model="queryParams.visitMethod" placeholder="请选择就诊类型" clearable + @change="change" > + + @@ -148,7 +156,7 @@ - + @@ -327,7 +336,7 @@ /> - + - \ No newline at end of file diff --git a/src/views/system/followupsee/index.vue b/src/views/system/followupsee/index.vue index 70cf6f3..55e66b9 100644 --- a/src/views/system/followupsee/index.vue +++ b/src/views/system/followupsee/index.vue @@ -24,8 +24,12 @@ {{ list.age }}
-
保存
-
取消
+
+ 保存 +
+
+ 取消 +
@@ -42,34 +46,167 @@
-
+
+ + + + + +
问卷模板: Barthel指数评定问卷
您好!本问卷用于评估日常生活能力，请根据自身日常实际表现选择合适的选项。
-
- 1.进食【单选题】 - - 备选项 - 备选项 - 备选项 +
+ {{ index + 1 }}.{{ item.questionName }} + （单选题） + （多选题） + （打分题） + （组合单选题） + （组合多选题） + （组合填空题） + （填空题） + （组合打分题） + （日期填空题） + （时间填空题） + + {{ aitem.optionName }} + + + {{ aitem.optionName }} + + +
+ + +
+ +
+ + +
+ +
+ + +
-
-
电话外呼
-
话术名称
-
+
+
电话外呼
+
话术名称
+
-
+
人工随访模板: 神经内科人工随访
**您好!
@@ -78,13 +215,20 @@
1.进食【单选题】 - 备选项 + + {{ item.label }} + +
- @@ -92,42 +236,183 @@
- + - \ No newline at end of file