From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/views/enterprise/insuranceApply.vue | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index f157646..a9eb6de 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -28,7 +28,7 @@
<el-form-item label="鎻愪氦鏃ユ湡" prop="createDate">
<el-date-picker
v-model="searchForm.createDate"
- @change="search"
+ @change="changeTime"
type="daterange"
range-separator="鑷�"
value-format="yyyy-MM-dd"
@@ -74,8 +74,17 @@
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : row.serviceDays - row.loseEfficacyDays}}</span>
</template>
</el-table-column>
- <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
- <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+ <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�">
+ <template slot-scope="{row}">
+ <span>{{row.currentFee!=null?row.currentFee: '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級">
+ <template slot-scope="{row}">
+ <span>{{row.fee!=null?row.fee: '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃ユ湡"></el-table-column>
<el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
<el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
<el-table-column
@@ -140,6 +149,12 @@
this.loadSelectList()
},
methods: {
+ reset() {
+ this.searchForm.createTimeS = ''
+ this.searchForm.createTimeE = ''
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
godetail (row) {
if (row.solutionType == 1) {
this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: row.id })
@@ -151,6 +166,11 @@
solutionAll({ dataType: 2 }).then(res => {
this.solutionList = res
})
+ },
+ changeTime (e) {
+ this.searchForm.createTimeS = e[0]
+ this.searchForm.createTimeE = e[1]
+ this.search()
}
}
}
--
Gitblit v1.9.3