From 7979474ca5570945126d7f087fa4363272d964b4 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期三, 28 二月 2024 14:34:25 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web into dev --- src/views/other/commonDialog/SelectCommonDialog.vue | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue index f7d6074..3603f67 100644 --- a/src/views/other/commonDialog/SelectCommonDialog.vue +++ b/src/views/other/commonDialog/SelectCommonDialog.vue @@ -177,9 +177,14 @@ } else if (this.editConfig.title === "鎶ヤ环鍗�") { this.tableColumn = [ { label: "鎶ヤ环鍗曞彿", prop: "number", isClick: true, default: true }, // 鎶ヤ环鍗曞彿 - { label: "閿�鍞礋璐d汉", prop: "member_name" } // 閿�鍞礋璐d汉 + { label: "鎶ヤ环鍚嶇О", prop: "quotationName" }, + { label: "閿�鍞礋璐d汉", prop: "member_name" }, // 閿�鍞礋璐d汉 + { label: "瀹㈡埛鍚嶇О", prop: "client_name" }, + { label: "鎵�灞炰笟鍔℃満浼�", prop: "sale_chance_name" }, + { label: "鎶ヤ环鍗曠姸鎬�", prop: "quotationStatus" }, + { label: "鍚堣", prop: "amountTotal" } ] - this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐d汉"] + this.showCol = ["鎶ヤ环鍗曞彿", "鎶ヤ环鍚嶇О", "閿�鍞礋璐d汉", "瀹㈡埛鍚嶇О", "鎵�灞炰笟鍔℃満浼�", "鎶ヤ环鍗曠姸鎬�", "鍚堣"] this.tableList = { selectIndex: true, @@ -363,7 +368,10 @@ this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => { return { ...item, - member_name: item.member.username + client_name: item.client.name, + sale_chance_name: item.sale_chance.name, + member_name: item.member.username, + quotationStatus: item.quotation_status.name } }) this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0 @@ -379,7 +387,10 @@ const list = res.data.list.map((item) => { return { ...item, - member_name: item.member.username + client_name: item.client.name, + sale_chance_name: item.sale_chance.name, + member_name: item.member.username, + quotationStatus: item.quotation_status.name } }) this.tableList.tableInfomation = list || [] -- Gitblit v1.8.0