From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/selectEmployees.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index dfa5994..90c6943 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -81,6 +81,7 @@
confirming:false,
type: '',
val: '',
+ companyId: null,
memberIds:[],
loading:false,
memberList:[],
@@ -115,6 +116,7 @@
if (obj.type) {
this.type = obj.type
}
+ this.companyId = obj.companyId
this.list = []
if (obj.insuranceApplyId) {
this.insuranceApplyId = obj.insuranceApplyId
@@ -162,9 +164,6 @@
}
item.fee = this.price
})
-
- console.log(this.oldList)
- console.log(this.seleData)
this.confirming=false
this.$emit('result', this.seleData)
this.seleData=[]
@@ -197,6 +196,7 @@
this.loading = true;
findListByDTO({
name: query,
+ companyId: this.companyId,
insuranceApplyId: this.insuranceApplyId,
notInInsuranceApplyId: this.notInInsuranceApplyId,
validTime: this.validTime
--
Gitblit v1.9.3