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/enterprise/insuranceApply.vue | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 1013974..73fc0c6 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -3,16 +3,12 @@
<!-- 鎼滅储琛ㄥ崟 -->
<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="璇烽�夋嫨" @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 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="baseSolutionId">
@@ -58,7 +54,12 @@
</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 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>
+<!-- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>-->
</template>
</el-table-column>
<el-table-column prop="solutionsName" fixed label="淇濋櫓鏂规" align="center" min-width="150"></el-table-column>
@@ -73,26 +74,31 @@
<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 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="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="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
<span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
@@ -110,10 +116,10 @@
>
<template slot-scope="{row}">
<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>-->
- <!-- </template>-->
+<!-- <el-button type="text" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濇湀搴﹁垂鐢ㄧ粺璁�',row)" v-permissions="['business:applychange:query']">鍔犲噺淇濊垂鐢�</el-button>-->
+ <template v-if="isShow(row.status, row.endTime)">
+ <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>
+ </template>
</template>
</el-table-column>
</el-table>
@@ -132,6 +138,8 @@
<OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handlePageChange" />
<!-- 鎶曚繚璇︽儏 -->
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
+ <!-- 鍔犲噺淇濈敵璇� -->
+ <additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
</TableLayout>
</template>
<script>
@@ -141,6 +149,7 @@
import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
+import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
import OperaApplyChangeMonthWindow from '@/components/business/OperaApplyChangeMonthWindow'
import { all as solutionAll } from '@/api/business/solutions'
@@ -149,7 +158,7 @@
extends: BaseTable,
components: { TableLayout, Pagination,
// OperaApplyChangeMonthWindow,
- OperaInsuranceApplyAddWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow },
+ OperaInsuranceApplyAddWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow, additionSubtractionApplication },
data () {
return {
// 鎼滅储
@@ -157,9 +166,23 @@
createTimeS: '',
createTimeE: '',
baseSolutionId: '',
- statusCollect: ''
+ statusCollect: '',
+ timeOut: ''
},
- solutionList: []
+ statusCollect: '',
+ solutionList: [],
+ 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 () {
@@ -173,14 +196,32 @@
this.loadSelectList()
},
methods: {
+ // 鍒ゆ柇鏄惁鏄剧ず鍔犲噺淇�
+ isShow(status, endTime) {
+ const currentDate = new Date();
+ const specifiedDate = new Date(endTime);
+ return [5,27].includes(status) && (currentDate < specifiedDate);
+ },
+ 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()
+ },
reset() {
- this.searchForm.createTimeS = ''
- this.searchForm.createTimeE = ''
- this.$refs.searchForm.resetFields()
- this.search()
+ this.searchForm.createTimeS = ''
+ this.searchForm.timeOut = ''
+ this.searchForm.createTimeE = ''
+ this.statusCollect = ''
+ this.searchForm.statusCollect = ''
+ this.$refs.searchForm.resetFields()
+ this.search()
},
result(flag,param){
- console.log(flag,param)
if(param && param.godetail && param.id){
if (param.type == 1) {
this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: param.id })
--
Gitblit v1.9.3