From e13d441c36ac5581698850cbeaf35111cfb9b7f3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 05 八月 2024 17:37:37 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/patient/outpatient.vue | 17 ---
src/views/shortmessage/healthinformation/index.vue | 109 +++++++++------------
src/views/patient/patient/behospitalized.vue | 45 +++-----
src/views/knowledge/education/index.vue | 92 +++++++----------
4 files changed, 104 insertions(+), 159 deletions(-)
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index de1d072..ec87876 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -68,72 +68,52 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="瀹ｆ暀鏍囬" prop="userName">
+ <el-form-item label="閫氱煡鏍囬" prop="preachname">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.preachname"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閫傜敤绉戝" prop="region">
- <el-cascader
- v-model="queryParams.administrative"
- :options="deptList"
- :props="props"
- :show-all-levels="false"
- clearable
- >
- <template slot-scope="{ node, data }">
- <span>{{ data.deptName }}</span>
- <span v-if="!node.isLeaf">
- ({{ data.children.length }})
- </span>
- </template>
- </el-cascader>
- </el-form-item>
- <el-form-item label="閫氱煡鍐呭" prop="userName">
- <el-input
- v-model="queryParams.userNamevalue"
- placeholder="璇疯緭鍏�"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="閫傜敤鏂瑰紡" prop="shape">
- <el-cascader
- v-model="queryParams.shapevalue"
- :options="optionss"
- :props="propss"
- clearable
- ></el-cascader>
- </el-form-item>
- <el-form-item label="鍐呭褰㈠紡" prop="classify">
+ <el-form-item label="閫傜敤闄㈠尯" prop="region">
<el-select
- v-model="queryParams.classifyvalue"
- placeholder="璇烽�夋嫨"
+ v-model="campus"
+ size="medium"
+ multiple
+ filterable
+ placeholder="璇烽�夋嫨鍒嗙被"
>
<el-option
- v-for="(item, index) in editabshape"
+ v-for="item in courtyardlist"
:key="item.label"
:label="item.label"
- :value="item.value"
+ :value="item.label"
>
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="閫氱煡鍐呭" prop="userName">
+ <el-input
+ v-model="queryParams.preachcontent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
<el-form-item label="鍙敤鐘舵��" prop="classify">
<el-select
- v-model="queryParams.classifyvalue"
+ v-model="queryParams.isavailable"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in usable"
+ v-for="(item, index) in qyoptions"
:key="item.value"
- :label="item.value"
- :value="item.label"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -320,7 +300,7 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
size="medium"
type="text"
@click="goQRCode(scope.row)"
@@ -329,8 +309,8 @@
<span class="button-text"
><i class="el-icon-edit"></i>浜岀淮鐮�</span
></el-button
- >
- <el-button
+ > -->
+ <!-- <el-button
size="medium"
type="text"
@click="Vieweducation(scope.row)"
@@ -338,7 +318,7 @@
><span class="button-textck"
><i class="el-icon-edit"></i>鏌ョ湅</span
></el-button
- >
+ > -->
<el-button
size="medium"
type="text"
@@ -513,9 +493,11 @@
inputVisible: false,
illnessVisible: false, //鎸囨爣鐤剧梾寮规
deptOptions: [],
+ courtyardlist: [],
optionsillness: [],
illnesslistapi: [],
illnesslist: [],
+ campus: [],
defaultProps: {
children: "heLibraryAssortList",
label: "assortname",
@@ -559,6 +541,7 @@
}, //绫诲埆琛ㄥ崟
optionss: [],
mode: [],
+ qyoptions: [],
languagelist: [],
editabshape: [],
usable: [],
@@ -586,6 +569,8 @@
this.usable = store.getters.usable;
this.precedencetype = store.getters.precedencetype;
this.editabshape = store.getters.editabshape;
+ this.qyoptions = store.getters.usable;
+ this.courtyardlist = store.getters.courtyardlist;
},
methods: {
@@ -621,6 +606,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+ this.queryParams.campus = this.campus.join(",");
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -633,7 +619,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.userId);
+ this.ids = selection.map((item) => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@@ -647,24 +633,24 @@
handleUpdate(row) {
this.$router.push({
path: "/knowledge/education/compilequer/",
- query: { id: "1" },
+ query: { id: row.id },
});
},
// 鏌ョ湅瀹ｆ暀
Vieweducation() {
this.$router.push({
path: "/knowledge/education/examine/",
- query: { id: "1" },
+ query: { id: row.id },
});
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- const userIds = row.userId || this.ids;
+ const userIds = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
.then(function () {
- return delFollowupinfo(userIds);
+ return dellibraryinfo(userIds);
})
.then(() => {
this.getList();
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 1c2552d..cf5db95 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -11,18 +11,18 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="鎮ｈ�呭鍚�" prop="name">
+ <el-form-item label="濮撳悕" prop="name">
<el-input
- v-model="queryParams.name"
+ v-model="queryParams.patname"
placeholder="璇疯緭鍏ュ鍚�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呬綇闄㈠彿" prop="idcardno">
+ <el-form-item label="鎮ｈ�呯紪鍙�" prop="patid">
<el-input
- v-model="queryParams.idcardno"
+ v-model="queryParams.patid"
placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
clearable
style="width: 250px"
@@ -41,41 +41,28 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="绉戝/鐥呭尯" prop="tagId">
+ <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
<el-select v-model="queryParams.Patientid" placeholder="璇烽�夋嫨">
<el-option
- v-for="dict in dict.type.nursinggrade"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ v-for="item in Patientrange"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍏ラ櫌鏃堕棿" prop="entrytime">
+ <el-form-item label=" 鍏ラ櫌鏃ユ湡 " prop="createTime">
<el-date-picker
- v-model="queryParams.entrytime"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ clearable
+ v-model="queryParams.createTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
>
</el-date-picker>
</el-form-item>
- <el-form-item
- label="鍑洪櫌鏃堕棿"
- prop="departuretime
-"
- >
- <el-date-picker
- v-model="queryParams.departuretime"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
+
<el-row>
<el-form-item>
<el-button
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index f48528b..da3eef5 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -42,22 +42,7 @@
</el-select>
</el-form-item>
<el-row>
- <!-- <el-form-item label="鎮ｈ�呮爣绛�" prop="tagId">
- <el-select
- v-model="queryParams.tagIds"
- multiple
- filterable
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in optionstag"
- :key="item.tagid"
- :label="item.tagname"
- :value="item.tagid"
- >
- </el-option>
- </el-select>
- </el-form-item> -->
+
<el-form-item label=" 灏辫瘖鏃ユ湡 " prop="createTime">
<el-date-picker
clearable
diff --git a/src/views/shortmessage/healthinformation/index.vue b/src/views/shortmessage/healthinformation/index.vue
index e920c1d..1db7b88 100644
--- a/src/views/shortmessage/healthinformation/index.vue
+++ b/src/views/shortmessage/healthinformation/index.vue
@@ -68,72 +68,49 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="閫氱煡鏍囬" prop="userName">
+ <el-form-item label="閫氱煡鏍囬" prop="preachname">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.preachname"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閫傜敤绉戝" prop="region">
- <el-cascader
- v-model="queryParams.administrative"
- :options="deptList"
- :props="props"
- :show-all-levels="false"
- clearable
- >
- <template slot-scope="{ node, data }">
- <span>{{ data.deptName }}</span>
- <span v-if="!node.isLeaf">
- ({{ data.children.length }})
- </span>
- </template>
- </el-cascader>
- </el-form-item>
- <el-form-item label="閫氱煡鍐呭" prop="userName">
- <el-input
- v-model="queryParams.userNamevalue"
- placeholder="璇疯緭鍏�"
- clearable
- style="width: 200px"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="閫傜敤鏂瑰紡" prop="shape">
- <el-cascader
- v-model="queryParams.shapevalue"
- :options="optionss"
- :props="propss"
- clearable
- ></el-cascader>
- </el-form-item>
- <el-form-item label="鍐呭褰㈠紡" prop="classify">
+ <el-form-item label="閫傜敤闄㈠尯" prop="region">
<el-select
- v-model="queryParams.classifyvalue"
- placeholder="璇烽�夋嫨"
+ v-model="campus"
+ size="medium"
+ multiple
+ filterable
+ placeholder="璇烽�夋嫨鍒嗙被"
>
<el-option
- v-for="(item, index) in editabshape"
+ v-for="item in courtyardlist"
:key="item.label"
:label="item.label"
- :value="item.value"
+ :value="item.label"
>
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="閫氱煡鍐呭" prop="userName">
+ <el-input
+ v-model="queryParams.preachcontent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
<el-form-item label="鍙敤鐘舵��" prop="classify">
- <el-select
- v-model="queryParams.classifyvalue"
- placeholder="璇烽�夋嫨"
- >
+ <el-select v-model="queryParams.isavailable" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in usable"
+ v-for="(item, index) in qyoptions"
:key="item.value"
- :label="item.value"
- :value="item.label"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -221,7 +198,7 @@
prop="preachcontent"
:show-overflow-tooltip="true"
/>
-
+ <!--
<el-table-column
label="閫傜敤鐤剧梾"
align="center"
@@ -240,7 +217,7 @@
></el-button
>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鏍囩"
@@ -320,7 +297,7 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
size="medium"
type="text"
@click="goQRCode(scope.row)"
@@ -329,8 +306,8 @@
<span class="button-text"
><i class="el-icon-edit"></i>浜岀淮鐮�</span
></el-button
- >
- <el-button
+ > -->
+ <!-- <el-button
size="medium"
type="text"
@click="Vieweducation(scope.row)"
@@ -338,7 +315,7 @@
><span class="button-textck"
><i class="el-icon-edit"></i>鏌ョ湅</span
></el-button
- >
+ > -->
<el-button
size="medium"
type="text"
@@ -516,6 +493,7 @@
optionsillness: [],
illnesslistapi: [],
illnesslist: [],
+ qyoptions: [],
defaultProps: {
children: "heLibraryAssortList",
label: "assortname",
@@ -541,6 +519,7 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
+ courtyardlist: [],
// 琛ㄥ崟鍙傛暟
form: {},
numberlb: 22,
@@ -560,6 +539,7 @@
optionss: [],
mode: [],
languagelist: [],
+ campus: [],
editabshape: [],
usable: [],
precedencetype: [],
@@ -586,6 +566,8 @@
this.usable = store.getters.usable;
this.precedencetype = store.getters.precedencetype;
this.editabshape = store.getters.editabshape;
+ this.qyoptions = store.getters.usable;
+ this.courtyardlist = store.getters.courtyardlist;
},
methods: {
@@ -622,19 +604,24 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+ this.queryParams.campus = this.campus.join(",");
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
- this.resetForm("queryForm");
- this.queryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ isavailable: "",
+ hetype: 2,
+ },
+ this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.userId);
+ this.ids = selection.map((item) => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
@@ -649,24 +636,24 @@
handleUpdate(row) {
this.$router.push({
path: "/knowledge/Noticeparticulars",
- query: { id: "1" },
+ query: { id: row.id, hetype: 2 },
});
},
// 鏌ョ湅閫氱煡
Vieweducation() {
this.$router.push({
path: "/knowledge/education/examine/",
- query: { id: "1" },
+ query: { id: row.id },
});
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- const userIds = row.userId || this.ids;
+ const userIds = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
.then(function () {
- return delFollowupinfo(userIds);
+ return dellibraryinfo(userIds);
})
.then(() => {
this.getList();
--
Gitblit v1.9.3