From b01b18c05b3e0d00576a02c9c83df8c8033e5986 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 16:28:06 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 278 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 183 insertions(+), 95 deletions(-)
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 61fd54a..9bc0695 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="208px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -23,6 +23,31 @@
<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="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.infomation.id || 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>鑷姩鐢熸垚</span>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
@@ -39,15 +64,14 @@
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('client')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <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">
@@ -75,8 +99,12 @@
<div class="common-select-btn" @click="selClientClick('contact')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient('contact')">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.contact_name && editConfig.infomation.contact_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contact')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -99,7 +127,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -116,7 +144,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -133,7 +161,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -143,7 +171,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>
@@ -168,7 +196,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -184,10 +212,10 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鍙兘鎬�(%)" prop="possibilities">
+ <el-form-item label="鍙兘鎬�(%)" prop="possibilities_id">
<div class="common-select">
<el-select
- v-model="editConfig.infomation.possibilities"
+ v-model="editConfig.infomation.possibilities_id"
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
@@ -196,7 +224,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -206,7 +234,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>
@@ -215,18 +243,37 @@
</el-col>
<el-col :span="12">
<el-form-item label="棰勭畻缁濆鍊�" prop="budget">
- <el-input v-model="editConfig.infomation.budget"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.budget"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 100%"
+ ></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="棰勮鎴愪氦鏃ユ湡" prop="expected_time">
- <el-date-picker v-model="editConfig.infomation.expected_time" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.expected_time"
+ value-format="yyyy-MM-dd"
+ type="date"
+ style="width: 100%"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="棰勮鍚堝悓閲戦" prop="projected_amount">
- <el-input v-model="editConfig.infomation.projected_amount"></el-input>
+ <el-input-number
+ v-model="editConfig.infomation.projected_amount"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :controls="false"
+ style="width: 100%; margin-right: 5px"
+ ></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -242,7 +289,7 @@
</el-option>
</el-select>
<!-- @click="editDropdownBox" -->
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -252,16 +299,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"
@@ -270,7 +318,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"
@@ -279,7 +327,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"
@@ -288,7 +336,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"
@@ -297,7 +345,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"
@@ -306,7 +354,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"
@@ -326,7 +374,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>
@@ -381,11 +429,12 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ disabled
>
<el-option v-for="item in countryOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -397,11 +446,12 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ @change="selProvinceChange"
>
<el-option v-for="item in provinceOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
@@ -413,15 +463,16 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ :disabled="cityOptions.length <= 0 ? true : false"
>
<el-option v-for="item in cityOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
- <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+ <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="鍖哄煙" prop="region_id">
<div class="common-select">
<el-select
@@ -436,8 +487,8 @@
<div class="common-select-btn"><i class="el-icon-setting"></i></div>
</div>
</el-form-item>
- </el-col>
- <el-col :span="20">
+ </el-col> -->
+ <el-col>
<el-form-item label="璇︾粏鍦板潃" prop="detail_address">
<el-input
type="textarea"
@@ -453,7 +504,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"
@@ -520,8 +571,12 @@
import { getAddSaleChance, getUpdateSaleChance } from "@/api/sales/salesOpportunity"
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";
export default {
name: "AddSalesOpportunityDialog",
+ mixins:[codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -534,7 +589,7 @@
}
}
},
- components: { SelectClientDialog, SelectContactDialog },
+ components: {WordInput, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -548,16 +603,16 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- name: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- 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: "change" }]
+ 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" }]
},
businessSourceOptions: [],
memberOptions: [],
@@ -565,9 +620,9 @@
saleStageOptions: [], // 閿�鍞樁娈�
oldCustomerMarketOptions: [], // 鑰佸鎴疯惀閿�
possibleOptions: [], // 鍙兘鎬�
- currencyOptions: [], // 甯佺
+ currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺
currentStateOptions: [], // 褰撳墠鐘舵��
- countryOptions: [], // 鍥藉
+ countryOptions: [{ id: 1, name: "涓浗" }], // 鍥藉
provinceOptions: [], // 鐪佷唤
cityOptions: [], // 鍩庡競
regionOptions: [], // 鍖哄煙
@@ -583,30 +638,54 @@
},
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:'' },
}
},
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();
+ },
+ 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 =
+ this.editConfig.infomation.province_id === 0 ? "" : this.editConfig.infomation.province_id
+ this.editConfig.infomation.city_id =
+ this.editConfig.infomation.city_id === 0 ? "" : this.editConfig.infomation.city_id
getAllData()
.then((res) => {
- // 缂� 鍙兘鎬� 甯佺 褰撳墠鐘舵��
this.memberOptions = res.data.member
this.businessSourceOptions = res.data.sales_source
this.businessTypeOptions = res.data.sale_type
this.oldCustomerMarketOptions = res.data.regular_customers
this.saleStageOptions = res.data.sale_stage
- this.countryOptions = res.data.country
this.provinceOptions = res.data.province
- this.cityOptions = res.data.city
this.regionOptions = res.data.region
this.possibleOptions = res.data.possibility
- this.currencyOptions = res.data.currency
+ // this.currencyOptions = res.data.currency
this.currentStateOptions = res.data.status
})
.catch((err) => {
@@ -628,41 +707,24 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddSaleChance(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name) {
- this.$parent.handleClose()
- } else {
- this.$parent.getData()
- }
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddSaleChance(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ // }
+ }
+ })
} else {
- getUpdateSaleChance(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateSaleChance(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
}
} else {
console.log("error submit")
@@ -678,9 +740,9 @@
budget: data.budget || 0,
capital_budget: data.capital_budget || "",
city_id: data.city_id || 0,
- client_id: parseInt(this.clientId),
+ client_id: this.clientId || 0,
competitors: data.competitors || "",
- contact_id: parseInt(this.contactId),
+ contact_id: this.contactId || 0,
country_id: data.country_id || 0,
currency: data.currency || 0,
disadvantages: data.disadvantages || "",
@@ -692,9 +754,9 @@
number: data.number || "",
opportunities: data.opportunities || "",
pain_points: data.pain_points || "",
- possibilities: data.possibilities || 0,
+ possibilities: data.possibilities_id || 0,
process: data.process || "",
- projected_amount: parseInt(data.projected_amount) || 0,
+ projected_amount: data.projected_amount || 0,
province_id: data.province_id || 0,
region_id: data.region_id || 0,
regular_customers_id: data.regular_customers_id || 0,
@@ -707,7 +769,10 @@
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
},
@@ -763,7 +828,22 @@
// 娣诲姞闄勪欢
addAnnexClick() {},
// 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
- setFormatClick() {}
+ setFormatClick() {},
+ // 閫夋嫨鐪佷唤
+ selProvinceChange(val) {
+ this.getCityList(val, "sel")
+ },
+ 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 (value === "sel") {
+ this.editConfig.infomation.city_id = ""
+ }
+ }
+ })
+ }
}
}
</script>
@@ -796,7 +876,12 @@
}
.common-select {
.common-select-sel {
- width: 270px;
+ flex: 1;
+ }
+ }
+ .custom-name{
+ .el-autocomplete{
+ flex: 1;
}
}
}
@@ -820,6 +905,9 @@
height: 55px;
line-height: 55px;
}
+ .el-input__inner {
+ text-align: left;
+ }
}
}
</style>
--
Gitblit v1.8.0