Commit 83650423 authored by tianhongyang's avatar tianhongyang

🐞 fix(咨询机构跳转参数变为query传参):

parent d569e9cd
import { Message } from "element-ui"; import { Message } from "element-ui";
import { parseTime } from './ruoyi'; import { parseTime } from './ruoyi';
import { router } from "@/router";
/** /**
* 表格时间格式化 * 表格时间格式化
...@@ -924,5 +925,10 @@ export const detailSideBar = new Map([ ...@@ -924,5 +925,10 @@ export const detailSideBar = new Map([
["cooperationList", "cooperationRecord"], ["cooperationList", "cooperationRecord"],
// 内部合作 准入情况 // 内部合作 准入情况
["approveInfo", "accessCondition"], ["approveInfo", "accessCondition"],
]) ]);
export const tableContainerFixed = (scrollBarContainer = "",) => {
}
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange"> v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
<!-- 项目列表 --> <!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}"> <template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed">{{row.projectName}}</div> <div v-if="row.projectName" class="no-line-feed" v-html="row.projectName"></div>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
<template slot="projectLeader" slot-scope="{data,row}"> <template slot="projectLeader" slot-scope="{data,row}">
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<el-button type="primary" @click="editProjectDetail">编辑信息</el-button> <el-button type="primary" @click="editProjectDetail">编辑信息</el-button>
</div> </div>
<div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'"> <div class="save-project-detail-container" v-if="currentList === 'consultingAgency' && isModify" :key="'save-project'">
<el-button type="primary" @click="editProjectDetail">保存</el-button> <el-button type="primary" @click="saveProjectDetail">保存</el-button>
<el-button @click="cancelSave">取消</el-button> <el-button @click="cancelSave">取消</el-button>
</div> </div>
</transition> </transition>
...@@ -92,19 +92,19 @@ export default { ...@@ -92,19 +92,19 @@ export default {
methods: { methods: {
async init() { async init() {
try { try {
const advisoryBodyCid = this.$route.params?.advisoryBodyCid; const advisoryBodyCid = this.$route.query?.advisoryBodyCid;
const projectKey = this.$route.query?.projectKey; const projectKey = this.$route.query?.projectKey;
if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID"); // if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
if (!projectKey) return this.$message.error("缺少项目主键"); if (!projectKey) return this.$message.error("缺少项目主键");
const detail = await getgetConsultingOrgProjectDetailApi({ const detail = await getgetConsultingOrgProjectDetailApi({
advisoryBodyCid, advisoryBodyCid,
projectKey projectKey
}); });
if (detail.code == 200 && detail.data) { if (detail.code == 200 && detail.data) {
this.projectDetailInfo = { ...this.pprojectDetailInfo, ...detail.data }; this.projectDetailInfo = { ...this.projectDetailInfo, ...detail.data };
} }
} catch (error) { } catch (error) {
console.log(error);
} }
}, },
editProjectDetail() { editProjectDetail() {
......
...@@ -337,8 +337,8 @@ export default { ...@@ -337,8 +337,8 @@ export default {
}, },
// 查看项目详情 // 查看项目详情
viewProjectDetail(row) { viewProjectDetail(row) {
if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id"); // if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail/${row.advisoryBody?.advisoryBodyCid}?projectKey=${row.projectKey}`); this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
}, },
// 跳转到企业详情 // 跳转到企业详情
viewEnterprise(row) { viewEnterprise(row) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment