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/components/business/OperaInsuranceApplyWindow.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index e337994..fdbfc1c 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -83,7 +83,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -228,7 +228,7 @@
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
<span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
- 鎻愪氦鎰忚锛歿{activity.content}}
+ {{activity.content}}
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
@@ -250,6 +250,9 @@
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鎹㈠巶鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
+ <template v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
</GlobalWindow>
</template>
@@ -335,6 +338,8 @@
open(title,target){
this.visible = true;
this.title = title
+ this.model={}
+ this.dataId=null
this.dataId = target.id
this.getDetail()
this.getList()
@@ -520,7 +525,7 @@
onSubmit(){
},
- getDetail(){
+ getDetail(){
getDetail(this.dataId).then(res => {
this.model = res
this.tableData = new Array()
--
Gitblit v1.9.3