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/views/business/insuranceApplyShop.vue | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 21de88b..138eb2e 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -4,24 +4,14 @@
<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">
-<<<<<<< HEAD
- <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="28"></el-option>
- <el-option label="寰呭鏍�" value="22"></el-option>
+ <el-option label="寰呯缃�" value="28"></el-option>
+ <el-option label="寰呭鏍�" value="22"></el-option>
<el-option label="寰呭嚭鍗�" value="23"></el-option>
<el-option label="宸查��鍥�" value="24"></el-option>
<el-option label="宸插叧闂�" value="25"></el-option>
<el-option label="鎶曚繚涓�" value="26"></el-option>
<el-option label="淇濋殰涓�" value="27"></el-option>
->>>>>>> 2ce7d1d9934f97604ff00b1789dd3628d814dd60
+ <el-option label="宸茶繃鏈�" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
@@ -72,7 +62,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" min-width="100px">
+ <el-table-column prop="statusInfo" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :class="'apply-status'+row.statusCollect" >{{row.statusInfo}}</span>
</template>
@@ -80,6 +70,7 @@
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="solutionsName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
--
Gitblit v1.9.3