From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/service/serviceFollowup/DetailServiceFollowup.vue | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/views/service/serviceFollowup/DetailServiceFollowup.vue b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
index 9b53e73..b952172 100644
--- a/src/views/service/serviceFollowup/DetailServiceFollowup.vue
+++ b/src/views/service/serviceFollowup/DetailServiceFollowup.vue
@@ -17,11 +17,11 @@
<div class="tab-view">
<el-tabs v-model="activeName" @tab-click="tabsClick">
<el-tab-pane label="璇︽儏" name="first"></el-tab-pane>
- <el-tab-pane label="闄勪欢绠＄悊" name="annex">
- <!-- <template slot="label">
+ <!-- <el-tab-pane label="闄勪欢绠＄悊" name="annex"> -->
+ <!-- <template slot="label">
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
</el-tabs>
</div>
<div v-if="activeName === 'first'" class="detail">
@@ -40,7 +40,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -59,14 +59,14 @@
<li>
<div class="left remark">
<div class="content-title">{{ "澶囨敞锛�" }}</div>
- <div class="content-data">{{ "澶囨敞鍐呭" }}</div>
+ <div class="content-data">{{ detailConfig.infomation.remark }}</div>
</div>
</li>
</ul>
</div>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info">
+ <!-- <div class="basic-info">
<div class="basic-info-label" @click="expandClick('annex')">
<i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
@@ -82,7 +82,7 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
</div>
<div v-if="activeName === 'annex'" class="second">
<!-- <SubOrder :isDetail="true" /> -->
@@ -140,32 +140,26 @@
{
leftStr: "鍥炶浜�",
leftValue: item.Member.username,
- rightStr: "椤圭洰璁″垝",
- rightValue: ""
+ rightStr: "婊℃剰搴�",
+ rightValue: item.satisfaction.name
},
{
- leftStr: "婊℃剰搴�",
- leftValue: item.satisfaction.name,
- rightStr: "鍙婃椂鐜�",
- rightValue: item.timelyRate.name
+ leftStr: "鍙婃椂鐜�",
+ leftValue: item.timelyRate.name,
+ rightStr: "瑙ｅ喅鐜�",
+ rightValue: item.solveRate.name
},
{
- leftStr: "瑙ｅ喅鐜�",
- leftValue: item.solveRate.name,
- rightStr: "鍘熸湇鍔′汉鍛�",
- rightValue: item.oldMember.username
+ leftStr: "鍘熸湇鍔′汉鍛�",
+ leftValue: item.oldMember.username,
+ rightStr: "鏈嶅姟浜哄憳鏄惁鏉ヨ繃",
+ rightValue: item.isVisit.name
},
{
- leftStr: "鏈嶅姟浜哄憳鏄惁鏉ヨ繃",
- leftValue: item.isVisit.name,
- rightStr: "鍒涘缓鏃堕棿",
- rightValue: ""
- },
- {
- leftStr: "淇敼鏃堕棿",
- leftValue: "",
- rightStr: "",
- rightValue: ""
+ leftStr: "鍒涘缓鏃堕棿",
+ leftValue: item.createTime,
+ rightStr: "淇敼鏃堕棿",
+ rightValue: item.updateTime
}
]
},
--
Gitblit v1.8.0