From 7b336b5d570dece2d283d33221874e8dae1a2118 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index e1ac5c8..f64ff23 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -39,7 +39,7 @@
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 10 ||model.status == 2" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
<el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
- <el-button v-if="model.status == 6 || model.status == 7|| model.status == 8" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
+ <el-button v-if="model.status == 6 || model.status == 7|| model.status == 8 || model.status == 11" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
<el-button v-if="model.status == 0" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
<el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.status == 5" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
@@ -253,7 +253,7 @@
:key="Math.random()"
align="center"
prop="fee"
- label="宸蹭骇鐢熻垂鐢紙鍏冿級">
+ label="浜х敓璐圭敤">
</el-table-column>
</el-table>
<el-table
@@ -262,14 +262,15 @@
ref="table"
v-if="activeName === '1'"
style="width: 100%">
- <el-table-column label="搴忓彿"
- align="center">
+ <el-table-column
+ label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="淇濆崟鐘舵��" :key="Math.random()"
- align="center">
+ align="center">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -574,6 +575,9 @@
} else {
this.formInline.applyStatus = ''
}
+ this.formInline.start = ''
+ this.formInline.startTimeE = ''
+ this.formInline.endTimeE = ''
this.list = []
this.list1 = []
this.list2 = []
@@ -595,19 +599,19 @@
changeStart(e) {
if (e.length > 0) {
this.formInline.startTimeS = e[0]
- this.formInline.endTimeS = e[1]
+ this.formInline.startTimeE = e[1]
} else {
this.formInline.startTimeS = ''
- this.formInline.endTimeS = ''
+ this.formInline.startTimeE = ''
}
this.search()
},
changeEnd(e) {
if (e.length > 0) {
- this.formInline.startTimeE = e[0]
+ this.formInline.endTimeS = e[0]
this.formInline.endTimeE = e[1]
} else {
- this.formInline.startTimeE = ''
+ this.formInline.endTimeS = ''
this.formInline.endTimeE = ''
}
this.search()
--
Gitblit v1.9.3