From ee8f1a0138b4b7de2389e31d2eb186167a1548f7 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 11 四月 2025 17:09:41 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/patient/authRole.vue | 4 +-
src/store/modules/user.js | 6 ++
src/views/followvisit/record/detailpage/index.vue | 18 ++++++---
src/views/patient/patient/hospital.vue | 4 +-
src/views/patient/patient/outpatient.vue | 12 +++---
src/views/patient/patient/behospitalized.vue | 4 +-
src/views/patient/patient/profile/index.vue | 4 +-
src/store/getters.js | 1
src/views/system/user/authRole.vue | 4 +-
src/views/followvisit/discharge/index.vue | 58 +++++++++++++++++------------
10 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 6988327..c59295e 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -14,6 +14,7 @@
permissions: (state) => state.user.permissions,
belongWards: (state) => state.user.belongWards,
belongDepts: (state) => state.user.belongDepts,
+ hisUserId: (state) => state.user.hisUserId,
permission_routes: (state) => state.permission.routes,
topbarRouters: (state) => state.permission.topbarRouters,
defaultRoutes: (state) => state.permission.defaultRoutes,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 0464b76..654f219 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@
name: '',
Id: '',
avatar: '',
+ hisUserId:'',
belongWards:[],
belongDepts:[],
roles: [],
@@ -106,6 +107,9 @@
SET_leavehospitaldistrictcodes: (state, belongWards) => {
state.belongWards = belongWards
},
+ SET_hisUserId: (state, hisUserId) => {
+ state.hisUserId = hisUserId
+ },
SET_leaveldeptcodes: (state, belongDepts) => {
state.belongDepts = belongDepts
}
@@ -147,8 +151,8 @@
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
- console.log(user.userId,'user1');
commit('SET_Id', user.userId)
+ commit('SET_hisUserId', user.hisUserId)
commit('SET_leavehospitaldistrictcodes', user.belongWards)
commit('SET_leaveldeptcodes', user.belongDepts)
commit('SET_AVATAR', avatar)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index b79f155..1f06a96 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -167,21 +167,7 @@
>鏂板</el-button
>
</el-col>
- <el-col :span="1.5">
- <div class="documentf">
- <div class="document">
- <el-button
- type="warning"
- plain
- icon="el-icon-upload2"
- size="medium"
- @click="handleExport"
- v-hasPermi="['system:user:export']"
- >瀵煎嚭</el-button
- >
- </div>
- </div>
- </el-col>
+
<el-col :span="1.5">
<div class="documentf">
<div class="document">
@@ -219,6 +205,19 @@
size="medium"
@click="buidegetTasklist()"
>寰呭姙鏈嶅姟</el-button
+ >
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="1.5">
+ <div class="documentf">
+ <div class="document">
+ <el-button
+ type="primary"
+ plain
+ size="medium"
+ @click="affiliation()"
+ >鏈汉鎵�灞炴湇鍔�</el-button
>
</div>
</div>
@@ -751,6 +750,13 @@
<!-- <el-form-item label="鍗冲埢鍙戦��">
<el-switch v-model="zcform.delivery"></el-switch>
</el-form-item> -->
+ <el-form-item label="鍑洪櫌鏃堕棿">
+ <el-input
+ style="width: 400px"
+ disabled
+ v-model="zcform.endtime"
+ ></el-input>
+ </el-form-item>
<el-form-item label="闅忚瀹屾垚鏃堕棿" prop="date1">
<el-date-picker
type="date"
@@ -1078,16 +1084,11 @@
/** 鏌ヨ闅忚鏈嶅姟鍒楄〃 */
getList(refresh) {
// 榛樿鍏ㄩ儴
- console.log(this.topqueryParams,'topqueryParams');
- console.log(store.getters.belongDepts,'store.getters.belongDepts');
-
if (this.topqueryParams.searchscope == 3) {
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- console.log('3');
-
this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
@@ -1146,6 +1147,11 @@
});
this.total = response.total;
});
+ },
+ affiliation(){
+ this.topqueryParams.drcode=store.getters.hisUserId;
+ this.topqueryParams.nurseId=store.getters.hisUserId;
+ this.getList(1);
},
buidegetTasklist(type) {
if (this.topqueryParams.searchscope == 3) {
@@ -1306,11 +1312,14 @@
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
- serviceType: 2,
- sort: 2,
sendstate: 2,
- searchscope: 2,
- };
+ sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
+ serviceType: 2,
+ searchscope: 3,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
+ },
this.handleQuery(1);
},
// 澶氶�夋閫変腑鏁版嵁
@@ -1483,6 +1492,7 @@
// 鍐嶆闅忚
followupvisit(row) {
this.zcform = row;
+ this.zcform.endtime = this.formatTime(this.zcform.endtime);
this.dialogFormVisible = true;
},
onSubmit() {},
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 05bfbc9..0bfa17b 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -565,6 +565,13 @@
v-model="form.leavehospitaldistrictname"
></el-input>
</el-form-item>
+ <el-form-item label="鍑洪櫌鏃堕棿">
+ <el-input
+ style="width: 400px"
+ disabled
+ v-model="form.endtime"
+ ></el-input>
+ </el-form-item>
<el-form-item label="闅忚鏂瑰紡" prop="resource">
<el-radio-group v-model="form.resource">
@@ -654,7 +661,7 @@
this.patid = this.$route.query.patid;
this.Voicetype = this.$route.query.Voicetype;
this.serviceType = this.$route.query.serviceType;
-console.log(this.id, this.patid);
+ console.log(this.id, this.patid);
this.getTaskservelist(this.id);
},
@@ -853,7 +860,7 @@
// 鑾峰彇鎮ｈ�呰褰�
getTaskservelist(id) {
- console.log(id,'idsub');
+ console.log(id, "idsub");
if (id) {
this.Whetherall = false;
@@ -867,12 +874,11 @@
}).then((res) => {
if (res.code == 200) {
this.form = res.rows[0].serviceSubtaskList[0];
- console.log(this.form, "this.form");
this.logsheetlist = res.rows[0].serviceSubtaskList;
this.templateid = this.logsheetlist[0].templateid;
const targetDate = new Date(this.form.longSendTime); // 鐩爣鏃ユ湡
const now = new Date(); // 褰撳墠鏃堕棿
-
+ this.form.endtime = this.formatTime(this.form.endtime);
if (now < targetDate && this.form.sendstate == 2) {
this.$confirm("褰撳墠鏈嶅姟鏈埌鍙戦�佹椂闂磋璋ㄦ厧淇敼", "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -910,7 +916,7 @@
});
},
Editsingletasksonyic(sendstate) {
- console.log(sendstate,'sendstate');
+ console.log(sendstate, "sendstate");
let objson = {};
getTaskservelist({
@@ -1003,7 +1009,7 @@
if (valid) {
let form = structuredClone(this.form);
form.longSendTime = this.formatTime(form.date1);
- form.finishtime = '';
+ form.finishtime = "";
if (form.resource) {
if (form.resource == 2) {
form.serviceType = 10;
diff --git a/src/views/patient/patient/authRole.vue b/src/views/patient/patient/authRole.vue
index 7efe5ad..10f0647 100644
--- a/src/views/patient/patient/authRole.vue
+++ b/src/views/patient/patient/authRole.vue
@@ -101,8 +101,8 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
const userId = this.form.userId;
- const roleIds = this.roleIds.join(",");
- updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+ // const roleIds = this.roleIds.join(",");
+ updateAuthRole({ userId: userId, roleIds: this.roleIds }).then((response) => {
this.$modal.msgSuccess("鎺堟潈鎴愬姛");
this.close();
});
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index e158d8b..d0b928d 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -598,10 +598,10 @@
getList() {
this.loading = true;
if (this.queryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- this.topqueryParams.leavehospitaldistrictcodes =
+ this.queryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
listpatient(this.queryParams).then((response) => {
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index c7a55fd..cddef99 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -580,10 +580,10 @@
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
if (this.queryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- this.topqueryParams.leavehospitaldistrictcodes =
+ this.queryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
this.loading = true;
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index 027a9e5..cf24dc1 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -21,9 +21,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="闂ㄨ瘖鍙�" prop="patid">
+ <el-form-item label="闂ㄨ瘖鍙�" prop="outhospno">
<el-input
- v-model="queryParams.patid"
+ v-model="queryParams.outhospno"
placeholder="璇疯緭鍏ラ棬璇婂彿"
clearable
style="width: 250px"
@@ -162,8 +162,8 @@
<el-table-column
label="闂ㄨ瘖鍙�"
align="center"
- key="patid"
- prop="patid"
+ key="outhospno"
+ prop="outhospno"
/>
<el-table-column
label="濮撳悕"
@@ -584,10 +584,10 @@
getList() {
this.loading = true;
if (this.queryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- this.topqueryParams.leavehospitaldistrictcodes =
+ this.queryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
listPatouthosp(this.queryParams).then((response) => {
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index edb58b7..fbaa877 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -376,8 +376,8 @@
<el-table-column
label="闂ㄨ瘖鍙�"
align="center"
- key="patid"
- prop="patid"
+ key="outhospno"
+ prop="outhospno"
/>
<el-table-column
label="濮撳悕"
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 7efe5ad..10f0647 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -101,8 +101,8 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
const userId = this.form.userId;
- const roleIds = this.roleIds.join(",");
- updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+ // const roleIds = this.roleIds.join(",");
+ updateAuthRole({ userId: userId, roleIds: this.roleIds }).then((response) => {
this.$modal.msgSuccess("鎺堟潈鎴愬姛");
this.close();
});
--
Gitblit v1.9.3