diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 10bb928..744562a 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -25,15 +25,15 @@ - + - 来款方式: - 合同 + {{createIncomeType(basicInfo.projectType)}}: + {{ basicInfo.chargeWay_dictText }} 合同编号: - {{basicInfo.contractNum}} + {{ basicInfo.contractNum }} @@ -48,33 +48,33 @@ 企业联系人: - {{basicInfo.name}} + {{ basicInfo.name }} 企业联系人性别: - {{basicInfo.gender_dictText}} + {{ basicInfo.gender_dictText }} 企业联系人职务: - {{basicInfo.post}} + {{ basicInfo.post }} 企业联系人电话: - {{basicInfo.phone}} + {{ basicInfo.phone }} 企业联系人邮箱: - {{basicInfo.email}} + {{ basicInfo.email }} 企业联系人邮编: - {{basicInfo.postalCodeContacts}} + {{ basicInfo.postalCodeContacts }} 企业联系人地址: @@ -84,17 +84,17 @@ 是否需要发票: - {{basicInfo.needInvoice_dictText}} + {{ basicInfo.needInvoice_dictText }} 是否打包: - {{basicInfo.pack_dictText}} + {{ basicInfo.pack_dictText }} 企业邮编: - {{basicInfo.postalCodeCompany}} + {{ basicInfo.postalCodeCompany }} 企业地址: @@ -107,7 +107,9 @@ 到账信息 到账信息 - {{item.paymentDate}}到账{{item.amountReceived}}元 + + {{ item.paymentDate }}到账{{ item.amountReceived }}元 + @@ -126,9 +128,9 @@ 查看物流 - - - + + + @@ -237,7 +239,7 @@ export default { // 企业信息 enterpriseInfo: {}, // 联系人信息 - contactsInfo:{}, + contactsInfo: {}, columns, // 到账信息 paymentInfoList, @@ -245,7 +247,8 @@ export default { logisticsInfoList, } }, - components:{ + computed: {}, + components: { JEllipsis }, methods: { @@ -253,16 +256,16 @@ export default { // 记录当前项目id this.currentProjectId = record.id // 通过id查询项目详情 - queryCommonProjectById({id:this.currentProjectId}).then(res => { - if(res.success){ - console.log(res.result,'res.result') + queryCommonProjectById({id: this.currentProjectId}).then(res => { + if (res.success) { + console.log(res.result, 'res.result') // 项目信息 this.basicInfo = res.result // 到账信息 this.paymentInfoList = res.result.paymentRecord // 开票邮寄信息 this.logisticsInfoList = res.result.mailBill - }else { + } else { console.log('未查到相应的信息') } }) @@ -296,10 +299,24 @@ export default { /* * 去合同详情 传入合同id * */ - toContractDetail(){ - this.$router.push({path:'/contractManagement/RevenueContractDetail',query:{ - revenueId:this.basicInfo.contractId - }}) + toContractDetail() { + this.$router.push({ + path: '/contractManagement/RevenueContractDetail', query: { + revenueId: this.basicInfo.contractId + } + }) + }, + /* + * 每一个项目的来款方式不同 + * */ + createIncomeType(val) { + if (val === 1 || val === 2 || val === 4) { + return '来款方式' + }else { + return '缴费方式' + } + + } } } @@ -317,10 +334,12 @@ h3 { label { color: #666; } + .contract-num { color: #42b983; cursor: pointer; } + h3.title::before { position: absolute; top: 4px;