From 8a0469c97262be9ecbc5eae38d812da789635c81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 17:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/settleClaims.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index 0934dfd..870e429 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -5,6 +5,9 @@
<el-form-item label="鍛樺伐濮撳悕" prop="memberName">
<el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
+ <el-form-item label="韬唤璇�" prop="memberIdcardNo">
+ <el-input v-model="searchForm.memberIdcardNo" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
<el-form-item label="鎶ユ鍗曚綅" prop="companyId" v-if="userInfo.type === 0">
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
<el-option
@@ -55,21 +58,22 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
+ <el-table-column prop="status" label="妗堜欢鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span :class="'settle-status'+row.status" style="color: #2E68EC" v-if="row.status === 0 || row.status === 2 || row.status === 3">澶勭悊涓�</span>
+ <span :class="'settle-status'+row.status" style="color: red" v-if="row.status === 1">宸叉挙妗�</span>
+ <span :class="'settle-status'+row.status" style="color: green " v-if="row.status ===4">宸茬粨妗�</span>
+ </template>
+ </el-table-column>
<el-table-column prop="reportNum" label="鎶ユ鍙�" min-width="100px"></el-table-column>
<el-table-column prop="companyName" label="鎶ユ浼佷笟" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="duName" label="娲鹃仯鍗曚綅" min-width="100px"></el-table-column>
<el-table-column prop="worktypeName" label="鎵�灞炲伐绉�" min-width="100px"></el-table-column>
<el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎶ユ鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="妗堜欢鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span style="color: #2E68EC" v-if="row.status === 0 || row.status === 2 || row.status === 3">澶勭悊涓�</span>
- <span style="color: red" v-if="row.status === 1">宸叉挙妗�</span>
- <span style="color: green " v-if="row.status ===4">宸茬粨妗�</span>
- </template>
- </el-table-column>
<el-table-column
v-if="containPermissions(['business:settleclaims:update', 'business:settleclaims:delete'])"
label="鎿嶄綔"
@@ -118,6 +122,7 @@
companyId: '',
duName: '',
memberName:'',
+ memberIdcardNo:'',
status: '',
informantName: ''
}
--
Gitblit v1.9.3