diff --git a/public/index.html b/public/index.html index 01361c0..1f90918 100644 --- a/public/index.html +++ b/public/index.html @@ -22,8 +22,6 @@ height: 100%; margin: 0px; padding: 0px; - /*最小宽度1200*/ - min-width: 1200px; overflow-x: auto; } diff --git a/src/assets/less/common.less b/src/assets/less/common.less index da16aea..c9e6619 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -105,7 +105,6 @@ //页面边距 .main-box { - min-width: 1100px; margin: 12px 12px 0 12px; } diff --git a/src/components/detailPage/FileList.vue b/src/components/detailPage/FileList.vue index 422e3d4..d9361a5 100644 --- a/src/components/detailPage/FileList.vue +++ b/src/components/detailPage/FileList.vue @@ -64,12 +64,16 @@ export default { default: () => { return [] } + }, + // 列表加载状态 + fileLoading: { + type: Boolean, + default: false } }, data() { return { - columns, - fileLoading: false + columns } }, methods: { diff --git a/src/components/jero/JYearDate.vue b/src/components/jero/JYearDate.vue new file mode 100644 index 0000000..f3812b7 --- /dev/null +++ b/src/components/jero/JYearDate.vue @@ -0,0 +1,109 @@ + + diff --git a/src/views/MessagePage/ProjectDetailModal.vue b/src/views/MessagePage/ProjectDetailModal.vue index 1dd3b97..ec46c7a 100644 --- a/src/views/MessagePage/ProjectDetailModal.vue +++ b/src/views/MessagePage/ProjectDetailModal.vue @@ -6,109 +6,126 @@ switchFullscreen @cancel="handleCancel" cancelText="关闭"> - -
-

基本信息

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-

付款信息

-
-
付款信息
- - -
-
- - -
-

开票邮寄信息

-
- + + +
+

基本信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+

付款信息

+ {{ showPaymentInfo ? '收起' : '查看' }} +
+
+
付款信息
+ + +
+
+ + +
+
+

开票邮寄信息

+ {{ showMailInfo ? '收起' : '查看' }} +
+
+ 查看物流 - - - - + + + + +
+
+ + + +
+

项目资料

+
-
- - + + + + @@ -116,6 +133,8 @@ import { queryCommonProjectById } from '@api/incomePaymentsApi' import JEllipsis from '@comp/jero/JEllipsis' import PreviewFile from '@comp/jero/PreviewFile' +import FileList from '@comp/detailPage/FileList' +import { getFileInfo } from '@api/api' // import {getAction} from "@api/manage"; const columns = [ { @@ -191,15 +210,25 @@ export default { contactsInfo: {}, columns, // 到账信息 - paymentInfoList:[], + paymentInfoList: [], // 开票邮寄信息 - logisticsInfoList:[], + logisticsInfoList: [], + // 显示付款信息 + showPaymentInfo: false, + // 显示邮寄信息 + showMailInfo: false, + // 项目资料列表 + fileList: [], + basicLoading: false, + // 项目资料列表的加载状态 + fileLoading: false } }, computed: {}, components: { JEllipsis, - PreviewFile + PreviewFile, + FileList }, created() { console.log('xiangmuxiangqing') @@ -214,6 +243,7 @@ export default { this.currentProjectId = record.id } // 通过id查询项目详情 + this.basicLoading = true queryCommonProjectById({ id: this.currentProjectId }).then(res => { if (res.success) { console.log(res.result, 'res.result') @@ -223,9 +253,15 @@ export default { this.paymentInfoList = res.result.paymentRecord // 开票邮寄信息 this.logisticsInfoList = res.result.mailBill + // 拿项目资料信息，现在的文件列表数据不全 + if (this.basicInfo.files) { + this.initFileList(this.basicInfo.files) + } } else { console.log('未查到相应的信息') } + }).finally(() => { + this.basicLoading = false }) }, handleCancel() { @@ -281,6 +317,53 @@ export default { } else { return '缴费方式' } + }, + /** + * 控制付款信息显隐 + */ + viewPaymentInfo() { + this.showPaymentInfo = !this.showPaymentInfo + }, + /** + * 控制开票邮寄信息显隐 + */ + viewMailInfo() { + this.showMailInfo = !this.showMailInfo + }, + /* + * 通过文件id获取文件的相关信息 + * */ + getFileInfo(id) { + return new Promise(resolve => { + let result = {} + getFileInfo({ id: id }).then(res => { + if (res.success) { + result = res.result + } + }).finally(() => { + resolve(result) + }) + }) + }, + /* + * 获取文件信息 + * */ + async initFileList(fileIds) { + this.fileLoading = true + if (fileIds) { + const fileList = [] + let arr = fileIds.split(',') + for (let i = 0; i < arr.length; i++) { + let fileObj = {} + fileObj = await this.getFileInfo(arr[i]) + fileList.push({ fileId: fileObj.id, fileName: fileObj.fileName, createTime: fileObj.createTime }) + } + this.fileList = [...fileList] + } else { + this.fileList = [] + } + this.fileLoading = false + console.log(this.fileList) } } } @@ -314,6 +397,12 @@ h3.title::before { background: #069f99; } +/*可收起的标题样式*/ +.collapsible-title { + display: flex; + justify-content: space-between; +} + /*基本信息*/ .base-info { .ant-col { diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue index 13280ba..74cb71f 100644 --- a/src/views/mineContract/MineContract.vue +++ b/src/views/mineContract/MineContract.vue @@ -23,92 +23,114 @@
- - - - - - - - - - - - + + + + + + + + + + + + +
- + diff --git a/src/views/mineContract/modules/MineContractModule.vue b/src/views/mineContract/modules/MineContractModule.vue index 443fea0..0fea1cc 100644 --- a/src/views/mineContract/modules/MineContractModule.vue +++ b/src/views/mineContract/modules/MineContractModule.vue @@ -1,13 +1,13 @@