From fb66c7aafd8d7ef6f4be05a0c12cfa3c4ca84863 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 15 七月 2024 13:48:41 +0800
Subject: [PATCH] qxtj
---
src/views/reservation/reservations/index.vue | 17 ++++++++++++++---
src/views/reservation/resercopy/index.vue | 12 +++++++++++-
src/views/system/tijianall/index.vue | 4 ++--
3 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index e79c40c..6a43536 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -123,7 +123,9 @@
align="center"
prop="company"
width="200"
- />
+ >
+
+ </el-table-column>
<!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
<el-table-column label="濮撳悕" align="center" prop="name" width="75" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="75">
@@ -869,6 +871,14 @@
handleFileSuccess(response, file, fileList) {
this.ListObj = response.data;
this.userList = response.data.list;
+ this.userList.forEach(item => {
+ this.CompanyList.forEach (item1 => {
+ if(item1.drugManufacturerId ==this.objs.drugManufacturerId ){
+ item.company = item1.cnName
+ }
+ })
+
+ })
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 280ab4b..c1c568f 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -1110,7 +1110,10 @@
}
if (this.formIn.isExpire === 2) {
this.drawer = true;
- this.discount = this.formIn.discount;
+ if( this.formIn.discount!= null){
+ this.discount = this.formIn.discount;
+ }
+
//鍏ㄩ儴濂楅
if (this.formIn.sex != null) {
let cusSex = this.formIn.sex;
@@ -1218,7 +1221,10 @@
this.tijiao1 = false;
}
this.drawer1 = true;
- this.discount = this.formIn.discount;
+ if( this.formIn.discount != null){
+ this.discount = this.formIn.discount;
+
+ }
//鍏ㄩ儴濂楅
if (this.formIn.sex != null) {
let cusSex = this.formIn.sex;
@@ -1256,10 +1262,13 @@
this.loading = false;
});
}
- let cusId = this.formIn.idCard;
+ let id = this.formIn.id;
this.list1 = true;
(this.tableData1 = []),
(this.newpacName = []),
+ getReservation(id).then((response) => {
+ if (response.data) {
+ let cusId = response.data.idCard;
getTransitionList(cusId).then((response) => {
if (response.data) {
this.tableData1 = response.data;
@@ -1286,6 +1295,8 @@
this.list1 = true;
}
});
+ }
+ })
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 0e68b0a..cdb2c5c 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -404,7 +404,7 @@
<el-tab-pane label="缁勫悎" name="third">
<div class="tab8">
<el-row :gutter="20" style="width: 100%">
- <el-col :span="8">
+ <el-col :span="6">
<div
style="
text-align: center;
@@ -524,7 +524,7 @@
</el-tree> -->
<!-- </div> -->
<el-row :gutter="20" style="width: 100%">
- <el-col :span="8">
+ <el-col :span="6">
<div
style="
text-align: center;
--
Gitblit v1.8.0