From 4faaa50ff4a44a07949f82271170bec1d9a9e8ef Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 11 十月 2023 16:06:23 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index 69c9edd..9bc0695 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -23,6 +23,31 @@
<div class="basic-info-title">鏈轰細鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+<!-- <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">
+ <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 +72,6 @@
<i class="el-icon-remove-outline" 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">
@@ -552,8 +572,11 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import { getCityList } from "@/api/common/address"
+import WordInput from "@/components/wordInput.vue";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
export default {
name: "AddSalesOpportunityDialog",
+ mixins:[codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -566,7 +589,7 @@
}
}
},
- components: { SelectClientDialog, SelectContactDialog },
+ components: {WordInput, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -615,7 +638,8 @@
},
restaurants: [],
clientId: this.editCommonConfig.infomation.client_id,
- contactId: this.editCommonConfig.infomation.contact_id
+ contactId: this.editCommonConfig.infomation.contact_id,
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�",codeStandID:'' },
}
},
created() {
@@ -625,8 +649,26 @@
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
+ this.formInfo();
+ },
+ watch:{
+ 'editConfig.visible'(val){
+ if(val){
+ this.formInfo()
+ }
+ },
+ 'editConfig.infomation.codeStandID'(){
+ this.formInfo()
+ }
},
methods: {
+ formInfo(){
+ 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 =
@@ -727,7 +769,10 @@
whether_established: data.whether_established || "",
remark: data.remark || "",
- detail_address: data.detail_address || ""
+ detail_address: data.detail_address || "",
+
+ codeStandID:data.ID,
+ codeRule:this.codeRule,
}
return params
},
--
Gitblit v1.8.0