From 0bdc7d10c8c4b13a993f5f1474b7fb2fc8c88fc9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 14:26:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/client/contacts/AddContactsDialog.vue | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 27 deletions(-)
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index d228881..edd0a04 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"
>
<!-- 淇℃伅 -->
@@ -23,14 +23,25 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+ <el-col :span="12" v-if="isUnflod">
+ <el-form-item label="鑱旂郴浜虹紪鍙�" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="this.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>鑷姩鐢熸垚</span>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="鑱旂郴浜哄鍚�" prop="name">
<el-input v-model="editConfig.infomation.name"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12" v-if="isUnflod">
- <el-form-item label="鑱旂郴浜虹紪鍙�" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -41,12 +52,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 +84,12 @@
</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>
@@ -76,13 +97,7 @@
</el-col>
<el-col :span="12">
<el-form-item v-if="isUnflod" label="棣栬鑱旂郴浜�" prop="is_first">
- <el-switch
- v-model="editConfig.infomation.is_first"
- active-color="#2E68DB"
- inactive-color="#AEB9CA"
- active-value="鏄�"
- inactive-value="鍚�"
- >
+ <el-switch v-model="editConfig.infomation.is_first" active-color="#2E68DB" inactive-color="#AEB9CA">
</el-switch>
</el-form-item>
</el-col>
@@ -97,6 +112,7 @@
v-model="editConfig.infomation.birthday"
value-format="yyyy-MM-dd"
type="date"
+ style="width: 100%"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -256,8 +272,10 @@
import { getAllData } from "@/api/client/client"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import { getCityList } from "@/api/common/address"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddContactsDialog",
+ mixins: [codeMixin],
props: {
editContactsConfig: {
type: Object,
@@ -278,27 +296,28 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editContactsConfig,
rules: {
- name: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ 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'] }],
phone: [
- { required: false, message: "", trigger: "blur" },
- { len: 11, message: "闀垮害鍦�11涓瓧绗�", trigger: "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: "blur"
+ trigger: ["change",'blur']
}
],
email: [
- { required: false, message: "", trigger: "blur" },
+ { required: false, message: "", trigger: ["change",'blur'] },
{
pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
- trigger: "blur"
+ trigger: ["change",'blur']
}
]
},
@@ -333,8 +352,27 @@
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
+ this.formInfo()
+ },
+ watch: {
+ "editContactsConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editContactsConfig.infomation.codeStandID"() {
+ this.formInfo()
+ }
},
methods: {
+ formInfo() {
+ this.objCode.type = "鑱旂郴浜虹紪鐮�"
+ 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 =
@@ -353,6 +391,7 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
const params = this.saveParams()
@@ -414,7 +453,9 @@
position: data.position || "",
province_id: data.province_id || 0,
region_id: data.region_id || 0,
- wechat: data.wechat || ""
+ wechat: data.wechat || "",
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -430,6 +471,7 @@
}
},
handleSelectClient(item) {
+ this.editConfig.infomation.client_name = item.name
this.clientId = item.id
},
selClientClick() {
@@ -442,8 +484,12 @@
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient() {
+ console.log("sssssssss")
+ console.log(this.editConfig.infomation.client_name)
+ // if (this.editConfig.infomation.client_name !== "") {
this.editConfig.infomation.client_name = ""
this.clientId = 0
+ // }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -506,7 +552,7 @@
}
.common-select {
.common-select-sel {
- width: 270px;
+ width: 100%;
}
}
}
@@ -524,6 +570,7 @@
justify-content: center;
align-items: center;
color: #6166d3;
+ cursor: pointer;
}
.dialog-footer {
background-color: #f5f5f5;
--
Gitblit v1.8.0