From 88481a34a70b92804b622c1fcaa3f1c3e01f5402 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 17 三月 2025 11:25:11 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/discharge/index.vue | 131 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 2dfd732..50992c8 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
@@ -213,14 +224,16 @@
<el-table-column
label="浠诲姟鍚嶇О"
fixed
+ width="150"
+ show-overflow-tooltip
align="center"
key="taskName"
prop="taskName"
- width="180"
/>
<!-- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" /> -->
<el-table-column
label="濮撳悕"
+ width="100"
align="center"
key="sendname"
prop="sendname"
@@ -262,7 +275,7 @@
</div>
<div v-if="scope.row.sendstate == 2">
<el-tag type="primary" :disable-transitions="false"
- >寰呮墽琛�</el-tag
+ >寰呴殢璁�</el-tag
>
</div>
<div v-if="scope.row.sendstate == 3">
@@ -295,7 +308,7 @@
/>
<el-table-column
- label="浜哄伐澶勭悊鎰忚"
+ label="澶勭悊鎰忚"
align="center"
key="suggest"
prop="suggest"
@@ -398,7 +411,7 @@
/> -->
<!-- <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> -->
- <!-- <el-table-column label="鎬у埆" align="center" key="sex" prop="sex" /> -->
+ <!-- <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="绉戝"
@@ -462,25 +475,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
+ <template slot-scope="scope" v-if="scope.row.remark">
+ <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">
@@ -665,7 +684,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 +721,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 +730,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 +758,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 +800,7 @@
initPassword: undefined,
// 鏃ユ湡鑼冨洿
dateRange: [],
+ dateRangefs: [],
// 宀椾綅閫夐」
postOptions: [],
ruleForm: {
@@ -842,7 +866,7 @@
value: 0,
},
{
- name: "寰呮墽琛�",
+ name: "寰呴殢璁�",
value: 0,
},
{
@@ -855,7 +879,14 @@
// value: 0,
// },
],
-
+ zcrules: {
+ date1: [
+ { required: true, message: "璇烽�夋嫨闅忚鏂瑰紡", trigger: "change" },
+ ],
+ resource: [
+ { required: true, message: "璇烽�夋嫨闅忚鏃堕棿", trigger: "blur" },
+ ],
+ },
// 琛ㄥ崟鍙傛暟
form: {
phonenumber: "",
@@ -869,6 +900,8 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
+ sendstate: 2,
+ sort: 2, //0 鍑洪櫌鏃堕棿(姝ｅ簭) 1 鍑洪櫌鏃堕棿(鍊掑簭) 2 鍙戦�佹椂闂�(姝ｅ簭) 3 鍙戦�佹椂闂�(鍊掑簭)
serviceType: 2,
searchscope: 3,
scopetype: [],
@@ -885,7 +918,7 @@
},
{
value: 2,
- label: "寰呮墽琛�",
+ label: "寰呴殢璁�",
},
{
value: 3,
@@ -972,6 +1005,14 @@
console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
+ 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;
@@ -1142,7 +1183,8 @@
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];
this.getList(refresh);
},
// 鎮ｈ�呰寖鍥村鐞�
@@ -1167,11 +1209,14 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
+ this.dateRangefs = [];
this.topqueryParams = {
pageNum: 1,
pageSize: 10,
serviceType: 2,
+ sendstate: 2,
searchscope: 2,
+ sort: 2,
};
this.handleQuery(1);
},
@@ -1313,7 +1358,6 @@
if (row.preachformson) {
if (row.preachformson.includes("3")) {
type = 1;
- console.log(type, "rwo");
}
}
this.$router.push({
@@ -1391,28 +1435,31 @@
}
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);
+ 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