From 2f919191f1c7739eb0ef54392cd265284b55af9e Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 29 一月 2024 19:58:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- company/src/components/enterprise/selectEmployees.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 7 deletions(-) diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue index c25116c..d2cb3da 100644 --- a/company/src/components/enterprise/selectEmployees.vue +++ b/company/src/components/enterprise/selectEmployees.vue @@ -10,26 +10,31 @@ <el-table :data="list" border + @selection-change="handleSelectionChange" style="width: 100%"> + <el-table-column + type="selection" + width="55"> + </el-table-column> <el-table-column label="搴忓彿" width="80px"> <template slot-scope="scope"> <span>{{scope.$index + 1}}</span> </template> </el-table-column> <el-table-column - prop="date" + prop="name" label="濮撳悕"> </el-table-column> <el-table-column - prop="name" + prop="idcardNo" label="韬唤璇佸彿"> </el-table-column> <el-table-column - prop="address" + prop="duName" label="娲鹃仯鍗曚綅"> </el-table-column> <el-table-column - prop="address" + prop="workTypeName" label="鎵�灞炲伐绉�"> </el-table-column> </el-table> @@ -47,7 +52,10 @@ data () { return { val: '', - list: [] + list: [], + price: '', + seleData: [], + oldList: [] } }, created () { @@ -57,16 +65,49 @@ }) }, methods: { - open (title) { + open (title, obj) { + this.price = obj.price + this.oldList = obj.arr this.title = title this.visible = true this.getList() + }, + confirm() { + if (this.seleData.length === 0) { + this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�') + return + } + 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.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`) + return + } + } + } + this.seleData.forEach(item => { + item.idCard = item.idcardNo + item.memberName = item.name + item.workTypeName = '' + item.worktypeId = '' + item.duId = '' + item.duName = '' + item.fee = this.price + }) + this.$emit('result', this.seleData) + this.visible = false + }, + handleSelectionChange (e) { + this.seleData = e }, getList() { findListByDTO({ name: this.val }).then(res => { - this.list = [] + res.forEach(item => { + item.fee = '' + }) + this.list = res }) } } -- Gitblit v1.9.3