Commit 1a7f44cb authored by xiongjinke's avatar xiongjinke

修改

parent 3895a86d
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
prefix-icon="fromTime-icon" prefix-icon="fromTime-icon"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始月份" start-placeholder="开始日期"
end-placeholder="结束月份"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</template> </template>
<!-- 输入框 --> <!-- 输入框 -->
......
...@@ -143,4 +143,36 @@ export default { ...@@ -143,4 +143,36 @@ export default {
/*::v-deep .el-table__fixed{ /*::v-deep .el-table__fixed{
height: calc(100% - 16px) !important; height: calc(100% - 16px) !important;
}*/ }*/
::v-deep .el-table__row{
&:nth-child(even){
background-color: #F9FCFF;
.more{
background: #F8FBFF;
span{
color: #0081FF;
}
}
}
&:nth-child(odd){
.more{
span{
color: #0081FF;
}
}
}
}
::v-deep .el-table th.el-table__cell.is-leaf,::v-deep .el-table td.el-table__cell {
border-bottom: 1px solid #E6EAF1;
}
::v-deep .el-table--border .el-table__cell {
border-right: 1px solid #E6EAF1;
}
::v-deep .el-table__body tr.hover-row.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped.current-row>td,::v-deep .el-table__body tr.hover-row.el-table__row--striped>td,::v-deep .el-table__body tr.hover-row>td{
background-color:#DCEBFF;
.more{
background: #DCEBFF;
}
}
</style> </style>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- 弹窗关联项目 --> <!-- 弹窗关联项目 -->
<el-drawer <el-drawer
title="添加合作情况" title="添加合作情况"
size="40%" size="45%"
:visible.sync="drawer" :visible.sync="drawer"
:direction="direction" :direction="direction"
:with-header="false" :with-header="false"
...@@ -55,19 +55,19 @@ ...@@ -55,19 +55,19 @@
<div class="addhzqk_top"> <div class="addhzqk_top">
<div class="addhzqk_top_t"> <div class="addhzqk_top_t">
<div class="top_t_h1"> <div class="top_t_h1">
<img src="@/assets/images/economies/icon.png" />{{ info.companyName }} <img src="@/assets/images/economies/icon.png" />{{ companyInfo.companyName }}
</div> </div>
<div class="top_t_close"><i class="el-icon-close" @click="handleClose"></i></div> <div class="top_t_close"><i class="el-icon-close" @click="handleClose"></i></div>
</div> </div>
<div class="addhzqk_top_d"> <div class="addhzqk_top_d">
<div class="top_d_item"> <div class="top_d_item">
法定代表人:<span>{{ info.legalPerson }}</span> 法定代表人:<span>{{ companyInfo.corporatePerson }}</span>
</div> </div>
<div class="top_d_item"> <div class="top_d_item">
注册资本:<span>{{ info.registerCapital }}万</span> 注册资本:<span>{{ companyInfo.regCapital }}</span>
</div> </div>
<div class="top_d_item"> <div class="top_d_item">
注册地址:<span>{{ info.registerAddress }}</span> 注册地址:<span>{{ companyInfo.addressDetail }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
components: { components: {
Detail Detail
}, },
props: ['customerIds'], props: ['customerIds','companyInfo'],
data() { data() {
return { return {
ifEmpty:false, ifEmpty:false,
...@@ -161,7 +161,7 @@ export default { ...@@ -161,7 +161,7 @@ export default {
formData: [ formData: [
{ type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []}, { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
{ type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []}, { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询'}, { type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
], ],
stageOptions:[], stageOptions:[],
statusOptions:[], statusOptions:[],
...@@ -352,7 +352,7 @@ export default { ...@@ -352,7 +352,7 @@ export default {
}, },
//输入数字 //输入数字
number(value){ number(value){
this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数 this.addParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入2位小数
}, },
//打开详情 //打开详情
clickDetail(id){ clickDetail(id){
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- 招标偏好 --> <!-- 招标偏好 -->
<Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" /> <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" />
<!-- 合作情况 --> <!-- 合作情况 -->
<Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" /> <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 决策链条 --> <!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" /> <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 跟进记录 --> <!-- 跟进记录 -->
......
...@@ -46,8 +46,8 @@ export default { ...@@ -46,8 +46,8 @@ export default {
{label: '列入日期', prop: 'inDate', width: '95'}, {label: '列入日期', prop: 'inDate', width: '95'},
{label: '做出决定机关(移入)', prop: 'department', width: '264'}, {label: '做出决定机关(移入)', prop: 'department', width: '264'},
{label: '移出经营异常名录原因', prop: 'outReason', width: '320'}, {label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
{label: '移日期', prop: 'outDate', width: '95'}, {label: '移日期', prop: 'outDate', width: '95'},
{label: '做出决定机关(移)', prop: 'outDepartment', width: '264'} {label: '做出决定机关(移)', prop: 'outDepartment', width: '264'}
], ],
formData: [ formData: [
{ type: 4, fieldName: 'years', value: '', placeholder: '列入时间', options: []} { type: 4, fieldName: 'years', value: '', placeholder: '列入时间', options: []}
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<template slot="punishReason" slot-scope="scope"> <template slot="punishReason" slot-scope="scope">
<span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}"> <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
<div v-html="scope.row.punishReason"></div> <div v-html="scope.row.punishReason"></div>
<span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span> <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)" class="more">...<span>更多</span></span>
</span> </span>
</template> </template>
</tables> </tables>
......
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