From 94ad4de767b25b0e6b2486287da90a7cb78ad3d3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 12 十月 2023 18:48:13 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 2dd0b08..1320e66 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -22,6 +22,26 @@
<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="client_name">
<div class="custom-name">
@@ -47,11 +67,6 @@
<i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
- </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" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col v-if="isUnflod" :span="12">
@@ -324,8 +339,10 @@
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import SelectLeadDialog from "@/views/other/commonDialog/SelectLeadDialog"
+import codeMixin from "./mixin/codeMixin";
export default {
name: "AddFollowupRecordsDialog",
+ mixins: [codeMixin],
props: {
editContactsConfig: {
type: Object,
@@ -364,6 +381,8 @@
number: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰曠紪鍙�", trigger: "blur" }],
member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
record: [{ required: true, message: "璇疯緭鍏ヨ窡杩涜褰�", trigger: "blur" }],
+ client_name:[{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
+ topic:[{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
// content: [{ required: true, message: "璇疯緭鍏ュ唴瀹�", trigger: "blur" }],
phoneNumber: [
{ required: false, message: "", trigger: "blur" },
@@ -408,7 +427,7 @@
clientId: this.editContactsConfig.infomation.client_id,
contactId: this.editContactsConfig.infomation.contact_id,
saleChanceId: this.editContactsConfig.infomation.sale_chance_id,
- saleLeadId: this.editContactsConfig.infomation.sales_leads_id
+ saleLeadId: this.editContactsConfig.infomation.sales_leads_id,
}
},
created() {
@@ -418,8 +437,27 @@
this.$store.dispatch("geLead")
this.getCommonData()
this.getContactInfoList()
+ 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() {
getAllData().then((res) => {
console.log(res)
@@ -495,7 +533,9 @@
record: data.record || "",
sale_chance_id: this.saleChanceId || 0,
sales_leads_id: this.saleLeadId || 0,
- topic: data.topic || ""
+ topic: data.topic || "",
+ codeStandID:data.ID,
+ codeRule:this.codeRule,
}
}
let params = {}
--
Gitblit v1.8.0