From bd25d9a8a058e8c618ee4188ed5f15a898c0f7e8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 27 一月 2024 11:43:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/insuranceApply.vue | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 8eb3a44..8dfed6c 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -17,19 +17,19 @@
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+ <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -43,7 +43,6 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
-<!-- <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�"/>-->
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -62,17 +61,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="status" label="鎶曚繚鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.statusCollect === 0">寰呭鏍�</span>
- <span v-if="row.statusCollect === 1">寰呭嚭鍗�</span>
- <span v-if="row.statusCollect === 2">淇濋殰涓�</span>
- <span v-if="row.statusCollect === 3">宸茶繃鏈�</span>
- <span v-if="row.statusCollect === 4">宸查��鍥�</span>
- <span v-if="row.statusCollect === 5">閫�鍥炵敵璇蜂腑</span>
- <span v-if="row.statusCollect === 6">宸插叧闂�</span>
- </template>
- </el-table-column>
+ <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" min-width="100px"></el-table-column>
<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>
@@ -105,6 +94,8 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import { all as solutionAll} from '@/api/business/solutions'
+import { pageAll as companyAll} from '@/api/business/company'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
export default {
name: 'InsuranceApply',
@@ -114,10 +105,11 @@
return {
// 鎼滅储
searchForm: {
- createDate: '',
+ createTimeS: '',
+ createTimeE: '',
solutionId: '',
companyId: '',
- statusCollect: ''
+ statusCollect: ''
},
solutionList:[],
companyList:[]
@@ -131,12 +123,23 @@
'field.main': 'id'
})
this.search()
- // this.loadSelectList()
+ this.loadSelectList()
},
- methods (){
- // loadSelectList() {
- //
- // }
+ methods:{
+ // handlePageChange() {
+ // this.search()
+ // },
+ loadSelectList() {
+ solutionAll({dataType:0}).then(res => {
+ this.solutionList = res
+ }).catch(err => {
+ })
+ companyAll({}).then(res => {
+ this.companyList = res
+ }).catch(err => {
+ })
+ }
+
}
}
</script>
--
Gitblit v1.9.3