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/dispatchUnitDetailsPlat.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index afbdb8a..b73dd8b 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -67,9 +67,9 @@
<el-table-column
label="鐘舵��">
<template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 1">瀹℃牳閫氳繃</span>
- <span v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
+ <span style="color:#2E68EC" v-if="row.status === 0">寰呭鏍�</span>
+ <span style="color:green" v-if="row.status === 1">瀹℃牳閫氳繃</span>
+ <span style="color:red" v-if="row.status === 2">瀹℃牳涓嶉�氳繃</span>
</template>
</el-table-column>
<!-- <el-table-column
@@ -93,7 +93,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;">
@@ -112,6 +112,9 @@
<OperaDispatchUnitWindow ref="OperaDispatchUnitWindow" @success="callback" />
<dispatchReview ref="dispatchReview" @success="callback" />
<dispatchReviewCheck ref="dispatchReviewCheck" @success="callback" />
+ <template v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
</GlobalWindow>
</template>
@@ -161,7 +164,7 @@
},
tableData: [],
insuranceScheme: [],
- reverse: true,
+ reverse: false,
visible5:false,
activities: []
}
@@ -188,8 +191,8 @@
duSolutionList: [],
saveDuSolutionDTOList:[ ]
}
-
this.form.id = target.id
+ this.form.checkInfo=''
this.getDetails()
},
async getDetails() {
--
Gitblit v1.9.3