diff --git a/src/api/analysis/analysis.js b/src/api/analysis/analysis.js index a09f936..fc9ea40 100644 --- a/src/api/analysis/analysis.js +++ b/src/api/analysis/analysis.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { data } from 'jquery' // 招标解析->查询列表 export function listAPI(params) { @@ -18,37 +19,47 @@ export function addDataAPI(data) { }) } -/* 工器具库->修改工器具 */ -export function editDataAPI(data) { +// 招标解析->查看标段列表 +export function getBidListAPI(params) { return request({ - url: '/smartBid/mainDatabase/tool/editData', - method: 'POST', - data - }) -} - -/* 工器具库->删除工器具 */ -export function delDataAPI(data) { - return request({ - url: '/smartBid/mainDatabase/tool/delData', - method: 'POST', - data - }) -} - -/* 工器具库->查询详情 */ -export function getDetailDataAPI(params) { - return request({ - url: '/smartBid/mainDatabase/tool/detailData', + url: '/smartBid/analysis/getBidList', method: 'GET', params }) } +// 招标解析->查看项目详情 +export function getProDetailAPI(params) { + return request({ + url: '/smartBid/analysis/getProDetail', + method: 'GET', + params + }) +} + +// 招标解析->更新项目数据 +export function editProDataAPI(data) { + return request({ + url: '/smartBid/analysis/editProData', + method: 'POST', + data + }) +} + +// 招标解析->更新标段数据 +export function editBidDataAPI(data) { + return request({ + url: '/smartBid/analysis/editBidData', + method: 'POST', + data + }) +} + + /* 测试 mq */ export function testMQAPI(params) { return request({ - url: '/smartBid/analysis/testAsyncMq', + url: '/smartBid/analysis/testAsyncMq2', method: 'GET', params }) diff --git a/src/views/analysis/components/AnalysisBidDetail.vue b/src/views/analysis/components/AnalysisBidDetail.vue index 7fb73fd..7f0965b 100644 --- a/src/views/analysis/components/AnalysisBidDetail.vue +++ b/src/views/analysis/components/AnalysisBidDetail.vue @@ -34,7 +34,7 @@
招标人
-
{{ detailData.bidder || '--' }}
+
{{ detailData.tenderer || '--' }}
@@ -49,13 +49,13 @@
开标时间
-
{{ detailData.openTime || '--' }}
+
{{ detailData.bidOpeningTime || '--' }}
开标方式
-
{{ detailData.openMethod || '--' }}
+
{{ detailData.bidOpeningMethod || '--' }}
@@ -63,13 +63,12 @@
项目简介
-
{{ detailData.proDescription || '--' }}
+
{{ detailData.proIntroduction || '--' }}
- -
-
招标文件
-
{{ detailData.proDescription || '--' }}
+
+
{{ item.compositionFileName || '--' }}
+
{{ getFirstFileName(item) }}
@@ -77,7 +76,7 @@ @@ -265,8 +266,15 @@ export default { .card-header { display: flex; align-items: center; + justify-content: space-between; gap: 8px; + .card-header-left { + display: flex; + align-items: center; + gap: 8px; + } + .header-icon { font-size: 20px; color: #409EFF; @@ -278,6 +286,17 @@ export default { font-weight: 600; color: #303133; } + + .edit-btn { + color: #409EFF; + font-size: 14px; + font-weight: 500; + padding: 0; + + &:hover { + color: #66b1ff; + } + } } .analysis-detail-content { diff --git a/src/views/analysis/components/AnalysisForm.vue b/src/views/analysis/components/AnalysisForm.vue index 81a7694..b23f2b7 100644 --- a/src/views/analysis/components/AnalysisForm.vue +++ b/src/views/analysis/components/AnalysisForm.vue @@ -1,7 +1,8 @@ + diff --git a/src/views/analysis/config.js b/src/views/analysis/config.js index 5cc07d3..f915690 100644 --- a/src/views/analysis/config.js +++ b/src/views/analysis/config.js @@ -30,7 +30,7 @@ export const bidFormLabel = [ isShow: false, // 是否展示label f_type: 'ipt', f_label: '标的名称', - f_model: 'proName', + f_model: 'markName', f_max: 32, f_width: '250px', }, @@ -38,7 +38,7 @@ export const bidFormLabel = [ isShow: false, // 是否展示label f_type: 'ipt', f_label: '标段名称', - f_model: 'personName', + f_model: 'bidName', f_max: 32, f_width: '250px', }, @@ -46,7 +46,7 @@ export const bidFormLabel = [ isShow: false, // 是否展示label f_type: 'sel', f_label: '解析状态', - f_model: 'analysisStatus', + f_model: 'parsingState', f_selList: [ { label: '解析中', value: 0 }, { label: '解析成功', value: 1 }, @@ -69,26 +69,26 @@ export const columnsList = [ ] export const detailColumnsList = [ - { t_props: 'toolName', t_label: '标的名称' }, - { t_props: 'model', t_label: '单位' }, - { t_props: 'unit', t_label: '标段标号' }, - { t_props: 'technicalParameters', t_label: '标段名称' }, - { t_props: 'mainFunction', t_label: '最高投标限价(万元)' }, - { t_props: 'mainFunction', t_label: '安全文明施工费(万元)' }, - { t_props: 'mainFunction', t_label: '投标保证金(万元)' }, - { t_props: 'mainFunction', t_label: '工期' }, - { t_props: 'mainFunction', t_label: '招标阶段' }, + { t_props: 'markName', t_label: '标的名称' }, + { t_props: 'unit', t_label: '单位' }, + { t_props: 'bidNumber', t_label: '标段标号' }, + { t_props: 'bidName', t_label: '标段名称' }, + { t_props: 'maximumBidLimit', t_label: '最高投标限价(万元)' }, + { t_props: 'safetyConstFee', t_label: '安全文明施工费(万元)' }, + { t_props: 'bidBond', t_label: '投标保证金(万元)' }, + { t_props: 'duration', t_label: '工期' }, + { t_props: 'biddingStage', t_label: '招标阶段' }, ] export const bidListColumnsList = [ - { t_props: 'toolName', t_label: '标的名称' }, - { t_props: 'model', t_label: '单位' }, - { t_props: 'unit', t_label: '标段标号' }, - { t_props: 'technicalParameters', t_label: '标段名称' }, - { t_props: 'mainFunction', t_label: '最高投标限价(万元)' }, - { t_props: 'mainFunction', t_label: '安全文明施工费(万元)' }, - { t_props: 'mainFunction', t_label: '投标保证金(万元)' }, - { t_props: 'mainFunction', t_label: '工期' }, - { t_props: 'mainFunction', t_label: '招标阶段' }, - { t_props: 'mainFunction', t_label: '解析状态' } + { t_props: 'markName', t_label: '标的名称' }, + { t_props: 'unit', t_label: '单位' }, + { t_props: 'bidNumber', t_label: '标段标号' }, + { t_props: 'bidName', t_label: '标段名称' }, + { t_props: 'maximumBidLimit', t_label: '最高投标限价(万元)' }, + { t_props: 'safetyConstFee', t_label: '安全文明施工费(万元)' }, + { t_props: 'bidBond', t_label: '投标保证金(万元)' }, + { t_props: 'duration', t_label: '工期' }, + { t_props: 'biddingStage', t_label: '招标阶段' }, + { t_slot: 'parsingState', t_label: '解析状态' } ] \ No newline at end of file diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue index 65cd7ec..f82d47e 100644 --- a/src/views/analysis/index.vue +++ b/src/views/analysis/index.vue @@ -43,7 +43,7 @@ + :width="600" @handleQuery="handleQuery" /> @@ -146,7 +146,7 @@ export default { this.$router.push({ name: 'AnalysisDetail', query: { - proId: encryptWithSM4('2'), + proId: encryptWithSM4(row.proId + '' || '0'), }, }) }, @@ -155,7 +155,7 @@ export default { this.$router.push({ name: 'AnalysisBidDetail', query: { - proId: encryptWithSM4('2'), + proId: encryptWithSM4(row.proId + '' || '0'), }, }) }, @@ -164,7 +164,7 @@ export default { this.$router.push({ name: 'AnalysisBidIndex', query: { - proId: encryptWithSM4('2'), + proId: encryptWithSM4(row.proId + '' || '0'), }, }) }, diff --git a/src/views/common/FileOrImageDisplay.vue b/src/views/common/FileOrImageDisplay.vue index a0537fe..d5384f8 100644 --- a/src/views/common/FileOrImageDisplay.vue +++ b/src/views/common/FileOrImageDisplay.vue @@ -32,32 +32,28 @@ -- - + + @@ -278,20 +278,5 @@ export default { } } -.preview-dialog ::v-deep .el-dialog { - height: 88vh; - display: flex; - flex-direction: column; -} -.preview-dialog ::v-deep .el-dialog__body { - flex: 1; - padding: 0; - height: 0; - /* 重要:让flex布局生效 */ -} - -.preview-dialog ::v-deep .onlyoffice-container { - height: 100%; -} \ No newline at end of file diff --git a/src/views/common/ViewFile.vue b/src/views/common/ViewFile.vue new file mode 100644 index 0000000..0e3502f --- /dev/null +++ b/src/views/common/ViewFile.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/src/views/enterpriseLibrary/personnel/components/child/OtherInfoDetail.vue b/src/views/enterpriseLibrary/personnel/components/child/OtherInfoDetail.vue index 29dd413..8f950d6 100644 --- a/src/views/enterpriseLibrary/personnel/components/child/OtherInfoDetail.vue +++ b/src/views/enterpriseLibrary/personnel/components/child/OtherInfoDetail.vue @@ -104,7 +104,8 @@ export default { name: item.fileName, filePath: item.filePath, lsFilePath: item.lsFilePath, - fileType: item.fileType + fileType: item.fileType, + id: item.sourceId })); } diff --git a/src/views/enterpriseLibrary/technical/components/RightTable.vue b/src/views/enterpriseLibrary/technical/components/RightTable.vue index d06a776..0726898 100644 --- a/src/views/enterpriseLibrary/technical/components/RightTable.vue +++ b/src/views/enterpriseLibrary/technical/components/RightTable.vue @@ -31,11 +31,12 @@ - + + @@ -44,13 +45,13 @@ import TableModel from '@/components/TableModel2' import { columnsList, formLabel } from './config' import { listAPI, delDataAPI } from '@/api/enterpriseLibrary/technical/technical' import { encryptWithSM4 } from '@/utils/sm' -import OnlyOfficeViewer from '@/views/common/OnlyOfficeViewer' +import ViewFile from '@/views/common/ViewFile' export default { name: 'RightTableTechnical', components: { TableModel, - OnlyOfficeViewer + ViewFile }, dicts: ['construction_nature', 'structural_form', 'basic_form'], props: { @@ -69,11 +70,7 @@ export default { columnsList, listAPI, dialogVisible: false, - documentUrl: '', - documentTitle: '', - documentKey: '', - mode: 'view', - type: 'desktop', + fileData: {}, } }, watch: { @@ -157,22 +154,17 @@ export default { /** 查看文件 */ viewFile(row) { console.log(row); - this.documentTitle = row.technicalName - this.documentKey = row.resourceFileVoList?.[0]?.sourceId + '' + this.fileData = { + fileName: row.technicalName, + id: row.resourceFileVoList?.[0]?.sourceId + '' + } this.dialogVisible = true }, - handleDocumentReady() { - console.log('文档已准备就绪') - }, - handleAppReady() { - console.log('应用已准备就绪') - }, - handleError(error) { - console.log('错误:', error) - }, - handleInitialized() { - console.log('初始化完成') + handleCloseDialog() { + this.dialogVisible = false + this.fileData = {} }, + /** 删除操作 */ handleDelete(raw) { this.$confirm(`确定要删除方案名称"${raw.technicalName}"吗?删除后将无法恢复!`, '操作提示', { @@ -242,21 +234,4 @@ export default { margin-right: 0; } } - -.preview-dialog ::v-deep .el-dialog { - height: 88vh; - display: flex; - flex-direction: column; -} - -.preview-dialog ::v-deep .el-dialog__body { - flex: 1; - padding: 0; - height: 0; - /* 重要:让flex布局生效 */ -} - -.preview-dialog ::v-deep .onlyoffice-container { - height: 100%; -}