From f3d34173074df5589fd577d03e272948853ebfb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 10:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/enterprise/myPolicy.vue | 68 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index f583878..b711b90 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -6,7 +6,7 @@
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
- <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.baseSolutionId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
:key="item.baseId"
@@ -15,19 +15,32 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐘舵��" prop="statusCollect">
- <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="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-option label="鎶曚繚涓�" value="26"></el-option>
+ <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="timeOut">
+ <el-select v-model="searchForm.timeOut" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="鏈紑濮�" value="0"></el-option>
+ <el-option label="淇濋殰涓�" value="1"></el-option>
+ <el-option label="宸茶繃鏈�" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+<!-- <el-form-item label="鐘舵��" prop="statusCollect">-->
+<!-- <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="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-option label="鎶曚繚涓�" value="26"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="淇濋櫓鐢熸晥璧锋湡" prop="time1">
<el-date-picker
v-model="time1"
@@ -84,7 +97,7 @@
</el-table-column>
<el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ <span :class="'apply-status'+row.status">{{row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionsName" align="center" fixed label="淇濋櫓鏂规" min-width="150"></el-table-column>
@@ -99,12 +112,12 @@
<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="鍦ㄤ繚浜烘暟" >
+<!-- <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>
@@ -114,11 +127,16 @@
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : (row.serviceDays - row.loseEfficacyDays+'澶�')}}</span>
</template>
</el-table-column>
- <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
+<!-- <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.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
+ <span>{{row.changeMoney+' 鍏�'}}</span>
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
<span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
@@ -138,7 +156,7 @@
<el-button type="text" @click="godetail(row)" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
<!-- <el-button type="text" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濇湀搴﹁垂鐢ㄧ粺璁�',row)" v-permissions="['business:applychange:query']">鍔犲噺淇濊垂鐢�</el-button>
<template v-if="row.statusCollect === 2">-->
-<!-- <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>-->
+ <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>
<!-- </template>-->
</template>
</el-table-column>
@@ -198,7 +216,9 @@
startTimeE: '',
startTimeS: '',
baseSolutionId: '',
- statusCollect: '2'
+ status: '5',
+ solutionType: '',
+ timeOut: ''
},
obj: {
renewalNum: 0,
--
Gitblit v1.9.3