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/views/enterprise/insuranceApply.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index c956493..617c916 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -4,7 +4,7 @@
<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="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
<el-option label="寰呯绔�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
@@ -18,9 +18,9 @@
<el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
- :key="item.id"
+ :key="item.baseId"
:label="item.name"
- :value="item.id">
+ :value="item.baseId">
</el-option>
</el-select>
</el-form-item>
@@ -43,7 +43,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:dispatchunit:create']">
- <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -55,7 +55,11 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" label="鐘舵��"></el-table-column>
+ <el-table-column prop="statusInfo" label="鐘舵��">
+ <template slot-scope="{row}">
+ <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
<el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
@@ -124,7 +128,7 @@
},
methods:{
loadSelectList() {
- solutionAll({ dataType:0 }).then(res => {
+ solutionAll({ dataType:2}).then(res => {
this.solutionList = res
})
}
--
Gitblit v1.9.3