diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 38fe1de..c36107b 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -13,6 +13,8 @@ const editUserInfo = (param) => postAction('/company/payContactsManagement/compa
const getSubBidCommitteeDetail = (param) => getAction('/payCaseCommittee/payCaseCommittee/detail', param)
// 资料下载--批量下载
const batchDownloadFile = (param) => getAction('/project/payWorkingGroupDistributionRecord/zipFile', param)
+// 我的合同--详情
+const getContractDetailById = (param) => getAction('/contract/payIncomeContract/queryCompanyById', param)
export {
queryCommonProjectById,
@@ -21,5 +23,6 @@ export {
getContactUserInfo,
editUserInfo,
getSubBidCommitteeDetail,
- batchDownloadFile
+ batchDownloadFile,
+ getContractDetailById
}
diff --git a/src/components/table/ProjectTable.vue b/src/components/table/ProjectTable.vue
index 30ee2bf..eac9b8e 100644
--- a/src/components/table/ProjectTable.vue
+++ b/src/components/table/ProjectTable.vue
@@ -151,6 +151,10 @@ export default {
overflow: hidden;
word-break: keep-all;
text-overflow: ellipsis;
+ font-size: 14px;
+ font-family: PingFang SC, PingFang SC-Medium;
+ font-weight: 500;
+ color: #333333;
}
}
diff --git a/src/views/dataDownload/DataDownload.vue b/src/views/dataDownload/DataDownload.vue
index 36d3873..b69787c 100644
--- a/src/views/dataDownload/DataDownload.vue
+++ b/src/views/dataDownload/DataDownload.vue
@@ -30,7 +30,6 @@
tt.fileId === this.selectedRowKeys[0])
- fileName = `${firstFile[0].fileName}等${this.selectedRowKeys.length}个文件`
+ fileName = `${firstFile[0].fileName}等${this.selectedRowKeys.length}个文件.zip`
let fileIdStr = this.selectedRowKeys.join(',')
batchDownloadFile({ ids: fileIdStr }).then(res => {
// 调用a标签下载文件的方法
diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue
index 2a6ebd1..2b5fe95 100644
--- a/src/views/mineContract/MineContract.vue
+++ b/src/views/mineContract/MineContract.vue
@@ -7,7 +7,7 @@
-
+
@@ -30,13 +30,13 @@
{{ text }}
-
+
- {{ record.chargeProject }}
+ {{ text }}
- {{ record.chargeProject }}
+ {{ text }}
@@ -72,17 +72,17 @@ export default {
columns: [
{
title: '',
- dataIndex: 'chargeProject',
+ dataIndex: 'contractNum',
scopedSlots: 'projectName',
- col: 6
+ col: 5
}, {
title: '合同名称',
- dataIndex: 'chargeUse_dictText',
+ dataIndex: 'contractName',
scopedSlots: 'text',
- col: 6
+ col: 5
}, {
title: '合同金额',
- dataIndex: 'receivableAmount',
+ dataIndex: 'contractAmount',
scopedSlots: 'text',
col: 5
}, {
@@ -92,13 +92,13 @@ export default {
col: 5
}, {
title: '邮寄',
- dataIndex: 'mail',
+ dataIndex: 'postStatus',
scopedSlots: 'status',
- col: 2
+ col: 4
}
],
url: {
- list: ''
+ list: '/contract/payIncomeContract/queryCompanyPageList'
}
}
},
@@ -112,7 +112,8 @@ export default {
this.ipagination.pageSize = pagination.pageSize
this.loadData()
},
- openDetail() {
+ openDetail(record) {
+ this.$refs.detail.contractId = record.id
this.$refs.detail.open()
}
}
diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue
index 0d2d1f8..2b7736b 100644
--- a/src/views/mineContract/modules/MineContractModule.vue
+++ b/src/views/mineContract/modules/MineContractModule.vue
@@ -14,7 +14,7 @@
合同编号:
-
+
@@ -22,7 +22,7 @@
合同名称:
-
+
@@ -32,7 +32,7 @@
负责人:
-
+
@@ -40,7 +40,7 @@
合同金额:
-
+
@@ -50,9 +50,9 @@
关联项目:
-
-
-
+
+ {{ item.chargeProject }}
+
@@ -81,6 +81,8 @@