Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/enterprise/selectEmployees.vue

@@ -51,11 +51,13 @@
        components: { GlobalWindow },
        data () {
            return {
                type: '',
                val: '',
                list: [],
                price: '',
                insuranceApplyId: '',
                notInInsuranceApplyId: '',
                validTime: '',
                seleData: [],
                oldList: []
            }
@@ -70,14 +72,21 @@
            open (title, obj) {
                this.insuranceApplyId = ''
                this.notInInsuranceApplyId = ''
                this.val = ''
                this.price = obj.price
                this.oldList = obj.arr
                if (obj.type) {
                    this.type = obj.type
                }
                this.list = []
                if (obj.insuranceApplyId) {
                    this.insuranceApplyId = obj.insuranceApplyId
                }
                if (obj.notInInsuranceApplyId) {
                    this.notInInsuranceApplyId = obj.notInInsuranceApplyId
                }
                if (obj.validTime) {
                    this.validTime = obj.validTime
                }
                this.title = title
                this.visible = true
@@ -100,7 +109,7 @@
                    item.idCard = item.idcardNo
                    item.memberName = item.name
                    item.memberId = item.id
                    if (this.notInInsuranceApplyId) {
                    if (this.notInInsuranceApplyId || this.type == 1) {
                        item.workTypeName = ''
                        item.worktypeId = ''
                        item.duId = ''
@@ -118,7 +127,8 @@
                findListByDTO({
                    name: this.val,
                    insuranceApplyId: this.insuranceApplyId,
                    notInInsuranceApplyId: this.notInInsuranceApplyId
                    notInInsuranceApplyId: this.notInInsuranceApplyId,
                    validTime: this.validTime
                }).then(res => {
                    res.forEach(item => {
                        item.fee = ''