From 81ffbda9c4396086a740c988ae634c57a27f868d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 01 四月 2025 17:40:25 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 329 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 224 insertions(+), 105 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 4d25298..81059ef 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -90,6 +90,17 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+ <el-form-item label="搴旈殢璁挎椂闂�">
+ <el-date-picker
+ v-model="dateRangefs"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
<el-form-item label="鎮ｈ�呭鍚�" prop="sendname">
<el-input
@@ -119,6 +130,17 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鎺掑簭鏂瑰紡" prop="status">
+ <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in topicoptionssort"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button
@@ -205,7 +227,7 @@
<el-table
v-loading="loading"
:data="userList"
- height="660"
+ height="808"
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
@@ -213,6 +235,8 @@
<el-table-column
label="浠诲姟鍚嶇О"
fixed
+ width="150"
+ show-overflow-tooltip
align="center"
key="taskName"
prop="taskName"
@@ -311,8 +335,8 @@
<el-table-column
label="闅忚浜哄憳"
align="center"
- key="createBy"
- prop="createBy"
+ key="updateBy"
+ prop="updateBy"
width="120"
/>
<el-table-column
@@ -349,6 +373,13 @@
</template></el-table-column
>
<el-table-column
+ label="涓绘不鍖荤敓"
+ width="120"
+ align="center"
+ key="drname"
+ prop="drname"
+ />
+ <el-table-column
label="鍑洪櫌澶╂暟"
width="120"
align="center"
@@ -380,13 +411,7 @@
key="nurseName"
prop="nurseName"
/>
- <el-table-column
- label="涓绘不鍖荤敓"
- width="120"
- align="center"
- key="drname"
- prop="drname"
- />
+
<!-- <el-table-column
label="鐥呭巻鍙�"
@@ -462,25 +487,31 @@
</el-table-column> -->
<el-table-column
label="浠诲姟缁撴灉璇存槑"
- width="200"
+ width="220"
align="center"
key="remark"
prop="remark"
>
<template slot-scope="scope" v-if="scope.row.remark">
- <el-tag
- type="warning"
- v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
- >{{ scope.row.remark }}</el-tag
+ <el-tooltip
+ :content="scope.row.remark"
+ placement="top"
+ effect="dark"
>
- <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+ <el-tag
+ type="warning"
+ v-if="scope.row.sendstate != 5 && scope.row.sendstate != 4"
+ >{{ scope.row.remark }}</el-tag
+ >
+ <el-tag type="warning" v-else>{{ scope.row.remark }}</el-tag>
+ </el-tooltip>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
align="center"
fixed="right"
- width="200"
+ width="300"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -522,6 +553,14 @@
><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
></el-button
>
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+ ><span class="button-textxga"
+ ><i class="el-icon-edit"></i>鎮ｈ�呰繃婊�</span
+ ></el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -536,56 +575,59 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀瑰奖鍍忛殢璁垮璇濇 -->
<el-dialog
- :title="title"
- :visible.sync="addalteropen"
- width="700px"
- append-to-body
+ :title="amendtag ? '淇敼鎮ｈ�呬俊鎭�' : '鏂板鎮ｈ��'"
+ :visible.sync="Labelchange"
+ width="900px"
>
- <el-form ref="form" :model="form" label-width="100px">
- <el-row :gutter="20">
- <el-col :span="12"
- ><el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="form.name"></el-input> </el-form-item
- ></el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24"
- ><el-form-item label="鎵�灞炵瀹�">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨绉戝">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select> </el-form-item></el-col
- ></el-row>
- <el-row :gutter="20">
- <el-col :span="24"
- ><el-form-item label="闅忚绫诲瀷">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨闅忚绫诲瀷">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select> </el-form-item
- ></el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24">
- <el-form-item label="鏈嶅姟妯″潡">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨妯″潡">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕" width="100" prop="name">
+ <el-input
+ v-model="form.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ maxlength="30"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鎬у埆" width="100" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+ <el-option
+ v-for="dict in sextype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input
+ v-model="form.age"
+ placeholder="璇疯緭鍏ュ勾榫�"
+ maxlength="30"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
- <el-row :gutter="20">
+
+ <el-row>
<el-col :span="24">
- <el-form-item label="褰卞儚闅忚瑕佹眰">
- <el-input type="textarea" v-model="form.desc"></el-input>
+ <el-form-item label="杩囨护鍘熷洜">
+ <el-input
+ v-model="form.notrequiredreason"
+ type="textarea"
+ placeholder="璇疯緭鍏ヨ繃婊ゅ師鍥�"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">鎻� 浜�</el-button>
- <el-button @click="cancel">杩� 鍥�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
<!-- 淇敼鍙戦�佹椂闂村璇濇 -->
@@ -665,7 +707,7 @@
</el-dialog>
<!-- 鍐嶆闅忚 -->
<el-dialog title="鎮ｈ�呭啀娆￠殢璁�" :visible.sync="dialogFormVisible">
- <el-form ref="form" :model="zcform" label-width="80px">
+ <el-form ref="zcform" :rules="zcrules" :model="zcform" label-width="80px">
<el-form-item label="浠诲姟鍚嶇О">
<el-input
style="width: 400px"
@@ -702,7 +744,7 @@
></el-input>
</el-form-item>
- <el-form-item label="闅忚鏂瑰紡">
+ <el-form-item label="闅忚鏂瑰紡" prop="resource">
<el-radio-group v-model="zcform.resource">
<el-radio label="1">鏈梾鍖洪殢璁�</el-radio>
<el-radio label="2">闅忚涓績闅忚</el-radio>
@@ -711,7 +753,7 @@
<!-- <el-form-item label="鍗冲埢鍙戦��">
<el-switch v-model="zcform.delivery"></el-switch>
</el-form-item> -->
- <el-form-item label="闅忚鏃堕棿">
+ <el-form-item label="闅忚鏃堕棿" prop="date1">
<el-date-picker
type="date"
placeholder="閫夋嫨鏃ユ湡"
@@ -739,7 +781,11 @@
resetUserPwd,
changeUserStatus,
} from "@/api/system/user";
-import { getTaskservelist, buidegetTasklist,addserviceSubtask } from "@/api/AiCentre/index";
+import {
+ getTaskservelist,
+ buidegetTasklist,
+ addserviceSubtask,
+} from "@/api/AiCentre/index";
import Treeselect from "@riophae/vue-treeselect";
import store from "@/store";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -777,6 +823,7 @@
initPassword: undefined,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ dateRangefs: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -785,6 +832,7 @@
zcform: {},
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
+ Labelchange: false,
ycvalue: "",
yfsvalue: "",
inputValue: "",
@@ -855,7 +903,14 @@
// value: 0,
// },
],
-
+ zcrules: {
+ date1: [
+ { required: true, message: "璇烽�夋嫨闅忚鏂瑰紡", trigger: "change" },
+ ],
+ resource: [
+ { required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" },
+ ],
+ },
// 琛ㄥ崟鍙傛暟
form: {
phonenumber: "",
@@ -865,10 +920,30 @@
qystatus: "",
btstatus: "",
},
+ topicoptionssort:[
+ {
+ value: 0,
+ label: "鍑洪櫌鏃堕棿(姝ｅ簭)",
+ },
+ {
+ value: 1,
+ label: "鍑洪櫌鏃堕棿(鍊掑簭)",
+ },
+ {
+ value: 2,
+ label: "鍙戦�佹椂闂�(姝ｅ簭)",
+ },
+ {
+ value: 3,
+ label: "鍙戦�佹椂闂�(鍊掑簭)",
+ },
+ ],
// 鏌ヨ鍙傛暟
topqueryParams: {
pageNum: 1,
pageSize: 10,
+ sendstate: 2,
+ sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 2,
searchscope: 3,
scopetype: [],
@@ -879,6 +954,10 @@
options: [],
topicoptions: [
+ {
+ value: null,
+ label: "鍏ㄩ儴",
+ },
{
value: 1,
label: "琛ㄥ崟宸查鍙�",
@@ -904,6 +983,16 @@
label: "宸插畬鎴�",
},
],
+ sextype: [
+ {
+ value: 1,
+ label: "鐢�",
+ },
+ {
+ value: 2,
+ label: "濂�",
+ },
+ ],
topicoptionsyj: [
{
value: 1,
@@ -914,6 +1003,7 @@
label: "姝ｅ父",
},
],
+ amendtag:false,
errtype: "",
leavehospitaldistrictcode: "",
serviceState: [],
@@ -954,13 +1044,19 @@
this.getList(1);
},
methods: {
- /** 鏌ヨ褰卞儚闅忚鏈嶅姟鍒楄〃 */
+ /** 鏌ヨ闅忚鏈嶅姟鍒楄〃 */
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);
}
@@ -972,7 +1068,14 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
- this.topqueryParams.deptOrDistrict=2,
+ if (
+ this.topqueryParams.leavehospitaldistrictcodes[0] &&
+ this.topqueryParams.leaveldeptcodes[0]
+ ) {
+ this.topqueryParams.deptOrDistrict = 2;
+ } else {
+ this.topqueryParams.deptOrDistrict = 1;
+ }
getTaskservelist(this.topqueryParams).then((response) => {
this.userList = response.rows[0].serviceSubtaskList;
this.total = response.total;
@@ -1108,11 +1211,7 @@
row.status = row.status === "0" ? "1" : "0";
});
},
- // 鍙栨秷鎸夐挳
- cancel() {
- this.addalteropen = false;
- this.reset();
- },
+
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -1140,10 +1239,14 @@
this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
+ console.log('1');
+
this.topqueryParams.pageNum = 1;
this.topqueryParams.startOutHospTime = this.dateRange[0];
this.topqueryParams.endOutHospTime = this.dateRange[1];
-
+ this.topqueryParams.startSendDateTime = this.dateRangefs[0];
+ this.topqueryParams.endSendDateTime = this.dateRangefs[1];
+ console.log('2');
this.getList(refresh);
},
// 鎮ｈ�呰寖鍥村鐞�
@@ -1168,10 +1271,13 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
+ this.dateRangefs = [];
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
serviceType: 2,
+ sort: 2,
+ sendstate: 2,
searchscope: 2,
};
this.handleQuery(1);
@@ -1229,24 +1335,28 @@
})
.catch(() => {});
},
-
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.Labelchange = false;
+ this.reset();
+ },
/** 鎻愪氦鎸夐挳 */
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
- if (this.form.userId != undefined) {
- updateUser(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
+ this.form.isoperation = 2;
+ this.form.notrequiredFlag = 1;
+ alterpatient(this.form)
+ .then((response) => {
+ console.log(response);
+ })
+ .then(() => {
this.getList(1);
+ this.$modal.msgSuccess("鎮ｈ�呰繃婊ゆ垚鍔�");
});
- } else {
- addUser(this.form).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList(1);
- });
- }
+
+ this.reset();
+ this.Labelchange = false;
}
});
},
@@ -1314,7 +1424,6 @@
if (row.preachformson) {
if (row.preachformson.includes("3")) {
type = 1;
- console.log(type, "rwo");
}
}
this.$router.push({
@@ -1348,8 +1457,6 @@
getTaskservelist({
patid: row.patid,
taskid: row.taskid,
- deptOrDistrict:2,
-
}).then((res) => {
if (res.code == 200) {
objson.sendstate = 4;
@@ -1364,6 +1471,14 @@
});
})
.catch(() => {});
+ },
+ // 鎮ｈ�呰繃婊よЕ鍙�
+ handleUpdate(row) {
+ particularpatient(row.patid).then((response) => {
+ this.form = response.data;
+ });
+ this.amendtag = true;
+ this.Labelchange = true;
},
// 渚挎嵎鎸夐挳
toleadExport(too) {
@@ -1394,28 +1509,32 @@
}
return "";
},
- // 鍒涘缓鍐嶆闅忚鏈嶅姟
- setupsubtask() {
- console.log(this.zcform);
- let form = structuredClone(this.zcform);
- form.longSendTime = this.formatTime(form.date1);
- if (form.resource) {
- if (form.resource == 2) {
- form.serviceType = 10;
+ // 鍒涘缓鍐嶆闅忚鏈嶅姟
+ setupsubtask() {
+ this.$refs["zcform"].validate((valid) => {
+ if (valid) {
+ let form = structuredClone(this.zcform);
+ form.longSendTime = this.formatTime(form.date1);
+ form.finishtime = "";
+ if (form.resource) {
+ if (form.resource == 2) {
+ form.serviceType = 10;
+ }
+ } else {
+ this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
+ }
+ form.id = null;
+ form.sendstate = 2;
+ form.preachform = form.preachformson;
+ addserviceSubtask(form).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("鍒涘缓鎴愬姛");
+ } else {
+ this.$modal.msgError("鍒涘缓澶辫触");
+ }
+ this.dialogFormVisible = false;
+ });
}
- } else {
- this.$modal.msgError("鏈�夋嫨闅忚鏂瑰紡");
- }
- form.id = null;
- form.sendstate = 2;
- form.preachform = form.preachformson;
- addserviceSubtask(form).then((res) => {
- if (res.code == 200) {
- this.$modal.msgSuccess("鍒涘缓鎴愬姛");
- }else{
- this.$modal.msgError("鍒涘缓澶辫触");
- }
- this.dialogFormVisible=false;
});
},
},
--
Gitblit v1.9.3