From 1249ca8ff44f8de7992fdb5866eae19613d606c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 16 八月 2023 19:37:49 +0800
Subject: [PATCH] 详情页联调
---
src/views/sales/subOrder/index.vue | 6 +
src/views/service/serviceContract/DetailServiceContract.vue | 14 ++
src/views/service/clientServiceOrder/DetailClientServiceOrder.vue | 2
src/views/client/client/DetailClientManage.vue | 1
src/views/sales/masterOrder/DetailMasterOrder.vue | 12 +
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 12 +-
src/views/sales/refundForm/index.vue | 6 +
src/views/client/salesLead/DetailSalesLead.vue | 1
src/common/untils/request.js | 2
src/views/sales/salesOpportunity/DetailOpportunity.vue | 25 ++++-
src/views/sales/salesDetails/DetailSpecification.vue | 20 +++
src/views/sales/salesReturn/index.vue | 6 +
src/views/client/followupRecords/index.vue | 8 +
src/views/sales/quotation/DetailQuotation.vue | 18 +++
src/views/sales/salesOpportunity/index.vue | 31 +++++-
src/views/sales/salesReturn/DetailReturn.vue | 14 ++
src/views/sales/subOrder/DetailSubOrder.vue | 14 ++
src/views/service/clientServiceOrder/index.vue | 31 ++++-
src/views/client/contacts/DetailContacts.vue | 3
src/views/service/serviceContract/index.vue | 33 +++++-
20 files changed, 206 insertions(+), 53 deletions(-)
diff --git a/src/common/untils/request.js b/src/common/untils/request.js
index 9418a79..866adce 100644
--- a/src/common/untils/request.js
+++ b/src/common/untils/request.js
@@ -30,7 +30,7 @@
/* //瀵瑰搷搴旀暟鎹仛浜涗簨 */
if (res.data.code === 200) {
return res.data ? res.data : {}
- } else if (res.data.code === 700001) {
+ } else if (res.data.code === 700001 || res.data.code === 700005) {
console.log("瀹㈡埛鍚嶇О閲嶅")
return res
} else {
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 8c968bb..4716456 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -254,6 +254,7 @@
keywordType: "瀹㈡埛鍚嶇О",
keyword: this.detailConfig.infomation.name,
id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
client_name: this.detailConfig.infomation.name,
contact_name: this.detailConfig.infomation.contact_name,
client_status_id: this.detailConfig.infomation.client_status_id,
diff --git a/src/views/client/contacts/DetailContacts.vue b/src/views/client/contacts/DetailContacts.vue
index b886609..83f8206 100644
--- a/src/views/client/contacts/DetailContacts.vue
+++ b/src/views/client/contacts/DetailContacts.vue
@@ -157,8 +157,9 @@
created() {
this.setData(this.detailConfig.infomation)
this.addConfig = {
- id_name: "contact_id",
+ id_name: "contact_name",
id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
client_name: this.detailConfig.infomation.client_name,
contact_name: this.detailConfig.infomation.name,
client_status_id: this.detailConfig.infomation.Client.client_status_id,
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 17d4a0e..7227a7e 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -131,8 +131,14 @@
if (!this.isDetail) {
this.search_map = {}
} else {
+ let content = ""
+ if (this.addConfig.keywordType === "閿�鍞満浼�") {
+ content = this.addConfig.id
+ } else {
+ content = this.addConfig.common_name
+ }
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: content
}
}
this.getData(this.search_map)
diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue
index 22e0c18..7708428 100644
--- a/src/views/client/salesLead/DetailSalesLead.vue
+++ b/src/views/client/salesLead/DetailSalesLead.vue
@@ -153,6 +153,7 @@
this.addConfig = {
id_name: "sales_leads_id",
id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.id,
sales_leads_name: this.detailConfig.infomation.name,
sales_leads_id: this.detailConfig.infomation.id
}
diff --git a/src/views/sales/masterOrder/DetailMasterOrder.vue b/src/views/sales/masterOrder/DetailMasterOrder.vue
index 1e243d8..740aa2a 100644
--- a/src/views/sales/masterOrder/DetailMasterOrder.vue
+++ b/src/views/sales/masterOrder/DetailMasterOrder.vue
@@ -98,14 +98,18 @@
isBasicExpand: true, // 鍩烘湰淇℃伅
basicInfoList: [],
isAnnexExpand: true, // 闄勪欢淇℃伅
- addCommonConfig: {
- master_order_number: this.masterOrderDetail.infomation.number,
- masterOrderId: this.masterOrderDetail.infomation.id
- }
+ addCommonConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addCommonConfig = {
+ id_name: "master_order_number",
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.number,
+ master_order_number: this.masterOrderDetail.infomation.number,
+ masterOrderId: this.masterOrderDetail.infomation.id
+ }
},
mounted() {},
methods: {
diff --git a/src/views/sales/quotation/DetailQuotation.vue b/src/views/sales/quotation/DetailQuotation.vue
index 6499e00..8f65d45 100644
--- a/src/views/sales/quotation/DetailQuotation.vue
+++ b/src/views/sales/quotation/DetailQuotation.vue
@@ -126,10 +126,10 @@
<!-- <FollowupRecords :isDetail="true" /> -->
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'serviceContract'" class="second">
- <ServiceContract :isDetail="true" />
+ <ServiceContract :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -174,11 +174,23 @@
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ id_name: "quotation_number",
+ keywordType: "鎶ヤ环鍗�",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id
+ }
this.setTableForm()
},
mounted() {},
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index a61c1e6..2876234 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -60,6 +60,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 0e4cddf..24c8b48 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -200,13 +200,13 @@
<!-- <FollowupRecords :isDetail="true" /> -->
</div>
<div v-if="activeName === 'return'" class="second">
- <SalesReturn :isDetail="true" />
+ <SalesReturn :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'serviceContract'" class="second">
- <ServiceContract :isDetail="true" />
+ <ServiceContract :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'refundForm'" class="second">
- <RefundForm :isDetail="true" />
+ <RefundForm :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -257,11 +257,23 @@
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ id_name: "sale_detail_name",
+ keywordType: "閿�鍞槑缁嗗崟",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id
+ }
this.setTableForm()
},
mounted() {},
diff --git a/src/views/sales/salesOpportunity/DetailOpportunity.vue b/src/views/sales/salesOpportunity/DetailOpportunity.vue
index 34f0131..90985b1 100644
--- a/src/views/sales/salesOpportunity/DetailOpportunity.vue
+++ b/src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -240,19 +240,19 @@
</div> -->
</div>
<div v-if="activeName === 'second'" class="second">
- <FollowupRecords :isDetail="true" />
+ <FollowupRecords :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'collectionForecast'" class="second">
<!-- <SalesOpportunity :isDetail="true" /> -->
</div>
<div v-if="activeName === 'quotation'" class="second">
- <Quotation :isDetail="true" />
+ <Quotation :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'serviceContract'" class="second">
- <ServiceContract :isDetail="true" />
+ <ServiceContract :isDetail="true" :add-config="addConfig" />
</div>
</div>
<!-- 鎺ㄨ繘 -->
@@ -311,10 +311,25 @@
active: "",
allOptions: [],
options: []
- }
+ },
+ addConfig: {}
}
},
created() {
+ this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ id_name: "sale_chance_id",
+ keywordType: "閿�鍞満浼�",
+ keyword: this.detailConfig.infomation.name,
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id,
+ sale_chance_name: this.detailConfig.infomation.name,
+ sale_chance_id: this.detailConfig.infomation.id
+ }
this.getSaleStageList()
this.setData(this.detailConfig.infomation)
},
diff --git a/src/views/sales/salesOpportunity/index.vue b/src/views/sales/salesOpportunity/index.vue
index 839f2a4..7d04bf4 100644
--- a/src/views/sales/salesOpportunity/index.vue
+++ b/src/views/sales/salesOpportunity/index.vue
@@ -31,10 +31,10 @@
@getSelectArray="getSelectArray"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="120">
+ <el-table-column label="鎿嶄綔" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button type="text" size="small">璺熻繘</el-button>
+ <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
<!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
</template>
</el-table-column>
@@ -48,6 +48,8 @@
<DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
<!-- 鑱旂郴浜鸿鎯� -->
<DetailContacts v-if="contactsDeail.visible" :contacts-detail="contactsDeail" />
+ <!-- 鏂板缓/缂栬緫璺熻繘璁板綍 -->
+ <AddFollowupRecordsDialog v-if="editFollowupConfig.visible" :edit-contacts-config="editFollowupConfig" />
</div>
</template>
@@ -56,6 +58,7 @@
import { getSaleChanceList, getDelSaleChance } from "@/api/sales/salesOpportunity"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailOpportunity from "@/views/sales/salesOpportunity/DetailOpportunity"
+import AddFollowupRecordsDialog from "@/views/client/followupRecords/AddFollowupRecordsDialog"
export default {
name: "SalesOpportunity",
@@ -76,7 +79,8 @@
AddSalesOpportunityDialog,
DetailOpportunity,
DetailContacts: () => import("@/views/client/contacts/DetailContacts"),
- DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddFollowupRecordsDialog
},
computed: {},
data() {
@@ -126,7 +130,12 @@
infomation: {}
},
search_map: {},
- selValueList: []
+ selValueList: [],
+ editFollowupConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ }
}
},
created() {
@@ -272,13 +281,25 @@
selContactsClick(row) {
console.log(row)
this.contactsDeail.visible = true
- this.contactsDeail.infomation = { ...row.contact }
+ this.contactsDeail.infomation = { ...row.contact, sale_chance_name: row.name, sale_chance_id: row.id }
},
// 鏈轰細鍚嶇О璇︽儏
selCommonClick(row) {
console.log(row)
this.opportunityDeail.visible = true
this.opportunityDeail.infomation = { ...row }
+ },
+ // 璺熻繘
+ followupClick(row) {
+ console.log(row)
+ this.editFollowupConfig.visible = true
+ this.editFollowupConfig.title = "鏂板缓"
+ this.editFollowupConfig.infomation = {
+ ...row,
+ number: "",
+ sale_chance_name: row.name,
+ sale_chance_id: row.id
+ }
}
}
}
diff --git a/src/views/sales/salesReturn/DetailReturn.vue b/src/views/sales/salesReturn/DetailReturn.vue
index 9cd2e7e..c47b0c1 100644
--- a/src/views/sales/salesReturn/DetailReturn.vue
+++ b/src/views/sales/salesReturn/DetailReturn.vue
@@ -123,7 +123,7 @@
</div>
</div>
<div v-if="activeName === 'refundForm'" class="second">
- <RefundForm :isDetail="true" />
+ <RefundForm :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -165,11 +165,21 @@
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ keywordType: "閿�鍞��璐у崟",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id
+ }
this.setTableForm()
},
mounted() {},
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 88d5af4..f0f727b 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -61,6 +61,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index fa66982..5e47425 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -83,7 +83,7 @@
</div>
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -123,11 +123,21 @@
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ keywordType: "閿�鍞瓙鍗�",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id
+ }
this.setTableForm()
},
mounted() {},
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index bf615ca..bd300a8 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -138,7 +138,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.common_name
}
}
this.getData(this.search_map)
@@ -301,5 +301,9 @@
.el-table .el-table__cell {
padding: 0;
}
+ .el-table__header tr,
+ .el-table__header th {
+ height: 48px;
+ }
}
</style>
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index 5450cbc..d9d1319 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -677,7 +677,7 @@
contactId: this.editCommonConfig.infomation.contactId,
serviceContractId: this.editCommonConfig.infomation.serviceContractId,
SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
- productNameId: this.editCommonConfig.infomation.productId,
+ productName: this.editCommonConfig.infomation.productName,
saleChanceId: this.editCommonConfig.infomation.saleChanceId
}
},
@@ -769,7 +769,8 @@
SalesDetailsId: this.SalesDetailsId || 0,
priorityLevelId: data.priorityLevelId || 0,
problemDesc: data.problemDesc || "",
- productId: this.productNameId,
+ productName: this.productName,
+ productTypeName: "",
realTime: data.realTime || "",
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
@@ -798,7 +799,6 @@
} else if (value === "contract") {
restaurants = this.salesDetailsList
} else if (value === "productName") {
- console.log(this.productList)
restaurants = this.productList
} else if (value === "contact") {
restaurants = this.contactNamelist
@@ -827,7 +827,7 @@
} else if (value === "contract") {
this.SalesDetailsId = item.id
} else if (value === "productName") {
- this.productNameId = item.Number
+ this.productName = item.Name
} else if (value === "contact") {
this.contactId = item.id
} else if (value === "chance") {
@@ -869,7 +869,7 @@
this.SalesDetailsId = row.id
} else if (value === "productName") {
this.editConfig.infomation.product_name = row.Name
- this.productNameId = row.Number
+ this.productName = row.Name
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
@@ -888,7 +888,7 @@
this.SalesDetailsId = 0
} else if (value === "productName") {
this.editConfig.infomation.product_name = ""
- this.productNameId = 0
+ this.productName = ""
} else if (value === "contact") {
this.editConfig.infomation.contact_name = ""
this.contactId = 0
diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
index f11ef4d..8eaf37b 100644
--- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
+++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue
@@ -371,7 +371,7 @@
leftStr: "浜у搧绫诲埆",
leftValue: "",
rightStr: "浜у搧鍚嶇О",
- rightValue: data.Product.name
+ rightValue: data.productName
},
{
leftStr: "鏈嶅姟鏂瑰紡",
diff --git a/src/views/service/clientServiceOrder/index.vue b/src/views/service/clientServiceOrder/index.vue
index c2d952d..d4b8927 100644
--- a/src/views/service/clientServiceOrder/index.vue
+++ b/src/views/service/clientServiceOrder/index.vue
@@ -61,6 +61,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -107,11 +113,20 @@
value: "serviceNumber",
label: "鏈嶅姟鍗曠紪鍙�"
},
- selValueList: []
+ selValueList: [],
+ keyword: "",
+ keywordType: ""
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
@@ -137,11 +152,11 @@
}
},
// 璇锋眰鏁版嵁
- async getData(keyword, keywordType) {
+ async getData() {
this.loading = true
await getServiceOrderList({
- keyword: keyword,
- keywordType: keywordType,
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
salesDetailsId: 0,
@@ -182,11 +197,13 @@
},
// 鎼滅储
searchClick(val, content) {
- console.log(val, content)
- this.getData(content, val.label)
+ this.keyword = content
+ this.keywordType = val.label
+ this.getData()
},
resetClick() {
- this.search_map = {}
+ this.keyword = ""
+ this.keywordType = ""
this.getData()
},
// 鏂板缓
diff --git a/src/views/service/serviceContract/DetailServiceContract.vue b/src/views/service/serviceContract/DetailServiceContract.vue
index 677c90d..a852e68 100644
--- a/src/views/service/serviceContract/DetailServiceContract.vue
+++ b/src/views/service/serviceContract/DetailServiceContract.vue
@@ -151,7 +151,7 @@
<!-- <FollowupRecords :isDetail="true" /> -->
</div>
<div v-if="activeName === 'clientService'" class="second">
- <ClientServiceOrder :isDetail="true" />
+ <ClientServiceOrder :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'invoice'" class="second">
<!-- <FollowupRecords :isDetail="true" /> -->
@@ -200,11 +200,21 @@
sumProp: ["other1", "other2", "other3", "other4"],
mergeNumber: 3
},
- productTableList: {}
+ productTableList: {},
+ addConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ keywordType: "鏈嶅姟鍚堝悓",
+ keyword: this.detailConfig.infomation.number,
+ id: this.detailConfig.infomation.id,
+ client_name: this.detailConfig.infomation.client.name,
+ contact_name: this.detailConfig.infomation.contact_name,
+ client_id: this.detailConfig.infomation.client_id,
+ contact_id: this.detailConfig.infomation.contact_id
+ }
this.setTableForm()
},
mounted() {},
diff --git a/src/views/service/serviceContract/index.vue b/src/views/service/serviceContract/index.vue
index 180b8e7..fec9873 100644
--- a/src/views/service/serviceContract/index.vue
+++ b/src/views/service/serviceContract/index.vue
@@ -56,6 +56,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -108,11 +114,20 @@
value: "number",
label: "鏈嶅姟鍚堝悓缂栧彿"
},
- selValueList: []
+ selValueList: [],
+ keyword: "",
+ keywordType: ""
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
@@ -140,11 +155,11 @@
}
},
// 璇锋眰鏁版嵁
- async getData(keyword, keywordType) {
+ async getData() {
this.loading = true
await getServiceContractList({
- keyword: keyword,
- keywordType: keywordType,
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -179,18 +194,20 @@
},
// 鎼滅储
searchClick(val, content) {
- console.log(val, content)
- this.getData(content, val.label)
+ this.keyword = content
+ this.keywordType = val.label
+ this.getData()
},
resetClick() {
- this.search_map = {}
+ this.keyword = ""
+ this.keywordType = ""
this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { ...this.addConfig }
},
// 缂栬緫
handleClick(row) {
--
Gitblit v1.8.0