Skip to content

D
dsk-operate-sys-cscec
Commit 644f110a authored by yht15023815643's avatar yht15023815643
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents a74c3b99 b12f74d0
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 39 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/SupplierLimitedController.java
View file @ 644f110a
...@@ -21,19 +21,19 @@ import javax.annotation.Resource; ...@@ -21,19 +21,19 @@ import javax.annotation.Resource;
*/ */
@RestController @RestController
@RequestMapping("fSupplierLimited") @RequestMapping("fSupplierLimited")
public class FSupplierLimitedController { public class SupplierLimitedController {
/** /**
* 服务对象 * 服务对象
*/ */
@Resource @Resource
private FSupplierLimitedService fSupplierLimitedService; private FSupplierLimitedService supplierLimitedService;
/** /**
* 获取涉诉限用禁用名单 * 获取涉诉限用禁用名单
*/ */
@GetMapping("/getSupplierLimitedList") @GetMapping("/getSupplierLimitedList")
public TableDataInfo<SupplierLimitedSearchVo> getSupplierLimitedList(SupplierLimitedSearchBo searchBo, PageQuery pageQuery) { public TableDataInfo<SupplierLimitedSearchVo> getSupplierLimitedList(SupplierLimitedSearchBo searchBo, PageQuery pageQuery) {
return fSupplierLimitedService.querySupplierLimitedList(searchBo, pageQuery); return supplierLimitedService.querySupplierLimitedList(searchBo, pageQuery);
} }
/** /**
...@@ -41,7 +41,7 @@ public class FSupplierLimitedController { ...@@ -41,7 +41,7 @@ public class FSupplierLimitedController {
*/ */
@GetMapping("/getSupplierUnlimitedList") @GetMapping("/getSupplierUnlimitedList")
public TableDataInfo<SupplierUnlimitedSearchVo> getSupplierUnlimitedList(SupplierUnlimitedSearchBo searchBo, PageQuery pageQuery) { public TableDataInfo<SupplierUnlimitedSearchVo> getSupplierUnlimitedList(SupplierUnlimitedSearchBo searchBo, PageQuery pageQuery) {
return fSupplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery); return supplierLimitedService.querySupplierUnlimitedList(searchBo, pageQuery);
} }
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/FSupplierLimitedServiceImpl.java
View file @ 644f110a
...@@ -83,6 +83,10 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap ...@@ -83,6 +83,10 @@ public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMap
//查不到则抛异常 //查不到则抛异常
//throw new ServiceException("未查询到该供应商Cid"); //throw new ServiceException("未查询到该供应商Cid");
} }
//关键字标红
if (StringUtils.isNotBlank(searchBo.getSupplierName())) {
searchVo.setFsuppliername(StringUtils.markInRed(searchVo.getFsuppliername(), searchBo.getSupplierName()));
}
} }
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java
View file @ 644f110a
...@@ -77,4 +77,17 @@ public class JskCompanyRelationTableV1DetailPageDto extends BasePage { ...@@ -77,4 +77,17 @@ public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
* 成员Id（常合作集团成员详情） * 成员Id（常合作集团成员详情）
*/ */
private Integer memberId; private Integer memberId;
/**
* 集团名称（集团查看详情需传）
*/
private String combineName;
/**
* 成员名称（常合作集团成员详情传
*/
private String memberName;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1Dto.java
View file @ 644f110a
...@@ -72,5 +72,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage { ...@@ -72,5 +72,10 @@ public class JskCompanyRelationTableV1Dto extends BasePage {
*/ */
private String combineId; private String combineId;
/**
* 集团名称（集团查看详情需传）
*/
private String combineName;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java
View file @ 644f110a
...@@ -71,12 +71,19 @@ public class EnterpriseService { ...@@ -71,12 +71,19 @@ public class EnterpriseService {
} }
public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception { public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
if (body.isVaildCid()) return R.ok(); if (body.isVaildCid()) {
return R.ok();
}
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false)); Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
Integer companyCode = MapUtils.getInteger(companyMap, "code", 300); Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
if (200 != companyCode) return R.ok(); if (200 != companyCode) {
return R.ok();
}
Map companyData = MapUtils.getMap(companyMap, "data", null); Map companyData = MapUtils.getMap(companyMap, "data", null);
if (ObjectUtil.isEmpty(companyData)) {
return R.ok();
}
companyData.put("uipId", null); companyData.put("uipId", null);
companyData.put("claimStatus", 0); companyData.put("claimStatus", 0);
companyData.put("bratingSubjectLevel", null); companyData.put("bratingSubjectLevel", null);
...@@ -102,14 +109,20 @@ public class EnterpriseService { ...@@ -102,14 +109,20 @@ public class EnterpriseService {
} }
public R statistic(EnterpriseStatisticBody body) throws Exception { public R statistic(EnterpriseStatisticBody body) throws Exception {
if (body.isVaildCid()) return R.ok(); if (body.isVaildCid()) {
return R.ok();
}
Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false)); Map<String, Object> statisticMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/statistic", BeanUtil.beanToMap(body, false, false));
Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300); Integer statisticMapCode = MapUtils.getInteger(statisticMap, "code", 300);
if (200 != statisticMapCode) throw new RuntimeException(); if (200 != statisticMapCode) {
return R.ok();
}
Map statisticMapData = MapUtils.getMap(statisticMap, "data", null); Map statisticMapData = MapUtils.getMap(statisticMap, "data", null);
if (MapUtils.isEmpty(statisticMapData)) return R.ok(); if (MapUtils.isEmpty(statisticMapData)) {
return R.ok();
}
//内部合作 //内部合作
Map<String,Object> cooperation = iCustomerInfoService.cooperationStatistic(body.getCompanyName()); Map<String,Object> cooperation = iCustomerInfoService.cooperationStatistic(body.getCompanyName());
...@@ -122,7 +135,9 @@ public class EnterpriseService { ...@@ -122,7 +135,9 @@ public class EnterpriseService {
paramMap.put("cid", body.getCompanyId()); paramMap.put("cid", body.getCompanyId());
Map<String, Object> projectStatisticMap = dskOpenApiUtil.requestBody("/operate/enterpriseProject/statistic", paramMap); Map<String, Object> projectStatisticMap = dskOpenApiUtil.requestBody("/operate/enterpriseProject/statistic", paramMap);
Integer projectStatisticMapCode = MapUtils.getInteger(projectStatisticMap, "code", 300); Integer projectStatisticMapCode = MapUtils.getInteger(projectStatisticMap, "code", 300);
if (200 != projectStatisticMapCode) return R.ok(statisticMapData); if (200 != projectStatisticMapCode) {
return R.ok(statisticMapData);
}
Map projectStatisticMapData = MapUtils.getMap(projectStatisticMap, "data", null); Map projectStatisticMapData = MapUtils.getMap(projectStatisticMap, "data", null);
......
dsk-operate-ui/src/utils/index.js
View file @ 644f110a
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 = "",) => {
}
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
View file @ 644f110a
<template> <template>
<div class="consulting-agency-container"> <div class="consulting-agency-container">
<el-form :model="comProjectDetailInfo" :rules="rules" :inline-message="false" class="basic-engineering-information-inner"> <el-form :model="comProjectDetailInfo" :rules="rules" :show-message="false" class="basic-engineering-information-inner">
<!-- 基础信息 --> <!-- 基础信息 -->
<div class="project-basic-information"> <div class="project-basic-information">
<div class="info-module-title"><span>基础信息</span></div> <div class="info-module-title"><span>基础信息</span></div>
...@@ -14,15 +14,13 @@ ...@@ -14,15 +14,13 @@
<tr> <tr>
<td class="table-key">咨询机构名称</td> <td class="table-key">咨询机构名称</td>
<td> <td>
<transition mode="out-in" name="edit-fade"> <div class="normal-value" v-if="!comIsModify">
<div class="normal-value" v-if="!comIsModify"> {{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}}
{{comProjectDetailInfo.advisoryBody && comProjectDetailInfo.advisoryBody.advisoryBodyName ? comProjectDetailInfo.advisoryBody.advisoryBodyName : "-"}} </div>
</div> <el-form-item label="" v-if="comIsModify" prop="advisoryBody.advisoryBodyName">
<el-form-item label="" v-if="comIsModify"> <el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable v-focus placeholder="请输入完整咨询机构名称"
<el-input v-model="comProjectDetailInfo.advisoryBody.advisoryBodyName" clearable v-focus placeholder="请输入完整咨询机构名称" @input="searchConsulting"></el-input>
@input="searchConsulting"></el-input> </el-form-item>
</el-form-item>
</transition>
</td> </td>
<td class="table-key">法人代表</td> <td class="table-key">法人代表</td>
<td> <td>
...@@ -54,17 +52,32 @@ ...@@ -54,17 +52,32 @@
<tr> <tr>
<td class="table-key">项目负责人</td> <td class="table-key">项目负责人</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeader">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeader" clearable placeholder="请输入项目负责人"></el-input>
</el-form-item>
</td> </td>
<td class="table-key">项目负责人专业</td> <td class="table-key">项目负责人专业</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeaderMajor">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入项目负责人专业"></el-input>
</el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="table-key">联系电话</td> <td class="table-key">联系电话</td>
<td colspan="3"> <td colspan="3">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone ? comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone ? comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.projectLeaderPhone">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone" clearable placeholder="请输入项目负责人联系电话"></el-input>
</el-form-item>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -82,17 +95,39 @@ ...@@ -82,17 +95,39 @@
<tr> <tr>
<td class="table-key">结算开始时间</td> <td class="table-key">结算开始时间</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleStartTime ? comProjectDetailInfo.advisoryBodyProject.settleStartTime : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleStartTime ? comProjectDetailInfo.advisoryBodyProject.settleStartTime : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.settleStartTime">
<el-date-picker v-model="comProjectDetailInfo.advisoryBodyProject.settleStartTime" type="datetime" placeholder="选择结算开始时间"
:value-format="'yyyy-MM-dd HH:mm:ss'">
</el-date-picker>
</el-form-item>
</td> </td>
<td class="table-key">结算完成时间</td> <td class="table-key">结算完成时间</td>
<td> <td>
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleFinishTime ? comProjectDetailInfo.advisoryBodyProject.settleFinishTime : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleFinishTime ? comProjectDetailInfo.advisoryBodyProject.settleFinishTime : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.settleFinishTime">
<el-date-picker v-model="comProjectDetailInfo.advisoryBodyProject.settleFinishTime" type="datetime" placeholder="选择结算完成时间"
:value-format="'yyyy-MM-dd HH:mm:ss'">
</el-date-picker>
</el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="table-key">是否为终审单位</td> <td class="table-key">是否为终审单位</td>
<td colspan="3"> <td colspan="3">
{{comProjectDetailInfo.advisoryBodyProject && statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) ? statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) : "-"}} <div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) ? statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) : "-"}}
</div>
<el-form-item label="" v-if="comIsModify" prop="advisoryBodyProject.isFinalJudgeUnit">
<el-radio-group v-model="comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit">
<el-radio :label="0">是</el-radio>
<el-radio :label="1">否</el-radio>
</el-radio-group>
</el-form-item>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -102,6 +137,7 @@ ...@@ -102,6 +137,7 @@
</template> </template>
<script> <script>
import { searchConsultingApi } from "@/api/consultingOrgManagement"; import { searchConsultingApi } from "@/api/consultingOrgManagement";
import { elementMessageSingleton } from "@/utils";
export default { export default {
name: "consultingAgency", name: "consultingAgency",
props: { props: {
...@@ -133,15 +169,26 @@ export default { ...@@ -133,15 +169,26 @@ export default {
} }
}, },
data() { data() {
const phoneValidator = (rule, value, callback) => {
const phoneReg = /^1[3-9]\d{9}$/;
if (!value && !value?.toString()?.trim()) {
return callback(new Error(`请输入项目负责人联系电话`));
}
if (value && !phoneReg.test(value)) {
return callback(new Error(`请输入正确的手机号码`));
}
return callback();
};
return { return {
comIsModify: this.isModify, comIsModify: this.isModify,
comProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)), comProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)),
oldComProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)), oldComProjectDetailInfo: JSON.parse(JSON.stringify(this.projectDetailInfo)),
rules: { rules: {
"advisoryBody.advisoryBodyName": [{ required: true, trigger: ["blur", "change"], message: "咨询机构名称不能为空" }],
"advisoryBodyProject.projectLeaderPhone": [{ required: true, trigger: ["blur", "change"], validator: phoneValidator }],
}, },
tableKeyWidth: 0, tableKeyWidth: 0,
searchTimer: null searchTimer: null,
}; };
}, },
//可访问data属性 //可访问data属性
...@@ -196,13 +243,54 @@ export default { ...@@ -196,13 +243,54 @@ export default {
async searchConsultingHandle(keywords) { async searchConsultingHandle(keywords) {
try { try {
const searchResult = await searchConsultingApi(keywords); const searchResult = await searchConsultingApi(keywords);
if (searchResult.code == 200) { if (searchResult.code == 200 && searchResult.data) {
console.log(searchResult); const _temp = JSON.parse(JSON.stringify(searchResult.data));
this.updateTemplate(_temp);
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
}, },
updateTemplate(data) {
const updateMap = new Map([
["advisoryBody.advisoryBodyName", "advisoryBodyName"],
["advisoryBody.advisoryBodyCid", "advisoryBodyCid"],
["advisoryBody.businessScope", "businessScope"],
["isNewAdvisoryBody", "isNewAdvisoryBody"],
["corporatePerson", "corporatePerson"],
["regAddress", "regAddress"],
]);
this.setTemplateData(updateMap, data);
},
setTemplateData(mapData, data) {
/**
* @type {Map<string,string>}
*/
const _mapTemp = mapData;
// 寻找对应的赋值对象
for (const [key, value] of _mapTemp) {
const keys = key.split(".");
const len = keys.length;
if (len == 1) {
this.$set(this.comProjectDetailInfo, key, data[value]);
continue;
}
const currentObjectKey = keys[len - 2];
const currentKey = keys[len - 1];
const currentObject = this.findCurrent(this.comProjectDetailInfo, currentObjectKey);
this.$set(currentObject, currentKey, data[value]);
}
},
findCurrent(originData, key) {
for (const _key in originData) {
if (_key == key) {
return originData[_key];
}
if (Object.prototype.toString.call(originData[_key]) == "[object Object]") {
return this.findCurrent(originData[_key], key);
}
}
},
clearSearchTimer() { clearSearchTimer() {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = null; this.searchTimer = null;
...@@ -280,6 +368,16 @@ export default { ...@@ -280,6 +368,16 @@ export default {
margin-bottom: 0px; margin-bottom: 0px;
z-index: 9; z-index: 9;
&.is-error {
.el-form-item__content {
.el-input {
.el-input__inner {
border-color: #ff4949;
}
}
}
}
.el-form-item__content { .el-form-item__content {
height: 100%; height: 100%;
font-size: 12px; font-size: 12px;
...@@ -306,6 +404,34 @@ export default { ...@@ -306,6 +404,34 @@ export default {
border: 1px solid #0081ff; border: 1px solid #0081ff;
} }
} }
.el-date-editor {
width: 100%;
.el-input__prefix {
display: none;
}
}
.el-radio-group {
display: flex;
align-items: center;
padding-left: 12px;
box-sizing: border-box;
.el-radio__input.is-checked .el-radio__inner {
border-color: #0081ff;
background: #0081ff;
}
.el-radio__input.is-checked + .el-radio__label {
color: #0081ff;
}
.el-radio__inner:hover {
border-color: #0081ff;
}
}
} }
} }
} }
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue
View file @ 644f110a
...@@ -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}">
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue
View file @ 644f110a
...@@ -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() {
......
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ 644f110a
...@@ -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