From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/quotation/DetailQuotation.vue | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index 3fbd54a..4fb9144 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -9,7 +9,7 @@
>
<template slot="title">
<div class="header">
- <span class="header-label">鍗曟嵁缂栧彿</span>
+ <span class="header-label">鎶ヤ环鍗�</span>
<span class="header-title">{{ detailConfig.infomation.number }}</span>
</div>
</template>
@@ -23,7 +23,7 @@
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
<!-- </el-tab-pane> -->
- <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
+ <!-- <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane> -->
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
</el-tabs>
</div>
@@ -51,31 +51,12 @@
<div class="content-title">{{ item.leftStr + "锛�" }}</div>
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
- <div class="right">
+ <div v-if="item.rightStr.length > 0" class="right">
<div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
</ul>
- </div>
- </div>
- <!-- 鏉′欢涓庢潯娆� -->
- <div class="basic-info">
- <div class="basic-info-label" @click="expandClick('termsConditions')">
- <i v-if="isTermsConditionsExpand" class="el-icon-arrow-down"></i>
- <i v-else class="el-icon-arrow-up"></i>
- <span style="margin-left: 10px">鏉′欢涓庢潯娆�</span>
- </div>
- <div v-show="isTermsConditionsExpand" class="basic-info-content">
- <div class="termsConditions">
- <div class="content-title">{{ "鏉′欢涓庢潯娆�" + "锛�" }}</div>
- <div class="content-termsConditions">
- {{ "\n" + detailConfig.infomation.conditions }}
- <!-- <ul>
- <li v-for="(item, index) in Status.termsConditions" :key="index">{{ item }}</li>
- </ul> -->
- </div>
- </div>
</div>
</div>
<!-- 闄勪欢淇℃伅 -->
@@ -110,6 +91,25 @@
:show-summary="showSummary"
:product-table-list="productTableList"
/>
+ </div>
+ </div>
+ <!-- 鏉′欢涓庢潯娆� -->
+ <div class="basic-info">
+ <div class="basic-info-label" @click="expandClick('termsConditions')">
+ <i v-if="isTermsConditionsExpand" class="el-icon-arrow-down"></i>
+ <i v-else class="el-icon-arrow-up"></i>
+ <span style="margin-left: 10px">鏉′欢涓庢潯娆�</span>
+ </div>
+ <div v-show="isTermsConditionsExpand" class="basic-info-content">
+ <div class="termsConditions">
+ <div class="content-title">{{ "鏉′欢涓庢潯娆�" + "锛�" }}</div>
+ <div class="content-termsConditions">
+ {{ "\n" + detailConfig.infomation.conditions }}
+ <!-- <ul>
+ <li v-for="(item, index) in Status.termsConditions" :key="index">{{ item }}</li>
+ </ul> -->
+ </div>
+ </div>
</div>
</div>
<!-- 瀹℃壒鏃ュ織 -->
@@ -206,8 +206,8 @@
{
leftStr: "鎶ヤ环鍗曠姸鎬�",
leftValue: item.quotation_status.name,
- rightStr: "鑱旂郴浜哄鍚�",
- rightValue: item.contact_name
+ rightStr: "閿�鍞満浼�",
+ rightValue: item.sale_chance.name
},
{
leftStr: "鏈夋晥鏈熻嚦",
@@ -216,9 +216,9 @@
rightValue: item.member.username
},
{
- leftStr: "閿�鍞満浼�",
- leftValue: item.sale_chance.name,
- rightStr: "鍒涘缓鏃堕棿",
+ leftStr: "鍒涘缓鏃堕棿",
+ leftValue: "",
+ rightStr: "",
rightValue: ""
}
]
--
Gitblit v1.8.0