From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/service/clientServiceOrder/DetailClientServiceOrder.vue | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
index ccd05dd..10bb4c1 100644
--- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
+++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
@@ -9,15 +9,15 @@
>
<template slot="title">
<div class="header">
- <span class="header-label">鏈嶅姟鍗曠紪鍙�</span>
- <span class="header-title">{{ detailConfig.infomation.number }}</span>
+ <span class="header-label">瀹㈡埛鏈嶅姟鍗�</span>
+ <span class="header-title">{{ detailConfig.infomation.serviceNumber }}</span>
</div>
</template>
<div class="content">
<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"></el-tab-pane>
+ <!-- <el-tab-pane label="闄勪欢绠＄悊" name="annex"></el-tab-pane> -->
<el-tab-pane label="鏈嶅姟鍥炶鍗�" name="followup">
<!-- <template slot="label">
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
@@ -41,7 +41,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>
@@ -63,7 +63,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>
@@ -85,7 +85,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>
@@ -183,7 +183,7 @@
</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>
@@ -199,7 +199,7 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
<!-- 绛惧瓧纭 -->
<div class="basic-info">
<div class="basic-info-label" @click="expandClick('signConfim')">
@@ -261,7 +261,7 @@
<!-- <Contacts :isDetail="true" /> -->
</div>
<div v-if="activeName === 'followup'" class="second">
- <ServiceFollowup :isDetail="true" />
+ <ServiceFollowup :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -311,12 +311,24 @@
isServiceContractExpand: true, // 鏈嶅姟鍚堝悓淇℃伅
serviceContractList: [],
isHistoryExpand: true, // 瀹㈡埛鏈嶅姟鍗曞巻鍙茶褰�
- historyList: []
+ historyList: [],
+ addConfig: {}
}
},
created() {
this.setData()
this.setTable()
+ console.log(this.detailConfig.infomation.contact_name)
+ this.addConfig = {
+ keyword: this.detailConfig.infomation.serviceNumber,
+ keywordType: "瀹㈡埛鏈嶅姟鍗�",
+ client_name: this.detailConfig.infomation.client_name,
+ clientId: this.detailConfig.infomation.clientId,
+ contactId: this.detailConfig.infomation.contactId,
+ contact_name: this.detailConfig.infomation.contact_name,
+ service_number: this.detailConfig.infomation.serviceNumber,
+ serviceOrderId: this.detailConfig.infomation.id
+ }
},
mounted() {},
methods: {
@@ -345,7 +357,7 @@
},
{
leftStr: "鏈嶅姟鍚堝悓",
- leftValue: data.Contract.number,
+ leftValue: data.ServiceContract.number,
rightStr: "鏁呴殰绫诲埆",
rightValue: data.FaultType.name
},
@@ -353,13 +365,13 @@
leftStr: "涓婚",
leftValue: data.subject,
rightStr: "鍚堝悓璁㈠崟",
- rightValue: data.OrderManage.number
+ rightValue: data.SalesDetails.number
},
{
leftStr: "浜у搧绫诲埆",
leftValue: "",
rightStr: "浜у搧鍚嶇О",
- rightValue: data.Product.name
+ rightValue: data.productName
},
{
leftStr: "鏈嶅姟鏂瑰紡",
@@ -387,7 +399,7 @@
},
{
leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
+ leftValue: data.createTime,
rightStr: "鍒涘缓浜�",
rightValue: ""
}
@@ -403,7 +415,7 @@
leftStr: "鏈�鏂版洿鏂颁汉",
leftValue: "",
rightStr: "淇敼鏃堕棿",
- rightValue: ""
+ rightValue: data.updateTime
}
]
this.timeAmountList = [
--
Gitblit v1.8.0