From 6e8501e2ebc00deec415088a1cbd98db8a55a6b1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 一月 2024 20:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/enterprise/insuranceApply.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 0561cbf..c956493 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -2,12 +2,16 @@
<TableLayout :permissions="['business:insuranceapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
+ <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="2"></el-option>
- <el-option label="宸茬缃�" value="3"></el-option>
- <el-option label="宸叉挙閿�" value="7"></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-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
@@ -51,14 +55,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="status" label="鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鎵�</span>
- <span v-if="row.status === 2">寰呯缃�</span>
- <span v-if="row.status === 3">宸茬缃�</span>
- <span v-if="row.status === 4">宸叉挙閿�</span>
- </template>
- </el-table-column>
+ <el-table-column prop="statusInfo" label="鐘舵��"></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>
@@ -73,7 +70,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInsuranceApplyWindow.open('缂栬緫鎶曚繚鐢宠淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.id })" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -85,7 +82,9 @@
</pagination>
</template>
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @sucess="handlePageChange" />
+ <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @success="handlePageChange" />
+ <!-- 鎶曚繚璇︽儏 -->
+ <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
</TableLayout>
</template>
@@ -94,11 +93,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+
import { all as solutionAll} from '@/api/business/solutions'
export default {
name: 'InsuranceApply',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
+ components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails },
data () {
return {
// 鎼滅储
@@ -106,7 +107,7 @@
createTimeS: '',
createTimeE: '',
baseSolutionId: '',
- status: '2'
+ statusCollect: ''
},
solutionList:[]
}
--
Gitblit v1.9.3