From 96fdf32bd5612b6c16dcbcc8352a9f54adcc8e7e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 18 八月 2023 16:26:59 +0800
Subject: [PATCH] 產品相關及bug修復
---
src/views/client/client/DetailClientManage.vue | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 7d9a0fb..d71dab4 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -118,6 +118,10 @@
</div>
</li>
</ul>
+ <div class="business_scope">
+ <div class="content-title">{{ "缁忚惀鑼冨洿锛�" }}</div>
+ <div class="content-data">{{ detailConfig.infomation.business_scope }}</div>
+ </div>
</div>
</div>
<!-- 鍦板潃淇℃伅 -->
@@ -140,6 +144,10 @@
</div>
</li>
</ul>
+ <div class="business_scope">
+ <div class="content-title">{{ "鍦板潃淇℃伅" }}</div>
+ <div class="content-data">{{ detailConfig.infomation.detail_address }}</div>
+ </div>
</div>
</div>
<!-- 澶囨敞淇℃伅 -->
@@ -180,25 +188,28 @@
</div> -->
</div>
<div v-if="activeName === 'contact'" class="second">
- <Contacts :isDetail="true" :add-config="addContactsConfig" />
+ <Contacts :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'second'" class="second">
<FollowupRecords :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'salesOpportunity'" class="second">
- <SalesOpportunity :isDetail="true" :add-config="addContactsConfig" />
+ <SalesOpportunity :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'quotation'" class="second">
- <Quotation :isDetail="true" :add-config="addContactsConfig" />
+ <Quotation :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'master'" class="second">
- <MasterOrder :isDetail="true" :add-config="addContactsConfig" />
+ <MasterOrder :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'sub'" class="second">
- <SubOrder :isDetail="true" :add-config="addContactsConfig" />
+ <SubOrder :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" :add-config="addContactsConfig" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
+ </div>
+ <div v-if="activeName === 'receipt'" class="second">
+ <Receipt :isDetail="true" :add-config="addConfig" :source-type="1" />
</div>
</div>
</el-drawer>
@@ -213,6 +224,7 @@
import MasterOrder from "@/views/sales/masterOrder"
import SubOrder from "@/views/sales/subOrder"
import SalesDetails from "@/views/sales/salesDetails"
+import Receipt from "@/views/other/payment/receipt"
export default {
name: "DetailClientManage",
props: {
@@ -226,7 +238,7 @@
}
}
},
- components: { FollowupRecords, Contacts, SalesOpportunity, Quotation, MasterOrder, SubOrder, SalesDetails },
+ components: { FollowupRecords, Contacts, SalesOpportunity, Quotation, MasterOrder, SubOrder, SalesDetails, Receipt },
computed: {},
data() {
return {
@@ -244,17 +256,17 @@
addressInfoList: [],
isRemarkExpand: true, // 澶囨敞淇℃伅
isAnnexExpand: true, // 闄勪欢淇℃伅
- addConfig: {},
- addContactsConfig: {
- client_name: this.clientManageDetail.infomation.name
- }
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
this.addConfig = {
- id_name: "client_id",
+ id_name: "client_name",
+ keywordType: "瀹㈡埛鍚嶇О",
+ keyword: this.detailConfig.infomation.name,
id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
client_name: this.detailConfig.infomation.name,
contact_name: this.detailConfig.infomation.contact_name,
client_status_id: this.detailConfig.infomation.client_status_id,
@@ -293,20 +305,14 @@
{
leftStr: "鎵�灞炲叕娴�",
leftValue: "",
- rightStr: "鏈嶅姟浠ｈ〃",
- rightValue: ""
- },
- {
- leftStr: "绛惧埌",
- leftValue: "",
rightStr: "涓嬫鍥炶鏃ユ湡",
- rightValue: this.processTime(item.next_visit_time)
+ rightValue: item.next_visit_time
},
{
- leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
- rightStr: "鏈�鏅氭湇鍔″埌鏈熸棩",
- rightValue: this.processTime(item.latest_service_time)
+ leftStr: "鏈�鏅氭湇鍔″埌鏈熸棩",
+ leftValue: item.latest_service_time,
+ rightStr: "鍒涘缓鏃堕棿",
+ rightValue: ""
},
{
leftStr: "鍒涘缓浜�",
@@ -358,7 +364,7 @@
},
{
leftStr: "娉ㄥ唽鏃堕棿",
- leftValue: this.processTime(item.registration_time),
+ leftValue: item.registration_time,
rightStr: "娉ㄥ唽璧勯噾",
rightValue: item.RegisteredCapital.name
},
@@ -367,12 +373,6 @@
leftValue: item.EnterpriseNature.name,
rightStr: "瀹㈡埛瑙勬ā",
rightValue: item.EnterpriseScale.name
- },
- {
- leftStr: "缁忚惀鑼冨洿",
- leftValue: item.business_scope,
- rightStr: "",
- rightValue: ""
}
]
this.addressInfoList = [
@@ -387,13 +387,13 @@
leftValue: item.City.name,
rightStr: "",
rightValue: ""
- },
- {
- leftStr: "璇︾粏鍦板潃",
- leftValue: item.detail_address,
- rightStr: "",
- rightValue: ""
}
+ // {
+ // leftStr: "璇︾粏鍦板潃",
+ // leftValue: item.detail_address,
+ // rightStr: "",
+ // rightValue: ""
+ // }
]
},
handleClose() {
@@ -421,12 +421,6 @@
} else if (value === "annex") {
this.isAnnexExpand = !this.isAnnexExpand
}
- },
- // 澶勭悊鏃堕棿
- processTime(dateTime) {
- return this.dateFormat("YYYY-mm-dd HH:MM:SS", dateTime) === "1900-01-01 08:00:00"
- ? "--"
- : this.dateFormat("YYYY-mm-dd HH:MM:SS", dateTime)
},
// 鏃堕棿鏄剧ず
dateFormat(fmt, date) {
@@ -546,10 +540,29 @@
color: #333;
}
}
- .remark {
+ .remark,
+ .all {
width: 100%;
}
}
+ .business_scope {
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ min-height: 40px;
+ .content-title {
+ width: 320px;
+ text-align: right;
+ color: #555;
+ }
+ .content-data {
+ flex: 1;
+ padding: 5px;
+ text-align: left;
+ margin-left: 25px;
+ color: #333;
+ }
+ }
}
}
}
--
Gitblit v1.8.0