From 33836e44d74759010d8e79f3cc702186c4bdf4ea Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 17 十月 2023 11:22:56 +0800 Subject: [PATCH] bug修复(5235 5236) --- src/views/client/contacts/AddContactsDialog.vue | 79 ++++++++++++++++++++++++++++++--------- 1 files changed, 61 insertions(+), 18 deletions(-) diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue index 3b3bc45..e03be94 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,6 +52,7 @@ :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> @@ -72,7 +84,12 @@ </el-col> <el-col :span="12"> <el-form-item v-if="isUnflod" label="閿�鍞礋璐d汉" 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> @@ -95,6 +112,7 @@ v-model="editConfig.infomation.birthday" value-format="yyyy-MM-dd" type="date" + style="width: 100%" placeholder="閫夋嫨鏃ユ湡" > </el-date-picker> @@ -254,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, @@ -276,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'] } ] }, @@ -331,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 = @@ -412,7 +452,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 }, @@ -509,7 +551,7 @@ } .common-select { .common-select-sel { - width: 270px; + width: 100%; } } } @@ -527,6 +569,7 @@ justify-content: center; align-items: center; color: #6166d3; + cursor: pointer; } .dialog-footer { background-color: #f5f5f5; -- Gitblit v1.8.0