From c5dc5086ea67f32afb457141aec478b66a037ea3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 13 十月 2023 18:03:51 +0800
Subject: [PATCH] feat: bug修改
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 1 +
src/views/sales/quotation/AddQuotationDialog.vue | 12 ++++++++++--
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 9 ++-------
src/views/sales/quotation/index.vue | 2 ++
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index b0da187..1ca59b2 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -342,7 +342,7 @@
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import SelectLeadDialog from "@/views/other/commonDialog/SelectLeadDialog"
import codeMixin from "./mixin/codeMixin"
-import { getContactList } from "@/api/client/contacts"
+// import { getContactList } from "@/api/client/contacts"
import { mapActions } from "vuex"
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
@@ -442,7 +442,7 @@
created() {
this.$store.dispatch("geClient")
this.$store.dispatch("geContact")
- this.$store.dispatch("geChance")
+ // this.$store.dispatch("geChance")
this.$store.dispatch("geLead")
this.getCommonData()
this.getContactInfoList()
@@ -594,11 +594,6 @@
if (value === "client") {
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
- await getContactList({
- clientId: this.clientId
- }).then((res) => {
- this.getContactFilter(res.data.list)
- })
this.isChance = false
this.getChanceList(item.id)
// console.log("clientId",this.clientId,this.editConfig.infomation.client_name)
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 428fa9b..deb0a8d 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -357,7 +357,7 @@
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "blur" }],
+ sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "blur" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
memberOptions: [],
@@ -495,7 +495,7 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- quotationName: this.quotationName || "",
+ quotationName: data.quotationName || "",
conditions: data.conditions || "",
file: data.file || "",
member_id: data.member_id || 0,
@@ -659,6 +659,14 @@
clearupProduct(data) {
this.tableData = data
this.productTableList.tableData = this.tableData
+ },
+ // 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
+ checkChance(rule, value, callback) {
+ if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
+ callback()
+ } else {
+ callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+ }
}
}
}
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 2d78b7a..38ae9fc 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -233,6 +233,8 @@
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
+ console.log("dddddddd")
+ console.log(row)
this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
},
// 鎵归噺鍒犻櫎
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index fa9e011..5d4ebd6 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -93,6 +93,7 @@
"
value-key="name"
@select="handleSelectClient('contact', $event)"
+ placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О"
:disabled="isContact"
></el-autocomplete>
<div v-if="!isContact" class="common-select-btn" @click="selClientClick('contact')">
--
Gitblit v1.8.0