Skip to content

D
dsk-cr20g
Commit 9d3c14c1 authored by caixingbing's avatar caixingbing
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 23375df6 6ec9bb36
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 151 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java
View file @ 9d3c14c1
...@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -81,10 +82,18 @@ public class BusinessFileController extends BaseController { ...@@ -81,10 +82,18 @@ public class BusinessFileController extends BaseController {
try { try {
//获取文件名 //获取文件名
String filename = file.getOriginalFilename(); String filename = file.getOriginalFilename();
//TODO 校验是否上传同名文件
String businessFileName = request.getHeader("FilePath"); String businessFileName = request.getHeader("FilePath");
// 上传文件路径 // 上传文件路径
String filePath = RuoYiConfig.getUploadPath() + businessFileName + "/"; String filePath = RuoYiConfig.getUploadPath() + businessFileName + "/";
//校验是否上传同名文件
File newFile = new File(filePath);
// 获取当前目录下的文件和文件夹
File[] files = newFile.listFiles();
for (File allFile : files) {
if(filename.equals(allFile.getName())) return error("文件已存在");
}
// 上传并返回文件全路径 // 上传并返回文件全路径
String fileName = FileUploadUtils.upload(filePath, file); String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName; String url = serverConfig.getUrl() + fileName;
......
dsk-operate-ui/src/assets/styles/public.css
View file @ 9d3c14c1
...@@ -570,6 +570,10 @@ select { ...@@ -570,6 +570,10 @@ select {
height: 40px; height: 40px;
opacity: 0; opacity: 0;
} }
.el-select-dropdown.is-multiple .el-select-dropdown__item:hover {
color: #3181fa;
}
.select-list { .select-list {
color: #666; color: #666;
line-height: 24px; line-height: 24px;
...@@ -586,6 +590,31 @@ select { ...@@ -586,6 +590,31 @@ select {
background-color: #fff; background-color: #fff;
padding: 6px 0px; padding: 6px 0px;
} }
.select-radio {
max-height: 400px;
background: #fff;
}
.select-radio[x-placement^=bottom] {
margin-top: 8px;
}
.select-radio .select-radio-list {
position: relative;
}
.select-radio .select-radio-icon {
position: absolute;
top: 8px;
right: 4px;
}
.select-radio .select-radio-picker {
opacity: 0;
position: absolute;
top: -6px;
left: 0;
width: 0px;
}
.select-radio::-webkit-scrollbar-thumb { .select-radio::-webkit-scrollbar-thumb {
background-color: #b9b9b9 !important; background-color: #b9b9b9 !important;
...@@ -681,8 +710,8 @@ select { ...@@ -681,8 +710,8 @@ select {
} }
.select-list .el-radio .el-radio__label:hover { .select-list .el-radio .el-radio__label:hover {
/* color: #0381fa; color: #0381fa;
background: #f2f7ff; */ background: #f2f7ff;
} }
.select-list .el-radio__input.is-checked+.el-radio__label { .select-list .el-radio__input.is-checked+.el-radio__label {
...@@ -1074,4 +1103,26 @@ select { ...@@ -1074,4 +1103,26 @@ select {
color: #B589DB; color: #B589DB;
} }
.performance_other_select.el-select-dropdown.el-popper .el-select-dropdown__wrap.el-scrollbar__wrap {
max-height: 274px;
}
.performance_other_select .el-scrollbar {
display: block !important;
}
.performance_other_select .performance_source_name_ipt {
margin: 10px 20px;
width: 300px;
}
.performance_pagination_wrap {
border-top: 1px solid #EFEFEF;
padding-right: 6px;
padding-bottom: 16px;
margin-bottom: 24px;
}
.performance_pagination_wrap .common-pagination {
margin-top: 16px;
}
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 9d3c14c1
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
<div> <div>
<div class="content"> <div class="content">
<div class="content_item"> <div class="content_item">
<div class="label">项目名称</div>
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="keys" > <el-input class="ename_input" placeholder="请输入企业名称关键字" v-model="keys" >
<div slot="append" class="btn-search" @click="search">搜索</div> <div slot="append" class="btn-search" @click="search">搜索</div>
</el-input> </el-input>
...@@ -12,7 +11,7 @@ ...@@ -12,7 +11,7 @@
</div> </div>
<div class="content_item"> <div class="content_item">
<div class="label">基本信息</div> <div class="label">企业地区</div>
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
<div class="select-popper" > <div class="select-popper" >
<span :class="{color_text:jskBidQueryDto.provinceIds.length ||jskBidQueryDto.cityIds.length ||jskBidQueryDto.areaIds.length,}"> <span :class="{color_text:jskBidQueryDto.provinceIds.length ||jskBidQueryDto.cityIds.length ||jskBidQueryDto.areaIds.length,}">
...@@ -111,7 +110,7 @@ ...@@ -111,7 +110,7 @@
<div class="bottomlist-title"> <div class="bottomlist-title">
<div class="bottomlist-title-left" > <div class="bottomlist-title-left" >
<p class="title-left"> <p class="title-left">
项目明细 查询结果列表
</p> </p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click" <el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover"> popper-class="viewlist-el-popover">
...@@ -145,7 +144,7 @@ ...@@ -145,7 +144,7 @@
<el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}" element-loading-text="Loading" border highlight-current-row> <el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}" element-loading-text="Loading" border highlight-current-row>
<el-table-column type="index" label="序号" width="60"> <el-table-column type="index" label="序号" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(pageNum - 1) *10 + scope.$index + 1}}</span> <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="公司名称" width="430" > <el-table-column label="公司名称" width="430" >
...@@ -277,7 +276,12 @@ ...@@ -277,7 +276,12 @@
{{scope.row.accountsReceivable||"--"}} {{scope.row.accountsReceivable||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="公益性&准公益性主营占比" width="168" > <el-table-column label="其他应收款（亿元）" width="132" >
<template slot-scope="scope">
{{scope.row.otherReceivable||"--"}}
</template>
</el-table-column>
<el-table-column label="公益性&准公益性主营占比(%)" width="188" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_001||"--"}} {{scope.row.econData_001||"--"}}
</template> </template>
...@@ -302,7 +306,7 @@ ...@@ -302,7 +306,7 @@
{{scope.row.belongNetProfit||"--"}} {{scope.row.belongNetProfit||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="净资产收益率" width="96" > <el-table-column label="净资产收益率(%)" width="136" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.roe||"--"}} {{scope.row.roe||"--"}}
</template> </template>
...@@ -332,27 +336,27 @@ ...@@ -332,27 +336,27 @@
{{scope.row.uipInterestBearingDebt||"--"}} {{scope.row.uipInterestBearingDebt||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="有息债务/总负债" width="114" > <el-table-column label="有息债务/总负债(%)" width="134" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_002||"--"}} {{scope.row.econData_002||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="综合融资成本" width="96" > <el-table-column label="综合融资成本(%)" width="116" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.ofcb||"--"}} {{scope.row.ofcb||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="现金比率" width="72" > <el-table-column label="现金比率(%)" width="92" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.cashRatio||"--"}} {{scope.row.cashRatio||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="现金流量比率" width="96" > <el-table-column label="现金流量比率(%)" width="116" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.cashFlowRatio||"--"}} {{scope.row.cashFlowRatio||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="现金到期债务比" width="112" > <el-table-column label="现金到期债务比(%)" width="132" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.cashDebtRatio||"--"}} {{scope.row.cashDebtRatio||"--"}}
</template> </template>
...@@ -362,7 +366,7 @@ ...@@ -362,7 +366,7 @@
{{scope.row.creditBalance||"--"}} {{scope.row.creditBalance||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="授信余额/全部债务" width="126" > <el-table-column label="授信余额/全部债务(%)" width="146" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_003||"--"}} {{scope.row.econData_003||"--"}}
</template> </template>
...@@ -372,17 +376,17 @@ ...@@ -372,17 +376,17 @@
{{scope.row.ebitdaIcr||"--"}} {{scope.row.ebitdaIcr||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="私募债余额占比" width="108" > <el-table-column label="私募债余额占比(%)" width="128" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.ppnBalanceProp||"--"}} {{scope.row.ppnBalanceProp||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="一年内到期债权占比" width="132" > <el-table-column label="一年内到期债权占比(%)" width="152" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_004||"--"}} {{scope.row.econData_004||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="债券余额/有息债务" width="132" > <el-table-column label="债券余额/有息债务(%)" width="152" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_005||"--"}} {{scope.row.econData_005||"--"}}
</template> </template>
...@@ -392,7 +396,7 @@ ...@@ -392,7 +396,7 @@
{{scope.row.loan||"--"}} {{scope.row.loan||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="借款/有息债务" width="102" > <el-table-column label="借款/有息债务(%)" width="122" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.econData_006||"--"}} {{scope.row.econData_006||"--"}}
</template> </template>
...@@ -402,7 +406,7 @@ ...@@ -402,7 +406,7 @@
{{scope.row.nonStandardBalance||"--"}} {{scope.row.nonStandardBalance||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="非标余额/有息债务" width="132" > <el-table-column label="非标余额/有息债务(%)" width="152" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.nonStandardRatio||"--"}} {{scope.row.nonStandardRatio||"--"}}
</template> </template>
...@@ -412,9 +416,9 @@ ...@@ -412,9 +416,9 @@
{{scope.row.guaranteeAmount||"--"}} {{scope.row.guaranteeAmount||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="对外担保比例" width="96" > <el-table-column label="对外担保比例(%)" width="116" >
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.guaranteeAmount||"--"}} {{scope.row.guaranteeRatio||"--"}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属开发区" width="84" > <el-table-column label="所属开发区" width="84" >
...@@ -610,11 +614,12 @@ export default { ...@@ -610,11 +614,12 @@ export default {
this.domicile.push(arr[i].label); this.domicile.push(arr[i].label);
} }
} }
var obj = JSON.parse(JSON.stringify(this.landMarketDto)); var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
obj.provinceIds = provinceIds; obj.provinceIds = provinceIds;
obj.cityIds = cityIds; obj.cityIds = cityIds;
obj.areaIds = areaIds; obj.areaIds = areaIds;
this.landMarketDto = obj; this.jskBidQueryDto = obj;
this.search();
}, },
...@@ -677,16 +682,16 @@ export default { ...@@ -677,16 +682,16 @@ export default {
}, },
checkuipExecutivebtn(val){ checkuipExecutivebtn(val){
if(val){ this.uipExecutiveText =[];
this.uipExecutiveText =[]; this.checkuipExecutive=true;
} this.search();
}, },
uipExecutiveLevelbtn(val){ uipExecutiveLevelbtn(val){
if(val.length>0){ if(val.length>0){
this.checkuipExecutive=false; this.checkuipExecutive=false;
}else if(val.length==0){ }else if(val.length==0){
this.checkuipExecutive=true; this.checkuipExecutive==true;
} }
this.search(); this.search();
...@@ -947,8 +952,11 @@ export default { ...@@ -947,8 +952,11 @@ export default {
margin-right: 20px; margin-right: 20px;
::v-deep .el-input-group__append{ ::v-deep .el-input-group__append{
cursor: pointer; cursor: pointer;
padding: 0px;
.btn-search{ .btn-search{
width: 70px;
color: #0081ff; color: #0081ff;
text-align: center;
} }
} }
} }
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 9d3c14c1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="content"> <div class="content">
<div class="content_item"> <div class="content_item">
<div class="content_right item_ckquery_list"> <div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')"> <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<div slot="append" class="btn-search" @click="submitbtn">搜索</div> <div slot="append" class="btn-search" @click="submitbtn">搜索</div>
</el-input> </el-input>
<template v-if="ename"> <template v-if="ename">
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
</div> </div>
</div> </div>
<div class="content_item content_item1"> <div class="content_item content_item1">
<div class="label">更多选项</div> <div class="label">更多筛选</div>
<div class="content_right "> <div class="content_right ">
<div class="select-popper"> <!-- <div class="select-popper">
<div class=" " :class="regionWeb.length>0?'select-active':''"> <div class=" " :class="regionWeb.length>0?'select-active':''">
备案网站{{regionWeb.length>0?(regionWeb.length+'项'):''}} 备案网站{{regionWeb.length>0?(regionWeb.length+'项'):''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="select-popper"> <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start' > <el-dropdown trigger="click" placement='bottom-start' >
<div class="el-dropdown-link " :class="filePlaceCode?'select-active':''"> <div class="el-dropdown-link " :class="filePlaceCode?'select-active':''">
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <!-- <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start'> <el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="hasPhone?'select-active':''"> <div class="el-dropdown-link " :class="hasPhone?'select-active':''">
有无联系电话{{hasPhone?' 1项':''}} 有无联系电话{{hasPhone?' 1项':''}}
...@@ -153,8 +153,8 @@ ...@@ -153,8 +153,8 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div> -->
<div class="select-popper"> <!-- <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start'> <el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''"> <div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''">
<span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span> <span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div> -->
<div class="select-popper"> <div class="select-popper">
<div class=" " :class="systemValue.length>0?'select-active':''"> <div class=" " :class="systemValue.length>0?'select-active':''">
管理体系认证{{systemValue.length>0?(systemValue.length+'项'):''}} 管理体系认证{{systemValue.length>0?(systemValue.length+'项'):''}}
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio"> <el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in registeredAssets"> <template v-for=" (item,i) in registeredAssets">
<el-dropdown-item v-if='item.value!="自定义"' <el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==registeredAssetsText?'colort_ext ':''" :class="item.value==registeredAssetsText?'color_text ':''"
:command="{'value':item.value,'key':'注册资本','label':item.label}"> :command="{'value':item.value,'key':'注册资本','label':item.label}">
<p @click="registeredAssetsText=item.value"> <p @click="registeredAssetsText=item.value">
{{item.value}} {{item.value}}
...@@ -288,9 +288,9 @@ ...@@ -288,9 +288,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;"> <el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true" <div @mouseenter="showHandleNumber = true"
:class="registeredAssetsText=='自定义'?'colort_ext':''" style="padding: 0px 20px;" :class="registeredAssetsText=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false"> @mouseleave="showHandleNumber = false">
<span :class="registeredAssetsText=='自定义'?'colort_ext':''"> <span :class="registeredAssetsText=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i> 自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span> </span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;" <div class="jabph_popper_box" style="position:absolute;left: 124px;"
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio"> <el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in registeredAssets"> <template v-for=" (item,i) in registeredAssets">
<el-dropdown-item v-if='item.value!="自定义"' <el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==actualCapi?'colort_ext ':''" :class="item.value==actualCapi?'color_text ':''"
:command="{'value':item.value,'key':'实缴资本','label':item.label}"> :command="{'value':item.value,'key':'实缴资本','label':item.label}">
<p @click="actualCapi=item.value"> <p @click="actualCapi=item.value">
{{item.value}} {{item.value}}
...@@ -332,9 +332,9 @@ ...@@ -332,9 +332,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;"> <el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true" <div @mouseenter="showHandleNumber = true"
:class="actualCapi=='自定义'?'colort_ext':''" style="padding: 0px 20px;" :class="actualCapi=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false"> @mouseleave="showHandleNumber = false">
<span :class="actualCapi=='自定义'?'colort_ext':''"> <span :class="actualCapi=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i> 自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span> </span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;" <div class="jabph_popper_box" style="position:absolute;left: 124px;"
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio"> <el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in InsuredNumList"> <template v-for=" (item,i) in InsuredNumList">
<el-dropdown-item v-if='item.value!="自定义"' <el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==InsuredNumText?'colort_ext ':''" :class="item.value==InsuredNumText?'color_text ':''"
:command="{'value':item.value,'key':'社保人数','label':item.label}"> :command="{'value':item.value,'key':'社保人数','label':item.label}">
<p @click="InsuredNumText=item.value"> <p @click="InsuredNumText=item.value">
{{item.value}} {{item.value}}
...@@ -381,9 +381,9 @@ ...@@ -381,9 +381,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;"> <el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true" <div @mouseenter="showHandleNumber = true"
:class="InsuredNumText=='自定义'?'colort_ext':''" style="padding: 0px 20px;"> :class="InsuredNumText=='自定义'?'color_text':''" style="padding: 0px 20px;">
<!-- @mouseleave="showHandleNumber = false" --> <!-- @mouseleave="showHandleNumber = false" -->
<span :class="InsuredNumText=='自定义'?'colort_ext':''"> <span :class="InsuredNumText=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i> 自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span> </span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;" <div class="jabph_popper_box" style="position:absolute;left: 124px;"
...@@ -777,6 +777,10 @@ ...@@ -777,6 +777,10 @@
{ {
value: '1', value: '1',
label: '是高新企业' label: '是高新企业'
},
{
value: '0',
label: '不是高新企业'
} }
], ],
...@@ -1407,7 +1411,7 @@ ...@@ -1407,7 +1411,7 @@
}).catch(error=>{ }).catch(error=>{
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
}); });
this.getRegionWebList();
this.getaddressList(); this.getaddressList();
this.submitbtn(); this.submitbtn();
...@@ -1642,21 +1646,11 @@ ...@@ -1642,21 +1646,11 @@
getRegionWebList(){ getRegionWebList(){
api.searchDic().then(res=>{ api.searchDic().then(res=>{
if (res) { if (res) {
this.regionWebList = res this.regionWebList = res.regionWeb;
} else { }
api.regionWebList().then(res=>{
if (res) {
this.regionWebList = res
}
})
}
}).catch(error=>{ }).catch(error=>{
　　 api.regionWebList().then(res=>{
if (res) { });
this.regionWebList = res
}
})
});
}, },
// 工商注册地 // 工商注册地
...@@ -2597,18 +2591,18 @@ ...@@ -2597,18 +2591,18 @@
reset() { reset() {
Object.assign(this.$data, this.$options.data()) //重置data Object.assign(this.$data, this.$options.data()) //重置data
this.$axios.get('https://files.jiansheku.com/file/json/common/aptitudeCode.json').then(res => { api.aptitudeCode().then(res=>{
if (res && res.status == 200) { if (res) {
this.optionss = res.data; this.optionss = res;
} else { } else {
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
} }
}).catch(error=>{ }).catch(error=>{
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
　　 });
});
this.getaddressList(); this.getaddressList();
this.getRegionWebList(); this.getRegionWebList();
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 9d3c14c1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div> <div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div> <div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
<div class="records"> <div class="records">
<div class="writeIn"> <div class="writeIn" v-if="isDisabled == false">
<div class="default" v-if="isEdit == false" @click="getEdit"> <div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<div>新建一条跟进记录，如:周五上午预约客户上门拜访</div> <div>新建一条跟进记录，如:周五上午预约客户上门拜访</div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</el-input> </el-input>
</div> </div>
<div class="times"><img src="@/assets/images/project/ico_4.png"> <div class="times"><img src="@/assets/images/project/ico_4.png">
<el-date-picker class="w128" <el-date-picker class="w128" value-format="yyyy-MM-dd"
v-model="addParam.nextVisitTime" v-model="addParam.nextVisitTime"
type="date" type="date"
placeholder="下次拜访时间"> placeholder="下次拜访时间">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<div class="rec_time"> <div class="rec_time">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<div>{{item.creatTime}}</div> <div>{{item.creatTime}}</div>
<div class="operate"> <div class="operate" v-if="isDisabled == false">
<!--<img src="@/assets/images/edit.png">第一期不做编辑--> <!--<img src="@/assets/images/edit.png">第一期不做编辑-->
<img @click="delRecord(item.id)" src="@/assets/images/delete.png"> <img @click="delRecord(item.id)" src="@/assets/images/delete.png">
</div> </div>
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
default: 0 default: 0
}, },
datas:[],//数据源 datas:[],//数据源
isDisabled:false,
}, },
name: 'gjjl', name: 'gjjl',
data(){ data(){
...@@ -171,11 +172,13 @@ ...@@ -171,11 +172,13 @@
projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id projectId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
userId:this.$store.state.user.userId,//当前用户id userId:this.$store.state.user.userId,//当前用户id
projectList:[],//关联项目 projectList:[],//关联项目
isDisabled:this.isDisabled,
} }
}, },
computed: { computed: {
}, },
created(){ created(){
console.log(this.isDisabled)
//获取拜访方式 //获取拜访方式
getDictType('visit_mode_type').then(result=>{ getDictType('visit_mode_type').then(result=>{
this.bffslist = result.code == 200 ? result.data:[] this.bffslist = result.code == 200 ? result.data:[]
...@@ -183,6 +186,7 @@ ...@@ -183,6 +186,7 @@
this.showtype = this.types this.showtype = this.types
//客户管理跟进动态 //客户管理跟进动态
if(this.showtype == 'gjdt'){ if(this.showtype == 'gjdt'){
this.isDisabled = false
getUserList().then(result=>{ getUserList().then(result=>{
this.glqylist = result.data this.glqylist = result.data
}) })
...@@ -194,6 +198,7 @@ ...@@ -194,6 +198,7 @@
} }
//项目管理跟进动态 //项目管理跟进动态
if(this.showtype == 'projectgjdt'){ if(this.showtype == 'projectgjdt'){
this.isDisabled = false
this.projectId = null//项目id暂时清空，必须手选id this.projectId = null//项目id暂时清空，必须手选id
relateProject(this.userId).then(res=>{ relateProject(this.userId).then(res=>{
this.projectList = res.data this.projectList = res.data
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 9d3c14c1
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="cardtitles">工作待办</div> <div class="cardtitles">工作待办</div>
<div class="records"> <div class="records">
<div class="writeIn"> <div class="writeIn" v-if="isDisabled == false">
<div class="default" v-if="isEdit == false" @click="getEdit"> <div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<div>新建一条工作代办，如:周五上午预约客户上门拜访</div> <div>新建一条工作代办，如:周五上午预约客户上门拜访</div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
{{item.state == 2?"已完成":"未完成"}} {{item.state == 2?"已完成":"未完成"}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
<el-select placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)"> <el-select v-if="isDisabled == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)">
<el-option label="未完成" value="1"></el-option> <el-option label="未完成" value="1"></el-option>
<el-option label="已完成" value="2"></el-option> <el-option label="已完成" value="2"></el-option>
</el-select> </el-select>
...@@ -75,7 +75,8 @@ ...@@ -75,7 +75,8 @@
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
type: Number, type: Number,
default: 0 default: 0
} },
isDisabled:false,
}, },
data(){ data(){
return{ return{
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
}, },
datalist:[], datalist:[],
yqnum:0,//已逾期数量 yqnum:0,//已逾期数量
isDisabled:this.isDisabled,
} }
}, },
created(){ created(){
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ 9d3c14c1
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input> <el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div> </div>
<div class="btn btn_primary h32 b3" @click="opennew"><div class="img img1"></div>添加相关企业</div> <div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisabled == false"><div class="img img1"></div>添加相关企业</div>
</div> </div>
<div class="document tables"> <div class="document tables">
<el-table <el-table
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或添加相关企业，重新搜索</div> <div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
<div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div> <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisabled==false">新增相关企业</div>
</div> </div>
</template> </template>
<el-table-column <el-table-column
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="depth" prop="depth"
sortable
label="对接深度/竞争力度" label="对接深度/竞争力度"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="companyRole" prop="companyRole"
label="企业角色" label="企业角色"
sortable
width=""> width="">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
label="负责人" label="负责人"
width=""> width="">
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-if="isDisabled == false"
prop="name" prop="name"
label="" label=""
align="right" align="right"
...@@ -143,7 +143,8 @@ ...@@ -143,7 +143,8 @@
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
type: Number, type: Number,
default: 0 default: 0
} },
isDisabled:false,
}, },
data(){ data(){
return{ return{
...@@ -179,6 +180,7 @@ ...@@ -179,6 +180,7 @@
companyName:'', companyName:'',
}, },
ondel:-1, ondel:-1,
isDisabled:this.isDisabled,
} }
}, },
created(){ created(){
......
dsk-operate-ui/src/views/project/projectList/component/zlwd.vue
View file @ 9d3c14c1
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
<div class="btn btn_primary h36 w102" @click="getUP">上传文档</div> <div v-if="isDisabled==false" class="btn btn_primary h36 w102" @click="getUP">上传文档</div>
</div> </div>
</template> </template>
<el-table-column <el-table-column
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="hoverbtn"> <div class="hoverbtn">
<div class="xz" @click="downnlod(scope.row)">下载</div> <div class="xz" @click="downnlod(scope.row)">下载</div>
<div class="sc" @click="del(scope.row.filePath)">删除</div> <div class="sc" v-if="isDisabled == false" @click="del(scope.row.filePath)">删除</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -128,7 +128,8 @@ ...@@ -128,7 +128,8 @@
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
type: Number, type: Number,
default: 0 default: 0
} },
isDisabled:false,
}, },
data(){ data(){
return{ return{
...@@ -150,6 +151,7 @@ ...@@ -150,6 +151,7 @@
fileDatas:[], fileDatas:[],
filename:'', filename:'',
ondel:"", ondel:"",
isDisabled:this.isDisabled,
} }
}, },
created(){ created(){
...@@ -192,6 +194,8 @@ ...@@ -192,6 +194,8 @@
} }
}, },
getUP(){ getUP(){
if(this.isDisabled==true)
return false
this.isupload=true this.isupload=true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.uploadFile.$children[0].$refs.input.webkitdirectory = true this.$refs.uploadFile.$children[0].$refs.input.webkitdirectory = true
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 9d3c14c1
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
placeholder="请输入项目名称关键字" v-model="keyword" ></el-input> placeholder="请输入项目名称关键字" v-model="keyword" ></el-input>
</div> </div>
</div> </div>
<!-- <div class="content_item"> <div class="content_item">
<div class="label">参投单位</div> <div class="label">参投单位</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入参投单位关键字" v-model="jskBidQueryDto.companyName" ></el-input> placeholder="请输入参投单位关键字" v-model="jskBidQueryDto.companyName" ></el-input>
</div> </div>
</div> --> </div>
<div class="content_item"> <div class="content_item">
<div class="label">项目信息</div> <div class="label">项目信息</div>
<div class="content_right"> <div class="content_right">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
</el-dropdown> </el-dropdown>
<el-dropdown @command="tenderDatehandleCommand" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" > <el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i> <span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span> </span>
...@@ -134,24 +134,24 @@ ...@@ -134,24 +134,24 @@
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link> <router-link :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p> </p>
<div class="content-label"> <div class="content-label" v-if="item.domicile">
<span class="list-label list-label-zb" v-if="item.domicile"> <span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}} {{item.domicile}}
</span> </span>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text"> <p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span> <span>开标时间：</span>
<span>{{item.tenderTime||'--'}}</span> <span>{{item.tenderTime||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.punishDate">
<span>发布时间：</span> <span>发布时间：</span>
<span>{{item.punishDate||'--'}}</span> <span>{{item.punishDate||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.source">
<span>来源网站：</span> <span>来源网站：</span>
<span>{{item.source||'--'}}</span> <span>{{item.source||'--'}}</span>
</p> </p>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 9d3c14c1
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="label">招标单位</div> <div class="label">招标单位</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入招标单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input> placeholder="请输入招标采购单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</div> </div>
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false"> <el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''"> <span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
成交金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i> 合同预估金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidPlanDto.startPlanTenderAmount == item.value[0] &&jskBidPlanDto.endPlanTenderAmount == item.value[1] && <el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidPlanDto.startPlanTenderAmount == item.value[0] &&jskBidPlanDto.endPlanTenderAmount == item.value[1] &&
...@@ -155,46 +155,55 @@ ...@@ -155,46 +155,55 @@
<router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link> <router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> --> <!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </p>
<div class="content-label"> <div class="content-label" v-if="(item.province||item.city||item.city)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<span class="list-label" v-if="item.projectType">{{item.projectType}}</span> <span class="list-label" v-if="item.domicile">
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.city">
-{{item.city}}
</template>
</span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span> <span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span> <span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
<p class="list-content-text"> <p class="list-content-text" v-if="item.tenderee">
<span>招采单位：</span> <span>招采单位：</span>
<router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link> <router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link>
<span v-else>{{item.tenderee||'--'}}</span> <span v-else>{{item.tenderee||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.planTenderAmount">
<span>合同预估金额（万元）：</span> <span>合同预估金额（万元）：</span>
<span>{{item.planTenderAmount||'--'}}</span> <span>{{item.planTenderAmount||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.projectCapitalSource">
<span>资金来源：</span> <span>资金来源：</span>
<span>{{item.projectCapitalSource||'--'}}</span> <span>{{item.projectCapitalSource||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content"> <div class="list-content" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<p class="list-content-text"> <p class="list-content-text" v-if="item.issueTime">
<span>发布时间：</span> <span>发布时间：</span>
<span >{{item.issueTimestamp||'--'}}</span> <span >{{item.issueTime||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.planTenderDateStart">
<span>预计招标时间：</span> <span>预计招标时间：</span>
<span>{{item.planTenderDateStart||'--'}}</span> <span>{{item.planTenderDateStart||'--'}}</span>
</p> </p>
<p class="list-content-text"> <p class="list-content-text" v-if="item.sourceName">
<span>来源网站：</span> <span>来源网站：</span>
<span >{{item.sourceName||'--'}}</span> <span >{{item.sourceName||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content list-addree"> <div class="list-content list-addree" v-if="item.projectScale">
<p class="list-content-text"> <p class="list-content-text">
<span class="content-text-gc">工程规模：</span> <span class="content-text-gc">工程规模：</span>
<span class="content-text-p">{{item.projectScale||'--'}}</span> <span class="content-text-p">{{item.projectScale||'--'}}</span>
...@@ -789,7 +798,7 @@ export default { ...@@ -789,7 +798,7 @@ export default {
width: auto; width: auto;
background: #F3F4F5; background: #F3F4F5;
display: inline-flex; display: inline-flex;
margin-top: 7px; margin-top: 12px;
.list-content-text{ .list-content-text{
margin-top: 0px; margin-top: 0px;
span{ span{
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 9d3c14c1
...@@ -190,52 +190,55 @@ ...@@ -190,52 +190,55 @@
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link> <router-link :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
</p> </p>
<div class="content-label" v-if="item.domicile||item.projectType&&item.projectType!='其他'&&item.projectType!='空白'||item.industry&&item.industry!='其他'&&item.industry!='空白'">
<span class="list-label " v-if="item.projectType&&item.projectType!='其他'&&item.projectType!='空白'">
{{item.projectType}}
</span>
<span class="list-label list-label-wl" v-if="item.industry&&item.industry!='其他'&&item.industry!='空白'">
{{item.industry}}
</span>
<span class="list-label list-label-lx" v-if="item.domicile">
{{item.domicile}}
</span>
</div>
<div class="list-content"> <div class="list-content">
<p class="list-content-text"v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>建设/申请单位：</span> <span>项目业主：</span>
<span class="blue">{{item.companyName}}</span> <router-link :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link>
</p> </p>
<p class="list-content-text"v-if="item.handleTime">
<span>发布日期：</span> <p class="list-content-text"v-if="item.money">
<span>{{item.handleTime}}</span> <span>总投资：</span>
<span v-html="item.money+'万元'"></span>
</p> </p>
<p class="list-content-text"v-if="item.examineStatus"> <p class="list-content-text"v-if="item.planStartTime">
<span>办件结果：</span> <span>计划开工日期：</span>
<span>{{item.examineStatus}}</span> <span>{{item.planStartTime}}</span>
</p> </p>
<p class="list-content-text"v-if="item.industry"> <p class="list-content-text"v-if="item.planEndTime">
<span>行业分类：</span> <span>计划完工日期：</span>
<span>{{item.industry}}</span> <span>{{item.planEndTime}}</span>
</p> </p>
<p class="list-content-text"v-if="item.buildNature"> <p class="list-content-text"v-if="item.isProject!=null">
<span>建设性质：</span> <span>是否为民间推介项目：</span>
<span>{{item.buildNature}}</span> <span>{{item.isProject==0?'否':'是'}}</span>
</p> </p>
</div> </div>
<div class="list-content list-addree"> <div class="list-content" v-if="item.buildScale">
<template v-if="item.province||item.city||item.district"> <p class="list-content-text" >
<img src="@/assets/images/addree.png" alt=""> <span>建设规模：</span>
<p class="list-content-text"> <span>{{item.buildScale}}</span>
<span>行政区划：</span> </p>
<span >
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.district">
-{{item.district}}
</template>
</span>
</p>
</template>
</div> </div>
</li> </li>
</ul> </ul>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
...@@ -557,8 +560,8 @@ ...@@ -557,8 +560,8 @@
methods: { methods: {
searchDic(){ searchDic(){
api.searchDic().then(res=>{ api.searchDic().then(res=>{
this.projectTypeOptions = res.data.projectType; this.projectTypeOptions = res.projectType;
this.industryOptions = res.data.establishmentIndustry this.industryOptions = res.establishmentIndustry
}).catch(error=>{ }).catch(error=>{
}); });
...@@ -1260,7 +1263,7 @@ ...@@ -1260,7 +1263,7 @@
} }
} }
.content-label{ .content-label{
margin-top: 7px; margin-top: 12px;
.list-label{ .list-label{
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
...@@ -1270,11 +1273,20 @@ ...@@ -1270,11 +1273,20 @@
font-size: 12px; font-size: 12px;
} }
.list-label-wl{
background: #e8f7f0;
color: #38c8bf;
}
.list-label-lx{
background: #e4f3fd;
color: #41a1fd;
}
} }
.list-content{ .list-content{
margin-top: 3px; margin-top: 8px;
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items: center; align-items: center;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 9d3c14c1
...@@ -208,12 +208,12 @@ ...@@ -208,12 +208,12 @@
<p class="list-content-text" v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span> <span>招采单位：</span>
<router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link> <router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
<span v-else class="blue">{{item.companyName||'--'}}</span> <span v-else class="blue" v-html="item.companyName"></span>
</p> </p>
<p class="list-content-text" v-if="item.agency"> <p class="list-content-text" v-if="item.agency">
<span>代理单位：</span> <span>代理单位：</span>
<router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link> <router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link>
<span v-else class="blue">{{item.agency||'--'}}</span> <span v-else class="blue" v-html="item.agency"></span>
</p> </p>
</div> </div>
...@@ -222,9 +222,16 @@ ...@@ -222,9 +222,16 @@
<span>预算金款：</span> <span>预算金款：</span>
<span>{{item.bidMoney||'--'}}万元</span> <span>{{item.bidMoney||'--'}}万元</span>
</p> </p>
<p class="list-content-text" v-if="item.contact"> <p class="list-content-text" v-if="item.contactTel || item.agencyContactTel">
<span>联系方式：</span> <span>联系方式：</span>
<span >招采单位{{item.contact}}{{item.contactTel}} </span> <span >
<template v-if="item.contactTel">
招采单位 {{ item.contact }} {{ item.contactTel}}{{item.contactTel && item.agencyContactTel ? ";" : ""}}
</template>
<template v-if="item.agencyContactTel">
代理单位 {{ item.agencyContact }} {{ item.agencyContactTel }}
</template>
</span>
</p> </p>
</div> </div>
...@@ -716,8 +723,8 @@ ...@@ -716,8 +723,8 @@
methods: { methods: {
searchDic(){ searchDic(){
api.searchDic().then(res=>{ api.searchDic().then(res=>{
this.projectTypeOptions = res.data.projectType; this.projectTypeOptions = res.projectType;
this.subjectMatterOptions = res.data.subjectMatter this.subjectMatterOptions = res.subjectMatter
}).catch(error=>{ }).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