From 33836e44d74759010d8e79f3cc702186c4bdf4ea Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 11:22:56 +0800
Subject: [PATCH] bug修复（5235 5236）
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 187 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 47 deletions(-)
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index cf157a8..14316e5 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -9,11 +9,12 @@
custom-class="iframe-dialog"
>
<el-form
+ v-if="refreshFlag"
ref="form"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="208px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -23,8 +24,38 @@
<div class="basic-info-title">鏈轰細鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+ <!-- <el-col :span="12">-->
+ <!-- <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
+ <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
+ />
+ <span v-else-if="method == 0" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈轰細鍚嶇О" prop="name">
+ <div class="custom-name">
+ <el-input v-model="editConfig.infomation.name"></el-input>
+ <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
+ <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name" ref="clientName">
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.client_name"
@@ -44,25 +75,12 @@
class="common-select-btn"
@click="clearupClient('client')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞満浼氱紪鍙�" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏈轰細鍚嶇О" prop="name">
- <div class="custom-name">
- <el-input v-model="editConfig.infomation.name"></el-input>
- <!-- <div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div> -->
- <!-- <div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div> -->
- </div>
- </el-form-item>
- </el-col>
+
<el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name">
<div class="custom-name">
@@ -75,22 +93,28 @@
"
value-key="name"
@select="handleSelectClient('contact', $event)"
+ placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О"
+ :disabled="isContact"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('contact')">
+ <div v-if="!isContact" class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
- v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ v-if="
+ editConfig.infomation.contact_name &&
+ editConfig.infomation.contact_name.length > 0 &&
+ !isContact
+ "
class="common-select-btn"
@click="clearupClient('contact')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍟嗘満鏉ユ簮" prop="sales_sources_id">
+ <el-form-item label="鏈轰細鏉ユ簮" prop="sales_sources_id">
<div class="common-select">
<el-select
v-model="editConfig.infomation.sales_sources_id"
@@ -112,7 +136,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍟嗘満绫诲瀷" prop="sale_type_id">
+ <el-form-item label="鏈轰細绫诲瀷" prop="sale_type_id">
<div class="common-select">
<el-select
v-model="editConfig.infomation.sale_type_id"
@@ -151,7 +175,7 @@
v-model="editConfig.infomation.member_id"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -214,7 +238,7 @@
v-model="editConfig.infomation.currency"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -229,7 +253,7 @@
:min="0"
:precision="2"
:controls="false"
- style="width: 25%; margin-right: 5px"
+ style="width: 100%"
></el-input-number>
</el-form-item>
</el-col>
@@ -239,6 +263,7 @@
v-model="editConfig.infomation.expected_time"
value-format="yyyy-MM-dd"
type="date"
+ style="width: 100%"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -278,16 +303,17 @@
<div class="basic-info-title">鍟嗘満涓冭绱�(5W2P)</div>
<div class="basic-info-view">
<el-row>
- <el-col :span="20">
+ <el-col>
<el-form-item label="瀹㈡埛闇�姹傛垨鐥涚偣锛坵hy锛�" prop="pain_points">
<el-input
type="textarea"
+ style="width: 100%"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.pain_points"
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="鏄惁宸茬粡绔嬮」锛坧lan锛�" prop="whether_established">
<el-input
type="textarea"
@@ -296,7 +322,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="璧勯噾棰勭畻鏄灏戯紙plan锛�" prop="capital_budget">
<el-input
type="textarea"
@@ -305,7 +331,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="鍏抽敭鍐崇瓥浜烘槸璋侊紙who锛�" prop="key_maker">
<el-input
type="textarea"
@@ -314,7 +340,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="鍏抽敭鍐崇瓥鍥犵礌鏈夊摢浜涳紙what锛�" prop="key_factors">
<el-input
type="textarea"
@@ -323,7 +349,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="鍐崇瓥娴佺▼鏄�庢牱鐨勶紙what锛�" prop="process">
<el-input
type="textarea"
@@ -332,7 +358,7 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="20">
+ <el-col>
<el-form-item label="绔炰簤瀵规墜鎻愪緵鐨勬柟妗堬紙what锛�" prop="solutions">
<el-input
type="textarea"
@@ -466,7 +492,7 @@
</div>
</el-form-item>
</el-col> -->
- <el-col :span="20">
+ <el-col>
<el-form-item label="璇︾粏鍦板潃" prop="detail_address">
<el-input
type="textarea"
@@ -482,7 +508,7 @@
<div class="basic-info-title">澶囨敞淇℃伅</div>
<div class="basic-info-view">
<el-row>
- <el-col :span="20">
+ <el-col>
<el-form-item label="澶囨敞" prop="remark">
<el-input
type="textarea"
@@ -550,8 +576,12 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import { getCityList } from "@/api/common/address"
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getContactList } from "@/api/client/contacts"
export default {
name: "AddSalesOpportunityDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -564,30 +594,30 @@
}
}
},
- components: { SelectClientDialog, SelectContactDialog },
+ components: { WordInput, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
},
clientList() {
return this.$store.state.getClientName.clientList
- },
- contactNamelist() {
- return this.$store.state.getClientName.contactNamelist
}
},
data() {
return {
- dialogWidth: "80%",
+ refreshFlag: true,
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏ラ攢鍞満浼氱紪鍙�", trigger: "blur" }],
name: [{ required: true, message: "璇疯緭鍏ユ満浼氬悕绉�", trigger: "blur" }],
+
member_id: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
sale_stage_id: [{ required: true, message: "璇烽�夋嫨閿�鍞樁娈�", trigger: "change" }],
currency: [{ required: true, message: "璇烽�夋嫨甯佺", trigger: "change" }],
expected_time: [{ required: true, message: "璇烽�夋嫨棰勮鎴愪氦鏃ユ湡", trigger: "change" }],
- projected_amount: [{ required: true, message: "璇疯緭鍏ラ璁″悎鍚岄噾棰�", trigger: "blur" }]
+ projected_amount: [{ required: true, message: "璇疯緭鍏ラ璁″悎鍚岄噾棰�", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" }]
},
businessSourceOptions: [],
memberOptions: [],
@@ -613,18 +643,42 @@
},
restaurants: [],
clientId: this.editCommonConfig.infomation.client_id,
- contactId: this.editCommonConfig.infomation.contact_id
+ contactId: this.editCommonConfig.infomation.contact_id,
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�", codeStandID: "" },
+ isContact: true,
+ contactNamelist: []
}
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geContact")
if (this.editConfig.title !== "鏂板缓" && this.editConfig.infomation.province_id !== 0) {
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
+ this.formInfo()
+ if (this.editConfig.title === '缂栬緫'){
+ this.isContact = false
+ this.getContactList(this.editConfig.infomation.contact_id)
+ }
+ },
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
+ }
+ this.getRCodeStandardList()
+ },
getCommonData() {
this.editConfig.infomation.country_id = 1
this.editConfig.infomation.province_id =
@@ -725,9 +779,25 @@
whether_established: data.whether_established || "",
remark: data.remark || "",
- detail_address: data.detail_address || ""
+ detail_address: data.detail_address || "",
+
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
+ },
+ // 鑾峰彇鑱旂郴浜哄垪琛�
+ getContactList(id) {
+ getContactList({
+ clientId: id,
+ page: 0,
+ pageSize: 0,
+ search_map: {}
+ }).then((res) => {
+ if (res.code == 200) {
+ this.contactNamelist = res.data.list
+ }
+ })
},
// 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
@@ -748,6 +818,8 @@
handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.isContact = false
+ this.getContactList(item.id)
} else if (value === "contact") {
this.contactId = item.id
}
@@ -763,20 +835,37 @@
if (value === "contact") {
this.editConfig.infomation.contact_name = row.name
this.contactId = row.id
+ this.isContact = false
+ this.getContactList(row.id)
} else if (value === "client") {
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
}
+ this.refresh()
+ },
+ /**
+ * 寮哄埗鍒锋柊form缁勪欢
+ * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
+ */
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
+ })
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
this.editConfig.infomation.client_name = ""
this.clientId = 0
+ this.isContact = true
+ this.editConfig.infomation.contact_name = ""
+ this.contactId = 0
} else if (value === "contact") {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
}
+ this.refresh()
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -788,9 +877,8 @@
},
async getCityList(val, value) {
await getCityList({ province_id: val }).then((res) => {
- console.log(res)
- if (res.data.code === 200) {
- this.cityOptions = res.data.data.list
+ if (res.code === 200) {
+ this.cityOptions = res.data.list
if (value === "sel") {
this.editConfig.infomation.city_id = ""
}
@@ -829,7 +917,12 @@
}
.common-select {
.common-select-sel {
- width: 270px;
+ flex: 1;
+ }
+ }
+ .custom-name {
+ .el-autocomplete {
+ flex: 1;
}
}
}
--
Gitblit v1.8.0