From 3c2e49d7bcc91268a75689db400d1f1698c0f8b7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 16:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/insuranceApply.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 1f2ea6d..d569c0e 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -4,7 +4,7 @@
<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">
- <el-option label="寰呭鎵�" value="0"></el-option>
+ <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>
@@ -18,9 +18,9 @@
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
- :key="item.id"
+ :key="item.baseId"
:label="item.name"
- :value="item.id">
+ :value="item.baseId">
</el-option>
</el-select>
</el-form-item>
@@ -75,7 +75,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.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -108,7 +108,7 @@
searchForm: {
createTimeS: '',
createTimeE: '',
- solutionId: '',
+ baseSolutionId: '',
companyId: '',
statusCollect: ''
},
@@ -131,7 +131,7 @@
// this.search()
// },
loadSelectList() {
- solutionAll({dataType:0}).then(res => {
+ solutionAll({dataType:2}).then(res => {
this.solutionList = res
}).catch(err => {
})
--
Gitblit v1.9.3