Merge remote-tracking branch 'origin/master'

jiangping

2024-03-05 a4fc9ef5d32a062a664bda212f9e50632e1b7a86

 company/src/components/enterprise/selectEmployees.vue

@@ -99,7 +99,8 @@
                }
                for (let i = 0; i < this.seleData.length; i++) {
                    for (let a = 0; a < this.oldList.length; a++) {
                        if (this.seleData[i].name === this.oldList[a].memberName || this.seleData[i].idCard === this.oldList[a].idcardNo) {
                        // this.seleData[i].name === this.oldList[a].memberName ||
                        if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
                            this.$message.warning(`[${this.seleData[i].name}]员工重复`)
                            return
                        }