From f5221c566758ab0873727da3cb3df645708eb085 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期六, 13 九月 2025 14:41:12 +0800
Subject: [PATCH] 测试分支发布
---
src/views/followvisit/again/index.vue | 93 ++++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/src/views/followvisit/again/index.vue b/src/views/followvisit/again/index.vue
index b356ad7..92d569e 100644
--- a/src/views/followvisit/again/index.vue
+++ b/src/views/followvisit/again/index.vue
@@ -108,10 +108,10 @@
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
></el-input>
</el-form-item>
- <el-form-item label="鎮ｈ�呰瘖鏂�" prop="leavediagname">
+ <el-form-item label="璇婃柇鍚嶇О" prop="leavediagname">
<el-input
v-model="topqueryParams.leavediagname"
- placeholder="璇疯緭鍏ユ偅鑰呰瘖鏂�"
+ placeholder="璇疯緭鍏ヨ瘖鏂悕绉�"
></el-input>
</el-form-item>
@@ -180,8 +180,7 @@
<el-col :span="1.5">
<el-button
type="primary"
- plain
- icon="el-icon-plus"
+ icon="el-icon-plus"
size="medium"
@click="handleAdd"
>鏂板</el-button
@@ -450,10 +449,18 @@
<!-- <el-table-column label="鎬у埆"width="100" align="center" key="sex" prop="sex" /> -->
<!-- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> -->
<el-table-column
- label="绉戝"
+ label="棣栨闅忚绉戝"
align="center"
key="deptname"
prop="deptname"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鏈绉戝"
+ align="center"
+ key="visitDeptName"
+ prop="visitDeptName"
width="120"
>
</el-table-column>
@@ -636,7 +643,17 @@
</el-form-item>
</el-col>
</el-row>
-
+<el-row >
+ <el-col :span="8">
+ <el-form-item label="杩囨护鍖荤敓" width="100" prop="filterDrname">
+ <el-input
+ v-model="form.filterDrname"
+ placeholder="璇疯緭鍏ュ尰鐢熷鍚�"
+ maxlength="30"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="杩囨护鍘熷洜">
@@ -910,7 +927,7 @@
// value: 0,
// },
{
- name: "搴旈殢璁�",
+ name: "闇�闅忚",
value: 0,
},
{
@@ -921,10 +938,10 @@
name: "寰呴殢璁�",
value: 0,
},
- {
- name: "宸插彂閫�",
- value: 0,
- },
+ // {
+ // name: "宸插彂閫�",
+ // value: 0,
+ // },
// {
// name: "琛ㄥ崟宸插彂閫�",
@@ -974,8 +991,10 @@
sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 2,
searchscope: 3,
+ visitCount: 2,
scopetype: [],
- leaveldeptcodes: [],
+ visitDeptCodes: [],
+ leaveldeptcodes:[],
leavehospitaldistrictcodes: [],
},
propss: { multiple: true },
@@ -1111,6 +1130,9 @@
// 榛樿鍏ㄩ儴
if (this.topqueryParams.searchscope == 3) {
+ this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
@@ -1127,7 +1149,7 @@
this.loading = true;
if (
this.topqueryParams.leavehospitaldistrictcodes[0] &&
- this.topqueryParams.leaveldeptcodes[0]
+ this.topqueryParams.visitDeptCodes[0]&&this.topqueryParams.leaveldeptcodes[0]
) {
this.topqueryParams.deptOrDistrict = 2;
} else {
@@ -1144,7 +1166,7 @@
this.ycvalue = response.rows[0].yc;
this.cardlist[2].value = response.rows[0].fssb;
this.cardlist[3].value = response.rows[0].dsf;
- this.cardlist[4].value = response.rows[0].yfs2;
+ // this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
@@ -1174,8 +1196,9 @@
});
},
affiliation() {
- this.topqueryParams.drcode = store.getters.hisUserId;
- this.topqueryParams.nurseId = store.getters.hisUserId;
+
+ this.topqueryParams.managementDoctorCode= store.getters.hisUserId;
+
this.getList(1);
},
onthatday() {
@@ -1189,7 +1212,10 @@
},
buidegetTasklist(type) {
if (this.topqueryParams.searchscope == 3) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
this.topqueryParams.leavehospitaldistrictcodes =
@@ -1207,6 +1233,7 @@
leavehospitaldistrictcodes:
this.topqueryParams.leavehospitaldistrictcodes,
sendstates: [2, 3],
+ visitDeptCodes: this.topqueryParams.visitDeptCodes,
leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
};
buidegetTasklist(obj).then((response) => {
@@ -1220,7 +1247,7 @@
this.ycvalue = response.rows[0].yc;
this.cardlist[3].value = response.rows[0].fssb;
this.cardlist[4].value = response.rows[0].dsf;
- this.cardlist[5].value = response.rows[0].yfs2;
+ // this.cardlist[5].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
@@ -1304,6 +1331,9 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
if (this.topqueryParams.searchscope == 3) {
+ this.topqueryParams.visitDeptCodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
@@ -1323,13 +1353,16 @@
let type = value[0];
let code = value.slice(-1)[0];
this.topqueryParams.leavehospitaldistrictcodes = [];
+ this.topqueryParams.visitDeptCodes = [];
this.topqueryParams.leaveldeptcodes = [];
if (type == 1) {
+ this.topqueryParams.visitDeptCodes.push(code);
this.topqueryParams.leaveldeptcodes.push(code);
this.topqueryParams.leavehospitaldistrictcodes = [];
this.topqueryParams.searchscope = 1;
} else if (type == 2) {
this.topqueryParams.leavehospitaldistrictcodes.push(code);
+ this.topqueryParams.visitDeptCodes = [];
this.topqueryParams.leaveldeptcodes = [];
this.topqueryParams.searchscope = 2;
} else {
@@ -1340,18 +1373,20 @@
resetQuery() {
this.dateRange = [];
this.dateRangefs = [];
- (this.topqueryParams = {
+ this.topqueryParams = {
pageNum: 1,
pageSize: 10,
sendstate: 2,
sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 2,
searchscope: 3,
+ visitCount: 2,
scopetype: [],
- leaveldeptcodes: [],
+ visitDeptCodes: [],
+ leaveldeptcodes:[],
leavehospitaldistrictcodes: [],
- }),
- this.handleQuery(1);
+ };
+ this.handleQuery(1);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1391,6 +1426,8 @@
},
//鎮ｈ��360璺宠浆
gettoken360(sfzh, drcode, drname) {
+ this.$modal.msgWarning('360鍔熻兘鏆傛湭寮�閫�');
+ return; // 闃绘鍚庣画浠ｇ爜鎵ц
this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh;
if (this.postData.XiaoXiTou.ZuHuMC == "涓芥按甯備腑鍖婚櫌") {
this.postData.YeWuXX.YongHuXX.YongHuID = "1400398571877961728";
@@ -1520,6 +1557,7 @@
patid: row.patid,
id: row.id,
Voicetype: type,
+ visitCount: this.topqueryParams.visitCount,
},
});
},
@@ -1564,6 +1602,7 @@
handleUpdate(row) {
particularpatient(row.patid).then((response) => {
this.form = response.data;
+ this.form.filterDrname = store.getters.nickName;
});
this.amendtag = true;
this.Labelchange = true;
@@ -1736,10 +1775,12 @@
}
}
::v-deep.leftvlue .el-card__body {
- background: #d0e9fd;
+ background: #F2F8FF;
+ color: #324A9B;
}
::v-deep.leftvlue .el-card__body:hover {
- background: #8dc8f8;
+ background: #3664D9;
+ color: #fff;
cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
}
::v-deep.errleftvlue .el-card__body {
@@ -1784,7 +1825,9 @@
border-radius: 1px;
color: #ffffff;
}
-
+.button-textxga {
+ color: #de7897;
+}
::v-deep.el-radio-group {
span {
font-size: 24px;
--
Gitblit v1.9.3