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

项目详情，首页调整

Browse Source
This commit is contained in:
zhaoxiao
2021-09-26 13:54:42 +08:00
parent ff31c47e43
commit 57da4e34d0
10 changed files with 99 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/imgs/meeting_project_selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

src/components/ProjectDetailModal.vue
+13 -1
View File
@@ -226,6 +226,14 @@ const columns = [
]
export default {
name: 'ProjectDetailModal',
props: {
// 字段名称是否非id，适用于票据邮寄等页面id不是项目id的情况
notId: {
type: Boolean,
required: false,
default: false
}
},
data() {
return {
description: '项目详情模态框',
@@ -255,7 +263,11 @@ export default {
open(record) {
this.visible = true
// 记录当前项目id
this.currentProjectId = record.id
if (this.notId) {
this.currentProjectId = record.projectId
} else {
this.currentProjectId = record.id
}
// 通过id查询项目详情
queryCommonProjectById({id: this.currentProjectId}).then(res => {
if (res.success) {
src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue
+2
View File
@@ -451,6 +451,8 @@ export default {
let record
record = res.result
this.isSaved = true
// 获取合同号
this.contractNum = record.contractNum
// 处理企业信息回显
record.signedCompany = {
id: record.signedCompanyId,
src/views/dashboard/Analysis.vue
+7 -3
View File
@@ -144,12 +144,16 @@ export default {
legend: {
type: 'plain',
orient: 'vertical',
width: 20,
right: 10,
top: 20,
bottom: 20,
itemGap: 30, // 图例间距
itemWidth: 15,
data: ['Search Engine', 'Direct', 'Email', 'Union Ads', 'Video Ads', 'Search Engine1', 'Direct1', 'Email1', 'Union Ads1', 'Video Ads1']
itemWidth: 13,
data: ['Search Engine', 'Direct', 'Email', 'Union Ads', 'Video Ads', 'Search Engine1', 'Direct1', 'Email1', 'Union Ads1', 'Video Ads1'],
formatter: function (name) {
return name.length > 7 ? name.substr(0, 7) + '...' : name
}
},
tooltip: {
trigger: 'item'
@@ -398,7 +402,6 @@ export default {
}
.item-left {
width: 60%;
padding-left: 15px;
height: 100%;
padding-top: 45px;
@@ -409,6 +412,7 @@ export default {
}
.item-right {
flex-shrink: 0;
padding-right: 10px;
cursor: pointer;
max-height: 105px;
src/views/mailManagement/BillMail.vue
+8 -9
View File
@@ -76,13 +76,10 @@
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text, record">
<a-tooltip placement="top">
<template slot="title">
<span>{{text}}</span>
</template>
<span class="primary-color">{{text}}</span>
</a-tooltip>
<!-- 项目名称-->
<template slot="projectName" slot-scope="text, record">
<j-ellipsis :value="text" :length="18" class="primary-color"
@click="openDetailModal(record)"></j-ellipsis>
</template>
<span slot="print" slot-scope="text, record" class="action-span-cell">
@@ -97,6 +94,7 @@
</div>
<mail-modal ref="modalForm" @ok="modalFormOk"></mail-modal>
</a-card>
<project-detail-modal ref="projectDetail" not-id></project-detail-modal>
</div>
</template>
<script>
@@ -109,12 +107,13 @@ import MailModal from './modules/MailModal'
import JDate from '@comp/tools/JDate'
import { downloadFile } from '@/api/manage'
import SelectPrincipal from '@/components/company/SelectPrincipal'
import ProjectDetailModal from '../../components/ProjectDetailModal'
export default {
name: 'BillMail',
mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
components: {
PageHeaderTitle, JDate, MailModal, SelectPrincipal
PageHeaderTitle, JDate, MailModal, SelectPrincipal, ProjectDetailModal
},
data() {
return {
@@ -143,7 +142,7 @@ export default {
ellipsis: true,
align: 'center',
dataIndex: 'projectName',
scopedSlots: {customRender: 'htmlSlot'}
scopedSlots: {customRender: 'projectName'}
},
{
title: '票号',
src/views/projectManagement/WorkingGroupProjectManagement.vue
+46 -21
View File
@@ -115,6 +115,7 @@ import ProgressBar from '@comp/ProgressBar'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
import { copyWorkingGroup, checkoutWorkingGroupPrincipal } from '../../api/incomePaymentsApi'
import { getAction } from '../../api/manage'
export default {
name: 'WorkingGroupProjectManagement',
@@ -172,28 +173,52 @@ export default {
]
}
},
watch: {
// 监听dataSource校验登录人信息
dataSource: {
handler(val) {
let arr = val
arr.forEach((item, index) => {
// （负责人B不可操作）
checkoutWorkingGroupPrincipal({ id: item.id }).then(res => {
// 不可操作则置否
if (res.success) {
item.canOperate = true
} else {
item.canOperate = false
}
this.$set(this.dataSource, index, item)
})
})
},
deep: true
}
},
methods: {
loadData(arg) {
if (!this.url.list) {
this.$message.error('请设置url.list属性!')
return
}
//加载数据 若传入参数1则加载第一页的内容
if (arg === 1) {
this.ipagination.current = 1
}
var params = this.getQueryParams()//查询条件
this.loading = true
getAction(this.url.list, params).then((res) => {
if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------
this.dataSource = res.result.records || res.result
if (res.result.total) {
this.ipagination.total = res.result.total
//清空列表选中
this.onClearSelected()
} else {
this.ipagination.total = 0
}
// 判断登录用户是否为负责人B
this.dataSource.forEach((item, index) => {
// （负责人B不可操作）
checkoutWorkingGroupPrincipal({ id: item.id }).then(res => {
// 不可操作则置否
if (res.success) {
item.canOperate = true
} else {
item.canOperate = false
}
this.$set(this.dataSource, index, item)
})
})
//update-end---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------
}
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false
}).finally(() => {
this.loading = false
})
},
/**
* 文件维护
* @param record
src/views/statisticalReport/WholeInstituteStatisticsList.vue
+4 -2
View File
@@ -139,6 +139,7 @@
</a-table>
</div>
</a-card>
<project-detail-modal ref="projectDetail" not-id></project-detail-modal>
</div>
</template>
@@ -150,10 +151,11 @@ import { queryDepartTreeList } from '../../api/api'
import SelectPrincipal from '../../components/company/SelectPrincipal'
import JYearDate from '../../components/jero/JYearDate'
import { getAction } from '../../api/manage'
import ProjectDetailModal from '../../components/ProjectDetailModal'
export default {
name: 'WholeInstituteStatisticsList',
components: { PageHeaderTitle, SelectPrincipal, JYearDate },
components: { PageHeaderTitle, SelectPrincipal, JYearDate, ProjectDetailModal },
mixins: [JeroListMixin],
data() {
return {
@@ -185,7 +187,7 @@ export default {
align: 'center',
// width: 200,
dataIndex: 'projectName',
scopedSlots: { customRender: 'text' }
scopedSlots: { customRender: 'projectName' }
}, {
title: '负责人',
align: 'center',
src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+4 -2
View File
@@ -110,6 +110,7 @@
</a-table>
</div>
</a-card>
<project-detail-modal ref="projectDetail"></project-detail-modal>
</div>
</template>
@@ -118,10 +119,11 @@ import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '@api/manage'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
export default {
name: 'IndividualPaymentStatisticsDetail',
components: { PageHeaderTitle, JYearDate },
components: { PageHeaderTitle, JYearDate, ProjectDetailModal },
mixins: [JeroListMixin],
data() {
return {
@@ -162,7 +164,7 @@ export default {
align: 'center',
width: 160,
dataIndex: 'projectName',
scopedSlots: { customRender: 'text' }
scopedSlots: { customRender: 'projectName' }
}, {
title: '应收金额',
align: 'center',
src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+11 -2
View File
@@ -109,6 +109,13 @@
:scroll="{x: 1100}"
class="j-table-force-nowrap footer-table">
<!-- 项目名称-->
<template slot="projectName" slot-scope="text, record">
<j-ellipsis :value="text" :length="18" class="primary-color"
@click="openDetailModal(record)"></j-ellipsis>
</template>
<template slot="text" slot-scope="text">
<j-ellipsis :value="text" :length="18"></j-ellipsis>
</template>
@@ -117,6 +124,7 @@
</a-table>
</div>
</a-card>
<project-detail-modal ref="projectDetail" not-id></project-detail-modal>
</div>
</template>
@@ -128,10 +136,11 @@ import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '@api/manage'
import SelectPrincipal from '@comp/company/SelectPrincipal'
import { queryDepartTreeList } from '@api/api'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
export default {
name: 'ProjectPaymentStatisticsList',
components: { PageHeaderTitle, JYearDate, SelectPrincipal },
components: { PageHeaderTitle, JYearDate, SelectPrincipal, ProjectDetailModal },
mixins: [JeroListMixin],
data() {
return {
@@ -169,7 +178,7 @@ export default {
align: 'center',
width: 160,
dataIndex: 'projectName',
scopedSlots: { customRender: 'text' }
scopedSlots: { customRender: 'projectName' }
}, {
title: '来款单位',
align: 'center',
src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+4 -2
View File
@@ -111,6 +111,7 @@
</a-table>
</div>
</a-card>
<project-detail-modal ref="projectDetail" not-id></project-detail-modal>
</div>
</template>
@@ -119,10 +120,11 @@ import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle'
import { JeroListMixin } from '../../../mixins/JeroListMixin'
import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '@api/manage'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
export default {
name: 'EnterprisePaymentStatisticsDetail',
components: { PageHeaderTitle, JYearDate },
components: { PageHeaderTitle, JYearDate, ProjectDetailModal },
mixins: [JeroListMixin],
data() {
return {
@@ -152,7 +154,7 @@ export default {
title: '来款项目',
align: 'center',
dataIndex: 'projectName',
scopedSlots: { customRender: 'text' }
scopedSlots: { customRender: 'projectName' }
}, {
title: '应收金额',
align: 'center',