Skip to content

D
dsk-operate-sys-cscec
Commit 171e8cd9 authored by fulixin's avatar fulixin
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 e221f041 a6e19278
Hide whitespace changes
Inline Side-by-side
Showing with 299 additions and 58 deletions
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ 171e8cd9
......@@ -64,7 +64,7 @@
</div>
<div class="result-head-right">
<!-- 表头设置 -->
<dsk-table-header-setting :settingList="formColum" @settingChange="settingChange"></dsk-table-header-setting>
<!--<dsk-table-header-setting :settingList="formColum" @settingChange="settingChange"></dsk-table-header-setting>-->
</div>
</div>
......@@ -80,14 +80,15 @@
<el-table-column label="序号" width="60" align="left">
<template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="工程名称" min-width="150" prop="projectName">
<el-table-column label="工程名称" min-width="200" prop="projectName">
<template slot-scope="scope">
<div v-if="scope.row.projectName" class="no-line-feed" v-html="scope.row.projectName" @click="viewProjectDetail(scope.row)">{{scope.row.projectName}}</div>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="发包人名称" min-width="150" prop="ownerName">
<el-table-column label="发包人名称" min-width="170" prop="ownerName">
<template slot-scope="scope">
<!--<span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>-->
<span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>
<span v-else>-</span>
</template>
......@@ -453,7 +454,7 @@ export default {
// 查看项目详情
viewProjectDetail(row) {
// if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.projectKey}`);
this.$tab.openPage(row.projectName, `/consultingOrgManagement/projectDetail?advisoryBodyCid=${row.advisoryBody?.advisoryBodyCid ? row.advisoryBody?.advisoryBodyCid : ""}&projectKey=${row.contractKey}`);
},
// 跳转到企业详情
viewEnterprise(row) {
......@@ -513,7 +514,15 @@ export default {
height: calc(100% - 241px);
@import "@/assets/styles/search-result-list-public.scss";
.no-line-feed {
display: block;
color: #0081ff;
cursor: pointer;
width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
::v-deep .table-list-com-ins {
height: calc(100% - 40px);
margin-top: 16px;
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/accessCondition.vue
View file @ 171e8cd9
......@@ -64,7 +64,7 @@
</tr>
<tr>
<td class="table-key">公司性质</td>
<td>{{supplierAccessInfo.ownerKind ? supplierAccessInfo.ownerKind : "-"}}</td>
<td>{{supplierAccessInfo.customerProperty ? supplierAccessInfo.customerProperty : "-"}}</td>
<td class="table-key">资质等级</td>
<td>{{supplierAccessInfo.credential ? supplierAccessInfo.credential : "-"}}</td>
</tr>
......@@ -100,18 +100,152 @@
<div class="certificate-details table-item">
<div class="info-module-title"><span>上传证书及其他信息</span></div>
<el-table :data="textTabel" border stripe>
<el-table-column label="证书类型" width="194px">
</el-table-column>
<el-table-column label="到期时间" width="194px">
</el-table-column>
<el-table-column label="状态" width="194px">
</el-table-column>
<el-table-column label="查看" min-width="194px">
</el-table-column>
<el-table-column label="操作" width="194px">
</el-table-column>
</el-table>
<table class="table-box" border="0" cellspacing="0" >
<thead>
<td width="30%">证书类型</td>
<td width="25%">到期时间</td>
<td width="10%">状态</td>
<td width="35%">查看</td>
</thead>
<template v-if="supplierAccessInfo.businessLicenseList&&supplierAccessInfo.businessLicenseList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.businessLicenseList">
<td :rowspan="supplierAccessInfo.businessLicenseList.length" v-if="index == 0">营业执照</td>
<td>{{supplierAccessInfo.expireDate1 || '--'}}</td>
<td>{{supplierAccessInfo.status1}}</td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue"> {{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>营业执照</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<template v-if="supplierAccessInfo.orgCertificateList&&supplierAccessInfo.orgCertificateList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.orgCertificateList">
<td :rowspan="supplierAccessInfo.orgCertificateList.length" v-if="index == 0">组织机构代码</td>
<td>{{supplierAccessInfo.expireDate2 || '--'}}</td>
<td>{{supplierAccessInfo.status2}}</td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue"> {{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>组织机构代码</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<template v-if="supplierAccessInfo.taxCertificateList&&supplierAccessInfo.taxCertificateList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.taxCertificateList">
<td :rowspan="supplierAccessInfo.taxCertificateList.length" v-if="index == 0">税务登记证</td>
<td>{{supplierAccessInfo.expireDate3 || '--'}}</td>
<td>{{supplierAccessInfo.status3}}</td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue"> {{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>税务登记证</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<template v-if="supplierAccessInfo.qualificationCertificateList&&supplierAccessInfo.qualificationCertificateList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.qualificationCertificateList">
<td :rowspan="supplierAccessInfo.qualificationCertificateList.length" v-if="index == 0">资质证书</td>
<td>{{supplierAccessInfo.expireDate4 || '--'}}</td>
<td>{{supplierAccessInfo.status4}}</td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue"> {{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>资质证书</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<template v-if="supplierAccessInfo.safetyCertificateList&&supplierAccessInfo.safetyCertificateList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.safetyCertificateList">
<td :rowspan="supplierAccessInfo.safetyCertificateList.length" v-if="index == 0">安全生产</td>
<td>{{supplierAccessInfo.expireDate5 || '--'}}</td>
<td>{{supplierAccessInfo.status5}}</td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue"> {{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>安全生产</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<template v-if="supplierAccessInfo.ratepayerCertificateList&&supplierAccessInfo.ratepayerCertificateList.length>0">
<tr v-for="(item,index) in supplierAccessInfo.ratepayerCertificateList">
<td :rowspan="supplierAccessInfo.ratepayerCertificateList.length" v-if="index == 0">增值税一般纳税人资格证明</td>
<td></td>
<td></td>
<td class="blue">
<el-link :href="`${item.docLink}`" :underline="false" target="_blank">
<span class="blue">{{item.docName}}</span>
</el-link>
</td>
</tr>
</template>
<template v-else>
<tr>
<td>增值税一般纳税人资格证明</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</template>
<tr>
<td>业绩报告</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
<tr>
<td>考察报告</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
<tr>
<td>其他</td>
<td>--</td>
<td>--</td>
<td>--</td>
</tr>
</table>
</div>
......@@ -125,25 +259,25 @@
<table>
<tr>
<td class="table-key">准入情况</td>
<td colspan="3">-</td>
<td colspan="3">{{supplierAccessInfo.isagree || '--'}}</td>
</tr>
<tr>
<td class="table-key">经办人</td>
<td>-</td>
<td>{{supplierAccessInfo.responsiblePerson || '--'}}</td>
<td class="table-key">准入时间</td>
<td>-</td>
<td>{{supplierAccessInfo.approveDate1 || '--'}}</td>
</tr>
<tr>
<td class="table-key">商务经理</td>
<td>-</td>
<td>{{supplierAccessInfo.businessManager || '--'}}</td>
<td class="table-key">准入时间</td>
<td>-</td>
<td>{{supplierAccessInfo.approveDate3 || '--'}}</td>
</tr>
<tr>
<td class="table-key">项目经理</td>
<td>-</td>
<td>{{supplierAccessInfo.projectManager || '--'}}</td>
<td class="table-key">准入时间</td>
<td>-</td>
<td>{{supplierAccessInfo.approveDate4 || '--'}}</td>
</tr>
</table>
</div>
......@@ -154,9 +288,9 @@
<table>
<tr>
<td class="table-key">公司意见</td>
<td>-</td>
<td>{{supplierAccessInfo.purchasePrincipal || '--'}}</td>
<td class="table-key">准入时间</td>
<td>-</td>
<td>{{supplierAccessInfo.approveDate2 || '--'}}</td>
</tr>
</table>
</div>
......@@ -272,6 +406,33 @@ export default {
.approval-opinions,
.certificate-details {
margin-top: 32px;
.table-box {
margin-top: 16px;
border: 1px solid #e6e9f0;
width: 100%;
border-top: 0;
thead {
background: #f0f3fa;
}
tr:nth-child(2n + 1) {
background: #f9fcff;
}
tr:hover {
background: #dcebff;
}
td {
border-top: 1px solid #e6e9f0;
border-right: 1px solid #e6e9f0;
height: auto;
font-weight: 400;
font-size: 12px;
padding: 12px;
}
.blue {
color: #0081ff;
cursor: pointer;
}
}
}
.certificate-details {
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/consultingAgencyCooperation.vue
View file @ 171e8cd9
......@@ -3,37 +3,108 @@
<head-form-new title="咨询机构合作" :form-data="formData" :query-params="queryParams" :total="tableDataTotal" :isExcel="true"
@handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<tables v-if="!isSkeleton" :indexFixed="true" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal"
:queryParams="queryParams" @handle-current-change="handleCurrentChange">
<!-- 项目列表 -->
<template slot="projectName" slot-scope="scope">
<span v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;"
@click="viewProjectDetail(scope.row)">{{scope.row.projectName}}</span>
<span v-else>-</span>
</template>
<!-- 省市区 -->
<template slot="provinceName" slot-scope="scope">
<span>{{`${scope.row.provinceName}${scope.row.provinceName || scope.row.cityName ? " - " : ""}${scope.row.cityName}`}}</span>
</template>
<!-- 业主单位 -->
<template slot="ownerName" slot-scope="scope">
<!--<span v-if="scope.row.ownerName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>-->
<!--<span v-if="scope.row.ownerName" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>-->
<router-link :to="`/enterprise/${encodeStr(scope.row.ownerCid)}}`" tag="a" class="a-link" v-if="scope.row.ownerCid" v-html="scope.row.ownerName"></router-link>
<span v-else>-</span>
</template>
<!-- 项目承接单位 -->
<template slot="contractOrgName" slot-scope="scope">
<!--<span v-if="scope.row.contractOrgName" @click="viewEnterprise(scope.row)">{{scope.row.contractOrgName}}</span>-->
<router-link :to="`/enterprise/${encodeStr(scope.row.contractOrgCid)}}`" tag="a" class="a-link" v-if="scope.row.contractOrgCid" v-html="scope.row.contractOrgName"></router-link>
<span v-else>-</span>
</template>
<!-- 咨询机构名称 -->
<template slot="advisoryBodyName" slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.advisoryBodyCid)}}`" tag="a" class="a-link" v-if="scope.row.advisoryBodyCid" v-html="scope.row.advisoryBodyName"></router-link>
<span v-else>-</span>
</template>
</tables>
<!-- table 列表 -->
<div class="table-item" v-if="!isSkeleton">
<el-table
ref="tableRef"
:data="tableData"
highlight-current-row
style="margin-top: 16px;"
>
<el-table-column label="序号" width="60" align="left">
<template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="工程名称" min-width="200" prop="projectName">
<template slot-scope="scope">
<div v-if="scope.row.projectName" class="no-line-feed" v-html="scope.row.projectName" @click="viewProjectDetail(scope.row)">{{scope.row.projectName}}</div>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="发包人名称" min-width="170" prop="ownerName">
<template slot-scope="scope">
<!--<span v-if="scope.row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>-->
<span v-if="scope.row.ownerName" class="no-line-feed" @click="viewOwnerUnit(scope.row)">{{scope.row.ownerName}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="对接人员">
<el-table-column label="项目经理及联系方式" min-width="150" prop="projectManagerAndPhone">
<template slot-scope="scope">
<span v-if="scope.row.projectManagerAndPhone">{{scope.row.projectManagerAndPhone}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="商务经理联及系方式" min-width="150" prop="businessManagerAndPhone">
<template slot-scope="scope">
<span v-if="scope.row.businessManagerAndPhone">{{scope.row.businessManagerAndPhone}}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="咨询机构信息">
<el-table-column label="招标代理机构名称" min-width="150" prop="bidAgencyUnit">
<template slot-scope="scope">
<span v-if="scope.row.bidAgencyUnit">{{scope.row.bidAgencyUnit}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="造价咨询单位（项目状态目前无法明确的，可不填写）" min-width="150">
<el-table-column label="一审单位" min-width="100" prop="firstAuditUnit">
<template slot-scope="scope">
<span v-if="scope.row.firstAuditUnit">{{scope.row.firstAuditUnit}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="二审单位" min-width="100" prop="secondAuditUnit">
<template slot-scope="scope">
<span v-if="scope.row.secondAuditUnit">{{scope.row.secondAuditUnit}}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="三审单位" min-width="100" prop="thirdAuditUnit">
<template slot-scope="scope">
<span v-if="scope.row.thirdAuditUnit">{{scope.row.thirdAuditUnit}}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
<el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange"/>
</div>
</div>
<!--<tables v-if="!isSkeleton" :indexFixed="true" :tableData="tableData" :forData="forData" :tableDataTotal="tableDataTotal"-->
<!--:queryParams="queryParams" @handle-current-change="handleCurrentChange">-->
<!--&lt;!&ndash; 项目列表 &ndash;&gt;-->
<!--<template slot="projectName" slot-scope="scope">-->
<!--<span v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;"-->
<!--@click="viewProjectDetail(scope.row)">{{scope.row.projectName}}</span>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 省市区 &ndash;&gt;-->
<!--<template slot="provinceName" slot-scope="scope">-->
<!--<span>{{`${scope.row.provinceName}${scope.row.provinceName || scope.row.cityName ? " - " : ""}${scope.row.cityName}`}}</span>-->
<!--</template>-->
<!--&lt;!&ndash; 业主单位 &ndash;&gt;-->
<!--<template slot="ownerName" slot-scope="scope">-->
<!--&lt;!&ndash;<span v-if="scope.row.ownerName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>&ndash;&gt;-->
<!--&lt;!&ndash;<span v-if="scope.row.ownerName" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>&ndash;&gt;-->
<!--<router-link :to="`/enterprise/${encodeStr(scope.row.ownerCid)}}`" tag="a" class="a-link" v-if="scope.row.ownerCid" v-html="scope.row.ownerName"></router-link>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 项目承接单位 &ndash;&gt;-->
<!--<template slot="contractOrgName" slot-scope="scope">-->
<!--&lt;!&ndash;<span v-if="scope.row.contractOrgName" @click="viewEnterprise(scope.row)">{{scope.row.contractOrgName}}</span>&ndash;&gt;-->
<!--<router-link :to="`/enterprise/${encodeStr(scope.row.contractOrgCid)}}`" tag="a" class="a-link" v-if="scope.row.contractOrgCid" v-html="scope.row.contractOrgName"></router-link>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 咨询机构名称 &ndash;&gt;-->
<!--<template slot="advisoryBodyName" slot-scope="scope">-->
<!--<router-link :to="`/enterprise/${encodeStr(scope.row.advisoryBodyCid)}}`" tag="a" class="a-link" v-if="scope.row.advisoryBodyCid" v-html="scope.row.advisoryBodyName"></router-link>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--</tables>-->
</div>
</template>
<script>
......
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