From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/insuranceApply.vue | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 30 deletions(-)
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 9f674f5..4a49a27 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -3,15 +3,18 @@
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
- <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="寰呭鏍�" value="0"></el-option>
- <el-option label="寰呭嚭鍗�" value="1"></el-option>
- <el-option label="寰呯缃�" value="7"></el-option>
- <el-option label="淇濋殰涓�" value="2"></el-option>
- <el-option label="宸茶繃鏈�" value="3"></el-option>
- <el-option label="宸查��鍥�" value="4"></el-option>
- <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
- <el-option label="宸插叧闂�" value="6"></el-option>
+ <el-select v-model="statusCollect" placeholder="璇烽�夋嫨" @change="changeStatus">
+ <el-option
+ v-for="(item, index) in status"
+ :key="index"
+ :label="item.label"
+ :value="item.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
+ <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="鐩翠繚鎶曚繚" :value="0"></el-option>
+ <el-option label="濮旀墭鎶曚繚" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
@@ -52,6 +55,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="$refs.chooseCompany.open('閫夋嫨闇�瑕佹姇淇濈殑浼佷笟')">鏂板</el-button></li>
+ </ul>
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -62,9 +68,13 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
+ <el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ <span style="color: #666;" v-if="[9,25,27,5].includes(row.status) && ['宸插叧闂�','宸茶繃鏈�'].includes(row.statusInfo)">{{row.statusInfo}}</span>
+ <span style="color: red;" v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'">{{ row.statusInfo}}</span>
+ <span style="color: #f95601;" v-else-if="[5,27].includes(row.status) && row.statusInfo === '寰呯敓鏁�'">{{ row.statusInfo}}</span>
+ <span style="color: #216EEE;" v-else-if="[12].includes(row.status) && row.statusInfo === '寰呭鏍�'">{{ row.statusInfo}}</span>
+ <span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionsName" fixed label="淇濋櫓鏂规" align="center" min-width="150"></el-table-column>
@@ -79,26 +89,36 @@
<span>{{row.code ? row.code : '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="insureNum" align="center" label="鎶曚繚浜烘暟" >
- <template slot-scope="{row}">
- <span>{{(row.insureNum||0)}} 浜�</span>
- </template>
- </el-table-column>
- <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >
- <template slot-scope="{row}">
- <span>{{(row.guaranteeNum||0)}} 浜�</span>
- </template>
- </el-table-column>
+<!-- <el-table-column prop="insureNum" align="center" label="鎶曚繚浜烘暟" >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{(row.insureNum||0)}} 浜�</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column prop="guaranteeNum" align="center" label="褰撳墠鍦ㄤ繚浜烘暟" width="120">
+ <template slot-scope="{row}">
+ <span>{{(row.guaranteeNum||0)}} 浜�</span>
+ </template>
+ </el-table-column>
+<!-- <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{(row.guaranteeNum||0)}} 浜�</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column label="鎶曚繚鏃堕暱">
<template slot-scope="{row}">
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : (row.serviceDays - row.loseEfficacyDays+'澶�')}}</span>
</template>
</el-table-column>
- <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
- <template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="fee" label="鎵规敼璐圭敤鍚堣" align="center" width="120">
+ <template slot-scope="{row}">
+ <span>{{row.changeMoney+' 鍏�'}}</span>
+ </template>
+ </el-table-column>
+<!-- <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
<span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
@@ -127,6 +147,10 @@
</template>
<!-- 鏂板缓/淇敼 -->
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handlePageChange"/>
+ <!-- 閫夋嫨浼佷笟 -->
+ <chooseCompany ref="chooseCompany" @submit="getVal" />
+ <!-- 鏂板鎶曚繚 -->
+ <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="handlePageChange" />
</TableLayout>
</template>
@@ -137,10 +161,12 @@
import { all as solutionAll} from '@/api/business/solutions'
import { pageAll as companyAll} from '@/api/business/company'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
+import chooseCompany from '@/components/common/chooseCompany'
export default {
name: 'InsuranceApply',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
+ components: { TableLayout, Pagination, OperaInsuranceApplyWindow, chooseCompany, OperaInsuranceApplyAddWindow },
data () {
return {
// 鎼滅储
@@ -149,12 +175,25 @@
createTimeE: '',
time: [],
baseSolutionId: '',
- solutionType: 0,
+ solutionType: '',
companyId: '',
- statusCollect: ''
+ statusCollect: '',
},
+ statusCollect: '',
solutionList:[],
- companyList:[]
+ companyList:[],
+ status: [
+ { label: '寰呭鏍�', id: '0' },
+ { label: '寰呭嚭鍗�', id: '1' },
+ { label: '鎶曚繚涓�', id: '26' },
+ { label: '寰呯缃�', id: '7' },
+ { label: '寰呯敓鏁�', id: '2,0' },
+ { label: '淇濋殰涓�', id: '2,1' },
+ { label: '宸茶繃鏈�', id: '2,2' },
+ { label: '宸查��鍥�', id: '4' },
+ { label: '閫�鍥炵敵璇蜂腑', id: '5' },
+ { label: '宸插叧闂�', id: '6' },
+ ]
}
},
created () {
@@ -168,9 +207,25 @@
this.loadSelectList()
},
methods:{
+ changeStatus(e) {
+ if (e.indexOf(',') !== -1) {
+ this.searchForm.timeOut = e.split(',')[1]
+ this.searchForm.statusCollect = e.split(',')[0]
+ } else {
+ this.searchForm.timeOut = ''
+ this.searchForm.statusCollect = e
+ }
+ this.search()
+ },
+ getVal(company) {
+ this.$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', { type: '', companyName: company.companyName, companyId: company.companyId })
+ },
// 鎼滅储妗嗛噸缃�
reset () {
this.$refs.searchForm.resetFields()
+ this.statusCollect = ''
+ this.searchForm.timeOut = ''
+ this.searchForm.statusCollect = ''
this.searchForm.createTimeS = ''
this.searchForm.createTimeE = ''
this.search()
--
Gitblit v1.9.3