From 1e60adac102dc1665eaab39ae0f81bff7ccb351d Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期日, 18 二月 2024 18:04:49 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijian/index.vue | 60 ++++++++++++++++++------------
src/api/hosp/project.js | 2
src/views/hosp/order/index.vue | 19 ++++++---
src/views/login.vue | 2
src/api/system/tijian.js | 2
src/views/team/reportresults/index.vue | 2 +
src/api/system/package.js | 2
src/views/team/disease/index.vue | 3 +
8 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/src/api/hosp/project.js b/src/api/hosp/project.js
index a380f4d..24afb08 100644
--- a/src/api/hosp/project.js
+++ b/src/api/hosp/project.js
@@ -11,7 +11,7 @@
// 鏌ヨ浣撴椤圭洰鍒楄〃(鏍戝舰缁撴瀯)
export function ProjectTree(data) {
return request({
- url: '/hosp/project/getlist',
+ url: '/hosp/project/getDxList',
method: 'get',
params: data
})
diff --git a/src/api/system/package.js b/src/api/system/package.js
index 17da341..bdca5ec 100644
--- a/src/api/system/package.js
+++ b/src/api/system/package.js
@@ -66,7 +66,7 @@
// 鍏ㄩ儴濂楅
export function getAllPackageList() {
return request({
- url: '/hosp/project/getlist',
+ url: '/hosp/project/getDxList',
method: 'get',
})
}
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index 2581c1a..11d9cd4 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -21,7 +21,7 @@
// 姣忎釜椤圭洰
export function projectGetList() {
return request({
- url: '/hosp/project/getlist',
+ url: '/hosp/project/getDxList',
method: 'get',
})
}
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 9c20890..49bc5b0 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -205,7 +205,7 @@
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
<div class="outside1">
- <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ <el-tree v-loading="loading" :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
@check-change="handleCurrentChecked">
</el-tree>
</div>
@@ -294,18 +294,18 @@
<!-- 娣诲姞琛ュ綍椤圭洰 -->
<el-dialog :title="title" :visible.sync="Projectopen1" width="980px" style="height: 860px" append-to-body>
<el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="6">
+ <el-col :span="8">
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
- <div class="outside1">
- <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ <div class="outside1" >
+ <el-tree v-loading="loading" :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
@check-change="handleCurrentChecked">
</el-tree>
</div>
</div>
</el-col>
- <el-col :span="18">
+ <el-col :span="15">
<div class="grid-content bg-purple">
<template>
<el-form :model="form">
@@ -801,6 +801,7 @@
// 琛ュ綍椤圭洰
handleProject(row) {
+ this.loading = true;
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
this.userId = row.userId;
@@ -818,12 +819,14 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
this.Treedata = response.data.list;
+ this.loading = false;
});
this.Projectopen = true;
this.title = "琛ュ綍椤圭洰";
},
// 琛ュ綍椤圭洰
handleProject1(row) {
+ this.loading = true;
this.orderId = this.ids;
this.cusId = this.cusIds;
this.userId = this.userIds;
@@ -841,6 +844,7 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
this.Treedata = response.data.list;
+ this.loading = false;
});
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
@@ -1055,7 +1059,10 @@
display: flex;
margin-top: 8px;
}
-
+.tab3{
+ max-height: 500px;
+ overflow-y:auto;
+}
.outside1 {
width: 700px;
display: flex;
diff --git a/src/views/login.vue b/src/views/login.vue
index cc9b420..146f1fc 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -60,7 +60,7 @@
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span>
+ <span>Copyright 漏 2023-2024璺嘲绉戞妧 All Rights Reserved.</span>
<!-- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span> -->
</div>
</div>
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 18e79dd..6ddedf0 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -901,7 +901,7 @@
cusPhone: [
{ required: true, message: "", trigger: "change" },
],
- cusBrithday: [
+ cusBrithday: [
{ required: true, message: "", trigger: "change" },
],
// cusNational: [
@@ -1548,7 +1548,7 @@
websocket.onclose = function () {
alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
};
- } else if (res.msg == "Y"){
+ } else if (res.msg == "Y") {
this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
this.$refs.aaa.title = "璇佷欢瀛楀吀";
@@ -1560,15 +1560,15 @@
},
handleChanges(param1) {
- if(this.form.pacCode == "涓嶈"){
+ if (this.form.pacCode == "涓嶈") {
this.form.cusIdcard = param1[0].xh;
- }else{
+ } else {
this.form.cusIdcard = param1[0].pacCode;
}
-
+
// this.form.cusName = param1[0].pacName;
// this.form.cusPhone = param1[0].pacRemark;
-
+
},
// selected(row, index) {
@@ -2073,6 +2073,21 @@
}
},
+ listgetOrder(data) {
+ getOrder(data).then((res) => {
+ this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ // this.dialogVisibles = true;
+ // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ //璋冩帴鍙ｆ樉绀哄妫�鍗�
+ const tjNumber = res.msg;
+ const viewNum = "792931586196398080";
+ const params = { viewNum, tjNumber };
+ this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
+ _this.confirm = true;
+ });
+ this.$tab.refreshPage();
+ },
+
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
@@ -2119,7 +2134,7 @@
this.tjFlowingWater = { copeWith, paidIn, discount };
let data;
- if (pacId) {
+ if (pacId || this.tjOrderList.length > 0) {
data = {
photo: this.srcUrl,
pacId,
@@ -2127,30 +2142,26 @@
tjFlowingWater: this.tjFlowingWater,
userId,
tjType,
- tjCategory:this.tjCategory
+ tjCategory: this.tjCategory
};
- } else {
+ this.listgetOrder(data)
+ } else if (pacId || this.tjOrderList.length > 0) {
data = {
photo: this.srcUrl,
tjOrderList: this.tjOrderList,
tjFlowingWater: this.tjFlowingWater,
userId,
tjType,
- tjCategory:this.tjCategory
+ tjCategory: this.tjCategory
};
+ this.listgetOrder(data)
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇烽�夋嫨濂楅!",
+ });
}
- getOrder(data).then((res) => {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- // this.dialogVisibles = true;
- // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
- //璋冩帴鍙ｆ樉绀哄妫�鍗�
- const tjNumber = res.msg;
- const viewNum = "792931586196398080";
- const params = { viewNum, tjNumber };
- this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
- _this.confirm = true;
- });
- this.$tab.refreshPage();
+
},
},
};
@@ -2159,8 +2170,9 @@
<style >
.el-form-item__error {
- display: none;
- }
+ display: none;
+}
+
.el-table__header-wrapper .el-checkbox {
display: none;
}
diff --git a/src/views/team/disease/index.vue b/src/views/team/disease/index.vue
index dafb05a..c3bca27 100644
--- a/src/views/team/disease/index.vue
+++ b/src/views/team/disease/index.vue
@@ -179,6 +179,7 @@
<el-table
border
:data="tableData1"
+ max-height="500"
style="width: 100%; margin-right: 10px"
@selection-change="handleSelectionChange"
>
@@ -190,7 +191,7 @@
>
</el-table-column>
</el-table>
- <el-table border :data="tableData2" style="width: 100%">
+ <el-table border :data="tableData2" max-height="500" style="width: 100%">
<el-table-column type="selection" width="40" align="center" />
<el-table-column prop="bingzhong" label="宸查�夌梾绉嶅悕绉�" align="center">
</el-table-column>
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index cb4b7af..91a168d 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -612,6 +612,8 @@
// }
.outside1 {
width: 500px;
+ max-height: 500px;
+ overflow-y:auto;
display: flex;
margin-top: 8px;
flex-direction: column;
--
Gitblit v1.8.0