项目详情修改
This commit is contained in:
@@ -10,106 +10,74 @@
|
||||
<section class="base-info">
|
||||
<h3 class="title">基本信息</h3>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>项目名称:</label>
|
||||
<span><j-ellipsis :value="basicInfo.chargeProject" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<!-- 我的项目--款项用途-->
|
||||
<a-col :span="12" v-if="projectType === 1">
|
||||
<label>款项用途:</label>
|
||||
<span><j-ellipsis :value="basicInfo.chargeWay_dictText" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>项目负责人:</label>
|
||||
<span><j-ellipsis :value="basicInfo.principalName" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>应收金额:</label>
|
||||
<span><j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>备注:</label>
|
||||
<span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<!-- 来款方式为合同的显示-->
|
||||
<a-row :gutter="24" v-if="!!basicInfo.contractNum">
|
||||
<a-col :span="12">
|
||||
<label>{{createIncomeType(basicInfo.projectType)}}:</label>
|
||||
<span>{{ basicInfo.chargeWay_dictText }}</span>
|
||||
<label>应付金额:</label>
|
||||
<span><j-ellipsis :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>合同编号:</label>
|
||||
<span class="contract-num" @click="toContractDetail">{{ basicInfo.contractNum }}</span>
|
||||
<label>实付金额:</label>
|
||||
<span><j-ellipsis :value="`${basicInfo.paidAmount}元`" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>打包:</label>
|
||||
<span><j-ellipsis :value="basicInfo.pack_dictText" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>需要发票:</label>
|
||||
<span><j-ellipsis :value="basicInfo.needInvoice_dictText" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>付款方式:</label>
|
||||
<span><j-ellipsis :value="basicInfo.chargeWay_dictText" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<!-- 合同-->
|
||||
<a-col :span="12" v-if="basicInfo.chargeWay === 2">
|
||||
<label>合同号:</label>
|
||||
<span class="contract-num" @click="toContractDetail"><j-ellipsis :value="basicInfo.contractNum"
|
||||
:length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<!-- 收费通知-->
|
||||
<a-col :span="12" v-if="basicInfo.chargeWay === 3">
|
||||
<label>收费通知号:</label>
|
||||
<span><j-ellipsis :value="basicInfo.chargeNoticeNo" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12" v-if="basicInfo.chargeWay === 3">
|
||||
<label>收费通知:</label>
|
||||
<span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
|
||||
</a-col>
|
||||
<!-- 我的项目--项目资料-->
|
||||
<a-col :span="12" class="files" v-if="projectType === 1">
|
||||
<label>项目资料:</label>
|
||||
<div>
|
||||
<preview-file :file-id="basicInfo.files"></preview-file>
|
||||
</div>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</section>
|
||||
<!-- 基本信息end-->
|
||||
<!-- 企业信息begin-->
|
||||
<section class="enterprise-info">
|
||||
<h3 class="title">企业信息</h3>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>来款企业:</label>
|
||||
<span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>企业联系人:</label>
|
||||
<span>{{ basicInfo.name }}</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>企业联系人性别:</label>
|
||||
<span>{{ basicInfo.gender_dictText }}</span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>企业联系人职务:</label>
|
||||
<span>{{ basicInfo.post }}</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>企业联系人电话:</label>
|
||||
<span>{{ basicInfo.phone }}</span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>企业联系人邮箱:</label>
|
||||
<span>{{ basicInfo.email }}</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>企业联系人邮编:</label>
|
||||
<span>{{ basicInfo.postalCodeContacts }}</span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>企业联系人地址:</label>
|
||||
<span><j-ellipsis :value="basicInfo.contactAddress" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>是否需要发票:</label>
|
||||
<span>{{ basicInfo.needInvoice_dictText }}</span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>是否打包:</label>
|
||||
<span>{{ basicInfo.pack_dictText }}</span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24">
|
||||
<a-col :span="12">
|
||||
<label>企业邮编:</label>
|
||||
<span>{{ basicInfo.postalCodeCompany }}</span>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<label>企业地址:</label>
|
||||
<span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</section>
|
||||
<!--企业信息end-->
|
||||
<!--到账信息begin-->
|
||||
<section class="payment-info">
|
||||
<h3 class="title">到账信息</h3>
|
||||
<section class="payment-info-title">到账信息</section>
|
||||
<div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
|
||||
{{ item.paymentDate }}到账{{ item.amountReceived }}元
|
||||
</div>
|
||||
<h3 class="title">付款信息</h3>
|
||||
<section class="payment-info-title">付款信息</section>
|
||||
<template v-if="paymentInfoList && paymentInfoList.length > 0">
|
||||
<div class="payment-info-content" v-for="item of paymentInfoList" :key="item.id">
|
||||
{{ item.paymentDate }}付款{{ item.amountReceived }}元
|
||||
</div>
|
||||
</template>
|
||||
<a-list v-else :data-source="[]" style="margin-top: 30px; border-bottom: 1px solid #d5d5d5;"/>
|
||||
</section>
|
||||
<!--到账信息end-->
|
||||
<!--开票邮寄信息begin-->
|
||||
@@ -125,8 +93,8 @@
|
||||
:dataSource="logisticsInfoList"
|
||||
class="j-table-force-nowrap"
|
||||
>
|
||||
<span slot="action" class="action-span-cell">
|
||||
<a @click="lookLogistics()">查看物流</a>
|
||||
<span slot="action" slot-scope="record" class="action-span-cell">
|
||||
<a @click="lookLogistics()" v-if="record.postStatus === 1">查看物流</a>
|
||||
</span>
|
||||
<!-- <p slot="expandedRowRender" slot-scope="record" style="margin: 0">-->
|
||||
<!-- {{ record.sendDate }}-->
|
||||
@@ -138,12 +106,16 @@
|
||||
<template slot="footer">
|
||||
<a-button @click="handleCancel">关闭</a-button>
|
||||
</template>
|
||||
|
||||
<mine-contract-module :visible.sync="contractDetailVisible" :contract-id="contractId"></mine-contract-module>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {queryCommonProjectById} from '@api/incomePaymentsApi'
|
||||
import { queryCommonProjectById } from '@api/incomePaymentsApi'
|
||||
import JEllipsis from '@comp/jero/JEllipsis'
|
||||
import PreviewFile from '@comp/jero/PreviewFile'
|
||||
import MineContractModule from '@views/mineContract/modules/MineContractModule'
|
||||
// import {getAction} from "@api/manage";
|
||||
const paymentInfoList = [
|
||||
{
|
||||
@@ -160,7 +132,7 @@ const paymentInfoList = [
|
||||
id: 1003,
|
||||
year: '2021',
|
||||
money: '200'
|
||||
},
|
||||
}
|
||||
]
|
||||
const logisticsInfoList = [
|
||||
{
|
||||
@@ -180,49 +152,49 @@ const columns = [
|
||||
{
|
||||
title: '开票人',
|
||||
align: 'center',
|
||||
dataIndex: 'createBy',
|
||||
dataIndex: 'createBy'
|
||||
},
|
||||
{
|
||||
title: '日期',
|
||||
align: 'center',
|
||||
dataIndex: 'billDate',
|
||||
dataIndex: 'billDate'
|
||||
},
|
||||
{
|
||||
title: '金额(元)',
|
||||
align: 'center',
|
||||
dataIndex: 'invoiceAmount',
|
||||
dataIndex: 'invoiceAmount'
|
||||
},
|
||||
{
|
||||
title: '票号',
|
||||
align: 'center',
|
||||
dataIndex: 'billNo',
|
||||
dataIndex: 'billNo'
|
||||
},
|
||||
{
|
||||
title: '项目',
|
||||
align: 'center',
|
||||
dataIndex: 'chargeCompanyName',
|
||||
dataIndex: 'chargeCompanyName'
|
||||
},
|
||||
{
|
||||
title: '邮寄人',
|
||||
align: 'center',
|
||||
dataIndex: 'liaisonMan',
|
||||
dataIndex: 'liaisonMan'
|
||||
},
|
||||
{
|
||||
title: '快递',
|
||||
align: 'center',
|
||||
dataIndex: 'sendMethod',
|
||||
dataIndex: 'sendMethod'
|
||||
},
|
||||
{
|
||||
title: '快递单号',
|
||||
align: 'center',
|
||||
dataIndex: 'postNo',
|
||||
dataIndex: 'postNo'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
dataIndex: '',
|
||||
scopedSlots: {customRender: 'action'}
|
||||
},
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
]
|
||||
export default {
|
||||
name: 'ProjectDetailModal',
|
||||
@@ -232,6 +204,12 @@ export default {
|
||||
type: Boolean,
|
||||
required: false,
|
||||
default: false
|
||||
},
|
||||
// 项目类型,我的项目--1;
|
||||
projectType: {
|
||||
type: Number,
|
||||
required: false,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@@ -253,11 +231,16 @@ export default {
|
||||
paymentInfoList,
|
||||
// 开票邮寄信息
|
||||
logisticsInfoList,
|
||||
// 合同详情
|
||||
contractDetailVisible: false,
|
||||
contractId: ''
|
||||
}
|
||||
},
|
||||
computed: {},
|
||||
components: {
|
||||
JEllipsis
|
||||
JEllipsis,
|
||||
PreviewFile,
|
||||
MineContractModule
|
||||
},
|
||||
methods: {
|
||||
open(record) {
|
||||
@@ -269,7 +252,7 @@ export default {
|
||||
this.currentProjectId = record.id
|
||||
}
|
||||
// 通过id查询项目详情
|
||||
queryCommonProjectById({id: this.currentProjectId}).then(res => {
|
||||
queryCommonProjectById({ id: this.currentProjectId }).then(res => {
|
||||
if (res.success) {
|
||||
console.log(res.result, 'res.result')
|
||||
// 项目信息
|
||||
@@ -282,7 +265,6 @@ export default {
|
||||
console.log('未查到相应的信息')
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
handleCancel() {
|
||||
this.visible = false
|
||||
@@ -301,7 +283,7 @@ export default {
|
||||
}
|
||||
})
|
||||
}
|
||||
return `${item.person}于${item.time}开票,金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
|
||||
return `${ item.person }于${ item.time }开票,金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
|
||||
},
|
||||
/*
|
||||
* 查看物流
|
||||
@@ -313,13 +295,15 @@ export default {
|
||||
* 去合同详情 传入合同id
|
||||
* */
|
||||
toContractDetail() {
|
||||
if(this.basicInfo.contractId){
|
||||
this.$router.push({
|
||||
path: '/contractManagement/RevenueContractDetail', query: {
|
||||
revenueId: this.basicInfo.contractId
|
||||
}
|
||||
})
|
||||
}else {
|
||||
if (this.basicInfo.contractId) {
|
||||
this.contractId = this.basicInfo.contractId
|
||||
this.contractDetailVisible = true
|
||||
// this.$router.push({
|
||||
// path: '/contractManagement/RevenueContractDetail', query: {
|
||||
// revenueId: this.basicInfo.contractId
|
||||
// }
|
||||
// })
|
||||
} else {
|
||||
this.$message.warn('该项目未与合同关联')
|
||||
}
|
||||
},
|
||||
@@ -328,12 +312,10 @@ export default {
|
||||
* */
|
||||
createIncomeType(val) {
|
||||
if (val === 1 || val === 2 || val === 4) {
|
||||
return '来款方式'
|
||||
}else {
|
||||
return '缴费方式'
|
||||
return '来款方式'
|
||||
} else {
|
||||
return '缴费方式'
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -367,6 +349,17 @@ h3.title::before {
|
||||
background: #069f99;
|
||||
}
|
||||
|
||||
/*基本信息*/
|
||||
.base-info {
|
||||
.ant-col {
|
||||
margin: 3px 0;
|
||||
}
|
||||
|
||||
.files {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
|
||||
/* 到账信息 */
|
||||
.payment-info {
|
||||
margin-bottom: 14px;
|
||||
|
||||
Reference in New Issue
Block a user