From b5acca92bd0794c24310d15c6fba8433d08119c9 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期三, 11 十月 2023 15:27:09 +0800
Subject: [PATCH] feat: 销售机会报价单销售总单销售子单 编辑弹窗调整表单编号位置, 更换适配新的编码组件
---
src/views/client/contacts/AddContactsDialog.vue | 105 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 30 deletions(-)
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index f0f79e6..e53b170 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -14,7 +14,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="120px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -41,12 +41,17 @@
:fetch-suggestions="querySearchAsync"
value-key="name"
@select="handleSelectClient"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
- <div class="common-select-btn" @click="clearupClient">
- <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"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -68,7 +73,7 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="isUnflod" label="閿�鍞礋璐ｄ汉" prop="member_id">
- <el-select v-model="editConfig.infomation.member_id" placeholder="璇烽�夋嫨" size="mini">
+ <el-select v-model="editConfig.infomation.member_id" placeholder="璇烽�夋嫨" size="mini" style="width: 100%">
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
@@ -87,7 +92,13 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="isUnflod" label="鐢熸棩" prop="birthday">
- <el-date-picker v-model="editConfig.infomation.birthday" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker
+ v-model="editConfig.infomation.birthday"
+ value-format="yyyy-MM-dd"
+ type="date"
+ style="width: 100%"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -114,7 +125,7 @@
<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>
@@ -126,11 +137,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>
@@ -142,15 +154,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
@@ -165,7 +178,7 @@
<div class="common-select-btn"><i class="el-icon-setting"></i></div>
</div>
</el-form-item>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="12">
<el-form-item label="閭紪" prop="postalCode">
<el-input v-model="editConfig.infomation.postalCode"></el-input>
@@ -242,6 +255,7 @@
import { getAddContact, getUpdateContact } from "@/api/client/contacts"
import { getAllData } from "@/api/client/client"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import { getCityList } from "@/api/common/address"
export default {
name: "AddContactsDialog",
props: {
@@ -264,7 +278,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editContactsConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -276,6 +290,14 @@
{
pattern: /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/,
message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
+ trigger: "blur"
+ }
+ ],
+ email: [
+ { required: false, message: "", trigger: "blur" },
+ {
+ pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
+ message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
trigger: "blur"
}
]
@@ -291,7 +313,7 @@
{ value: "8", label: "鍏徃鐢佃瘽" }
],
memberOptions: [],
- countryOptions: [], // 鍥藉
+ countryOptions: [{ id: 1, name: "涓浗" }], // 鍥藉
provinceOptions: [], // 鐪佷唤
cityOptions: [], // 鍩庡競
regionOptions: [], // 鍖哄煙
@@ -301,27 +323,29 @@
editVisible: false,
title: "",
infomation: {}
- }
+ },
+ clientId: this.editContactsConfig.infomation.client_id
}
},
created() {
this.$store.dispatch("geClient")
+ if (this.editConfig.title !== "鏂板缓" && this.editConfig.infomation.province_id !== 0) {
+ this.getCityList(this.editConfig.infomation.province_id, "edit")
+ }
this.getCommonData()
},
methods: {
getCommonData() {
- getAllData()
- .then((res) => {
- console.log(res)
- this.memberOptions = res.data.member
- this.countryOptions = res.data.country
- this.provinceOptions = res.data.province
- this.cityOptions = res.data.city
- this.regionOptions = res.data.region
- })
- .catch((err) => {
- console.log(err)
- })
+ 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) => {
+ console.log(res)
+ this.memberOptions = res.data.member
+ this.provinceOptions = res.data.province
+ })
},
handleClose() {
this.editConfig.visible = false
@@ -378,7 +402,7 @@
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
birthday: data.birthday || "",
city_id: data.city_id || 0,
- client_id: parseInt(data.client_id) || 0,
+ client_id: this.clientId || 0,
country_id: data.country_id || 0,
desc: data.desc || "",
email: data.email || "",
@@ -406,7 +430,8 @@
}
},
handleSelectClient(item) {
- this.editConfig.infomation.client_id = item.id
+ this.editConfig.infomation.client_name = item.name
+ this.clientId = item.id
},
selClientClick() {
this.editSelectClientConfig.editVisible = true
@@ -414,12 +439,16 @@
selClient(row) {
console.log(row)
this.editConfig.infomation.client_name = row.name
- this.editConfig.infomation.client_id = row.id
+ this.clientId = row.id
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient() {
+ console.log("sssssssss")
+ console.log(this.editConfig.infomation.client_name)
+ // if (this.editConfig.infomation.client_name !== "") {
this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.client_id = 0
+ this.clientId = 0
+ // }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -434,6 +463,21 @@
this.unflodCollapseStr = "鏀惰捣"
this.isUnflod = true
}
+ },
+ // 閫夋嫨鐪佷唤
+ 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 = ""
+ }
+ }
+ })
}
}
}
@@ -467,7 +511,7 @@
}
.common-select {
.common-select-sel {
- width: 270px;
+ width:100%;
}
}
}
@@ -485,6 +529,7 @@
justify-content: center;
align-items: center;
color: #6166d3;
+ cursor: pointer;
}
.dialog-footer {
background-color: #f5f5f5;
--
Gitblit v1.8.0