From f0ad3b00ae1cdbd12f64d870927f96ec6b7593a3 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 21 六月 2024 12:03:04 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 8 ++++----
src/views/system/tijian/index.vue | 16 +++++++++++-----
src/views/doctor/test/index.vue | 10 +++++-----
src/api/system/user.js | 7 +++++++
vue.config.js | 4 ++--
src/views/doctor/imaging/index.vue | 10 +++++-----
6 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index b149e6f..6a38491 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -12,6 +12,13 @@
})
}
+export function getlistUser() {
+ return request({
+ url: '/system/user/getList',
+ method: 'get',
+ })
+}
+
// 鏌ヨ鐢ㄦ埛璇︾粏
export function getUser(userId) {
return request({
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index d33050b..50a6d96 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1156,7 +1156,7 @@
import { addBigPositive } from "@/api/doctor/bigPositive";
import { addReplylog, hzHasDept } from "@/api/hosp/replylog";
import { listHzlog, addHzlog, delHzlog, updateHzlog } from "@/api/hosp/hzlog";
-import { listUser } from "@/api/system/user";
+import { getlistUser } from "@/api/system/user";
import { getChildList } from "@/api/system/dept";
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
@@ -1306,9 +1306,9 @@
methods: {
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
- listUser().then((response) => {
- this.userList = response.rows;
- console.log(this.userList)
+
+ getlistUser().then((response) => {
+ this.userList = response.data;
this.userList.forEach((element) => {
const userName = this.$store.state.user.name;
if (userName == element.userName) {
diff --git a/src/views/doctor/imaging/index.vue b/src/views/doctor/imaging/index.vue
index d6c24db..554a7ad 100644
--- a/src/views/doctor/imaging/index.vue
+++ b/src/views/doctor/imaging/index.vue
@@ -215,9 +215,9 @@
<div style="font-size: 14px">
<table style="
width: 96%;
- height:70px
+ height:70px;
margin: 10px 10px;
- margin-bottom:10px
+ margin-bottom:10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
font-size:16px
@@ -456,7 +456,7 @@
import { addBigPositive } from "@/api/doctor/bigPositive";
import { addReplylog, hzHasDept } from "@/api/hosp/replylog";
import { listHzlog, addHzlog, delHzlog, updateHzlog } from "@/api/hosp/hzlog";
-import { listUser } from "@/api/system/user";
+import { getlistUser } from "@/api/system/user";
import { getChildList } from "@/api/system/dept";
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
@@ -583,9 +583,9 @@
methods: {
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
- listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
+ getlistUser().then(
(response) => {
- this.userList = response.rows;
+ this.userList = response.data;
this.userList.forEach((element) => {
const userName = this.$store.state.user.name;
if (userName == element.userName) {
diff --git a/src/views/doctor/test/index.vue b/src/views/doctor/test/index.vue
index 75f0146..479807c 100644
--- a/src/views/doctor/test/index.vue
+++ b/src/views/doctor/test/index.vue
@@ -214,9 +214,9 @@
<div style="font-size: 14px">
<table style="
width: 96%;
- height:70px
+ height:70px;
margin: 10px 10px;
- margin-bottom:10px
+ margin-bottom:10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
font-size:16px
@@ -454,7 +454,7 @@
addBigPositive
} from "@/api/doctor/bigPositive";
import { listHzlog, addHzlog, delHzlog, updateHzlog } from "@/api/hosp/hzlog";
-import { listUser } from "@/api/system/user";
+import { getlistUser } from "@/api/system/user";
import { getChildList } from "@/api/system/dept";
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", , "lj_positive"],
@@ -584,9 +584,9 @@
methods: {
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
- listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
+ getlistUser().then(
(response) => {
- this.userList = response.rows;
+ this.userList = response.data;
if (this.doctorName == null) {
this.userList.forEach((element) => {
const userName = this.$store.state.user.name;
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index c56e90d..885ecf0 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -645,7 +645,7 @@
</template>
</el-table-column>
</el-table>
- <div>鍚堣锛歿{ marryall }}鍏�</div>
+ <h3 style="font-weight: bold;">鍚堣锛歿{ marryall }}鍏�</h3>
<!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -1319,6 +1319,7 @@
table: false,
HistoryList: {},
index: 0,
+ names:"",
dictType: [
{
value: 0,
@@ -1348,7 +1349,7 @@
hospName: "",
currentDate: "",
currentTime: "",
- tjCategory: "",
+ tjCategory: "12",
formIn: {
tjPro: "浣撴璐�",
},
@@ -2460,15 +2461,20 @@
});
});
}
- this.checkedkey.push(this.Treedata[0].proId);
- let proId = this.Treedata[0].proId;
+ this.checkedkey.push("1735504273274236929");
+ let proId = "1735504273274236929";
+ this.Treedata.forEach(item =>{
+ if(proId == item.proId){
+ this.names = item.proName
+ }
+ })
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
this.TreedataList.forEach((item) => {
this.checkedListkey.push(item.proId);
this.DataList.push(item);
this.DataList.forEach((item) => {
- item.propinName = this.Treedata[0].proName;
+ item.propinName = this.names;
});
});
this.TotalPrice1 = 0;
diff --git a/vue.config.js b/vue.config.js
index 654d3ca..a9af51d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -52,8 +52,8 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `https://ltpeis.xaltjdkj.cn:5801/`,
- // target: `http://192.168.1.113:5011`,
+ // target: `https://ltpeis.xaltjdkj.cn:5801/`,
+ target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0