Skip to content

D
dsk-operate-sys-cscec
Commit a2333995 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 9d95ba1e a921cd8d
Show whitespace changes
Inline Side-by-side
Showing with 336 additions and 175 deletions
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
View file @ a2333995
......@@ -101,99 +101,186 @@
</tr>
</table>
</div>
<!-- 项目联系人 -->
<!-- 业主信息 -->
<div class="project-contact project-detault-module">
<div class="info-module-title"><span>项目联系人</span></div>
<div class="info-module-title"><span>业主信息</span></div>
<table>
<!-- <colgroup>
<col>
<col :style="{width : tableKeyWidth}">
<col>
<col :style="{width : tableKeyWidth}">
</colgroup> -->
<tr>
<td class="table-key">项目负责人</td>
<td class="table-key">业主名称</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<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-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeader" clearable placeholder="请输入业主名称"></el-input>
</el-form-item>
</td>
<td class="table-key">项目负责人专业</td>
<td class="table-key">项目经理及联系方式</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<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 label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入项目经理及联系方式"></el-input>
</el-form-item>
</td>
<td class="table-key">商务经理及联系方式</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
</div>
<el-form-item label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入商务经理及联系方式"></el-input>
</el-form-item>
</td>
</tr>
</table>
</div>
<!-- 咨询机构信息 -->
<div class="project-contact project-detault-module">
<div class="info-module-title"><span>咨询机构信息</span></div>
<table>
<tr>
<td class="table-key">联系电话</td>
<td class="table-key">招标代理单位</td>
<td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">
<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 label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderPhone" clearable placeholder="请输入招标代理单位"></el-input>
</el-form-item>
</td>
</tr>
</table>
</div>
<!-- 项目结算信息 -->
<div class="project-settlement-information project-detault-module">
<div class="info-module-title"><span>项目结算信息</span></div>
<!-- 造价咨询机构 -->
<div class="project-contact project-detault-module">
<div class="info-module-title"><span>造价咨询机构</span></div>
<table>
<!-- <colgroup>
<col>
<col :style="{width : tableKeyWidth}">
<col>
<col :style="{width : tableKeyWidth}">
</colgroup> -->
<tr>
<td class="table-key">结算开始时间</td>
<td class="table-key">一审单位</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleStartTime ? comProjectDetailInfo.advisoryBodyProject.settleStartTime : "-"}}
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeader ? comProjectDetailInfo.advisoryBodyProject.projectLeader : "-"}}
</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 label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeader" clearable placeholder="请输入一审单位"></el-input>
</el-form-item>
</td>
<td class="table-key">结算完成时间</td>
<td class="table-key">二审单位</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.settleFinishTime ? comProjectDetailInfo.advisoryBodyProject.settleFinishTime : "-"}}
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
</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 label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入二审单位"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td class="table-key">是否为终审单位</td>
<td colspan="3">
<td class="table-key">三审单位</td>
<td :class="[comIsModify ? 'td-none-padding' : '']">
<div class="normal-value" v-if="!comIsModify">
{{comProjectDetailInfo.advisoryBodyProject && statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) ? statusCheck(comProjectDetailInfo.advisoryBodyProject.isFinalJudgeUnit) : "-"}}
{{comProjectDetailInfo.advisoryBodyProject && comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor ? comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor : "-"}}
</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 label="" v-if="comIsModify">
<el-input v-model="comProjectDetailInfo.advisoryBodyProject.projectLeaderMajor" clearable placeholder="请输入三审单位"></el-input>
</el-form-item>
</td>
</tr>
</table>
</div>
<!-- 项目联系人 -->
<!--<div class="project-contact project-detault-module">-->
<!--<div class="info-module-title"><span>项目联系人</span></div>-->
<!--<table>-->
<!--&lt;!&ndash; <colgroup>-->
<!--<col>-->
<!--<col :style="{width : tableKeyWidth}">-->
<!--<col>-->
<!--<col :style="{width : tableKeyWidth}">-->
<!--</colgroup> &ndash;&gt;-->
<!--<tr>-->
<!--<td class="table-key">项目负责人</td>-->
<!--<td :class="[comIsModify ? 'td-none-padding' : '']">-->
<!--<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 class="table-key">项目负责人专业</td>-->
<!--<td :class="[comIsModify ? 'td-none-padding' : '']">-->
<!--<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>-->
<!--</tr>-->
<!--<tr>-->
<!--<td class="table-key">联系电话</td>-->
<!--<td colspan="3" :class="[comIsModify ? 'td-none-padding' : '']">-->
<!--<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>-->
<!--</tr>-->
<!--</table>-->
<!--</div>-->
<!-- 项目结算信息 -->
<!--<div class="project-settlement-information project-detault-module">-->
<!--<div class="info-module-title"><span>项目结算信息</span></div>-->
<!--<table>-->
<!--&lt;!&ndash; <colgroup>-->
<!--<col>-->
<!--<col :style="{width : tableKeyWidth}">-->
<!--<col>-->
<!--<col :style="{width : tableKeyWidth}">-->
<!--</colgroup> &ndash;&gt;-->
<!--<tr>-->
<!--<td class="table-key">结算开始时间</td>-->
<!--<td :class="[comIsModify ? 'td-none-padding' : '']">-->
<!--<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 class="table-key">结算完成时间</td>-->
<!--<td :class="[comIsModify ? 'td-none-padding' : '']">-->
<!--<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>-->
<!--</tr>-->
<!--<tr>-->
<!--<td class="table-key">是否为终审单位</td>-->
<!--<td colspan="3">-->
<!--<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>-->
<!--</tr>-->
<!--</table>-->
<!--</div>-->
<!-- 自定义表单部分 -->
<el-form :model="form" class="custom-design-form-template" ref="customDesignFormTemplate" v-if="form.subfieldModuleList.length">
......
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/index.vue
View file @ a2333995
......@@ -144,7 +144,8 @@ export default {
// 跳转到企业详情
viewEnterprise(row) {
if (!row.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
// this.$tab.openPage(row.advisoryBodyName ? row.advisoryBodyName : "咨询机构详情", `/enterprise/${encodeStr(row.advisoryBodyCid)}`);
this.$tab.openPage(`${row.advisoryBodyName}合作明细`, `/enterprise/${encodeStr(row.advisoryBodyCid)}?path=consultingAgencyCooperation&companyName=${replaceDomTags(row.advisoryBodyName)}`);
},
// 创建最终查询条件
mergeCondition() {
......
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ a2333995
......@@ -13,39 +13,39 @@
<el-input v-model="form.ownerUnit" placeholder="请输入业主名称" clearable></el-input>
</el-form-item>
</div>
<div class="each-line">
<el-form-item label="承接项目单位">
<el-input v-model="form.undertakeProjectUnit" placeholder="请输入承接项目单位名称" clearable></el-input>
</el-form-item>
<el-form-item label="项目创建时间">
<el-date-picker v-model="form.projectCreateTime" type="daterange" range-separator="至" start-placeholder="年/月/日" end-placeholder="年/月/日"
format="yyyy/MM/dd" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="项目承接类型">
<el-select v-model="form.projectUndertakeType" placeholder="请选择" clearable>
<el-option v-for="item in projectTypeOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
<div class="each-line" style="padding-top:16px;border-top:1px solid #EEEEEE;box-sizing:border-box">
<el-form-item label="工程类型大类">
<el-select v-model="form.engineeringFoundationCategory" placeholder="请选择" clearable>
<el-option v-for="item in engineeringCategoryOptions" :key="item.value" :label="item.label" :value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工程类别明细">
<el-select v-model="form.engineeringCategoryDetail" placeholder="请选择" clearable>
<el-option v-for="item in engineeringCategoryDetailOptions" :key="item.value" :label="item.label" :value="item.label">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="合同金额">
<dsk-amount-range v-model="form.contractAmount" :range-text="'至'" :start-placeholder="'最小金额（万元）'"
:end-placeholder="'最大金额（万元）'"></dsk-amount-range>
</el-form-item>
</div>
<!--<div class="each-line">-->
<!--<el-form-item label="承接项目单位">-->
<!--<el-input v-model="form.undertakeProjectUnit" placeholder="请输入承接项目单位名称" clearable></el-input>-->
<!--</el-form-item>-->
<!--<el-form-item label="项目创建时间">-->
<!--<el-date-picker v-model="form.projectCreateTime" type="daterange" range-separator="至" start-placeholder="年/月/日" end-placeholder="年/月/日"-->
<!--format="yyyy/MM/dd" value-format="yyyy-MM-dd"></el-date-picker>-->
<!--</el-form-item>-->
<!--<el-form-item label="项目承接类型">-->
<!--<el-select v-model="form.projectUndertakeType" placeholder="请选择" clearable>-->
<!--<el-option v-for="item in projectTypeOptions" :key="item.value" :label="item.label" :value="item.value">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</div>-->
<!--<div class="each-line" style="padding-top:16px;border-top:1px solid #EEEEEE;box-sizing:border-box">-->
<!--<el-form-item label="工程类型大类">-->
<!--<el-select v-model="form.engineeringFoundationCategory" placeholder="请选择" clearable>-->
<!--<el-option v-for="item in engineeringCategoryOptions" :key="item.value" :label="item.label" :value="item.label">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--<el-form-item label="工程类别明细">-->
<!--<el-select v-model="form.engineeringCategoryDetail" placeholder="请选择" clearable>-->
<!--<el-option v-for="item in engineeringCategoryDetailOptions" :key="item.value" :label="item.label" :value="item.label">-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--<el-form-item label="合同金额">-->
<!--<dsk-amount-range v-model="form.contractAmount" :range-text="'至'" :start-placeholder="'最小金额（万元）'"-->
<!--:end-placeholder="'最大金额（万元）'"></dsk-amount-range>-->
<!--</el-form-item>-->
<!--</div>-->
</el-form>
<!-- 查询重置 -->
......@@ -70,54 +70,127 @@
<skeleton v-if="tableLoading"></skeleton>
<!-- table 列表 -->
<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
v-else-if="!tableLoading" :maxHeight="false" @handle-current-change="handleCurrentChange">
<!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed" v-html="row.projectName" @click="viewProjectDetail(row)">{{row.projectName}}</div>
<div class="table-item" v-if="!tableLoading" ref="tableContainer">
<el-table
ref="tableRef"
:data="tableDataList"
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="150" 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>
<!-- 业主单位 -->
<template slot="ownerName" slot-scope="{data,row}">
<div v-if="row.ownerName">
<span v-if="row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(row)">{{row.ownerName}}</span>
<span v-else>{{row.ownerName}}</span>
</div>
</el-table-column>
<el-table-column label="发包人名称" min-width="150" 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-else>-</span>
</template>
<!-- 项目承接单位 -->
<!-- <template slot="contractOrgName" slot-scope="{data,row}">
<div v-if="row.contractOrgName" class="no-line-feed">{{row.contractOrgName}}</div>
</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> -->
<!-- 咨询机构名称 -->
<template slot="advisoryBodyName" slot-scope="{data,row}">
<div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName">
<span v-if="row.advisoryBody.advisoryBodyCid" class="no-line-feed"
@click="viewEnterprise(row)">{{row.advisoryBody.advisoryBodyName}}</span>
<span v-else>{{row.advisoryBody.advisoryBodyName}}</span>
</div>
</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>
<!-- 项目负责人姓名 -->
<template slot="projectLeader" slot-scope="{row}">
<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeader">
{{row.advisoryBodyProject.projectLeader}}</div>
</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>
<!-- 项目负责人专业 -->
<template slot="projectLeaderMajor" slot-scope="{row}">
<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeaderMajor">
{{row.advisoryBodyProject.projectLeaderMajor}}</div>
</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>
<!-- 项目负责人电话 -->
<template slot="projectLeaderPhone" slot-scope="{row}">
<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeaderPhone">
{{row.advisoryBodyProject.projectLeaderPhone}}</div>
</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>
</table-list-com>
</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="total>queryParams.pageSize">
<el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="total" layout="prev, pager, next, jumper" @current-change="handleCurrentChange"/>
</div>
</div>
<!--<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"-->
<!--v-else-if="!tableLoading" :maxHeight="false" @handle-current-change="handleCurrentChange">-->
<!--&lt;!&ndash; 项目列表 &ndash;&gt;-->
<!--<template slot="projectName" slot-scope="{data,row}">-->
<!--<div v-if="row.projectName" class="no-line-feed" v-html="row.projectName" @click="viewProjectDetail(row)">{{row.projectName}}</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 业主单位 &ndash;&gt;-->
<!--<template slot="ownerName" slot-scope="{data,row}">-->
<!--<div v-if="row.ownerName">-->
<!--<span v-if="row.ownerUnitCid" class="no-line-feed" @click="viewOwnerUnit(row)">{{row.ownerName}}</span>-->
<!--<span v-else>{{row.ownerName}}</span>-->
<!--</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 项目承接单位 &ndash;&gt;-->
<!--&lt;!&ndash; <template slot="contractOrgName" slot-scope="{data,row}">-->
<!--<div v-if="row.contractOrgName" class="no-line-feed">{{row.contractOrgName}}</div>-->
<!--<span v-else>-</span>-->
<!--</template> &ndash;&gt;-->
<!--&lt;!&ndash; 咨询机构名称 &ndash;&gt;-->
<!--<template slot="advisoryBodyName" slot-scope="{data,row}">-->
<!--<div v-if="row.advisoryBody && row.advisoryBody.advisoryBodyName">-->
<!--<span v-if="row.advisoryBody.advisoryBodyCid" class="no-line-feed"-->
<!--@click="viewEnterprise(row)">{{row.advisoryBody.advisoryBodyName}}</span>-->
<!--<span v-else>{{row.advisoryBody.advisoryBodyName}}</span>-->
<!--</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 项目负责人姓名 &ndash;&gt;-->
<!--<template slot="projectLeader" slot-scope="{row}">-->
<!--<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeader">-->
<!--{{row.advisoryBodyProject.projectLeader}}</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 项目负责人专业 &ndash;&gt;-->
<!--<template slot="projectLeaderMajor" slot-scope="{row}">-->
<!--<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeaderMajor">-->
<!--{{row.advisoryBodyProject.projectLeaderMajor}}</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--&lt;!&ndash; 项目负责人电话 &ndash;&gt;-->
<!--<template slot="projectLeaderPhone" slot-scope="{row}">-->
<!--<div v-if="row.advisoryBody && row.advisoryBodyProject.projectLeaderPhone">-->
<!--{{row.advisoryBodyProject.projectLeaderPhone}}</div>-->
<!--<span v-else>-</span>-->
<!--</template>-->
<!--</table-list-com>-->
</div>
</div>
......@@ -148,26 +221,26 @@ export default {
advisoryBodyName: "",
// 业主单位
ownerUnit: "",
// 承接项目单位
undertakeProjectUnit: "",
// 项目创建开始时间
projectStartTime: "",
// 项目创建开始结束时间
projectEndTime: "",
// 组件时间用值
projectCreateTime: [],
// 项目承接类型
projectUndertakeType: "",
// 工程基础大类
engineeringFoundationCategory: "",
// 工程类别明细
engineeringCategoryDetail: "",
// 组件合同金额区间
contractAmount: [],
// 最小合同金额
minContractAmount: "",
// 最大合同金额
maxContractAmount: ""
// // 承接项目单位
// undertakeProjectUnit: "",
// // 项目创建开始时间
// projectStartTime: "",
// // 项目创建开始结束时间
// projectEndTime: "",
// // 组件时间用值
// projectCreateTime: [],
// // 项目承接类型
// projectUndertakeType: "",
// // 工程基础大类
// engineeringFoundationCategory: "",
// // 工程类别明细
// engineeringCategoryDetail: "",
// // 组件合同金额区间
// contractAmount: [],
// // 最小合同金额
// minContractAmount: "",
// // 最大合同金额
// maxContractAmount: ""
},
tableLoading: false,
// 列表表头
......@@ -336,7 +409,7 @@ export default {
} finally {
this.tableLoading = false;
await this.$nextTick();
this.total ? this.$refs.tableContainer.$refs.tableRef.doLayout() : null;
// this.total ? this.$refs.tableContainer.$refs.tableRef.doLayout() : null;
this.listenScrollX();
}
},
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/consultingAgencyCooperation.vue
View file @ a2333995
......@@ -76,16 +76,16 @@ export default {
{ label: '创建时间', prop: 'loadTime', width: "172" },
],
formData: [
{
type: 7, fieldName: 'projectProvince', value: '', placeholder: '项目省市', uid: this.getUid(), options: [], props: {
multiple: true,
value: "value",
label: "value",
// checkStrictly: true
}
},
{ type: 1, fieldName: 'isinvestproject', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
{ type: 1, fieldName: 'projectType2', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
// {
// type: 7, fieldName: 'projectProvince', value: '', placeholder: '项目省市', uid: this.getUid(), options: [], props: {
// multiple: true,
// value: "value",
// label: "value",
// // checkStrictly: true
// }
// },
// { type: 1, fieldName: 'isinvestproject', value: '', placeholder: '项目承接类型', options: [], uid: this.getUid() },
// { type: 1, fieldName: 'projectType2', value: '', placeholder: '工程类别明细', options: [], uid: this.getUid() },
{ type: 3, fieldName: 'projectName', value: '', placeholder: '请输入', uid: this.getUid() },
],
//列表
......@@ -213,20 +213,20 @@ export default {
const areaSearchList = this.$refs["searchFormNew"].$refs["cascader"][0].getCheckedNodes();
let province=[]
let city=[]
if(params.projectProvince){
for (let i=0; i<params.projectProvince.length; i++){
province.push(params.projectProvince[i][1])
city.push(params.projectProvince[i][2])
}
}
province=province.filter((item, index, self) => self.indexOf(item) === index);
if(province){
params.province=province
}
if(city){
params.city=city
}
delete params.projectProvince
// if(params.projectProvince){
// for (let i=0; i<params.projectProvince.length; i++){
// province.push(params.projectProvince[i][1])
// city.push(params.projectProvince[i][2])
// }
// }
// province=province.filter((item, index, self) => self.indexOf(item) === index);
// if(province){
// params.province=province
// }
// if(city){
// params.city=city
// }
// delete params.projectProvince
this.handleQuery(params)
} catch (error) {
......
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