From 22b4ff2a9e7eca77b2cdcc393ef552cc627054c4 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期三, 11 十月 2023 15:27:24 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/client/contacts/AddContactsDialog.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index e53b170..a814978 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -23,14 +23,29 @@
<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="editConfig.infomation.id || 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">
@@ -256,8 +271,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,
@@ -333,8 +350,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 =
@@ -414,7 +450,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
},
--
Gitblit v1.8.0