Skip to content

D
dsk-operate-sys-cscec
Commit 242a749d authored by Administrator's avatar Administrator
Browse files
Options

Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

parents ab87f5c3 e0d1a86b
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 88 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyVo.java
View file @ 242a749d
......@@ -62,7 +62,7 @@ public class AdvisoryBodyVo {
* 工程类别明细
*/
@ExcelProperty(value = "工程类别明细", index = 6)
private String projectType;
private String projectType2;
/**
* 咨询机构ID
......@@ -97,7 +97,7 @@ public class AdvisoryBodyVo {
* 合同金额
*/
@ExcelProperty(value = "合同金额", index = 10)
private BigDecimal contractOrigValue;
private BigDecimal contractValue;
/**
* 业主单位
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DCustomerServiceImpl.java
View file @ 242a749d
......@@ -52,10 +52,6 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
//项目合作数量
item.setProjectCooperationCount(vo.getProjectCooperationCount());
showCustomerClass(item);
//关键字标红
if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
}
try {
Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
if (!ObjectUtils.isEmpty(map.get("data"))) {
......@@ -66,6 +62,10 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
} catch (Exception e) {
//
}
//关键字标红
if (!ObjectUtils.isEmpty(bo.getCustomerName())) {
item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
}
});
}
return TableDataInfo.build(page);
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java
View file @ 242a749d
package com.dsk.search.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.utils.poi.ExcelUtil;
import com.dsk.jsk.domain.JskCombineSearchDto;
import com.dsk.jsk.domain.bo.ComposeQueryDto;
import com.dsk.search.service.BusinessOpportunityRadarService;
import com.dsk.search.service.ExportService;
......@@ -62,4 +64,26 @@ public class ExportController {
return exportService.aptitudeFile(file);
}
/**
* 集团成员列表导出
*/
@PostMapping("/combine/memberList")
public AjaxResult memberListExportPre(@RequestBody JskCombineSearchDto dto) throws Exception {
return exportService.memberListExport(dto);
}
//集团中标业绩导出
@PostMapping("/combine/win/bid")
@SaCheckPermission("combine:info:export:win:bid")
public AjaxResult exportWinBid(@RequestBody JskCombineSearchDto dto) {
return exportService.exportWinBid(dto);
}
//集团招标业绩导出
@PostMapping("/combine/bid")
@SaCheckPermission("combine:info:export:win:bid")
public AjaxResult exportBid(@RequestBody JskCombineSearchDto dto) {
return exportService.exportBid(dto);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java
View file @ 242a749d
package com.dsk.search.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.constant.Constants;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.excel.ExcelUtils;
import com.dsk.common.exception.ServiceException;
import com.dsk.jsk.domain.JskCombineSearchDto;
import com.dsk.jsk.domain.bo.ComposeQueryDto;
import com.dsk.jsk.service.EnterpriseService;
import com.dsk.system.domain.SysUserFileRecord;
......@@ -63,6 +65,7 @@ public class ExportService {
//生成中
fileRecord.setStatus(2);
fileRecord.setRemark("资质批量导出");
fileRecord.setCreateTime(new DateTime());
Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
composeQueryDto.setExportUniqueCode(fileId.toString());
//回调函数
......@@ -72,4 +75,55 @@ public class ExportService {
return AjaxResult.success();
}
//集团成员导出
public AjaxResult memberListExport(JskCombineSearchDto dto) {
SysUserFileRecord fileRecord = new SysUserFileRecord();
fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
fileRecord.setType(1);
//生成中
fileRecord.setStatus(2);
fileRecord.setRemark("集团成员列表导出");
fileRecord.setCreateTime(new DateTime());
Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
dto.setExportUniqueCode(fileId.toString());
//回调函数
dto.setExportBackUrl(EXPORT_BACK_URL);
dskOpenApiUtil.requestBody("/operate/export/member", BeanUtil.beanToMap(dto, false, false));
return AjaxResult.success();
}
//集团中标业绩导出
public AjaxResult exportWinBid(JskCombineSearchDto dto) {
SysUserFileRecord fileRecord = new SysUserFileRecord();
fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
fileRecord.setType(1);
//生成中
fileRecord.setStatus(2);
fileRecord.setRemark("集团中标业绩导出");
fileRecord.setCreateTime(new DateTime());
Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
dto.setExportUniqueCode(fileId.toString());
//回调函数
dto.setExportBackUrl(EXPORT_BACK_URL);
dskOpenApiUtil.requestBody("/operate/export/combineBid", BeanUtil.beanToMap(dto, false, false));
return AjaxResult.success();
}
//集团招标业绩
public AjaxResult exportBid(JskCombineSearchDto dto) {
SysUserFileRecord fileRecord = new SysUserFileRecord();
fileRecord.setFileName(dto.getExportExeclName().concat(Constants.SUFFIX_XLSX));
fileRecord.setType(1);
//生成中
fileRecord.setStatus(2);
fileRecord.setRemark("集团招标业绩导出");
fileRecord.setCreateTime(new DateTime());
Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
dto.setExportUniqueCode(fileId.toString());
//回调函数
dto.setExportBackUrl(EXPORT_BACK_URL);
dskOpenApiUtil.requestBody("/operate/export/combine/tender", BeanUtil.beanToMap(dto, false, false));
return AjaxResult.success();
}
}
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml
View file @ 242a749d
......@@ -14,7 +14,7 @@
abp.project_leader_phone,
ab.advisory_body_name,
dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
dp.project_type2,dp.contract_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
from advisory_body_project abp
left join advisory_body ab on ab.advisory_body_id = abp.advisory_body_id
left join d_project dp on dp.project_key = abp.project_key
......
dsk-operate-ui/src/utils/generator/custom-design-options.js
View file @ 242a749d
......@@ -7,8 +7,9 @@ export const subfieldModuleTemplate = {
defaultSubfieldModuleName: "分栏名称",
subfieldModuleName: "",
subfieldModuleNameRules: {
required: true,
message: "请输入分栏名称",
trigger: ["blur", "change"]
trigger: "change"
},
subfieldModulePlaceholder: "请输入分栏标题",
edit: false,
......@@ -22,6 +23,11 @@ export const defaultComOptions = [
comType: "el-input",
// 组件展示图标
comShowIcon: require("@/assets/images/consultingAgencyManagement/customForm/icon_single_line_text@2x.png"),
// 验证规则
rules: {},
// 绑定的值
value: "",
// 输入值为空提示
placeholder: "请输入"
}
];
\ No newline at end of file
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/CustomFormDesign.vue
View file @ 242a749d
......@@ -7,7 +7,7 @@
<div class="design-main fields-main">
<vuedraggable :list="defaultComOptions" :group="{name: 'customComGroup', pull: 'clone', put: false}" class="design-draggable-fields"
draggable=".draggable-fields-item" ghostClass="dragClass" :clone="targetComClone" :sort="false" :disabled="!subfieldModuleList.length"
@choose="chooseFieldItem" @end="fieldsOnEnd">
@end="fieldsOnEnd">
<transition-group name="fade" tag="div" class="draggable-fields-list">
<div class="draggable-fields-item" :class="{'has-no-subfield-module' : !subfieldModuleList.length}"
v-for="(item,index) of defaultComOptions" :key="index" @click="fieldsItemClick">
......@@ -22,18 +22,18 @@
<div class="custom-form-design-options">
<div class="design-header options-header">表单配置</div>
<div class="design-main options-main">
<el-form class="custom-design-el-form" ref="customDesignFormRef" :rules="{}">
<el-form class="custom-design-el-form" ref="customDesignFormRef" :rules="{}" @submit.native.prevent>
<!-- 最外层dragg容器 拖动模块module . -->
<!-- 最外层dragg容器 拖动模块module .subfield-module-dragg-target-icon -->
<vuedraggable :list="subfieldModuleList" group="customSubfieldmodule" class="subfield-module-container"
draggable=".subfield-module-dragg-target-icon">
draggable=".subfield-module-item-container" handle=".subfield-module-dragg-target-icon" :animation="340">
<!-- 添加的分栏模块以及chidren模块 -->
<transition-group name="fade" tag="div" class="subfield-module-list">
<vuedraggable v-for="(item,index) of subfieldModuleList" tag="subfield-module" :list="item.children" group="customSubfieldmoduleItem"
:component-data="createComponentData(item)" :key="item.uid" draggable=".subfield-module-item-dragg-target-icon">
<transition-group name="fade" tag="div" class="subfield-module-item-list">
<subfield-item v-for="(child,index) of item.children" :key="child.uid"></subfield-item>
</transition-group>
<vuedraggable v-for="(item,index) of subfieldModuleList" draggable=".subfield-item-container"
handle=".subfield-module-item-dragg-target-icon" tag="subfield-module" :list="item.children" group="customComGroup"
:component-data="createComponentData(item)" :key="item.uid" :animation="340">
<subfield-item v-for="(child,index) of item.children" :key="child.uid" :parentUid="item.uid" :childModuleInfo="child"
@removeModuleItem="removeModuleItem"></subfield-item>
</vuedraggable>
</transition-group>
</vuedraggable>
......@@ -113,10 +113,7 @@ export default {
// 字段组件结束拖动
fieldsOnEnd(e) {
console.log(e);
},
// 选中要移动的表单组件时
chooseFieldItem(e) {
console.log(e);
console.log(this.subfieldModuleList);
},
// 字段组件点击事件
fieldsItemClick() {
......@@ -143,11 +140,21 @@ export default {
},
editOK(module) {
},
removeModuleItem(itemModule, parentUid) {
const parentModule = this.subfieldModuleList.find(item => item.uid == parentUid);
if (parentModule) {
// 更新源数据标题
const index = parentModule?.children?.findIndex(item => item.uid == itemModule.uid);
if (index > -1) {
parentModule?.children?.splice(index, 1);
}
}
},
removeModule(module) {
this.removeSubfieldModule = module;
this.removeSubFiledModuleDialog = true;
const findModule = this.subfieldModuleList.findIndex(item => item.uid == module.uid);
const findModule = this.subfieldModuleList.find(item => item.uid == module.uid);
if (findModule) {
// 更新源数据标题
findModule.subfieldModuleName = module.subfieldModuleName;
......
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldItem.vue
View file @ 242a749d
<template>
<div class="subfield-item-container">
<img src="@/assets/images/consultingAgencyManagement/customForm/icon_drag@2x.png" alt="" class="subfield-module-item-dragg-target-icon">
<el-form-item class="subfield-module-form-item" :label="comChildModuleInfo.comLabel">
<el-input v-model="comChildModuleInfo.value" :placeholder="comChildModuleInfo.placeholder" clearable></el-input>
</el-form-item>
<img src="@/assets/images/consultingAgencyManagement/customForm/icon_delete@2x.png" alt="" class="remove-subfield-item-icon"
@click.stop="removeModuleItem">
</div>
</template>
<script>
export default {
name: "subfieldItem",
props: {
childModuleInfo: Object,
parentUid: String
},
watch: {
childModuleInfo: {
handler(newValue) {
this.comChildModuleInfo = newValue;
},
deep: true
}
},
data() {
return {
comChildModuleInfo: this.childModuleInfo
};
},
//可访问data属性
......@@ -21,12 +38,47 @@ export default {
},
//方法集
methods: {
removeModuleItem() {
this.$emit("removeModuleItem", this.comChildModuleInfo, this.parentUid);
},
},
}
</script>
<style lang="scss" scoped>
.subfield-item-container {
width: 100%;
min-height: 56px;
padding: 0px 16px 0px 32px;
box-sizing: border-box;
display: flex;
align-items: center;
background: #dcebff;
.subfield-module-item-dragg-target-icon {
width: 14px;
height: 14px;
cursor: pointer;
}
::v-deep .subfield-module-form-item {
display: flex;
.el-form-item__label {
line-height: 32px;
font-size: 14px;
font-weight: 400;
color: rgba(35, 35, 35, 0.8);
}
.el-form-item__content {
flex: 1;
}
}
.remove-subfield-item-icon {
width: 16px;
height: 16px;
margin-left: 12px;
cursor: pointer;
}
}
</style>
dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldModule.vue
View file @ 242a749d
......@@ -3,8 +3,8 @@
<div class="subfield-module-header">
<div class="subfield-module-title">
<img src="@/assets/images/consultingAgencyManagement/customForm/icon_drag@2x.png" alt="" class="subfield-module-dragg-target-icon">
<el-form-item v-if="comModuleInfo.edit" class="subfield-module-form-item" :rules="comModuleInfo.subfieldModuleNameRules">
<el-input v-model="comModuleInfo.subfieldModuleName" :placeholder="comModuleInfo.subfieldModulePlaceholder" clearable></el-input>
<el-form-item v-if="comModuleInfo.edit" class="subfield-module-form-item" :rules="comModuleInfo.subfieldModuleNameRules" prop="">
<el-input v-model="comModuleInfo.subfieldModuleName" :placeholder="comModuleInfo.subfieldModulePlaceholder" clearable @keyup.enter.native.stop="editOK"></el-input>
</el-form-item>
<span v-else>{{comModuleInfo.defaultSubfieldModuleName}}</span>
</div>
......
dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
View file @ 242a749d
......@@ -49,8 +49,8 @@
<span class="color1 span">高风险 {{scope.row.highRiskCount}}</span>
<span class="color2 span">中风险 {{scope.row.middleRiskCount}}</span>
<span class="color3 span">低风险 {{scope.row.lowRiskCount}}</span>
<span class="color4 span">提示 {{scope.row.promptCount}}</span>
<span class="color5 span">正向 {{scope.row.positiveCount}}</span>
<!--<span class="color4 span">提示 {{scope.row.promptCount}}</span>-->
<!--<span class="color5 span">正向 {{scope.row.positiveCount}}</span>-->
</template>
</el-table-column>
<el-table-column label="监控时间" width="200" align="left" prop="createTime"></el-table-column>
......@@ -95,7 +95,7 @@
</el-input>
</div>
<div class="companyList">
<div class="list">
<div class="list" v-loading="loading">
<div class="item" v-for="item in dataList">
<div class="item-left">
<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.companyName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
......@@ -209,6 +209,8 @@
},
companyId:'',
downloadhref: '',//样例地址
// 加载状态
loading: false,
}
},
created() {
......@@ -226,6 +228,7 @@
})
},
handleKeyword(){
this.dataList=[]
this.addEnterprise()
},
changeCheckbox(item){
......@@ -334,6 +337,7 @@
},
addEnterprise(){
this.qyVisible=true;
this.loading = true
let data={
pageNum:1,
pageSize:10
......@@ -342,6 +346,7 @@
data.companyName=this.companyName;
}
queryMonitorCompany(data).then(res => {
this.loading = false
this.dataList=res.rows;
})
},
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
View file @ 242a749d
......@@ -80,7 +80,7 @@
</el-table-column>
<el-table-column label="监控对象" prop="companyName" align="left" width="250"></el-table-column>
<el-table-column label="风险级别" prop="riskLevel" align="left" width="120"></el-table-column>
<el-table-column label="监控类型" prop="parentName" align="left" width="150"></el-table-column>
<el-table-column label="监控类型" prop="dimensionName" align="left" width="150"></el-table-column>
<el-table-column label="动态内容" prop="details" align="left">
<template slot-scope="scope">
<div v-for="(item,index) in scope.row.Array" :key="index">
......@@ -202,14 +202,6 @@
},
],
fxjb:[
{
value:'提示',
label:'提示'
},
{
value:'正向',
label:'正向'
},
{
value:'低风险',
label:'低风险'
......
dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue
View file @ 242a749d
......@@ -7,7 +7,7 @@
<img src="@/assets/images/enterprise.png"/>
<span>{{object.companyName}}</span>
</div>
<p>
<p style="margin: 12px 0;">
<span class="label">法定代表人：</span>
<span class="val">{{object.corporatePerson}}</span>
<span class="label">注册资本：</span>
......@@ -54,7 +54,7 @@
<div class="label">时间筛选</div>
<div class="checkbox">
<el-radio-group v-model="radio">
<el-radio v-for="item in radioList" :label="item.type">{{item.label}}</el-radio>
<el-radio v-for="item in radioList" @change="radioBtn" :label="item.type">{{item.label}}</el-radio>
</el-radio-group>
<el-date-picker
v-if="radio==4"
......@@ -63,6 +63,7 @@
value-format="yyyy-MM-dd"
unlink-panels
size="small"
@change="changePicker"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
......@@ -87,7 +88,7 @@
</el-table-column>
<el-table-column label="监控对象" prop="companyName" align="left" width="250"></el-table-column>
<el-table-column label="风险级别" prop="riskLevel" align="left" width="120"></el-table-column>
<el-table-column label="监控类型" prop="parentName" align="left" width="150"></el-table-column>
<el-table-column label="监控类型" prop="dimensionName" align="left" width="150"></el-table-column>
<el-table-column label="动态内容" prop="details" align="left">
<template slot-scope="scope">
<div v-for="(item,index) in scope.row.Array" :key="index">
......@@ -189,23 +190,15 @@
],
fxjb:[
{
value:'1',
label:'提示'
},
{
value:'2',
label:'正向'
},
{
value:'3',
value:'低风险',
label:'低风险'
},
{
value:'4',
value:'中风险',
label:'中风险'
},
{
value:'5',
value:'高风险',
label:'高风险'
},
],
......@@ -443,6 +436,46 @@
break;
}
},
radioBtn(val){
let endTime = new Date()
this.queryParams.pageNum=1
this.queryParams.pageSize=10
switch (val) {
case 1:
this.queryParams.condition.beginTime=this.formatDate(endTime)
this.queryParams.condition.endTime=this.formatDate(endTime)
this.querySubmit()
break;
case 2:
this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 3))
this.queryParams.condition.endTime = this.formatDate(endTime)
this.querySubmit()
break;
case 3:
this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 7))
this.queryParams.condition.endTime = this.formatDate(endTime)
this.querySubmit()
break;
case 4:
this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 15))
this.queryParams.condition.endTime = this.formatDate(endTime)
this.querySubmit()
break;
case 5:
this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 30))
this.queryParams.condition.endTime = this.formatDate(endTime)
this.querySubmit()
break;
case 6:
this.date=[]
break;
default:
this.queryParams.condition.beginTime=''
this.queryParams.condition.endTime=''
this.querySubmit()
break;
}
},
// 重置页数
handleSizeChange(val) {
this.queryParams.pageNum = 1
......@@ -455,6 +488,16 @@
this.querySubmit()
window.scrollTo(0, 0);
},
// 时间选择改变后的回调
changePicker(value) {
if(value && value.length) {
this.queryParams.condition.beginTime = value[0]
this.queryParams.condition.endTime = value[1]
}
this.queryParams.pageNum=1
this.queryParams.pageSize=10
this.querySubmit()
},
// 时间格式化
formatDate(timeStr) {
let date = new Date(Number(timeStr));
......
dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue
View file @ 242a749d
......@@ -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 @ 242a749d
<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>
......@@ -18,6 +18,7 @@
:file-list="fileList"
:on-change="handleFileListChange"
:headers="headers"
:on-remove="onRemove"
:on-success="onSuccess">
<img class="up_img" src="@/assets/images/plus.png">
<div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div>
......@@ -97,14 +98,19 @@ import {importTemplate} from '@/api/supplier/assistant.js';
this.isUpload = true
}
},
onRemove(){
this.isUpload = false
},
onSuccess(res, file, fileList) {
this.$refs["upload"].clearFiles()
this.isUpload = false;
if (res.code == 200) {
this.addsuccess = true;
this.$emit("loadingFn",true);
this.$refs["upload"].clearFiles();
this.isUpload = false;
}else {
this.importCancel()
this.$emit("loadingFn",false);
this.$message.error({ message: res.msg, showClose: true })
}
},
......
dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue
View file @ 242a749d
......@@ -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 @ 242a749d
......@@ -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>
......
dsk-operate-ui/src/views/system/supplierBad/index.vue
View file @ 242a749d
......@@ -23,7 +23,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.status===0" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,1)">停用</span>
<span v-if="scope.row.status===1" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,1)">启用</span>
<span v-if="scope.row.status===1" style="cursor: pointer;margin-right: 16px;color: #0081FF;" @click="handleClick(scope.row,0)">启用</span>
<span style="cursor: pointer;color: #FF3C3C;" @click="handleClick(scope.row,2)">删除</span>
</template>
</el-table-column>
......@@ -168,7 +168,7 @@
methods: {
radioBtn(val){
configUpdate({configKey:'customer-badness-date-type',configValue:val}).then(res => {
this.$modal.success(res.msg);
this.$message.success(res.msg);
});
},
getList(){
......@@ -181,7 +181,8 @@
console.log(res)
this.isSkeleton = false;
this.tableData=res.rows;
this.tableDataTotal=res.total
this.tableDataTotal=res.total;
})
},
handleClick(item,key){
......@@ -209,7 +210,7 @@
console.log(res)
if(res.code === 200){
this.visible=false;
this.$modal.success("新增成功");
this.$message.success("新增成功");
this.getList()
}else {
this.$message.error(res.msg);
......@@ -237,7 +238,7 @@
handleSave(){
let time=this.startTime.substring(0,2)+'-'+this.endTime.substring(0,2)
configUpdate({configKey:'customer-badness-time-frame',configValue:time}).then(res => {
this.$modal.success(res.msg);
this.$message.success(res.msg);
});
},
converTime(time) {
......
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