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/sales/quotation/DetailQuotation.vue | 98 +++++++++++++++++++-----------------------------
1 files changed, 39 insertions(+), 59 deletions(-)
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index 8f65d45..4fb9144 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -9,21 +9,21 @@
>
<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 label="閿�鍞槑缁嗗崟" name="detail"></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>
</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>
<!-- 瀹℃壒鏃ュ織 -->
@@ -171,8 +171,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
@@ -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: ""
}
]
@@ -249,33 +249,13 @@
},
setTableForm() {
this.productTableList = {
- tableData: [
- {
- id: "1",
- productName: "涓婃捣鏈夐檺鍏徃",
- other0: "ZDYBD03-1",
- other1: "12",
- other2: "5.00",
- other4: "3.00",
- other3: "2.00"
- }
- ],
+ tableData: this.detailConfig.infomation.products,
tableColumn: [
- { label: "#", prop: "id", width: 40 },
- { label: "鍚◣鍗曚环", prop: "other9", input: true },
- { label: "浜у搧鍚嶇О", prop: "productName", input: true, isRequird: true },
- { label: "浜у搧缂栧彿", prop: "other0" },
- { label: "鏁伴噺", prop: "other1", input: true, isRequird: true },
- { label: "鎶樻墸鐜�(%)", prop: "other6", input: true },
- { label: "涓嶅惈绋庡崟浠�", prop: "other7", input: true },
- { label: "鎶樻墸棰�", prop: "other2" },
- { label: "绋�(閿�鍞�)", prop: "other7", input: true },
- { label: "瀹為檯鍚◣鍗曚环", prop: "other3" },
- { label: "涓嶅惈绋庨噾棰�", prop: "other4" },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
- { label: "鎻忚堪", prop: "other8" },
- { label: "婧愬崟绫诲瀷", prop: "other5" },
- { label: "婧愬崟", prop: "other6" }
+ { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧缂栧彿", prop: "number" },
+ { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+ { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
}
--
Gitblit v1.8.0