From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/reinsurance.vue | 162 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 127 insertions(+), 35 deletions(-)
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index cd566c5..8fffa28 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -15,13 +15,13 @@
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
- @change="changeApplyStartTime"
- v-model="form.applyStartTime"
- type="date"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd"
- format="yyyy 骞� MM 鏈� dd 鏃�"
- placeholder="閫夋嫨鏃ユ湡">
+ @change="changeApplyStartTime"
+ v-model="form.applyStartTime"
+ type="date"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
<span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
@@ -70,15 +70,16 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
- label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+ label="淇濆崟鏃堕暱锛堝ぉ锛�">
</el-table-column>
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -105,13 +106,14 @@
</div>
</div>
<el-table
- :data="activeName === '0' ? form.addDetailList : form.delDetailList"
- border
- show-summary
- :summary-method="getSummaries"
- ref="multipleTable"
- @selection-change="handleSelectionChange"
- style="width: 100%;margin-bottom: 15px;">
+ v-if="activeName === '0'"
+ :data="form.addDetailList"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
<el-table-column
type="selection"
width="55">
@@ -122,14 +124,17 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="memberName"
label="濮撳悕">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="idCard"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ :key="Math.random()"
label="骞撮緞">
<template slot-scope="{row}">
<template v-if="item">
@@ -139,21 +144,83 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="workTypeName"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
+ :key="Math.random()"
+ prop="fee"
label="璐圭敤">
- <template slot-scope="{row}">
- <span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>-{{row.fee}}</span>
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table
+ v-if="activeName === '1'"
+ :data="form.delDetailList"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
+ <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
+ :key="Math.random()"
+ prop="memberName"
+ label="濮撳悕">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="idCard"
+ label="韬唤璇佸彿">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="骞撮緞">
+ <template slot-scope="{row}">
+ <template v-if="item">
+ <span style="color: red;" v-if="(getAgeByIdCard(row.idCard) < item.minAge) || (getAgeByIdCard(row.idCard) > item.maxAge)">{{getAgeByIdCard(row.idCard)}}</span>
+ <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
+ </template>
+ </template>
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="duName"
+ label="娲鹃仯鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="workTypeName"
+ label="鎵�灞炲伐绉�">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="fee"
+ label="璐圭敤">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
@@ -161,9 +228,9 @@
</el-table-column>
</el-table>
<div class="info" v-if="item">
- <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
- <span v-if="item.specialInfo">{{item.specialInfo}}</span>
- <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+ <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+ <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
+ <span v-if="item.ortherInfo" v-html="item.ortherInfo"> </span>
</div>
<!-- 閫夋嫨鍛樺伐 -->
<selectEmployees ref="selectEmployees" @result="getValue" />
@@ -185,6 +252,7 @@
import confirmJobType from '@/components/enterprise/confirmJobType'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { update, getChangeCountCyclePriceVO, applyChagneDetailList } from '@/api/business/applyChange'
export default {
name: 'reinsurance',
@@ -202,6 +270,7 @@
addDetailList: [],
delDetailList: [],
},
+ newVersionSolutionId: '',
activeName: '0',
pickerOptions: {},
price: '',
@@ -263,7 +332,7 @@
item.fee = res.cyclePrice
})
this.form.delDetailList.forEach(item => {
- item.fee = res.cyclePrice
+ item.fee = -res.cyclePrice
})
})
},
@@ -273,7 +342,7 @@
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [0]
}).then(res => {
res.forEach(item => {
@@ -287,32 +356,51 @@
this.form.addDetailList = res
})
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [1]
}).then(res => {
res.forEach(item => {
- item.fee = ''
+ // item.fee = ''
item.idCard = item.memberIdcardNo
- item.workTypeName = ''
- item.worktypeId = ''
- item.duName = ''
- item.duId = ''
+ // item.workTypeName = ''
+ // item.worktypeId = ''
+ // item.duName = ''
+ // item.duId = ''
})
this.form.delDetailList = res
})
getDetail(this.form.id)
.then(res => {
+ console.log(res)
this.list.push(res)
+ this.item = res
this.endTime = res.endTime
this.form.solutionId = res.solutionId
+ this.newVersionSolutionId = res.newVersionSolutionId
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
+ }
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+ // return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
}
};
- this.changeSolution1(res.solutionId)
+ // this.changeSolution1(res.solutionId)
})
},
getSummaries(param) {
@@ -328,13 +416,17 @@
this.form.addDetailList.forEach(item => {
total += item.fee
})
- sums[index] = total
+ sums[index] = total.toFixed(2)
return
} else {
this.form.delDetailList.forEach(item => {
total += item.fee
})
- sums[index] = '-' + total
+ // if (total < 0) {
+ sums[index] = total.toFixed(2)
+ // } else {
+ // sums[index] = '-' + total
+ // }
return
}
sums[index] = ''
@@ -500,7 +592,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
--
Gitblit v1.9.3