From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/insuranceApply.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 3cdb48a..ac5716b 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -28,16 +28,16 @@
<el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
- :key="item.id"
+ :key="item.baseId"
:label="item.name"
- :value="item.id">
+ :value="item.baseId">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎻愪氦鏃ユ湡" prop="createDate">
+ <el-form-item label="鎻愪氦鏃ユ湡" prop="time">
<el-date-picker
- v-model="searchForm.createDate"
- @change="search"
+ v-model="searchForm.time"
+ @change="changeTime"
type="daterange"
range-separator="鑷�"
value-format="yyyy-MM-dd"
@@ -79,7 +79,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>
@@ -112,6 +112,7 @@
searchForm: {
createTimeS: '',
createTimeE: '',
+ time: [],
baseSolutionId: '',
companyId: '',
statusCollect: ''
@@ -131,6 +132,23 @@
this.loadSelectList()
},
methods:{
+ // 鎼滅储妗嗛噸缃�
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.createTimeS = ''
+ this.searchForm.createTimeE = ''
+ this.search()
+ },
+ changeTime(e) {
+ if (e.length > 0) {
+ this.searchForm.createTimeS = e[0]
+ this.searchForm.createTimeE = e[1]
+ } else {
+ this.searchForm.createTimeS = ''
+ this.searchForm.createTimeE = ''
+ }
+ this.search()
+ },
// handlePageChange() {
// this.search()
// },
--
Gitblit v1.9.3