From 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 31 一月 2024 09:37:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/enterprise/selectEmployees.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index d2cb3da..365c51c 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -54,6 +54,8 @@
val: '',
list: [],
price: '',
+ insuranceApplyId: '',
+ notInInsuranceApplyId: '',
seleData: [],
oldList: []
}
@@ -66,8 +68,17 @@
},
methods: {
open (title, obj) {
+ this.insuranceApplyId = ''
+ this.notInInsuranceApplyId = ''
this.price = obj.price
this.oldList = obj.arr
+ this.list = []
+ if (obj.insuranceApplyId) {
+ this.insuranceApplyId = obj.insuranceApplyId
+ }
+ if (obj.notInInsuranceApplyId) {
+ this.notInInsuranceApplyId = obj.notInInsuranceApplyId
+ }
this.title = title
this.visible = true
this.getList()
@@ -88,10 +99,13 @@
this.seleData.forEach(item => {
item.idCard = item.idcardNo
item.memberName = item.name
- item.workTypeName = ''
- item.worktypeId = ''
- item.duId = ''
- item.duName = ''
+ item.memberId = item.id
+ if (this.notInInsuranceApplyId) {
+ item.workTypeName = ''
+ item.worktypeId = ''
+ item.duId = ''
+ item.duName = ''
+ }
item.fee = this.price
})
this.$emit('result', this.seleData)
@@ -102,7 +116,9 @@
},
getList() {
findListByDTO({
- name: this.val
+ name: this.val,
+ insuranceApplyId: this.insuranceApplyId,
+ notInInsuranceApplyId: this.notInInsuranceApplyId
}).then(res => {
res.forEach(item => {
item.fee = ''
--
Gitblit v1.9.3