From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/client/contacts/AddContactsDialog.vue | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 415489f..4348ae2 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -95,7 +95,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12" style='height:47px;'>
+ <el-col :span="12" style="height: 47px">
<el-form-item v-if="isUnflod" label="棣栬鑱旂郴浜�" prop="is_first">
<el-switch v-model="editConfig.infomation.is_first" active-color="#2E68DB" inactive-color="#AEB9CA">
</el-switch>
@@ -299,25 +299,25 @@
dialogWidth: "50%",
editConfig: this.editContactsConfig,
rules: {
- name: [{ required: true, message: "璇疯緭鍏ヨ仈绯讳汉濮撳悕", trigger: ["change",'blur'] }],
- number: [{ required: true, message: "璇疯緭鍏�", trigger: ["change",'blur'] }],
- client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: ["change",'blur'] }],
- member_id: [{ required: true, message: "璇烽�夋嫨", trigger: ["change",'blur'] }],
+ name: [{ required: true, message: "璇疯緭鍏ヨ仈绯讳汉濮撳悕", trigger: ["change", "blur"] }],
+ number: [{ required: true, message: "璇疯緭鍏�", trigger: ["change", "blur"] }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: ["change", "blur"] }],
+ member_id: [{ required: true, validator: this.validateMemberId, trigger: ["change", "blur"] }],
phone: [
- { required: false, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: ["change",'blur'] },
- { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: ["change",'blur'] },
+ { required: false, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: ["change", "blur"] },
+ { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: ["change", "blur"] },
{
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: ["change",'blur']
+ trigger: ["change", "blur"]
}
],
email: [
- { required: false, message: "", trigger: ["change",'blur'] },
+ { required: false, message: "", trigger: ["change", "blur"] },
{
pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
- trigger: ["change",'blur']
+ trigger: ["change", "blur"]
}
]
},
@@ -358,6 +358,7 @@
"editContactsConfig.visible"(val) {
if (val) {
// this.formInfo()
+ console.log("11111")
}
},
"editContactsConfig.infomation.codeStandID"() {
@@ -380,8 +381,15 @@
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
+ if (this.editConfig.title === "鏂板缓") {
+ let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+ this.memberOptions.map((item) => {
+ if (item.username == username) {
+ this.$set(this.editConfig.infomation, "member_id", item.id)
+ }
+ })
+ }
this.provinceOptions = res.data.province
})
},
@@ -452,7 +460,7 @@
position: data.position || "",
province_id: data.province_id || 0,
region_id: data.region_id || 0,
- wechat: data.wechat || "",
+ wechat: data.wechat || ""
// codeStandID: data.ID,
}
return params
@@ -478,14 +486,14 @@
selClient(row) {
console.log(row)
this.clientId = row.id
- this.$set( this.editConfig.infomation,'client_name',row.name)
+ this.$set(this.editConfig.infomation, "client_name", row.name)
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient() {
- console.log(this.editConfig.infomation.client_name,'sssssssss')
+ console.log(this.editConfig.infomation.client_name, "sssssssss")
// if (this.editConfig.infomation.client_name !== "") {
this.clientId = null
- this.$set(this.editConfig.infomation,'client_name','')
+ this.$set(this.editConfig.infomation, "client_name", "")
// }
},
// 娣诲姞闄勪欢
@@ -516,6 +524,14 @@
}
}
})
+ },
+ // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+ validateMemberId(rule, value, callback) {
+ if (this.editConfig.infomation?.member_id > 0) {
+ callback()
+ } else {
+ callback(new Error("璇疯緭鍏ラ攢鍞礋璐ｄ汉"))
+ }
}
}
}
--
Gitblit v1.8.0