fix: 所有企业信息的行业类型显示不正确的bug修复
parent
4270d8e78f
commit
105f57205b
|
@ -51,10 +51,10 @@
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
|
<el-table-column prop="INDUSTRYALL" label="所属行业" show-overflow-tooltip >
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
<span v-if="row.CORPINFO_ID !='1'">
|
<span v-if="row.CORPINFO_ID !='1'">
|
||||||
{{ row.INDUSTRY_NAME }}
|
{{ row.INDUSTRYALL }}
|
||||||
</span>
|
</span>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
交通运输、仓储和邮政业
|
交通运输、仓储和邮政业
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
>
|
>
|
||||||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||||
<el-table-column prop="CORP_NAME" label="分公司名称"/>
|
<el-table-column prop="CORP_NAME" label="分公司名称"/>
|
||||||
<el-table-column prop="NAME" label="所属行业"/>
|
<el-table-column prop="INDUSTRYALL" label="所属行业"/>
|
||||||
<el-table-column label="属地">
|
<el-table-column label="属地">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
|
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
>
|
>
|
||||||
<el-table-column type="index" label="序号" width="50" align="center"/>
|
<el-table-column type="index" label="序号" width="50" align="center"/>
|
||||||
<el-table-column prop="CORP_NAME" label="分公司名称"/>
|
<el-table-column prop="CORP_NAME" label="分公司名称"/>
|
||||||
<el-table-column prop="NAME" label="分公司行业类型"/>
|
<el-table-column prop="INDUSTRYALL" label="分公司行业类型"/>
|
||||||
<el-table-column label="属地">
|
<el-table-column label="属地">
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
|
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
<div class="data-li">
|
<div class="data-li">
|
||||||
<div class="data-label textColor">所属行业:</div>
|
<div class="data-label textColor">所属行业:</div>
|
||||||
<div class="data-value">
|
<div class="data-value">
|
||||||
<span class="label-num textColor line-3">{{ pd.INDUSTRY_NAME }}</span>
|
<span class="label-num textColor line-3">{{ pd.INDUSTRY_ALL }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="data-li">
|
<div class="data-li">
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
|
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<!-- <el-col :span="4">-->
|
||||||
<el-form-item label="所属行业">
|
<!-- <el-form-item label="所属行业">-->
|
||||||
<el-select v-model="CORP_OF_TYPE" style="width: 100%;">
|
<!-- <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
|
||||||
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
|
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
|
||||||
</el-select>
|
<!-- </el-select>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<!-- <el-col :span="4">-->
|
<!-- <el-col :span="4">-->
|
||||||
<!-- <el-form-item label="属地">-->
|
<!-- <el-form-item label="属地">-->
|
||||||
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
|
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
>
|
>
|
||||||
<el-table-column type="index" label="序号" width="50" align="center" />
|
<el-table-column type="index" label="序号" width="50" align="center" />
|
||||||
<el-table-column prop="CORP_NAME" label="企业名称" />
|
<el-table-column prop="CORP_NAME" label="企业名称" />
|
||||||
<el-table-column prop="TYPE_NAME" label="所属行业" />
|
<el-table-column prop="INDUSTRYALL" label="所属行业" />
|
||||||
<el-table-column label="属地" >
|
<el-table-column label="属地" >
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}
|
{{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
|
<el-input v-model="KEYWORDS" placeholder="企业名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4">
|
<!-- <el-col :span="4">-->
|
||||||
<el-form-item label="所属行业">
|
<!-- <el-form-item label="所属行业">-->
|
||||||
<el-select v-model="CORP_OF_TYPE" style="width: 100%;">
|
<!-- <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
|
||||||
<el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
|
<!-- <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
|
||||||
</el-select>
|
<!-- </el-select>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<!-- <el-col :span="4">-->
|
<!-- <el-col :span="4">-->
|
||||||
<!-- <el-form-item label="属地">-->
|
<!-- <el-form-item label="属地">-->
|
||||||
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
|
<!-- <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
>
|
>
|
||||||
<el-table-column type="index" label="序号" width="50" align="center" />
|
<el-table-column type="index" label="序号" width="50" align="center" />
|
||||||
<el-table-column prop="CORP_NAME" label="企业名称" />
|
<el-table-column prop="CORP_NAME" label="企业名称" />
|
||||||
<el-table-column prop="TYPE_NAME" label="所属行业" />
|
<el-table-column prop="INDUSTRYALL" label="所属行业" />
|
||||||
<el-table-column prop="gaoCount" label="告知卡数" />
|
<el-table-column prop="gaoCount" label="告知卡数" />
|
||||||
<el-table-column label="属地" >
|
<el-table-column label="属地" >
|
||||||
<template slot-scope="{row}">
|
<template slot-scope="{row}">
|
||||||
|
|
Loading…
Reference in New Issue