From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期一, 21 八月 2023 11:23:34 +0800 Subject: [PATCH] bug修复 --- src/views/client/contacts/AddContactsDialog.vue | 81 ++++++++++++++++++++++++++++------------ 1 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue index f0f79e6..80e8f08 100644 --- a/src/views/client/contacts/AddContactsDialog.vue +++ b/src/views/client/contacts/AddContactsDialog.vue @@ -87,7 +87,12 @@ </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" + placeholder="閫夋嫨鏃ユ湡" + > </el-date-picker> </el-form-item> </el-col> @@ -114,7 +119,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 +131,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 +148,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 +172,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 +249,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: { @@ -278,6 +286,14 @@ message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�", trigger: "blur" } + ], + email: [ + { required: false, message: "", trigger: "blur" }, + { + pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/, + message: "璇疯緭鍏ユ纭殑閭鏍煎紡", + trigger: "blur" + } ] }, businessSourceOptions: [ @@ -291,7 +307,7 @@ { value: "8", label: "鍏徃鐢佃瘽" } ], memberOptions: [], - countryOptions: [], // 鍥藉 + countryOptions: [{ id: 1, name: "涓浗" }], // 鍥藉 provinceOptions: [], // 鐪佷唤 cityOptions: [], // 鍩庡競 regionOptions: [], // 鍖哄煙 @@ -301,27 +317,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 +396,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 +424,7 @@ } }, handleSelectClient(item) { - this.editConfig.infomation.client_id = item.id + this.clientId = item.id }, selClientClick() { this.editSelectClientConfig.editVisible = true @@ -414,12 +432,12 @@ selClient(row) { console.log(row) this.editConfig.infomation.client_name = row.name - this.editConfig.infomation.client_id = row.id + this.clientId = row.id }, // 娓呴櫎宸查�夋嫨鐢ㄦ埛 clearupClient() { this.editConfig.infomation.client_name = "" - this.editConfig.infomation.client_id = 0 + this.clientId = 0 }, // 娣诲姞闄勪欢 addAnnexClick() {}, @@ -434,6 +452,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 = "" + } + } + }) } } } -- Gitblit v1.8.0