From c889c9e4792506e0a7f457560c0d4110645fae93 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 26 十月 2022 09:47:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/components/solveProblem/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/solveProblem/index.vue b/src/components/solveProblem/index.vue
index 6e36f23..b997b5e 100644
--- a/src/components/solveProblem/index.vue
+++ b/src/components/solveProblem/index.vue
@@ -9,13 +9,13 @@
<el-timeline-item :color="mycolor" v-for="item in list" :key="item.id">
<div class="title">
<div class="title-left">銆恵{item.name}}銆戝鐞嗕汉: {{item.disposeRecords && item.disposeRecords.length
- != 0 ? item.disposeRecords[0].handlerText:''}} {{item.disposeRecords && item.disposeRecords.length}}
+ != 0 ? item.disposeRecords[0].handlerText:''}}
</div>
<div class="title-right">{{item.disposeRecords.length !==0 ?
filterTime(item.disposeRecords[0].endTime):''}}
</div>
</div>
- <div class="message">{{filterPerson(item.name)}}</div>
+ <div class="message">{{filterPerson(item.name)}} {{item.disposeRecords && item.disposeRecords.length !=0 ? item.disposeRecords[0].result:''}}</div>
</el-timeline-item>
</el-timeline>
</div>
@@ -50,7 +50,7 @@
filterPerson(name) {
const { dispatchInfo } = this;
if (name === '璋冨害') {
- return '銆愭淳閬ｆ剰瑙併��' + dispatchInfo.dispatchOpinion
+ return '銆愭淳閬ｆ剰瑙併��'
} else if (name === '鏍告煡') {
return '銆愭牳鏌ョ粨鏋溿��'
} else if (name === '缁撴') {
--
Gitblit v1.8.0