From b6d2a806e6572ffc4c226c91f0a60b31a7b1fbc0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 5f75645..9dbd1e4 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -151,7 +151,7 @@
import { all, getNewVersion } from '@/api/business/solutions'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
- name: 'OperaInsuranceApplyWindow',
+ name: 'OperaInsuranceApplyWindow2',
extends: BaseOpera,
components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
data () {
@@ -163,6 +163,7 @@
applyStartTime: '',
applyEndTime: ''
},
+ type: '',
pickerOptions: {}, // 瀛樻斁picker options鐨勫彉閲�
price: '',
company: [],
@@ -192,6 +193,9 @@
this.tableData = []
this.form.id = null
this.item = null
+ if (target.type) {
+ this.type = target.type
+ }
this.form.solutionId = ''
this.form.applyStartTime = ''
this.form.applyEndTime = ''
@@ -216,8 +220,15 @@
findList({ applyId: this.form.id })
.then(res => {
res.forEach(item => {
+ console.log(item)
item.idCard = item.idcardNo
item.fee = ''
+ if (this.type === 1) {
+ item.duName = ''
+ item.duId = ''
+ item.worktypeId = ''
+ item.workTypeName = ''
+ }
})
this.tableData = res
})
@@ -252,7 +263,7 @@
}
this.seleData.forEach(item => {
this.tableData.forEach((row, index) => {
- if (item === row.name) {
+ if (item === row.idCard) {
this.tableData.splice(index, 1)
}
})
@@ -427,7 +438,7 @@
getUser(obj) {
this.seleData.forEach(id => {
this.tableData.forEach(row => {
- if (id === row.id) {
+ if (id === row.idCard) {
row.workTypeName = obj.workTypeName
row.worktypeId = obj.worktypeId
row.duName = obj.duName
@@ -482,7 +493,7 @@
return sexAndAge.age
},
handleSelectionChange (e) {
- this.seleData = e.map(item => item.id)
+ this.seleData = e.map(item => item.idCard)
},
getValue(list) {
this.tableData.push(...list)
--
Gitblit v1.9.3