From cca6dd93779040e13d52981a55afd2dd7ee17b90 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 12 六月 2024 17:16:03 +0800
Subject: [PATCH] sssssssssss
---
company/src/components/enterprise/selectEmployees.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/company/src/components/enterprise/selectEmployees.vue b/company/src/components/enterprise/selectEmployees.vue
index db719bb..dfa5994 100644
--- a/company/src/components/enterprise/selectEmployees.vue
+++ b/company/src/components/enterprise/selectEmployees.vue
@@ -6,35 +6,39 @@
:confirm-working="isWorking"
@confirm="confirm"
>
+ <div style="display: inline-block;padding: 20px 10px;color: red" class="el-upload__tip" >
+ 鎿嶄綔鎻愮ず锛� 璇峰湪涓嬮潰鎼滅储妗嗗唴杈撳叆鍛樺伐濮撳悕鎴栬韩浠借瘉鍙疯繘琛屽憳宸ヤ俊鎭悳绱紝骞堕�夋嫨鍛樺伐杩涜鎿嶄綔
+ </div>
<el-select
- v-model="memberIds"
+ value-key="id"
+ v-model="seleData"
filterable
multiple
remote
- style="margin-bottom: 15px;width: 50%;margin-right: 10px"
- placeholder="璇疯緭鍏ュ憳宸ュ鍚嶆垨韬唤璇佸彿"
+ style="margin-bottom: 15px;width: 100%;margin-right: 10px"
+ placeholder="璇疯緭鍏ュ憳宸ュ鍚嶆垨韬唤璇佸彿杩涜閫夋嫨"
:remote-method="searchSelData"
:loading="loading">
<el-option
v-for="item in memberList"
:key="item.id"
:label="item.name+' ' +(item.idcardNo||'')"
- :value="item.id">
+ :value="item">
</el-option>
</el-select>
<!--
<el-input v-model="val" placeholder="璇疯緭鍏ュ憳宸ュ鍚嶅悗锛岀偣鍑绘悳绱㈡寜閽垨鑰呮寜涓媏nter閿繘琛屾煡璇�" @keypress.enter.native="getList" style="margin-bottom: 15px;width: 50%;margin-right: 10px"></el-input>
-->
- <el-button type="primary" @click="getList" style="width: 100px;">鎼滅储</el-button>
+<!-- <el-button type="primary" @click="getList" style="width: 100px;">鎼滅储</el-button>-->
<el-table
- :data="list"
+ :data="seleData"
border
- @selection-change="handleSelectionChange"
+ selection-change1="handleSelectionChange"
style="width: 100%">
- <el-table-column
+<!-- <el-table-column
type="selection"
width="55">
- </el-table-column>
+ </el-table-column>-->
<el-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
@@ -103,6 +107,11 @@
this.price = obj.price
this.confirming=false
this.oldList = obj.arr
+ // this.seleData = obj.arr || []
+ this.memberIds=[]
+ this.seleData=[]
+ this.memberList=[]
+ this.confirming=false
if (obj.type) {
this.type = obj.type
}
@@ -126,14 +135,16 @@
}
this.confirming=true
if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ this.$message.warning('鑷冲皯鎼滅储閫夋嫨涓�浣嶅憳宸ヨ繘琛屾搷浣�')
+ this.confirming=false
return
}
for (let i = 0; i < this.seleData.length; i++) {
for (let a = 0; a < this.oldList.length; a++) {
// this.seleData[i].name === this.oldList[a].memberName ||
- if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
+ if (this.seleData[i].idcardNo === this.oldList[a].idCard) {
this.$message.warning(`[${this.seleData[i].name}]鍛樺伐閲嶅`)
+ this.confirming=false
return
}
}
@@ -142,6 +153,7 @@
item.idCard = item.idcardNo
item.memberName = item.name
item.memberId = item.id
+ item.reducePrice = item.fee
if (this.notInInsuranceApplyId || this.type == 1) {
item.workTypeName = ''
item.worktypeId = ''
@@ -150,8 +162,12 @@
}
item.fee = this.price
})
- this.$emit('result', this.seleData)
+
+ console.log(this.oldList)
+ console.log(this.seleData)
this.confirming=false
+ this.$emit('result', this.seleData)
+ this.seleData=[]
this.visible = false
},
handleSelectionChange (e) {
--
Gitblit v1.9.3