From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
company/src/views/business/insuranceApplyShop.vue | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 21de88b..851e516 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -4,24 +4,13 @@
<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-select>
</el-form-item>
<el-form-item label="鎶曚繚浼佷笟" prop="companyId">
@@ -72,7 +61,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>
--
Gitblit v1.9.3