From 4c9eab7cd2f92e6ebee76f38f1616cb3e5855697 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 10 四月 2025 10:46:27 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/outpatient/index.vue | 2
src/views/followvisit/technology/index.vue | 20 +-
src/views/patient/physical/index.vue | 2
src/views/patient/patient/physical.vue | 5
src/views/followvisit/SpecificDisease/index.vue | 20 +-
vue.config.js | 2
src/views/patient/medtechnician/SpecializedService.vue | 72 ++++++-
src/views/patient/patient/outpatient.vue | 93 ++++++++-
src/views/patient/medtechnician/PatientChart.vue | 10
src/views/patient/questionnaire/index.vue | 20 +-
src/views/patient/subsequent/index.vue | 2
src/views/followvisit/record/index.vue | 20 +-
src/views/followvisit/record/detailpage/index.vue | 2
src/views/patient/patient/operation.vue | 5
src/views/patient/patient/hospital.vue | 101 +++++++---
src/views/patient/patient/behospitalized.vue | 105 +++++++---
src/api/knowledge/questionbank.js | 4
src/views/followvisit/discharge/index.vue | 27 +-
src/views/patient/ycquestionnaire/index.vue | 20 +-
19 files changed, 356 insertions(+), 176 deletions(-)
diff --git a/src/api/knowledge/questionbank.js b/src/api/knowledge/questionbank.js
index 66c03f7..7849081 100644
--- a/src/api/knowledge/questionbank.js
+++ b/src/api/knowledge/questionbank.js
@@ -1,11 +1,11 @@
import request from '@/utils/request'
import { parseStrEmpty } from "@/utils/ruoyi";//澶勭悊瀛楃涓�,und,null杞崲涓�'';
-// 鏌ヨ棰樺簱鍒楄〃
+//
export function listpatient(query) {
return request({
url: '/smartor/patarchive/list',
method: 'get',
params: query
})
-};
\ No newline at end of file
+};
diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index 8d3f8b2..0dd7ee7 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -301,7 +301,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -822,10 +822,10 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
@@ -982,12 +982,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index e3cebd3..b79f155 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -338,7 +338,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -751,7 +751,7 @@
<!-- <el-form-item label="鍗冲埢鍙戦��">
<el-switch v-model="zcform.delivery"></el-switch>
</el-form-item> -->
- <el-form-item label="闅忚鏃堕棿" prop="date1">
+ <el-form-item label="闅忚瀹屾垚鏃堕棿" prop="date1">
<el-date-picker
type="date"
placeholder="閫夋嫨鏃ユ湡"
@@ -874,19 +874,14 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
},
-
- // {
- // name: "寮傚父",
- // value: 0,
- // },
{
name: "鍙戦�佸け璐�",
value: 0,
@@ -1118,12 +1113,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index fdb6fa4..35ac394 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -292,7 +292,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 3f1578b..05bfbc9 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -88,7 +88,7 @@
<el-table-column
prop="finishtime"
align="center"
- label="瀹屾垚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
width="200"
show-overflow-tooltip
>
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 841150b..a246c81 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -325,7 +325,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -847,10 +847,10 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
@@ -1026,12 +1026,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index 469f342..eec3dd4 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -314,7 +314,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -803,10 +803,10 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
@@ -995,12 +995,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/src/views/patient/medtechnician/PatientChart.vue b/src/views/patient/medtechnician/PatientChart.vue
index f21143c..8f2022d 100644
--- a/src/views/patient/medtechnician/PatientChart.vue
+++ b/src/views/patient/medtechnician/PatientChart.vue
@@ -789,8 +789,14 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.topqueryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.topqueryParams= {
+ pageNum: 1,
+ pageSize: 10,
+ type: 3,
+ userName: undefined,
+ tagid: undefined,
+ topic: undefined,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index 5b29d2a..bce4d80 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -60,18 +60,13 @@
></el-input>
</el-form-item>
<el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
- <el-select
- v-model="topqueryParams.searchscope"
- placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
- >
- <el-option
- v-for="item in source"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-cascader
+ v-model="topqueryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
</el-form-item>
<el-form-item label="浠诲姟缁勭姸鎬�" prop="status">
@@ -246,7 +241,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -652,6 +647,22 @@
ruleForm: {
type: [],
},
+ sourcetype: [
+ {
+ value: 1,
+ label: "绉戝",
+ children: [],
+ },
+ {
+ value: 2,
+ label: "鐥呭尯",
+ children: [],
+ },
+ {
+ value: 3,
+ label: "鍏ㄩ儴",
+ },
+ ],
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
inputValue: "",
@@ -757,6 +768,9 @@
serviceType: 2,
sendstate:2,
searchscope: 2,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
propss: { multiple: true },
options: [],
@@ -807,7 +821,18 @@
created() {
this.serviceState = store.getters.serviceState;
this.checkboxlist = store.getters.checkboxlist;
-
+ this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+ return {
+ label: dept.deptName,
+ value: dept.deptCode,
+ };
+ });
+ this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+ return {
+ label: dept.districtName,
+ value: dept.districtCode,
+ };
+ });
this.getList();
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
@@ -905,6 +930,25 @@
this.addalteropen = false;
this.reset();
},
+ // 鎮ｈ�呰寖鍥村鐞�
+ handleChange(value) {
+ let type = value[0];
+ let code = value.slice(-1)[0];
+ this.topqueryParams.leavehospitaldistrictcodes = [];
+ this.topqueryParams.leaveldeptcodes = [];
+
+ if (type == 1) {
+ this.topqueryParams.leaveldeptcodes.push(code);
+ this.topqueryParams.leavehospitaldistrictcodes = [];
+ this.topqueryParams.searchscope = 1;
+ } else if (type == 2) {
+ this.topqueryParams.leavehospitaldistrictcodes.push(code);
+ this.topqueryParams.leaveldeptcodes = [];
+ this.topqueryParams.searchscope = 2;
+ } else {
+ this.topqueryParams.searchscope = 3;
+ }
+ },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index 3c386b7..529717a 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -44,20 +44,15 @@
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
- <el-select
- v-model="queryParams.searchscope"
- placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
- >
- <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-cascader
+ v-model="queryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
+ </el-form-item>
<el-form-item label=" 鍏ラ櫌鏃ユ湡 " prop="createTime">
<el-date-picker
v-model="dateRange"
@@ -218,14 +213,14 @@
align="center"
key="deptname"
prop="deptname"
- width="120"
+ width="180"
/>
<el-table-column
label="鐥呭尯"
align="center"
key="leavehospitaldistrictname"
prop="leavehospitaldistrictname"
- width="120"
+ width="180"
/>
<!-- <el-table-column
label="搴婁綅鍙�"
@@ -253,7 +248,6 @@
label="鎿嶄綔"
fixed="right"
align="center"
- width="160"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
@@ -453,6 +447,22 @@
label: "鐥呭尯鎮ｈ��",
},
],
+ sourcetype: [
+ {
+ value: 1,
+ label: "绉戝",
+ children: [],
+ },
+ {
+ value: 2,
+ label: "鐥呭尯",
+ children: [],
+ },
+ {
+ value: 3,
+ label: "鍏ㄩ儴",
+ },
+ ],
// 琛ㄥ崟鍙傛暟
form: {
name: "",
@@ -508,11 +518,9 @@
pageSize: 10,
cry: 0,
searchscope: 2,
- idcardno: undefined,
- name: undefined,
- status: undefined,
- tagIds: undefined,
- telcode: undefined,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -572,25 +580,28 @@
this.getList();
this.listDept();
this.gettabList();
+ this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+ return {
+ label: dept.deptName,
+ value: dept.deptCode,
+ };
+ });
+ this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+ return {
+ label: dept.districtName,
+ value: dept.districtCode,
+ };
+ });
},
methods: {
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
this.loading = true;
- if (this.queryParams.searchscope == 1) {
- this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ if (this.queryParams.searchscope == 3) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- this.queryParams.leavehospitaldistrictcodes = null;
- } else if (this.queryParams.searchscope == 2) {
- this.queryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- this.queryParams.leaveldeptcodes = null;
- } else {
- this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.queryParams.leavehospitaldistrictcodes =
+ this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
listpatient(this.queryParams).then((response) => {
@@ -605,6 +616,25 @@
this.deptList = res.data;
console.log(this.deptList, "this.deptList");
});
+ },
+ // 鎮ｈ�呰寖鍥村鐞�
+ handleChange(value) {
+ let type = value[0];
+ let code = value.slice(-1)[0];
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.leaveldeptcodes = [];
+
+ if (type == 1) {
+ this.queryParams.leaveldeptcodes.push(code);
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.searchscope = 1;
+ } else if (type == 2) {
+ this.queryParams.leavehospitaldistrictcodes.push(code);
+ this.queryParams.leaveldeptcodes = [];
+ this.queryParams.searchscope = 2;
+ } else {
+ this.queryParams.searchscope = 3;
+ }
},
/** 鏌ヨ鏍囩鍒楄〃 */
gettabList() {
@@ -671,7 +701,12 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams= {
+ pageNum: 1,
+ pageSize: 10,
+ cry: 0,
+ searchscope: 2,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 1a0f749..1e274a2 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -47,20 +47,15 @@
</el-form-item>
- <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
- <el-select
- v-model="queryParams.searchscope"
- placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
- >
- <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-cascader
+ v-model="queryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
+ </el-form-item>
<el-form-item label=" 鍑洪櫌鏃ユ湡 " prop="createTime">
<el-date-picker
v-model="dateRange"
@@ -488,6 +483,22 @@
idcardtype: "",
relativetelcode: "",
},
+ sourcetype: [
+ {
+ value: 1,
+ label: "绉戝",
+ children: [],
+ },
+ {
+ value: 2,
+ label: "鐥呭尯",
+ children: [],
+ },
+ {
+ value: 3,
+ label: "鍏ㄩ儴",
+ },
+ ],
//瀵煎叆杩涘害
dractive: 1,
// 瀵煎叆灞曠ず琛ㄥ崟
@@ -532,11 +543,9 @@
pageSize: 10,
cry: 1,
searchscope:2,
- idcardno: undefined,
- name: undefined,
- status: undefined,
- tagIds: undefined,
- telcode: undefined,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -551,7 +560,18 @@
},
},
created() {
-
+ this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+ return {
+ label: dept.deptName,
+ value: dept.deptCode,
+ };
+ });
+ this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+ return {
+ label: dept.districtName,
+ value: dept.districtCode,
+ };
+ });
this.getList();
this.listDept();
this.gettabList();
@@ -559,20 +579,11 @@
methods: {
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
- if (this.queryParams.searchscope == 1) {
- this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ if (this.queryParams.searchscope == 3) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
- this.queryParams.leavehospitaldistrictcodes=null;
- } else if (this.queryParams.searchscope == 2) {
- this.queryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- this.queryParams.leaveldeptcodes=null;
- } else {
- this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.queryParams.leavehospitaldistrictcodes =
+ this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
this.loading = true;
@@ -602,6 +613,25 @@
console.log(response);
this.optionstag = response.rows;
});
+ },
+ // 鎮ｈ�呰寖鍥村鐞�
+ handleChange(value) {
+ let type = value[0];
+ let code = value.slice(-1)[0];
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.leaveldeptcodes = [];
+
+ if (type == 1) {
+ this.queryParams.leaveldeptcodes.push(code);
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.searchscope = 1;
+ } else if (type == 2) {
+ this.queryParams.leavehospitaldistrictcodes.push(code);
+ this.queryParams.leaveldeptcodes = [];
+ this.queryParams.searchscope = 2;
+ } else {
+ this.queryParams.searchscope = 3;
+ }
},
// 鏌ヨ瀵煎叆灞曠ず鍒楄〃
geterryList() {
@@ -654,7 +684,12 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams={
+ pageNum: 1,
+ pageSize: 10,
+ cry: 1,
+ searchscope:2,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/patient/operation.vue b/src/views/patient/patient/operation.vue
index cbb99ef..7af715a 100644
--- a/src/views/patient/patient/operation.vue
+++ b/src/views/patient/patient/operation.vue
@@ -608,7 +608,10 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams= {
+ pageNum: 1,
+ pageSize: 10,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index 9045b31..027a9e5 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -21,32 +21,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呯紪鍙�" prop="patid">
+ <el-form-item label="闂ㄨ瘖鍙�" prop="patid">
<el-input
v-model="queryParams.patid"
- placeholder="璇疯緭鍏ユ偅鑰呯紪鍙�"
+ placeholder="璇疯緭鍏ラ棬璇婂彿"
clearable
style="width: 250px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呰寖鍥�" prop="tagId">
- <el-select v-model="queryParams.Patientid" placeholder="璇烽�夋嫨">
- <el-option
- 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="status">
+ <el-cascader
+ v-model="queryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
+ </el-form-item>
<el-row>
- <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="createTime">
+ <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
<el-date-picker
clearable
- v-model="queryParams.createTime"
+ v-model="queryParams.admitdate"
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
@@ -396,6 +394,7 @@
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import store from "@/store";
export default {
name: "Userhuanze",
@@ -470,6 +469,22 @@
children: "children",
label: "label",
},
+ sourcetype: [
+ {
+ value: 1,
+ label: "绉戝",
+ children: [],
+ },
+ {
+ value: 2,
+ label: "鐥呭尯",
+ children: [],
+ },
+ {
+ value: 3,
+ label: "鍏ㄩ儴",
+ },
+ ],
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -489,6 +504,10 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ searchscope: 2,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -545,6 +564,18 @@
},
},
created() {
+ this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+ return {
+ label: dept.deptName,
+ value: dept.deptCode,
+ };
+ });
+ this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+ return {
+ label: dept.districtName,
+ value: dept.districtCode,
+ };
+ });
this.getList();
this.gettabList();
},
@@ -552,8 +583,14 @@
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
this.loading = true;
+ if (this.queryParams.searchscope == 3) {
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
+ }
listPatouthosp(this.queryParams).then((response) => {
- console.log(response);
this.userList = response.rows;
this.total = response.total;
this.loading = false;
@@ -572,6 +609,25 @@
console.log(response);
this.optionstag = response.rows;
});
+ },
+ // 鎮ｈ�呰寖鍥村鐞�
+ handleChange(value) {
+ let type = value[0];
+ let code = value.slice(-1)[0];
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.leaveldeptcodes = [];
+
+ if (type == 1) {
+ this.queryParams.leaveldeptcodes.push(code);
+ this.queryParams.leavehospitaldistrictcodes = [];
+ this.queryParams.searchscope = 1;
+ } else if (type == 2) {
+ this.queryParams.leavehospitaldistrictcodes.push(code);
+ this.queryParams.leaveldeptcodes = [];
+ this.queryParams.searchscope = 2;
+ } else {
+ this.queryParams.searchscope = 3;
+ }
},
// 鏌ヨ瀵煎叆灞曠ず鍒楄〃
geterryList() {
@@ -622,7 +678,10 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams= {
+ pageNum: 1,
+ pageSize: 10,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 90f9831..30228ec 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -779,7 +779,10 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams= {
+ pageNum: 1,
+ pageSize: 10,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 7ea596b..eed2493 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -295,7 +295,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index 0258c6a..5ffff7d 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -280,7 +280,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -719,10 +719,10 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
@@ -879,12 +879,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 86907d2..0129364 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -296,7 +296,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
diff --git a/src/views/patient/ycquestionnaire/index.vue b/src/views/patient/ycquestionnaire/index.vue
index b0e44de..03f7754 100644
--- a/src/views/patient/ycquestionnaire/index.vue
+++ b/src/views/patient/ycquestionnaire/index.vue
@@ -280,7 +280,7 @@
width="120"
/>
<el-table-column
- label="闅忚鏃堕棿"
+ label="闅忚瀹屾垚鏃堕棿"
sortable
align="center"
prop="finishtime"
@@ -719,10 +719,10 @@
name: "鍑洪櫌鏈嶅姟鎬婚噺",
value: 0,
},
- {
- name: "鎮ｈ�呰繃婊�",
- value: 0,
- },
+ // {
+ // name: "鎮ｈ�呰繃婊�",
+ // value: 0,
+ // },
{
name: "搴旈殢璁�",
value: 0,
@@ -879,12 +879,12 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].wzx;
- this.cardlist[2].value = response.rows[0].ysf;
+ // this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[1].value = response.rows[0].ysf;
this.ycvalue = response.rows[0].yc;
- this.cardlist[3].value = response.rows[0].fssb;
- this.cardlist[4].value = response.rows[0].dfs;
- this.cardlist[5].value = response.rows[0].yfs2;
+ this.cardlist[2].value = response.rows[0].fssb;
+ this.cardlist[3].value = response.rows[0].dfs;
+ this.cardlist[4].value = response.rows[0].yfs2;
this.yfsvalue = response.rows[0].yfs;
}
this.loading = false;
diff --git a/vue.config.js b/vue.config.js
index 5f156f6..e576a70 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,7 +38,7 @@
// target: `http://192.168.68.111:8095`,
// target: `http://10.202.20.185:8095`,
// target: `http://192.168.100.184:8095`,
- target:`http://localhost:8095`,
+ target:`http://localhost:8096`,
// target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
// target: `http://192.168.191.181:8095`,
--
Gitblit v1.9.3