From 79b0a1a4f81ec7750e6deeb02bc9865785b6fee9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 17 八月 2023 19:52:46 +0800
Subject: [PATCH] bug修复
---
src/views/client/salesLead/DetailSalesLead.vue | 2
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 2
src/views/sales/salesOpportunity/DetailOpportunity.vue | 10 +-
src/views/sales/quotation/AddQuotationDialog.vue | 33 +++++++-
src/views/client/client/DetailClientManage.vue | 67 ++++++++++------
src/views/sales/salesOpportunity/index.vue | 6 +
src/views/sales/subOrder/AddSubOrderDialog.vue | 39 +++++++--
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 15 +--
src/views/client/contacts/DetailContacts.vue | 10 +-
9 files changed, 120 insertions(+), 64 deletions(-)
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 4716456..ac60d6b 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>
<!-- 澶囨敞淇℃伅 -->
@@ -200,6 +208,9 @@
<div v-if="activeName === 'detail'" class="second">
<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>
</div>
@@ -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 {
@@ -293,20 +305,14 @@
{
leftStr: "鎵�灞炲叕娴�",
leftValue: "",
- rightStr: "鏈嶅姟浠ｈ〃",
- rightValue: ""
- },
- {
- leftStr: "绛惧埌",
- leftValue: "",
rightStr: "涓嬫鍥炶鏃ユ湡",
rightValue: this.processTime(item.next_visit_time)
},
{
- leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
- rightStr: "鏈�鏅氭湇鍔″埌鏈熸棩",
- rightValue: this.processTime(item.latest_service_time)
+ leftStr: "鏈�鏅氭湇鍔″埌鏈熸棩",
+ leftValue: this.processTime(item.latest_service_time),
+ rightStr: "鍒涘缓鏃堕棿",
+ rightValue: ""
},
{
leftStr: "鍒涘缓浜�",
@@ -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() {
@@ -546,10 +546,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;
+ }
+ }
}
}
}
diff --git a/src/views/client/contacts/DetailContacts.vue b/src/views/client/contacts/DetailContacts.vue
index 83f8206..74d6407 100644
--- a/src/views/client/contacts/DetailContacts.vue
+++ b/src/views/client/contacts/DetailContacts.vue
@@ -191,7 +191,7 @@
},
{
leftStr: "棣栬鑱旂郴浜�",
- leftValue: item.is_first,
+ leftValue: item.is_first ? "鏄�" : "鍚�",
rightStr: "寰俊鍙�",
rightValue: item.wechat
},
@@ -202,15 +202,15 @@
rightValue: item.email
},
{
- leftStr: "绛惧埌",
+ leftStr: "涓嬫鍥炶鏃ユ湡",
leftValue: "",
- rightStr: "涓嬫鍥炶鏃ユ湡",
+ rightStr: "鏈�鏂拌仈绯绘棩鏈�",
rightValue: ""
},
{
- leftStr: "鏈�鏂拌仈绯绘棩鏈�",
+ leftStr: "鏈仈绯诲ぉ鏁�",
leftValue: "",
- rightStr: "鏈仈绯诲ぉ鏁�",
+ rightStr: "",
rightValue: ""
}
]
diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue
index 7708428..4a7745e 100644
--- a/src/views/client/salesLead/DetailSalesLead.vue
+++ b/src/views/client/salesLead/DetailSalesLead.vue
@@ -201,7 +201,7 @@
{
leftStr: "鍏抽棴鍘熷洜",
leftValue: "",
- rightStr: "绛惧埌",
+ rightStr: "",
rightValue: ""
}
]
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index da372c4..309abba 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -190,7 +190,7 @@
<div style="margin-left: 400px">
甯佺
<el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -201,6 +201,8 @@
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
/>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
@@ -319,7 +321,7 @@
},
memberOptions: [],
quotationStatusOptions: [{ id: 1, name: "涓嶇煡閬�" }], // 鎶ヤ环鍗曠姸鎬�
- currencyOptions: [], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
approvalWorkflowOptions: [], // 瀹℃壒娴佺▼
productTableList: {},
showSummary: {
@@ -512,7 +514,7 @@
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
setFormatClick() {},
setTableForm() {
- if (this.editConfig.title === "鏂板缓") {
+ if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products === null) {
this.tableData = [
{
id: 1,
@@ -538,7 +540,7 @@
{ label: "浜у搧缂栧彿", prop: "Number" },
{ label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
{ label: "閿�鍞崟浠�", prop: "Unit", input: true },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
+ { label: "浠风◣鍚堣", prop: "total", input: true },
{ label: "鎻忚堪", prop: "other8" }
]
}
@@ -570,7 +572,28 @@
SalePrice: 0,
Unit: ""
})
- }
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ id: 1,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {}
}
}
</script>
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 8dcd74b..3aa7e53 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -205,7 +205,7 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞" prop="notes">
+ <el-form-item label="澶囨敞" prop="remark">
<el-input type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.notes"></el-input>
</el-form-item>
</el-col>
@@ -243,14 +243,8 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select
- v-model="editConfig.infomation.currency"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- disabled
- >
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -396,7 +390,8 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- saleChanceId: this.editCommonConfig.infomation.saleChanceId
+ saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ productId: 1
}
},
created() {
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 05bef45..55c02f7 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -337,7 +337,7 @@
<el-input
type="textarea"
:autosize="{ minRows: 2 }"
- v-model="editConfig.infomation.advantage"
+ v-model="editConfig.infomation.advantages"
></el-input>
</el-form-item>
</el-col>
diff --git a/src/views/sales/salesOpportunity/DetailOpportunity.vue b/src/views/sales/salesOpportunity/DetailOpportunity.vue
index 90985b1..d26b156 100644
--- a/src/views/sales/salesOpportunity/DetailOpportunity.vue
+++ b/src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -374,19 +374,19 @@
{
leftStr: "鑰佸鎴疯惀閿�",
leftValue: item.regular_customers_id,
- rightStr: "绛惧埌",
+ rightStr: "瀹℃壒鐘舵��",
rightValue: ""
},
{
- leftStr: "瀹℃壒鐘舵��",
+ leftStr: "绔炰簤瀵规墜",
leftValue: "",
- rightStr: "绔炰簤瀵规墜",
+ rightStr: "鍒涘缓浜�",
rightValue: ""
},
{
- leftStr: "鍒涘缓浜�",
+ leftStr: "鍒涘缓鏃堕棿",
leftValue: "",
- rightStr: "鍒涘缓鏃堕棿",
+ rightStr: "",
rightValue: ""
}
]
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 7d04bf4..8d8c905 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -159,7 +159,7 @@
{ label: "閿�鍞満浼氱紪鍙�", prop: "number" }, // 閿�鍞満浼氱紪鍙�
{ label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 100, isContactClick: true }, // 鑱旂郴浜哄鍚�
{ label: "閿�鍞樁娈�", prop: "sale_stage_name" }, // 閿�鍞樁娈�
- { label: "鍙兘鎬�(%)", prop: "possibilities" }, // 鍙兘鎬�
+ { label: "鍙兘鎬�(%)", prop: "possibility_name" }, // 鍙兘鎬�
{ label: "棰勮鎴愪氦鏃ユ湡", prop: "expected_time", min: 130 }, // 棰勮鎴愪氦鏃ユ湡
{ label: "棰勮鍚堝悓閲戦", prop: "projected_amount" }, // 棰勮鍚堝悓閲戦
{ label: "棰勭畻缁濆鍊�", prop: "capital_budget" }, // 棰勭畻缁濆鍊�
@@ -190,7 +190,9 @@
...item,
client_name: item.client.name,
contact_name: item.contact.name,
- sale_stage_name: item.sale_stage.name
+ sale_stage_name: item.sale_stage.name,
+ member_name: item.member.username,
+ possibility_name: item.possibility.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 462727f..bbd4601 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -118,14 +118,8 @@
浜у搧绠＄悊
<div style="margin-left: 400px">
甯佺
- <el-select
- v-model="editConfig.infomation.currency"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 63%"
- disabled
- >
- <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
+ <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -135,6 +129,8 @@
:product-table-list="productTableList"
@inputContent="inputContent"
@addProductClick="addProductClick"
+ @emptyProductClick="emptyProductClick"
+ @recalculateProductClick="recalculateProductClick"
/>
</div>
<!-- 鍚堣 -->
@@ -257,7 +253,7 @@
},
memberOptions: [],
discount: "2",
- currencyOptions: [],
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
discountOptions: [
{ value: "1", label: "鐧惧垎姣旈檷浠�" },
{ value: "2", label: "鐩存帴闄嶄环" }
@@ -460,7 +456,7 @@
{ label: "浜у搧缂栧彿", prop: "Number" },
{ label: "鏁伴噺", prop: "Amount", input: true, isRequird: true },
{ label: "閿�鍞崟浠�", prop: "Unit", input: true },
- { label: "浠风◣鍚堣", prop: "other3", input: true },
+ { label: "浠风◣鍚堣", prop: "total", input: true },
{ label: "鎻忚堪", prop: "other8" }
]
}
@@ -492,7 +488,28 @@
SalePrice: 0,
Unit: ""
})
- }
+ },
+ // 浜у搧娓呯┖
+ emptyProductClick() {
+ this.productId = 1
+ this.tableData = [
+ {
+ id: 1,
+ Amount: 0,
+ IsSale: true,
+ MaterialMode: "",
+ MinInventory: 0,
+ Name: "",
+ Number: "",
+ PurchaseType: "",
+ SalePrice: 0,
+ Unit: ""
+ }
+ ]
+ this.productTableList.tableData = this.tableData
+ },
+ // 浜у搧閲嶇畻
+ recalculateProductClick() {}
}
}
</script>
--
Gitblit v1.8.0