Skip to content

D
dsk-operate-sys-cscec
Commit a7bb1234 authored by liuChang's avatar liuChang
Browse files
Options

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

parents 9ba48532 242a749d
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 27 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java
View file @ a7bb1234
......@@ -2,6 +2,7 @@ package com.dsk.jsk.controller;
import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.jsk.domain.JskCompanyRelationTableV1DetailPageDto;
import com.dsk.jsk.domain.JskCompanyRelationTableV1Dto;
import com.dsk.jsk.service.CompanyRelationTableV1Service;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -46,7 +47,7 @@ public class CompanyRelationTableV1Controller {
*@date: 2023/5/18 10:29
*/
@PostMapping("/detailPage")
public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1DetailPageDto dto) throws Exception{
return relationTableV1Service.detailPage(dto);
}
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCompanyRelationTableV1DetailPageDto.java 0 → 100644
View file @ a7bb1234
package com.dsk.jsk.domain;
import lombok.Data;
import java.util.List;
/**
* @ClassName JskCompanyRelationTableV1DetailPageDto
* @Description 查看详情
* @Author Dgm
* @Date 2023/12/11 20:37
* @Version
*/
@Data
public class JskCompanyRelationTableV1DetailPageDto extends BasePage {
/**
* 搜-关键字素
*/
private String keyword;
/**
* 企业类型
*/
private String companyRole;
/**
* 项目类型
*/
private List<String> counterpartCompanyRoles;
/**
* 工程类型
*/
private List<String> projectTypes;
/**
* 咨询机构业务类型
*/
private List<String> businessTypes;
/**
* 公布日期-开始时间
*/
private String beginTime;
/**
* 公布日期-结束时间
*/
private String endTime;
/**
* 本次合作合同金额(万元)-最大金额
*/
private Double maxAmount;
/**
* 本次合作合同金额(万元)-最小金额
*/
private Double minAmount;
/**
* 企业Id
*/
private Integer companyId;
/**
* 企业类型 1：业主 2：施工 3：集团
*/
private Integer companyType;
/**
* 排序 1:金额降序 2:金额升序 3: 时间降序 4: 时间升区5: 数量降序6：数量升序
*/
private Integer sort = 5;
/**
* 集团Id
*/
private String combineId;
/**
* 成员Id（常合作集团成员详情）
*/
private Integer memberId;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java
View file @ a7bb1234
......@@ -34,7 +34,7 @@ public class CompanyRelationTableV1Service {
return dskOpenApiUtil.responsePage(map);
}
public TableDataInfo detailPage(JskCompanyRelationTableV1Dto dto) throws Exception {
public TableDataInfo detailPage(JskCompanyRelationTableV1DetailPageDto dto) throws Exception {
Map<String, Object> map = null;
if (dto.getCompanyType().equals(3) || dto.getCompanyType().equals(4)) {
map = dskOpenApiUtil.requestBody("/operate/consultancy/combineDetailPage", BeanUtil.beanToMap(dto, false, false));
......
dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue
View file @ a7bb1234
......@@ -26,19 +26,19 @@
<el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
class="table-item1 fixed-table" border highlight-current-row>
<el-table-column label="资质名称" fixed >
<el-table-column :resizable="false" label="资质名称" fixed >
<template slot-scope="scope">
{{scope.row.name}}
</template>
</el-table-column>
<el-table-column label="等级" width="274">
<el-table-column :resizable="false" label="等级" width="274">
<template slot-scope="scope">
{{scope.row.level||"--"}}
</template>
</el-table-column>
<el-table-column label="经营范围" >
<el-table-column :resizable="false" label="经营范围" >
<template slot-scope="scope">
{{scope.row.contractScope||"--"}}
</template>
......
dsk-operate-ui/src/views/supplier/components/BatchImport.vue
View file @ a7bb1234
<template>
<el-dialog title="批量查资质" custom-class="batch_import_dialog" :visible.sync="visible">
<el-dialog title="批量查资质" :close-on-click-modal="false" custom-class="batch_import_dialog" :visible.sync="visible">
<div class="upload" >
<div class="up_title">导入Excel文件，高效查询或导出企业信息；查询成功后可使用筛选项二次筛选</div>
<div>
......
dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue
View file @ a7bb1234
......@@ -80,41 +80,41 @@
</div>
<el-table :data="item.aptitudeListude" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
class="table-item1 fixed-table" border highlight-current-row>
<el-table-column label="证书编号" fixed width="119">
<el-table-column :resizable="false" label="证书编号" fixed width="119">
<template slot-scope="scope">
{{scope.row.serial||"--"}}
</template>
</el-table-column>
<el-table-column label="资质名称" fixed width="273">
<el-table-column :resizable="false" label="资质名称" fixed width="273">
<template slot-scope="scope">
{{scope.row.name||"--"}}
</template>
</el-table-column>
<el-table-column label="承包工程范围" width="415">
<el-table-column :resizable="false" label="承包工程范围" width="415">
<template slot-scope="scope">
{{scope.row.contractScope||"--"}}
</template>
</el-table-column>
<el-table-column label="发证日期" width="119">
<el-table-column :resizable="false" label="发证日期" width="119">
<template slot-scope="scope">
{{scope.row.issuTime||"--"}}
</template>
</el-table-column>
<el-table-column label="有效期至" width="119">
<el-table-column :resizable="false" label="有效期至" width="119">
<template slot-scope="scope">
{{scope.row.validate||"--"}}
</template>
</el-table-column>
<el-table-column label="发证机关" width="204">
<el-table-column :resizable="false" label="发证机关" width="204">
<template slot-scope="scope">
{{scope.row.organ||"--"}}
</template>
</el-table-column>
<el-table-column label="经营范围" width="415">
<el-table-column :resizable="false" label="经营范围" width="415">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
<span class="line_2"> {{scope.row.businessScope||"--"}}</span>
......@@ -125,7 +125,7 @@
</div>
</div>
<div class="pagination clearfix" v-show="total>0">
<el-pagination background :page-size="pageSize" :current-page="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
<el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
......@@ -140,41 +140,41 @@
<span class="float_r">共有 <span style="color: #0081FF;">{{ dialogData.total }}</span> 个资质</span>
</div>
<el-table :data="dialogData.list" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'" class="table-item1 fixed-table" border highlight-current-row>
<el-table-column label="证书编号" fixed width="119">
<el-table-column :resizable="false" label="证书编号" fixed width="119">
<template slot-scope="scope">
{{scope.row.serial||"--"}}
</template>
</el-table-column>
<el-table-column label="资质名称" fixed width="273">
<el-table-column :resizable="false" label="资质名称" fixed width="273">
<template slot-scope="scope">
{{scope.row.name||"--"}}
</template>
</el-table-column>
<el-table-column label="承包工程范围" width="415">
<el-table-column :resizable="false" label="承包工程范围" width="415">
<template slot-scope="scope">
{{scope.row.contractScope||"--"}}
</template>
</el-table-column>
<el-table-column label="发证日期" width="119">
<el-table-column :resizable="false" label="发证日期" width="119">
<template slot-scope="scope">
{{scope.row.issuTime||"--"}}
</template>
</el-table-column>
<el-table-column label="有效期至" width="119">
<el-table-column :resizable="false" label="有效期至" width="119">
<template slot-scope="scope">
{{scope.row.validate||"--"}}
</template>
</el-table-column>
<el-table-column label="发证机关" width="204">
<el-table-column :resizable="false" label="发证机关" width="204">
<template slot-scope="scope">
{{scope.row.organ||"--"}}
</template>
</el-table-column>
<el-table-column label="经营范围" width="415">
<el-table-column :resizable="false" label="经营范围" width="415">
<template slot-scope="scope">
<el-tooltip class="item" effect="light" :content="scope.row.businessScope" placement="bottom">
<span class="line_2"> {{scope.row.businessScope||"--"}}</span>
......@@ -374,8 +374,14 @@ export default {
},
handleCurrentChange(pageNum) {
this.pageNum = pageNum;
this.search();
if(pageNum*this.pageSize>10000){
this.$message.warning("数据达上限")
this.pageNum = 10000/this.pageSize
}else{
this.pageNum = pageNum;
}
this.search()
},
handleCurrentChange1(pageNum) {
this.pageNum1 = pageNum;
......
dsk-operate-ui/src/views/supplier/components/SearchResult.vue
View file @ a7bb1234
......@@ -2,25 +2,25 @@
<div class="search_result_box">
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
class="table-item1 fixed-table" border highlight-current-row>
<el-table-column type="index" label="序号" fixed width="60">
<el-table-column :resizable="false" type="index" label="序号" fixed width="60">
<template slot-scope="scope">
<span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="表格名称" >
<el-table-column :resizable="false" label="表格名称" >
<template slot-scope="scope">
{{scope.row.fileName||"--"}}
</template>
</el-table-column>
<el-table-column label="查询时间" width="189">
<el-table-column :resizable="false" label="查询时间" width="189">
<template slot-scope="scope">
{{scope.row.createTime||"--"}}
</template>
</el-table-column>
<el-table-column label="操作" width="154">
<el-table-column :resizable="false" label="操作" width="154">
<template slot-scope="scope">
<a class="download_span" :href="scope.row.url" v-if="scope.row.url">下载</a>
<span v-else >--</span>
......
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