From 9a1a82e442721ce04a743381b278482487d6a60b Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 11 十二月 2024 15:20:35 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 126 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 51 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 7ad5da9..caa2199 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -91,7 +91,7 @@
type="primary"
icon="el-icon-search"
size="medium"
- @click="handleQuery"
+ @click="handleQuery(1)"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="medium" @click="resetQuery"
@@ -285,9 +285,7 @@
prop="endDay"
>
<template slot-scope="scope">
- <span>{{
- scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
- }}</span>
+ <span>{{ scope.row.endDay ? scope.row.endDay + "澶�" : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -366,7 +364,6 @@
width="200"
/>
<el-table-column
-
label="浠诲姟鎵ц鏂瑰紡"
align="center"
key="preachform"
@@ -375,13 +372,10 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
- <span v-for="item in scope.row.preachform"
- >{{ item }}銆�
- </span>
+ <span v-for="item in scope.row.preachform">{{ item }}銆� </span>
</template>
</el-table-column>
- <el-table-column
-
+ <!-- <el-table-column
label="浠诲姟鍙戦�佹祦绋�"
align="center"
key="serviceSubtaskRecordList"
@@ -394,18 +388,17 @@
>{{ item.remark }}銆�
</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
-
label="浠诲姟缁撴灉璇存槑"
- width="120"
+ width="200"
align="center"
key="remark"
prop="remark"
>
<template slot-scope="scope" v-if="scope.row.remark">
<el-tag
- type="success"
+ type="warning"
v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
>{{ scope.row.remark }}</el-tag
>
@@ -414,8 +407,8 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
-
align="center"
+ fixed="right"
width="200"
class-name="small-padding fixed-width"
>
@@ -653,6 +646,7 @@
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
inputValue: "",
+ preachform: "",
previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
radio: "",
radios: [],
@@ -682,7 +676,7 @@
loading: false,
cardlist: [
{
- name: "鍏ㄩ儴鏈嶅姟",
+ name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
{
@@ -690,7 +684,7 @@
value: 0,
},
{
- name: "涓嶆墽琛�",
+ name: "鎮ｈ�呰繃婊�",
value: 0,
},
{
@@ -702,13 +696,13 @@
value: 0,
},
{
- name: "琚鍙�",
+ name: "宸插畬鎴�",
value: 0,
},
- {
- name: "宸插彂閫佹湭棰嗗彇",
- value: 0,
- },
+ // {
+ // name: "宸插彂閫佹湭棰嗗彇",
+ // value: 0,
+ // },
],
pickerOptions: {
disabledDate(time) {
@@ -805,17 +799,17 @@
this.serviceState = store.getters.serviceState;
this.checkboxlist = store.getters.checkboxlist;
- this.getList();
+ this.getList(1);
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
},
activated() {
- this.getList();
+ this.getList(1);
},
methods: {
/** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
- getList() {
+ getList(refresh) {
if (this.topqueryParams.searchscope == 1) {
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
@@ -835,28 +829,44 @@
this.loading = true;
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
- this.cardlist[0].value =
- Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].ysf;
- this.cardlist[2].value = response.rows[0].wzx;
- this.cardlist[3].value = response.rows[0].yc;
- this.cardlist[4].value = response.rows[0].fssb;
- this.cardlist[5].value = response.rows[0].blq;
- this.cardlist[6].value = response.rows[0].yfs;
+ this.total = response.total;
+ if (refresh) {
+ this.cardlist[0].value =
+ Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
+ this.cardlist[1].value = response.rows[0].ysf;
+ this.cardlist[2].value = response.rows[0].wzx;
+ this.cardlist[3].value = response.rows[0].yc;
+ this.cardlist[4].value = response.rows[0].fssb;
+ this.cardlist[5].value = response.rows[0].blq;
+ }
+ // this.cardlist[6].value = response.rows[0].yfs;
+ this.loading = false;
this.userList.forEach((item) => {
+ let idArray = null;
if (item.endtime) {
item.endDay = this.daysBetween(item.endtime);
+ console.log(item.endDay, "鏃堕棿");
}
- const idArray = item.preachform.split(",");
- item.preachform = idArray.map((value) => {
- // 鏌ユ壘id瀵瑰簲鐨勫璞�
- const item = this.checkboxlist.find((item) => item.value == value);
- // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
- return item ? item.label : null;
- });
+ console.log(item, "item");
+ if (item.preachform) {
+ if (item.endtime) {
+ item.preachformson = item.preachform;
+ idArray = item.preachform.split(",");
+ console.log(idArray, "idArray111");
+ }
+ console.log(idArray, "idArray222");
+
+ item.preachform = idArray.map((value) => {
+ // 鏌ユ壘id瀵瑰簲鐨勫璞�
+ const item = this.checkboxlist.find(
+ (item) => item.value == value
+ );
+ // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
+ return item ? item.label : null;
+ });
+ }
});
this.total = response.total;
- this.loading = false;
});
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
@@ -916,7 +926,8 @@
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
+ handleQuery(refresh) {
+
if (this.topqueryParams.searchscope == 1) {
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
@@ -937,7 +948,7 @@
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
- this.getList();
+ this.getList(refresh);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
@@ -948,7 +959,7 @@
serviceType: 2,
searchscope: 2,
};
- this.handleQuery();
+ this.handleQuery(1);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -1012,13 +1023,13 @@
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
- this.getList();
+ this.getList(1);
});
} else {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList();
+ this.getList(1);
});
}
}
@@ -1033,7 +1044,7 @@
return delUser(userIds);
})
.then(() => {
- this.getList();
+ this.getList(1);
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
.catch(() => {});
@@ -1046,7 +1057,7 @@
return console.log("鍋滄鎴愬姛");
})
.then(() => {
- this.getList();
+ this.getList(1);
this.$modal.msgWarning("鍋滄鎴愬姛");
})
.catch(() => {});
@@ -1059,7 +1070,7 @@
return console.log("寮�鍚垚鍔�");
})
.then(() => {
- this.getList();
+ this.getList(1);
this.$modal.msgSuccess("寮�鍚垚鍔�");
})
.catch(() => {});
@@ -1072,7 +1083,7 @@
return console.log("閫変腑鎴愬姛");
})
.then(() => {
- this.getList();
+ this.getList(1);
this.$modal.msgSuccess("閲嶇疆鎴愬姛");
})
.catch(() => {});
@@ -1083,9 +1094,22 @@
},
// 璺宠浆璇︽儏椤�
Seedetails(row) {
+ let type = "";
+ console.log(row, "rwo");
+ if (row.preachformson) {
+ if (row.preachformson.includes("3")) {
+ type = 1;
+ console.log(type, "rwo");
+ }
+ }
this.$router.push({
path: "/followvisit/record/detailpage/",
- query: { taskid: row.taskid, patid: row.patid, id: row.id },
+ query: {
+ taskid: row.taskid,
+ patid: row.patid,
+ id: row.id,
+ Voicetype: type,
+ },
});
},
// 渚挎嵎鎸夐挳
--
Gitblit v1.9.3