Commit 0d58b778 authored by tianhongyang's avatar tianhongyang

fix

parent 5d833de3
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition> <access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition>
<!-- 3、供应商合作记录 --> <!-- 3、供应商合作记录 -->
<cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId" <cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId"
:company-name="companyName"></cooperation-record> :company-name="companyName" :ctm-id="ctmId"></cooperation-record>
<!-- 4、施工业绩 --> <!-- 4、施工业绩 -->
<construction-performance v-if="currentPath.pathName=='constructionPerformance'" :company-id="companyId"></construction-performance> <construction-performance v-if="currentPath.pathName=='constructionPerformance'" :company-id="companyId"></construction-performance>
<!-- 5、在施工程情况 --> <!-- 5、在施工程情况 -->
...@@ -145,7 +145,7 @@ import DecisionMaking from "./decisionMaking"; //决策链条 ...@@ -145,7 +145,7 @@ import DecisionMaking from "./decisionMaking"; //决策链条
import Gjjl from "../../project/projectList/component/gjjl"; //跟进记录 import Gjjl from "../../project/projectList/component/gjjl"; //跟进记录
import ConsultingAgencyCooperation from "@/views/detail/party-a/internalCooperation/consultingAgencyCooperation"; //内部合作 咨询机构合作 import ConsultingAgencyCooperation from "@/views/detail/party-a/internalCooperation/consultingAgencyCooperation"; //内部合作 咨询机构合作
import AccessCondition from "@/views/detail/party-a/internalCooperation/accessCondition"; //内部合作 准入情况 import AccessCondition from "@/views/detail/party-a/internalCooperation/accessCondition"; //内部合作 准入情况
import CooperationRecord from "@/views/detail/party-a/internalCooperation/cooperationRecord"; //内部合作 准入情况 import CooperationRecord from "@/views/detail/party-a/internalCooperation/cooperationRecord"; //内部合作 供应商合作记录
import ConstructionPerformance from "@/views/detail/party-a/internalCooperation/constructionPerformance"; //内部合作 施工业绩 import ConstructionPerformance from "@/views/detail/party-a/internalCooperation/constructionPerformance"; //内部合作 施工业绩
import ConstructionSituation from "@/views/detail/party-a/internalCooperation/constructionSituation"; //内部合作 在施工程情况 import ConstructionSituation from "@/views/detail/party-a/internalCooperation/constructionSituation"; //内部合作 在施工程情况
import { import {
...@@ -214,6 +214,8 @@ export default { ...@@ -214,6 +214,8 @@ export default {
// 企业名称 // 企业名称
companyName: "", companyName: "",
companyId: '', //企业Id(测试默认3068) companyId: '', //企业Id(测试默认3068)
// 供应商Id
ctmId: "",
customerId: '', //企业Id(测试默认'a00d582a6041f32c16aac804e4924736') customerId: '', //企业Id(测试默认'a00d582a6041f32c16aac804e4924736')
isCompany: false, //判断是否有建设库数据 isCompany: false, //判断是否有建设库数据
isCustomer: false, //判断是否展示修改客户信息 isCustomer: false, //判断是否展示修改客户信息
...@@ -243,6 +245,7 @@ export default { ...@@ -243,6 +245,7 @@ export default {
}, },
watch: { watch: {
'$route'(to, from) { '$route'(to, from) {
// 该项目 不要传递 customerId 传递ctmId 该逻辑只是复制央企项目过来 没有实际意义
if (to.name == 'PartyA' && to.query.customerId) { if (to.name == 'PartyA' && to.query.customerId) {
if (to.query.customerId && to.query.path == 'business' || to.query.path == 'gjjl') { if (to.query.customerId && to.query.path == 'business' || to.query.path == 'gjjl') {
if (this.companyId == 0) { if (this.companyId == 0) {
...@@ -290,9 +293,12 @@ export default { ...@@ -290,9 +293,12 @@ export default {
async init() { async init() {
try { try {
if (this.$route.params.id) { // 获取companyId if (this.$route.params.id) { // 获取companyId
const { companyName, ctmId } = this.$route.query;
let companyId = this.$route.params.id; let companyId = this.$route.params.id;
// 有企业名的情况下带上企业名称 // 有企业名的情况下带上企业名称
this.companyName = this.$route.query.companyName ? this.$route.query.companyName : ""; this.companyName = companyName ? companyName : "";
// 供应商id
this.ctmId = ctmId ? ctmId : "";
await this.getCompanyId(companyId); await this.getCompanyId(companyId);
} }
} catch (error) { } catch (error) {
...@@ -311,8 +317,8 @@ export default { ...@@ -311,8 +317,8 @@ export default {
this.listenSider(); this.listenSider();
await this.handleQuery(); await this.handleQuery();
await this.getStatistic(this.companyName); await this.getStatistic(this.companyName);
await this.association(this.$route.query.customerId); // await this.association(this.$route.query.customerId);
await this.association();
this.$refs.sidebar.getFinancial(data); this.$refs.sidebar.getFinancial(data);
} }
}, },
......
...@@ -47,11 +47,11 @@ export default { ...@@ -47,11 +47,11 @@ export default {
DialogHeadFormNew, DialogHeadFormNew,
DialogTables DialogTables
}, },
props: ['companyId', "companyName"], props: ['companyId', "companyName", "ctmId"],
data() { data() {
return { return {
queryParams: { queryParams: {
customerId: this.companyId, customerId: this.ctmId,
customerName: this.companyName, customerName: this.companyName,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment