From 83898e6b7ff3996fcef889042442a25753b07dea Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 24 九月 2024 14:00:24 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 327 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 279 insertions(+), 48 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 3d30a2e..bd9c873 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -13,9 +13,9 @@
<el-form-item label="浠诲姟鍚嶇О">
<el-input v-model="topqueryParams.taskName"></el-input>
</el-form-item>
- <el-form-item label="鍙戣捣浜�">
+ <!-- <el-form-item label="鍙戣捣浜�">
<el-input v-model="topqueryParams.createBy"></el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="瀹℃牳鏃堕棿">
<el-date-picker
v-model="dateRange"
@@ -38,13 +38,39 @@
</el-option>
</el-select>
</el-form-item> -->
- <el-form-item label="妯℃澘鍚嶇О" prop="status">
- <el-input v-model="topqueryParams.templatename"></el-input>
+ <el-form-item label="鎮h�呭鍚�" prop="sendname">
+ <el-input v-model="topqueryParams.sendname" placeholder="璇疯緭鍏ユ偅鑰呭鍚�"></el-input>
</el-form-item>
- <el-form-item label="鍑洪櫌闅忚鐘舵��" prop="status">
+ <el-form-item label="鎮h�呮潵婧�" prop="status">
+ <el-select
+ v-model="topqueryParams.searchscope"
+ placeholder="璇烽�夋嫨鎮h�呮潵婧�"
+ >
+ <el-option
+ v-for="item in source"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="闅忚鐘舵��" prop="status">
<el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
<el-option
v-for="item in topicoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁撴灉鐘舵��" prop="status">
+ <el-select v-model="topqueryParams.excep" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in topicoptionsyj"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -74,7 +100,6 @@
icon="el-icon-plus"
size="medium"
@click="handleAdd"
- v-hasPermi="['system:user:add']"
>鏂板</el-button
>
</el-col>
@@ -173,36 +198,174 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
+ <el-table-column
+ label="浠诲姟鍚嶇О"
+ align="center"
+ key="taskName"
+ prop="taskName"
+ width="180"
+ />
+ <!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
<el-table-column
label="濮撳悕"
- fixed
align="center"
key="sendname"
prop="sendname"
/>
<el-table-column
+ label="韬唤璇佸彿鐮�"
+ width="200"
+ align="center"
+ key="sfzh"
+ prop="sfzh"
+ />
+ <el-table-column
+ label="闅忚鐘舵��"
+ align="center"
+ key="sendstate"
+ prop="sendstate"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <div v-if="scope.row.sendstate == 1">
+ <el-tag type="primary"
+ :disable-transitions="false">琚鍙�</el-tag></div>
+ <div v-if="scope.row.sendstate == 2">
+ <el-tag type="primary"
+ :disable-transitions="false">寰呭彂閫�</el-tag>
+ </div>
+ <div v-if="scope.row.sendstate == 3"> <el-tag type="success"
+ :disable-transitions="false">宸插彂閫�</el-tag></div>
+ <div v-if="scope.row.sendstate == 4"> <el-tag type="info"
+ :disable-transitions="false">涓嶆墽琛�</el-tag></div>
+ <div v-if="scope.row.sendstate == 5"> <el-tag type="danger"
+ :disable-transitions="false">鍙戦�佸け璐�</el-tag></div>
+ <div v-if="scope.row.sendstate == 6"> <el-tag type="danger"
+ :disable-transitions="false">宸插畬鎴�</el-tag></div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ label="缁撴灉鐘舵��"
+ align="center"
+ key="excep"
+ prop="excep"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <div v-if="scope.row.sendstate == 6">
+ <dict-tag
+ :options="dict.type.sys_yujing"
+ :value="scope.row.excep"
+ />
+ </div>
+ <div v-else>
+ <span></span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="澶勭悊鎰忚"
+ align="center"
+ key="suggest"
+ prop="suggest"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_suggest"
+ :value="scope.row.suggest"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鍑洪櫌鏃ユ湡"
+ width="200"
+ align="center"
+ key="endtime"
+ prop="endtime"
+ >
+ <template slot-scope="scope">
+ <span>{{ formatTime(scope.row.endtime) }}</span>
+ </template></el-table-column
+ >
+ <el-table-column
+ label="搴旈殢璁挎棩鏈�"
+ width="200"
+ align="center"
+ key="longSendTime"
+ prop="longSendTime"
+ >
+ <template slot-scope="scope">
+ <span>{{ formatTime(scope.row.longSendTime) }}</span>
+ </template></el-table-column
+ >
+ <el-table-column
+ label="鍑洪櫌澶╂暟"
+ width="120"
+ align="center"
+ key="endDay"
+ prop="endDay"
+ >
+ <template slot-scope="scope">
+ <span>{{
+ scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="璐d换鎶ゅ+"
+ width="120"
+ align="center"
+ key="nurseName"
+ prop="nurseName"
+ />
+ <el-table-column
+ label="涓绘不鍖荤敓"
+ width="120"
+ align="center"
+ key="drname"
+ prop="drname"
+ />
+ <el-table-column
+ label="闅忚寮傚父璁板綍"
+ width="120"
+ align="center"
+ key="remark"
+ prop="remark"
+ />
+
+
+ <!-- <el-table-column
label="鐥呭巻鍙�"
align="center"
sortable
key="medicalRecordNo"
prop="medicalRecordNo"
width="120"
- />
+ /> -->
- <el-table-column label="骞撮緞" align="center" key="age" prop="age" />
- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" />
- <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" />
+ <!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
+ <!-- <el-table-column label="鎬у埆" 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="leavehospitaldistrictname"
+ prop="leavehospitaldistrictname"
+ width="120"
+ >
+ </el-table-column>
+
+ <!-- <el-table-column
label="鐤剧梾鍚嶇О"
align="center"
key="icdName"
@@ -210,41 +373,42 @@
width="120"
:show-overflow-tooltip="true"
>
- </el-table-column>
- <el-table-column
- label="浠诲姟鍚嶇О"
- align="center"
- key="taskName"
- prop="taskName"
- width="120"
- />
+ </el-table-column> -->
<el-table-column
- label="闅忚鏂瑰紡锛堥渶璋冩暣鏍煎紡锛�"
+ label="妯℃澘鍚嶇О"
align="center"
- key="serviceform"
- prop="serviceform"
- width="120"
+ key="templatename"
+ prop="templatename"
+ width="200"
/>
+
<el-table-column
label="闅忚浜哄憳"
align="center"
- key="operator"
- prop="operator"
+ key="createBy"
+ prop="createBy"
width="120"
/>
+ <!-- <el-table-column
+ label="璐d换鍖诲笀"
+ align="center"
+ key="drname"
+ prop="drname"
+ width="120"
+ /> -->
- <el-table-column
- label="灏辫瘖鏃堕棿"
+ <!-- <el-table-column
+ label="鍑洪櫌鏃堕棿"
sortable
align="center"
- prop="admindate"
+ prop="createTime"
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.admindate) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column
label="闅忚鏃堕棿"
sortable
@@ -254,7 +418,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.sendType != 3">{{
- parseTime(scope.row.createTime)
+ formatTime(scope.row.createTime)
}}</span>
<span v-else>鍗冲埢鍙戦��</span>
</template>
@@ -270,7 +434,7 @@
<span>{{ parseTime(scope.row.finishtime) }}</span>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="闅忚鐘舵��"
fixed="right"
align="center"
@@ -282,7 +446,7 @@
<template slot-scope="scope">
<dict-tag :options="serviceState" :value="scope.row.sendstate" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鎿嶄綔"
@@ -335,11 +499,7 @@
><span class="button-zx"><i class="el-icon-s-order"></i></span
></el-button>
</el-tooltip> -->
- <el-button
- size="medium"
- type="text"
- @click="Seedetails(scope.row)"
- v-hasPermi="['system:user:edit']"
+ <el-button size="medium" type="text" @click="Seedetails(scope.row)"
><span class="button-zx"
><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
></el-button
@@ -504,8 +664,8 @@
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
- name: "User",
- dicts: ["sys_normal_disable", "sys_user_sex"],
+ name: "Discharge",
+ dicts: ["sys_normal_disable", "sys_user_sex", "sys_yujing", "sys_suggest"],
components: { Treeselect },
data() {
return {
@@ -555,6 +715,20 @@
},
value: [],
list: [],
+ source: [
+ {
+ value: 0,
+ label: "鎵�灞炴偅鑰�",
+ },
+ {
+ value: 1,
+ label: "绉戝鎮h��",
+ },
+ {
+ value: 2,
+ label: "鐥呭尯鎮h��",
+ },
+ ],
loading: false,
states: [
"Alabama",
@@ -650,7 +824,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- serviceType:2,
+ serviceType: 2,
},
propss: { multiple: true },
options: [],
@@ -667,6 +841,28 @@
{
value: 3,
label: "宸插彂閫�",
+ },
+ {
+ value: 4,
+ label: "涓嶆墽琛�",
+ },
+ {
+ value: 5,
+ label: "鍙戦�佸け璐�",
+ },
+ {
+ value: 6,
+ label: "宸插畬鎴�",
+ },
+ ],
+ topicoptionsyj: [
+ {
+ value: 1,
+ label: "寮傚父",
+ },
+ {
+ value: 0,
+ label: "姝e父",
},
],
serviceState: [],
@@ -691,9 +887,30 @@
methods: {
/** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
getList() {
+ if (this.topqueryParams.searchscope == 1) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes=null;
+ } else if (this.topqueryParams.searchscope == 2) {
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ this.topqueryParams.leaveldeptcodes=null;
+ } else {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ }
this.loading = true;
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows;
+ this.userList.forEach((item) => {
+ if (item.endtime) {
+ item.endDay = this.daysBetween(item.endtime);
+ }
+ });
this.total = response.total;
this.loading = false;
});
@@ -756,15 +973,29 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ if (this.topqueryParams.searchscope == 1) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes=null;
+ } else if (this.topqueryParams.searchscope == 2) {
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ this.topqueryParams.leaveldeptcodes=null;
+ } else {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ }
this.topqueryParams.pageNum = 1;
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
- this.resetForm("queryForm");
- this.topqueryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.topqueryParams = {};
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -902,7 +1133,7 @@
Seedetails(row) {
this.$router.push({
path: "/followvisit/record/detailpage/",
- query: { taskid: row.taskid, patid: row.patid },
+ query: { taskid: row.taskid, patid: row.patid,id: row.id},
});
},
// 瀵煎叆鎸夐挳
--
Gitblit v1.9.3