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/client/index.vue | 4
src/views/client/contacts/AddContactsDialog.vue | 50 ++++++++++++++--
src/views/client/salesLead/index.vue | 4
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 3 -
src/views/client/salesLead/AddSalesLeadDialog.vue | 49 ++++++++++++++--
src/views/client/client/AddClientManageDialog.vue | 50 ++++++++++++++--
src/views/client/followupRecords/mixin/codeMixin.js | 2
7 files changed, 136 insertions(+), 26 deletions(-)
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 62e3560..abb9144 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -24,17 +24,32 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
+ <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">
<div class="custom-name">
<el-input v-model="editConfig.infomation.name"></el-input>
<!-- <div class="common-select-btn"><i class="el-icon-house" title="宸ュ晢鏌ヨ"></i></div> -->
<!-- <div class="common-select-btn"><i class="el-icon-search" title="鏌ラ噸"></i></div> -->
</div>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="瀹㈡埛缂栧彿" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -495,8 +510,10 @@
<script>
import { getAllData, getAddClient, getUpdateClient, checkNameClient } from "@/api/client/client"
import { getCityList } from "@/api/common/address"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
export default {
name: "AddClientManageDialog",
+ mixins: [codeMixin],
props: {
editClientManageConfig: {
type: Object,
@@ -572,8 +589,27 @@
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
+ this.formInfo();
+ },
+ watch:{
+ 'editClientManageConfig.visible'(val){
+ if(val){
+ this.formInfo()
+ }
+ },
+ 'editClientManageConfig.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 =
@@ -688,7 +724,9 @@
representative: data.representative || "",
service_member_id: data.service_member_id || 0,
sales_leads_id: data.sales_leads_id || 0,
- contact_id: data.contact_id || 0
+ contact_id: data.contact_id || 0,
+ codeStandID:data.ID,
+ codeRule:this.codeRule,
}
return params
},
diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index 1496972..1780ee3 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -284,7 +284,6 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = {
city_id: 0,
@@ -296,15 +295,16 @@
enterprise_scale_id: 1,
industry_id: 1
}
+ this.editConfig.visible = true
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = {
...row
}
+ this.editConfig.visible = true
},
// 鍒犻櫎
delClick(id) {
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
},
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 5604167..5ae30a9 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -23,9 +23,6 @@
<div class="basic-info-view">
<el-row>
<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-form-item label="璺熻繘璁板綍缂栧彿" prop="number">
<WordInput
v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
diff --git a/src/views/client/followupRecords/mixin/codeMixin.js b/src/views/client/followupRecords/mixin/codeMixin.js
index 0594f64..8523a34 100644
--- a/src/views/client/followupRecords/mixin/codeMixin.js
+++ b/src/views/client/followupRecords/mixin/codeMixin.js
@@ -37,7 +37,7 @@
this.codeRule= (res.data.data&&res.data.data.data) ? res.data.data.data[0]:{}
let autoRule=AutoRule
let method=Method?Method:0
- this.method=method;
+ this.method=method
let rules=List
this.editConfig.infomation.ID=ID
if (method == 0 && res.data.data.data.length > 0) {
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 96ecfcc..52c05e6 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -21,13 +21,28 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
- <el-input v-model="editConfig.infomation.name" style="width: 100%"></el-input>
+ <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="number">
- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input>
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-input v-model="editConfig.infomation.name" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<!-- </el-row>
@@ -232,9 +247,10 @@
import { getAddSalesLeads, getUpdateSalesLeads } from "@/api/client/salesLead"
import { getAllData } from "@/api/client/client"
import { getCityList } from "@/api/common/address"
-
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
export default {
name: "AddSalesLeadDialog",
+ mixins: [codeMixin],
props: {
editSalesLeadConfig: {
type: Object,
@@ -288,9 +304,28 @@
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
+ this.formInfo();
},
mounted() {},
+ watch:{
+ 'editSalesLeadConfig.visible'(val){
+ if(val){
+ this.formInfo()
+ }
+ },
+ 'editSalesLeadConfig.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 =
@@ -332,7 +367,9 @@
province_id: this.editConfig.infomation.province_id || 0,
region_id: this.editConfig.infomation.region_id || 0,
sales_sources_id: this.editConfig.infomation.sales_sources_id || 0,
- detail_address: this.editConfig.infomation.detail_address || ""
+ detail_address: this.editConfig.infomation.detail_address || "",
+ codeStandID:this.editConfig.infomation.ID,
+ codeRule:this.codeRule,
}
console.log(params)
if (this.editConfig.title === "鏂板缓") {
diff --git a/src/views/client/salesLead/index.vue b/src/views/client/salesLead/index.vue
index d629572..7da5f86 100644
--- a/src/views/client/salesLead/index.vue
+++ b/src/views/client/salesLead/index.vue
@@ -213,16 +213,16 @@
},
// 鏂板缓
addBtnClick() {
- this.editSalesLeadConfig.visible = true
this.editSalesLeadConfig.title = "鏂板缓"
this.editSalesLeadConfig.infomation = { businessStatus: "鏂板缓", city_id: 0 }
+ this.editSalesLeadConfig.visible = true
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editSalesLeadConfig.visible = true
this.editSalesLeadConfig.title = "缂栬緫"
this.editSalesLeadConfig.infomation = { ...row, businessStatus: "鏂板缓" }
+ this.editSalesLeadConfig.visible = true
},
// 璺熻繘
followupClick(row) {
--
Gitblit v1.8.0