diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 043de70..ec4554b 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -19,6 +19,8 @@ const getContractDetailById = (param) => getAction('/contract/payIncomeContract/
const getCouncilDetailById = (param) => getAction('/payCaseCouncil/payCaseCouncil/detail', param)
// 分标委在研项目
const getCommitteeUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/listForThree', param)
+// 工作组在研项目
+const getWorkingGroupUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/list', param)
export {
queryCommonProjectById,
@@ -30,5 +32,6 @@ export {
batchDownloadFile,
getContractDetailById,
getCouncilDetailById,
- getCommitteeUnderStudyProject
+ getCommitteeUnderStudyProject,
+ getWorkingGroupUnderStudyProject
}
diff --git a/src/config/router.config.js b/src/config/router.config.js
index a343888..48ed0df 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -400,5 +400,20 @@ export const routerData = [
},
name: 'payment-voucher',
id: '13'
- }
+ },
+ {
+ path: '/workTeam/WorkTeamDetail',
+ component: 'workTeam/WorkTeamDetail',
+ redirect: null,
+ hidden: true,
+ route: '1',
+ meta: {
+ icon: '', // 菜单前图标
+ componentName: 'WorkTeamDetail',
+ keepAlive: false,
+ title: '工作组详情' // 菜单名称
+ },
+ name: 'work-team-detail',
+ id: '14'
+ },
]
diff --git a/src/views/subBidCommittee/modules/CommitteeUnderStudyFilesModal.vue b/src/views/MessagePage/modules/UnderStudyFilesModal.vue
similarity index 56%
rename from src/views/subBidCommittee/modules/CommitteeUnderStudyFilesModal.vue
rename to src/views/MessagePage/modules/UnderStudyFilesModal.vue
index a95accb..f30a8e2 100644
--- a/src/views/subBidCommittee/modules/CommitteeUnderStudyFilesModal.vue
+++ b/src/views/MessagePage/modules/UnderStudyFilesModal.vue
@@ -26,7 +26,7 @@
-
+
@@ -50,34 +50,27 @@ import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import { processingTimestamp } from '@/utils/util'
-const columns = [
- {
- title: '文件名',
- align: 'center',
- dataIndex: 'FILE_NAME',
- scopedSlots: { customRender: 'text' }
- }, {
- title: '上传时间',
- align: 'center',
- dataIndex: 'CREAT_TIME',
- scopedSlots: { customRender: 'time' }
- }, {
- title: '操作',
- align: 'center',
- dataIndex: 'action',
- width: 160,
- scopedSlots: { customRender: 'action' }
- }
-]
export default {
- name: 'CommitteeUnderStudyFilesModal',
+ name: 'UnderStudyFilesModal',
+ props: {
+ columns: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ },
+ // 是否为在分标委在研项目,默认是
+ isCommittee: {
+ type: Boolean,
+ default: true
+ }
+ },
data() {
return {
title: '操作',
width: 800,
visible: false,
confirmLoading: false,
- columns,
dataSource: []
}
},
@@ -88,22 +81,33 @@ export default {
* @param record
*/
handleDownload(record) {
- let param = {
- fileId: record.FILE_ID,
- fileName: record.FILE_NAME
+ if (this.isCommittee) {
+ let param = {
+ fileId: record.FILE_ID,
+ fileName: record.FILE_NAME
+ }
+ downloadFile(`/payResearchProject/payResearchProject/downLoad`, record.FILE_NAME, param)
+ } else {
+ downloadFile(`sys/common/download/${record.fileId}`, record.fileName)
}
- downloadFile(`/payResearchProject/payResearchProject/downLoad`, record.FILE_NAME, param)
},
/**
* 预览
* @param record
*/
handlePreview(record) {
- if (record && record.FILE_ID) {
- const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.FILE_ID }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.FILE_NAME }`
- let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
- // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
- window.open(url)
+ if (this.isCommittee) {
+ if (record && record.FILE_ID) {
+ const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.FILE_ID }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.FILE_NAME }`
+ let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
+ window.open(url)
+ }
+ } else {
+ if (record && record.fileId) {
+ const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.fileId }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.fileName }`
+ let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
+ window.open(url)
+ }
}
},
handleCancel() {
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index ab609f2..703a4ef 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -48,7 +48,7 @@
-
+
diff --git a/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue b/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
index b9ce3f6..76d50fc 100644
--- a/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
+++ b/src/views/subBidCommittee/SubBidCommitteeDetailPage.vue
@@ -63,7 +63,7 @@
-
+
@@ -71,7 +71,7 @@
import { getSubBidCommitteeDetail, getCommitteeUnderStudyProject } from '@api/incomePaymentsApi'
import MeetingList from '@comp/detailPage/MeetingList'
import FileList from '@comp/detailPage/FileList'
-import CommitteeUnderStudyFilesModal from '@views/subBidCommittee/modules/CommitteeUnderStudyFilesModal'
+import CommitteeUnderStudyFilesModal from '@views/MessagePage/modules/UnderStudyFilesModal'
const columns = [
{
@@ -127,6 +127,26 @@ const columns = [
}
]
+const fliesColumns = [
+ {
+ title: '文件名',
+ align: 'center',
+ dataIndex: 'FILE_NAME',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '上传时间',
+ align: 'center',
+ dataIndex: 'CREAT_TIME',
+ scopedSlots: { customRender: 'time' }
+ }, {
+ title: '操作',
+ align: 'center',
+ dataIndex: 'action',
+ width: 160,
+ scopedSlots: { customRender: 'action' }
+ }
+]
+
export default {
name: 'SubBidCommitteeDetailPage',
components: { MeetingList, FileList, CommitteeUnderStudyFilesModal },
@@ -152,7 +172,9 @@ export default {
showSizeChanger: true,
total: 0
},
- loading: false
+ loading: false,
+ // 在研文件表头
+ fliesColumns
}
},
created() {
@@ -193,7 +215,9 @@ export default {
*/
getUnderStudyProjectList() {
let param = {
- abbreviation: this.$route.query.abbreviation
+ abbreviation: this.$route.query.abbreviation,
+ pageNo: this.ipagination.current,
+ pageSize: this.ipagination.pageSize
}
getCommitteeUnderStudyProject(param).then(res => {
if (res.success) {
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index a33d167..345d3c8 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -48,7 +48,7 @@
-
+
@@ -66,7 +66,8 @@
-
+
+
+
\ No newline at end of file