LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
zhaoxiao
2021-10-13 15:24:35 +08:00
parent 896ad36e6a
commit e274635dc5
10 changed files with 109 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ProjectDetailModal.vue
+52 -39
View File
@@ -10,17 +10,17 @@
<section class="base-info">
<h3 class="title">基本信息</h3>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>项目负责人：</label>
<span><j-ellipsis :value="basicInfo.principalName" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>应收金额：</label>
<span><j-ellipsis :value="basicInfo.receivableAmount" :length="20"></j-ellipsis></span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col>
<a-col class="detail-item">
<label>备注：</label>
<span><j-ellipsis :value="basicInfo.remarks" :length="20"></j-ellipsis></span>
</a-col>
@@ -33,21 +33,21 @@
</a-row>
<!-- 来款方式为合同的显示-->
<a-row :gutter="24" v-if="!!basicInfo.contractNum">
<a-col :span="12">
<label>{{createIncomeType(basicInfo.projectType)}}：</label>
<a-col :span="12" class="detail-item">
<label>{{ createIncomeType(basicInfo.projectType) }}：</label>
<span>{{ basicInfo.chargeWay_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>合同编号：</label>
<span class="contract-num" @click="toContractDetail">{{ basicInfo.contractNum }}</span>
</a-col>
</a-row>
<a-row :gutter="24" v-if="basicInfo.chargeWay === 3">
<a-col :span="12" >
<a-col :span="12" class="detail-item">
<label>收费通知号：</label>
<span><j-ellipsis :value="basicInfo.chargeNoticeNo" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>收费通知：</label>
<span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
</a-col>
@@ -58,11 +58,11 @@
<section class="enterprise-info">
<h3 class="title">企业信息</h3>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>来款企业：</label>
<span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人：</label>
<span>{{ basicInfo.name }}</span>
</a-col>
@@ -72,47 +72,47 @@
<label>企业联系人性别：</label>
<span>{{ basicInfo.gender_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人职务：</label>
<span>{{ basicInfo.post }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人电话：</label>
<span>{{ basicInfo.phone }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人邮箱：</label>
<span>{{ basicInfo.email }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业联系人邮编：</label>
<span>{{ basicInfo.postalCodeContacts }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<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">
<a-col :span="12" class="detail-item">
<label>是否需要发票：</label>
<span>{{ basicInfo.needInvoice_dictText }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>是否打包：</label>
<span>{{ basicInfo.pack_dictText }}</span>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业邮编：</label>
<span>{{ basicInfo.postalCodeCompany }}</span>
</a-col>
<a-col :span="12">
<a-col :span="12" class="detail-item">
<label>企业地址：</label>
<span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
</a-col>
@@ -158,7 +158,7 @@
</template>
<script>
import {queryCommonProjectById} from '@api/incomePaymentsApi'
import { queryCommonProjectById } from '@api/incomePaymentsApi'
import JEllipsis from '@comp/jero/JEllipsis'
import PreviewFile from './jero/PreviewFile'
// import {getAction} from "@api/manage";
@@ -177,7 +177,7 @@ const paymentInfoList = [
id: 1003,
year: '2021',
money: '200'
},
}
]
const logisticsInfoList = [
{
@@ -197,49 +197,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: 'contactName',
dataIndex: 'contactName'
},
{
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',
@@ -269,7 +269,7 @@ export default {
// 到账信息
paymentInfoList,
// 开票邮寄信息
logisticsInfoList,
logisticsInfoList
}
},
computed: {},
@@ -287,7 +287,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')
// 项目信息
@@ -319,7 +319,7 @@ export default {
}
})
}
return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
return `${ item.person }于${ item.time }开票，金额为:${ item.money }元,票号:${ item.piaoNo },项目:${ porjectItem }`
},
/*
* 查看物流
@@ -331,13 +331,13 @@ export default {
* 去合同详情 传入合同id
* */
toContractDetail() {
if(this.basicInfo.contractId){
if (this.basicInfo.contractId) {
this.$router.push({
path: '/contractManagement/RevenueContractDetail', query: {
revenueId: this.basicInfo.contractId
}
})
}else {
} else {
this.$message.warn('该项目未与合同关联')
}
},
@@ -346,9 +346,9 @@ export default {
* */
createIncomeType(val) {
if (val === 1 || val === 2 || val === 4) {
return '来款方式'
}else {
return '缴费方式'
return '来款方式'
} else {
return '缴费方式'
}
@@ -370,6 +370,19 @@ label {
color: #666;
}
.detail-item {
display: flex;
label {
flex-shrink: 0;
}
span {
word-break: break-all;
display: block;
}
}
.contract-num {
color: #42b983;
cursor: pointer;
src/components/company/SelectContacts.vue
+1 -1
View File
@@ -150,7 +150,7 @@ export default {
* 新建联系人
*/
addContacts() {
if (this.selectedCompany && Object.keys(this.selectedCompany).length > 0) {
if (this.selectedCompany && Object.keys(this.selectedCompany).length > 0 && this.selectedCompany.id) {
// 传入是否调用无权限接口的参数 去判断
this.$refs.contactForm.add(this.isLimit)
this.$refs.contactForm.title = '新增'