From cdae87d86d3516b6275fc9ae2c251f83635c954c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 13 十月 2023 14:18:12 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/sales/quotation/DetailQuotation.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index bf0fc69..0a5c3e5 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -9,20 +9,20 @@
>
<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>
<div class="content">
- <div class="top">{{ "鍚堝悓鍙戣捣浜猴細" + "" }}</div>
+ <!-- <div class="top">{{ "鍚堝悓鍙戣捣浜猴細" + "" }}</div> -->
<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="changeOrder">
- <!-- <template slot="label">
+ <!-- <el-tab-pane label="鎶ヤ环鍙樻洿鍗�" name="changeOrder"> -->
+ <!-- <template slot="label">
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
- </el-tab-pane>
+ <!-- </el-tab-pane> -->
<el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
</el-tabs>
@@ -171,8 +171,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
--
Gitblit v1.8.0