From 03e883d19ea0ec1a32b406e802d1730fb61e24f4 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 12 八月 2025 17:40:21 +0800
Subject: [PATCH] 1
---
src/views/doctor/check/index.vue | 60 +++++++++++++++++++----------
src/views/reservation/reservations/index.vue | 8 +++
src/views/system/biol/index.vue | 6 +-
3 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 42cc11b..f4fee88 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1909,23 +1909,40 @@
}, */
bzxz() {
this.taocan = true;
- this.titles = "";
- var deptAdviceList1 = [];
- let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
- getAdviceByTjNumAndPro(data).then((res) => {
- if (res.data) {
- this.deptAdviceList3 = res.data;
- if (this.proParentList.xiaoJieIds) {
- this.proParentList.xiaoJieIds.forEach((item) => {
- this.deptAdviceList3.forEach((items) => {
- if (item == items.id) {
- deptAdviceList1.push(items);
- }
- });
- });
- this.deptAdviceList1 = [...new Set(deptAdviceList1)];
- } else if(this.proParentList.xiaoJieIds == null){
- this.deptAdviceList1 = [];
+ var deptAdviceList1 = []
+ // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
+ // getAdviceByTjNumAndPro(data).then((res) => {
+ // if (res.data) {
+ // this.deptAdviceList3 = res.data;
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ if (this.vaids.length != 0) {
+ const result = this.vaids.reduce((acc, item) => {
+ const matches = this.deptAdviceList.filter(items => {
+ return item == items.id; // 鎴� === 鏍规嵁闇�姹�
+ });
+ return acc.concat(matches);
+ }, []);
+ deptAdviceList1 = result;
+
+ return this.deptAdviceList1 = [
+ ...new Set(deptAdviceList1),
+ ];
+ } else {
+ this.proParentList.xiaoJieIds.forEach(item => {
+ this.deptAdviceList.forEach((items) => {
+ if (item == items.id) {
+ deptAdviceList1.push(items)
+ }
+ });
+ })
+ return this.deptAdviceList1 = [
+ ...new Set(deptAdviceList1),
+ ];
+ }
+
+
+ } else if (this.proParentList.xiaoJieIds == null) {
+ this.deptAdviceList1 = []
}
// this.deptAdviceList1 = [
@@ -1935,8 +1952,8 @@
// this.idss.push(items.id);
// this.remakes += items.advice + ",";
// });
- }
- });
+ // }
+ // });
},
result() {
@@ -2004,12 +2021,13 @@
},
quxiao(){
this.taocan = false;
- this.deptAdviceList1 = []
+ this.deptAdviceList1 = []
},
queding() {
if (this.proParentList.xiaoJie.length != 0) {
this.remakes = "";
this.titles = "";
+ this.vaids = []
this.deptAdviceList1.forEach((item1) => {
if (this.proParentList.remark != null) {
this.titles += item1.title + ",";
@@ -2696,7 +2714,7 @@
});
}
}
-
+
if (this.minedis == false) {
let data = [
{
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index d039963..eca2e6d 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -2172,6 +2172,7 @@
sex: null,
phoe: "",
nation: null,
+ companyId:null,
email: "",
marriage: null,
address: "",
@@ -2605,6 +2606,7 @@
handleUpdate(row) {
this.title = "淇敼浣撴棰勭害";
this.formIn = row;
+
this.form.tjType = this.formIn.tjType;
if (this.formIn.timeRegion === 0) {
this.formIn.timeRegion = "8:00-9:00";
@@ -3143,7 +3145,8 @@
isExpire: this.formIn.isExpire,
address: this.formIn.address,
company: this.formIn.company,
- department: this.formIn.department,
+ companyId: this.formIn.companyId,
+ marriage: this.formIn.marriage,
discount: this.discount,
email: this.formIn.email,
idCard: this.formIn.idCard,
@@ -3170,6 +3173,7 @@
address: this.formIn.address,
company: this.formIn.company,
department: this.formIn.department,
+ companyId: this.formIn.companyId,
discount: this.discount,
email: this.formIn.email,
idCard: this.formIn.idCard,
@@ -3233,6 +3237,7 @@
address: this.formIn.address,
company: this.formIn.company,
department: this.formIn.department,
+ companyId: this.formIn.companyId,
discount: this.discount,
email: this.formIn.email,
idCard: this.formIn.idCard,
@@ -3259,6 +3264,7 @@
address: this.formIn.address,
company: this.formIn.company,
department: this.formIn.department,
+ companyId: this.formIn.companyId,
discount: this.discount,
email: this.formIn.email,
idCard: this.formIn.idCard,
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index f1acf0d..2fa304a 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -530,9 +530,9 @@
</el-dialog>
<!--:before-close="handleClose" -->
<el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
- <el-form :model="forms" ref="form" :inline="true" label-width="76px" style="margin-top: 10px">
- <el-form-item label="" prop="radios">
- <el-select filterable v-model="forms.radios" placeholder="璇烽�夋嫨鎵撳嵃鍋ュ悍妫�鏌ヨ〃绫诲瀷" clearable
+ <el-form :model="forms" ref="form" style="margin-top: 10px; width: 100%">
+ <el-form-item label="" prop="radios" style="width: 100%">
+ <el-select filterable v-model="forms.radios" placeholder="璇烽�夋嫨鎵撳嵃鍋ュ悍妫�鏌ヨ〃绫诲瀷" clearable style="width: 100%"
>
<el-option v-for="dict in radiosList" :key="dict.dictValue" :label="dict.dictLabel"
:value="dict.dictValue" />
--
Gitblit v1.8.0