LK/income_payments_enterprise_terminal
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-15 15:48:59 +08:00
parent 3c4d61bff1
commit e3eef7508a
10 changed files with 258 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/MessagePage/ProjectDetailModal.vue
+45 -30
View File
@@ -10,63 +10,61 @@
<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.chargeProject" :length="20"></j-ellipsis></span>
</a-col>
<!-- 我的项目--款项用途-->
<a-col :span="12" v-if="projectType === 1">
<a-col :span="12" v-if="projectType === 1" class="detail-item">
<label>款项用途：</label>
<span><j-ellipsis :value="basicInfo.chargeUse_dictText" :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.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-col :span="12">
<a-col :span="12" class="detail-item">
<label>实付金额：</label>
<span><j-ellipsis :value="`${basicInfo.paidAmount}元`" :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.pack_dictText" :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.needInvoice_dictText" :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.chargeWay_dictText" :length="20"></j-ellipsis></span>
</a-col>
<!-- 合同-->
<a-col :span="12" v-if="basicInfo.chargeWay === 2">
<label>合同号：</label>
<a-col :span="12" v-if="basicInfo.chargeWay === 2" class="detail-item">
<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">
<a-col :span="12" v-if="basicInfo.chargeWay === 3" class="detail-item">
<label>收费通知号：</label>
<span><j-ellipsis :value="basicInfo.chargeNoticeNo" :length="20"></j-ellipsis></span>
</a-col>
<a-col :span="12" v-if="basicInfo.chargeWay === 3">
<a-col :span="12" v-if="basicInfo.chargeWay === 3" class="detail-item">
<label>收费通知：</label>
<span><preview-file :file-id="basicInfo.chargeNoticeId"></preview-file></span>
</a-col>
</a-row>
<a-row :gutter="24" v-if="basicInfo.files">
<a-col :span="12">
<div class="files">
<a-col class="detail-item">
<label>项目资料：</label>
<div>
<span>
<preview-file :file-id="basicInfo.files"></preview-file>
</div>
</div>
</span>
</a-col>
</a-row>
</section>
@@ -74,13 +72,15 @@
<!--到账信息begin-->
<section class="payment-info">
<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 class="payment-info-content" v-else :data-source="[]"/>
<div class="payment-info-box">
<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="[]"/>
</div>
</section>
<!--到账信息end-->
<!--开票邮寄信息begin-->
@@ -175,17 +175,17 @@ const columns = [
{
title: '项目',
align: 'center',
dataIndex: 'chargeCompanyName'
dataIndex: 'projectName'
},
{
title: '邮寄人',
align: 'center',
dataIndex: 'liaisonMan'
dataIndex: 'contactName'
},
{
title: '快递',
align: 'center',
dataIndex: 'sendMethod'
dataIndex: 'sendMethod_dictText'
},
{
title: '快递单号',
@@ -354,9 +354,20 @@ h3.title::before {
.ant-col {
margin: 3px 0;
}
}
.files {
display: flex;
.detail-item {
max-width: 100%;
display: flex;
label {
flex-shrink: 0;
display: block;
}
span {
word-break: break-all;
display: block;
}
}
@@ -364,6 +375,10 @@ h3.title::before {
.payment-info {
margin-bottom: 14px;
&-box {
border: 1px solid #ccc;
}
&-title {
text-align: center;
font-size: 14px;
@@ -379,7 +394,7 @@ h3.title::before {
//background: #efefef;
padding: 5px;
padding-left: 10px;
border: 1px solid #ccc;
//border: 1px solid #ccc;
border-top: none;
}
src/views/dashboard/Analysis.vue
+12 -3
View File
@@ -20,17 +20,17 @@
</div>
<div >
<div class="message-list-item" v-for="item of dataMessageList" :key="item.id">
<div style="display: flex">
<div class="message-list-item-name">
<div>【{{item.titile_dictText}}】</div>
<a-tooltip>
<template slot="title">
<span v-html="item.msgContent" class="ellipsis-span"></span>
</template>
<span v-html="myEllipsis(item.msgContent,40)" class="ellipsis-span"></span>
<span v-html="myEllipsis(item.msgContent,38)" class="ellipsis-span"></span>
</a-tooltip>
</div>
<!-- <span v-html="item.msgContent"></span>-->
<span>{{item.sendTime}}</span>
<span class="message-list-item-time">{{item.sendTime}}</span>
<span class="operate">
<a @click="showAnnouncement(item)" style="margin-right: 8px">查看</a>
<a @click="haveRead(item)" v-if="item.readFlag === '0' ">已读</a>
@@ -249,6 +249,15 @@ export default {
color: #FFF;
font-weight: 500;
}
&-item-name {
display: flex;
width: 35rem;
}
&-item-time {
width: 10rem;
}
}
}
.center {
src/views/dataMember/DataMember.vue
+23 -2
View File
@@ -12,7 +12,7 @@
</a-col>
<a-col :xl="6" :lg="8" :md="8" :sm="24">
<a-form-item label="需要发票">
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择需要发票"
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
v-model="queryParam.needInvoice"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -66,6 +66,24 @@
<j-ellipsis style="font-size: 14px" :value="record.projectName" :length="20"></j-ellipsis>
</div>
</template>
<!-- 需要tooltip的文本-->
<template v-slot:text="{record,text}">
<a-tooltip>
<template slot="title">
{{ text }}
</template>
{{ text }}
</a-tooltip>
</template>
<!-- 金额-->
<template v-slot:money="{record,text}">
<a-tooltip>
<template slot="title">
{{ text }}元
</template>
{{ text }}元
</a-tooltip>
</template>
</project-table>
</a-spin>
</div>
@@ -98,14 +116,17 @@ export default {
}, {
title: '应付金额',
dataIndex: 'amountReceivable',
scopedSlots: 'money',
col: 4
}, {
title: '实付金额',
dataIndex: 'paidAmount',
scopedSlots: 'money',
col: 3
}, {
title: '负责人',
dataIndex: 'principalName',
dataIndex: 'directorName',
scopedSlots: 'text',
col: 3
}, {
title: '打包',
src/views/meetingActivity/MeetingActivity.vue
+2 -2
View File
@@ -81,8 +81,8 @@
</p>
<p class="item-meeting-img item-meeting-meetingTime">
<img src="../../assets/meetingImgs/meeting-time.png"/>
召开时间：
<j-ellipsis :value="item.startTime + '~' + item.endTime" :length="30"></j-ellipsis>
召开时间：{{ item.startTime }}~{{ item.endTime }}
<!-- <j-ellipsis :value="item.startTime + '~' + item.endTime" :length="30"></j-ellipsis>-->
</p>
<p class="item-meeting-img item-meeting-meetingPaymode">
<img src="../../assets/meetingImgs/meeting_paymode.png"/>
src/views/mineContract/modules/MineContractModule.vue
+1 -1
View File
@@ -114,7 +114,7 @@ export default {
loading: false,
columns: [
{
title: '合同号',
title: '合同编号',
align: 'center',
dataIndex: 'contractNum'
},
src/views/mineProject/MineProject.vue
+12 -3
View File
@@ -12,7 +12,7 @@
</a-col>
<a-col :xl="6" :lg="8" :md="8" :sm="24">
<a-form-item label="需要发票">
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择需要发票"
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
v-model="queryParam.needInvoice"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -74,6 +74,15 @@
{{ text }}
</a-tooltip>
</template>
<!-- 金额-->
<template v-slot:money="{record,text}">
<a-tooltip>
<template slot="title">
{{ text }}元
</template>
{{ text }}元
</a-tooltip>
</template>
</project-table>
</a-spin>
</div>
@@ -109,12 +118,12 @@ export default {
}, {
title: '应付金额',
dataIndex: 'receivableAmount',
scopedSlots: 'text',
scopedSlots: 'money',
col: 3
}, {
title: '实付金额',
dataIndex: 'paidAmount',
scopedSlots: 'text',
scopedSlots: 'money',
col: 3
}, {
title: '负责人',
src/views/workTeam/WorkTeam.vue
+12 -3
View File
@@ -12,7 +12,7 @@
</a-col>
<a-col :xl="6" :lg="8" :md="8" :sm="24">
<a-form-item label="需要发票">
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择需要发票"
<j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
v-model="queryParam.needInvoice"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -69,6 +69,15 @@
{{ text }}
</a-tooltip>
</template>
<!-- 金额-->
<template v-slot:money="{record,text}">
<a-tooltip>
<template slot="title">
{{ text }}元
</template>
{{ text }}元
</a-tooltip>
</template>
<template v-slot:meeting>
<a-button type="primary" @click="toMeeting">工作组会议
<a-icon type="right"></a-icon>
@@ -105,12 +114,12 @@ export default {
}, {
title: '应付金额',
dataIndex: 'receivableAmount',
scopedSlots: 'text',
scopedSlots: 'money',
col: 4
}, {
title: '实付金额',
dataIndex: 'paidAmount',
scopedSlots: 'text',
scopedSlots: 'money',
col: 3
}, {
title: '负责人',