Skip to content

D
dsk-cr20g
Commit bbe71844 authored by danfuman's avatar danfuman
Browse files
Options

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

parents ccb48ec5 3f17abb0
Show whitespace changes
Inline Side-by-side
Showing with 3033 additions and 3010 deletions
dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/CustomerServiceImpl.java
View file @ bbe71844
...@@ -82,17 +82,18 @@ public class CustomerServiceImpl implements ICustomerService { ...@@ -82,17 +82,18 @@ public class CustomerServiceImpl implements ICustomerService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean add(Customer customer) { public boolean add(Customer customer) {
dealWithcustomerData(customer);
customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
customer.setCreateId(userId);
customer.setUpdateId(userId);
customer.setTenantId(LoginHelper.getTenantId());
//查重 //查重
Customer verifyCustomer = baseMapper.selectByCompanyNameAndUserId(customer.getCompanyName(), userId); Customer verifyCustomer = baseMapper.selectByCompanyNameAndUserId(customer.getCompanyName(), userId);
if (!ObjectUtils.isEmpty(verifyCustomer)) { if (!ObjectUtils.isEmpty(verifyCustomer)) {
throw new ServiceException("当前客户信息已存在，请勿重复添加！"); throw new ServiceException("当前客户信息已存在，请勿重复添加！");
} }
dealWithcustomerData(customer);
customer.setUipId(enterpriseCommonService.getUipIdByCompanyNameOrCompanyId(customer.getCompanyName(), customer.getCompanyId()));
customer.setCreateId(userId);
customer.setUpdateId(userId);
customer.setTenantId(LoginHelper.getTenantId());
int i = baseMapper.insert(customer); int i = baseMapper.insert(customer);
if (i == 0) throw new ServiceException("客户信息添加错误！"); if (i == 0) throw new ServiceException("客户信息添加错误！");
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java
View file @ bbe71844
package com.dsk.search.service; package com.dsk.search.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
...@@ -13,10 +14,12 @@ import com.dsk.common.exception.ServiceException; ...@@ -13,10 +14,12 @@ import com.dsk.common.exception.ServiceException;
import com.dsk.common.utils.DskOpenApiUtil; import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.common.utils.StringUtils; import com.dsk.common.utils.StringUtils;
import com.dsk.jsk.domain.vo.ImportantProjectExportVo; import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
import com.dsk.jsk.service.EnterpriseService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -37,6 +40,9 @@ public class BusinessOpportunityRadarService { ...@@ -37,6 +40,9 @@ public class BusinessOpportunityRadarService {
@Autowired @Autowired
ICustomerService iCustomerService; ICustomerService iCustomerService;
@Autowired
private EnterpriseService enterpriseService;
public AjaxResult jskBidNewsPage(JSONObject object) { public AjaxResult jskBidNewsPage(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object); Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
...@@ -111,14 +117,18 @@ public class BusinessOpportunityRadarService { ...@@ -111,14 +117,18 @@ public class BusinessOpportunityRadarService {
companyName = companyName.replace("<font color='#FF204E'>", ""); companyName = companyName.replace("<font color='#FF204E'>", "");
companyName = companyName.replace("</font>", ""); companyName = companyName.replace("</font>", "");
} }
companyMap.put("claimStatus", 0); companyMap.put("claimStatus", null);
for (CustomerStatusListVo vo : claimStatusList) { for (CustomerStatusListVo vo : claimStatusList) {
if (companyName.equals(vo.getCompanyName())) { if (companyName.equals(vo.getCompanyName())) {
companyMap.put("claimStatus", vo.getStatus()); companyMap.put("claimStatus", vo.getStatus());
} }
} }
Integer jskEid = MapUtils.getInteger(companyMap, "jskEid");
companyMap.put("uipId", enterpriseService.getUipIdByCompanyNameOrCompanyId(companyName, jskEid));
} }
return BeanUtil.toBean(map, AjaxResult.class); return BeanUtil.toBean(map, AjaxResult.class);
} }
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ bbe71844
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
<div class="content_item"> <div class="content_item">
<div class="label">企业资质</div> <div class="label">企业资质</div>
<div class="content_right content_item_ckquery"> <div class="content_right content_item_ckquery">
<div class="item_ckquery_list" v-for="(item,i) in aptitudeDtoList" :key="i" <div class="item_ckquery_list" v-for="(item,i) in aptitudeDtoList" :key="i" :class="i>0?'item_ckquery_distance':''">
:class="i>0?'item_ckquery_distance':''"> <el-cascader :options="optionss" separator='丨' clearable :ref="i" class="content_item_list" v-model="item.codeStr" @change='optionsbtn(i)'
<el-cascader :options="optionss" separator='丨' clearable :ref="i" class="content_item_list" filterable :props="{
v-model="item.codeStr" @change='optionsbtn(i)' filterable :props="{
checkStrictly:true, checkStrictly:true,
label:'name', label:'name',
value:'id', value:'id',
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
</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':''">
<span>进省备案{{filePlaceCode?' 1项':''}}</span> <span>进省备案{{filePlaceCode?' 1项':''}}</span>
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
...@@ -94,8 +93,7 @@ ...@@ -94,8 +93,7 @@
</div> </div>
<el-dropdown-menu slot="dropdown" class="select-list select-radio"> <el-dropdown-menu slot="dropdown" class="select-list select-radio">
<el-dropdown-item v-for="(itme,i) in filePlaceTypeList" :key="i"> <el-dropdown-item v-for="(itme,i) in filePlaceTypeList" :key="i">
<el-radio :label="itme.value" v-model="filePlaceType" <el-radio :label="itme.value" v-model="filePlaceType" @input="filePlaceTypeList_btn(i)">
@input="filePlaceTypeList_btn(i)">
{{itme.text}} {{itme.text}}
</el-radio> </el-radio>
</el-dropdown-item> </el-dropdown-item>
...@@ -121,9 +119,8 @@ ...@@ -121,9 +119,8 @@
工商注册地{{addresslength>0?(addresslength+'项'):''}} 工商注册地{{addresslength>0?(addresslength+'项'):''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd' <el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd' @input="addressListbtn" v-model="addressType"
@input="addressListbtn" v-model="addressType" :options="addressList" :props="props" :options="addressList" :props="props" collapse-tags></el-cascader>
collapse-tags></el-cascader>
</div> </div>
<!-- <div class="select-popper"> <!-- <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start'> <el-dropdown trigger="click" placement='bottom-start'>
...@@ -183,10 +180,9 @@ ...@@ -183,10 +180,9 @@
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-select v-model="systemValue" @input="systemCertificationbtn" popper-class='select-multiple-pop' <el-select v-model="systemValue" @input="systemCertificationbtn" popper-class='select-multiple-pop' class="select-multiple" multiple
class="select-multiple" multiple placeholder="请选择"> placeholder="请选择">
<el-option v-for=" (itme,i) in systemCertification" :key="i" :label="itme.value" <el-option v-for=" (itme,i) in systemCertification" :key="i" :label="itme.value" :value="itme.key">
:value="itme.key">
</el-option> </el-option>
</el-select> </el-select>
...@@ -207,42 +203,37 @@ ...@@ -207,42 +203,37 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<div class=" " <div class=" " :class="(aTaxYeartext.length>0&&aTaxYeartext[0]!='不限')?'select-active':''">
:class="(aTaxYeartext.length>0&&aTaxYeartext[0]!='不限')?'select-active':''">
纳税信用等级{{(aTaxYeartext.length>0&&aTaxYeartext[0]!='不限')>0?(aTaxYeartext.length+'项'):''}} 纳税信用等级{{(aTaxYeartext.length>0&&aTaxYeartext[0]!='不限')>0?(aTaxYeartext.length+'项'):''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-select v-model="aTaxYeartext" popper-class='select-multiple-pop' class="select-multiple" <el-select v-model="aTaxYeartext" popper-class='select-multiple-pop' class="select-multiple" @change="aTaxYearBtn" multiple
@change="aTaxYearBtn" multiple placeholder="请选择"> placeholder="请选择">
<el-option v-for=" (itme,i) in aTaxYearList" :key="i" :label="itme.label" :value="itme.value"> <el-option v-for=" (itme,i) in aTaxYearList" :key="i" :label="itme.label" :value="itme.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<div class=" " <div class=" " :class="(companyTypeText.length>0&&companyTypeText[0]!='不限')?'select-active':''">
:class="(companyTypeText.length>0&&companyTypeText[0]!='不限')?'select-active':''">
企业类型{{(companyTypeText.length>0&&companyTypeText[0]!='不限')>0?(companyTypeText.length+'项'):''}} 企业类型{{(companyTypeText.length>0&&companyTypeText[0]!='不限')>0?(companyTypeText.length+'项'):''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-select v-model="companyTypeText" popper-class='select-multiple-pop' class="select-multiple" <el-select v-model="companyTypeText" popper-class='select-multiple-pop' class="select-multiple" @change="companyTypebtn" multiple
@change="companyTypebtn" multiple placeholder="请选择"> placeholder="请选择">
<el-option v-for=" (itme,i) in companyTypeList" :key="i" :label="itme.value" <el-option v-for=" (itme,i) in companyTypeList" :key="i" :label="itme.value" :value="itme.label">
:value="itme.label">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<div class=" " <div class=" " :class="(businessStatusText.length>0&&businessStatusText[0]!='不限')?'select-active':''">
:class="(businessStatusText.length>0&&businessStatusText[0]!='不限')?'select-active':''">
登记状态{{(businessStatusText.length>0&&businessStatusText[0]!='不限')>0?(businessStatusText.length+'项'):''}} 登记状态{{(businessStatusText.length>0&&businessStatusText[0]!='不限')>0?(businessStatusText.length+'项'):''}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-select v-model="businessStatusText" popper-class='select-multiple-pop' class="select-multiple" <el-select v-model="businessStatusText" popper-class='select-multiple-pop' class="select-multiple" @change="businessStatusTextbtn"
@change="businessStatusTextbtn" multiple placeholder="请选择"> multiple placeholder="请选择">
<el-option v-for=" (itme,i) in businessStatusList" :key="i" :label="itme.label" <el-option v-for=" (itme,i) in businessStatusList" :key="i" :label="itme.label" :value="itme.value">
:value="itme.value">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
...@@ -255,8 +246,8 @@ ...@@ -255,8 +246,8 @@
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</div> </div>
<el-dropdown-menu slot="dropdown" class="select-list select-radio"> <el-dropdown-menu slot="dropdown" class="select-list select-radio">
<div class="select-radio-list " :class="itme.value==establishText?'active':''" :command='i' <div class="select-radio-list " :class="itme.value==establishText?'active':''" :command='i' v-for="(itme,i) in establishList"
v-for="(itme,i) in establishList" :key="i+'oo'"> :key="i+'oo'">
<template v-if="itme.value=='自定义'"> <template v-if="itme.value=='自定义'">
<span @mouseenter='getinputDate()'> <span @mouseenter='getinputDate()'>
<el-radio :label="itme.value" v-model="establishText"> <el-radio :label="itme.value" v-model="establishText">
...@@ -268,9 +259,8 @@ ...@@ -268,9 +259,8 @@
<el-radio v-else :label="itme.value" @change="establishListbtn" v-model="establishText"> <el-radio v-else :label="itme.value" @change="establishListbtn" v-model="establishText">
{{itme.value}} {{itme.value}}
</el-radio> </el-radio>
<el-date-picker class="select-radio-picker" v-if="itme.value=='自定义'" <el-date-picker class="select-radio-picker" v-if="itme.value=='自定义'" v-model='startTimetext' @change="timeInput"
v-model='startTimetext' @change="timeInput" placement='right-end' placement='right-end' value-format="yyyy-MM-dd" ref="saveDateInput" type="daterange">
value-format="yyyy-MM-dd" ref="saveDateInput" type="daterange">
</el-date-picker> </el-date-picker>
</div> </div>
</el-dropdown-menu> </el-dropdown-menu>
...@@ -278,29 +268,25 @@ ...@@ -278,29 +268,25 @@
</div> </div>
<div class="select-popper"> <div class="select-popper">
<el-dropdown @command="handleNumber" trigger="click" ref="popperMoney" placement="bottom-start" <el-dropdown @command="handleNumber" trigger="click" ref="popperMoney" placement="bottom-start" :hide-on-click="false">
:hide-on-click="false">
<div class="el-dropdown-link" :class="(registeredAssetsText!=='不限')?'select-popper-active':''"> <div class="el-dropdown-link" :class="(registeredAssetsText!=='不限')?'select-popper-active':''">
注册资本{{(registeredAssetsText!=='不限')?'1项':''}}<i class="el-icon-caret-bottom"></i> 注册资本{{(registeredAssetsText!=='不限')?'1项':''}}<i class="el-icon-caret-bottom"></i>
</div> </div>
<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?'color_text ':''"
: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}}
</p> </p>
</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=='自定义'?'color_text':''" style="padding: 0px 20px;"
:class="registeredAssetsText=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false"> @mouseleave="showHandleNumber = false">
<span :class="registeredAssetsText=='自定义'?'color_text':''"> <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;" v-if="showHandleNumber">
v-if="showHandleNumber">
<div class="jabph_popper_wrap"> <div class="jabph_popper_wrap">
从 <el-input class="jabph_popper_input" v-model="startNumMoney"> 从 <el-input class="jabph_popper_input" v-model="startNumMoney">
</el-input> 万 </el-input> 万
...@@ -322,37 +308,31 @@ ...@@ -322,37 +308,31 @@
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<el-dropdown @command="handleNumber" trigger="click" ref="popperActualCapi" placement="bottom-start" <el-dropdown @command="handleNumber" trigger="click" ref="popperActualCapi" placement="bottom-start" :hide-on-click="false">
:hide-on-click="false">
<div class="el-dropdown-link" :class="(actualCapi!=='不限')?'select-popper-active':''"> <div class="el-dropdown-link" :class="(actualCapi!=='不限')?'select-popper-active':''">
实缴资本{{(actualCapi!=='不限')?'1项':''}}<i class="el-icon-caret-bottom"></i> 实缴资本{{(actualCapi!=='不限')?'1项':''}}<i class="el-icon-caret-bottom"></i>
</div> </div>
<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?'color_text ':''"
: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}}
</p> </p>
</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=='自定义'?'color_text':''" style="padding: 0px 20px;"
:class="actualCapi=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false"> @mouseleave="showHandleNumber = false">
<span :class="actualCapi=='自定义'?'color_text':''"> <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;" v-if="showHandleNumber">
v-if="showHandleNumber">
<div class="jabph_popper_wrap"> <div class="jabph_popper_wrap">
从 <el-input class="jabph_popper_input" v-limit-num 从 <el-input class="jabph_popper_input" v-limit-num v-model="leftActualCapi">
v-model="leftActualCapi">
</el-input> 万 </el-input> 万
</div> </div>
<div class="jabph_popper_wrap"> <div class="jabph_popper_wrap">
到 <el-input class="jabph_popper_input" v-limit-num 到 <el-input class="jabph_popper_input" v-limit-num v-model="rightActualCapi">
v-model="rightActualCapi">
</el-input> 万 </el-input> 万
</div> </div>
<div> <div>
...@@ -366,34 +346,29 @@ ...@@ -366,34 +346,29 @@
</template> </template>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<el-dropdown @command="handleNumber" trigger="click" ref="popperInsuredNum" placement="bottom-start" <el-dropdown @command="handleNumber" trigger="click" ref="popperInsuredNum" placement="bottom-start" :hide-on-click="false">
:hide-on-click="false">
<div class="el-dropdown-link" :class="InsuredNumText?'select-popper-active':''"> <div class="el-dropdown-link" :class="InsuredNumText?'select-popper-active':''">
社保人数{{InsuredNumText?'1项':''}}<i class="el-icon-caret-bottom"></i> 社保人数{{InsuredNumText?'1项':''}}<i class="el-icon-caret-bottom"></i>
</div> </div>
<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?'color_text ':''"
: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}}
</p> </p>
</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=='自定义'?'color_text':''" style="padding: 0px 20px;">
:class="InsuredNumText=='自定义'?'color_text':''" style="padding: 0px 20px;">
<!-- @mouseleave="showHandleNumber = false" --> <!-- @mouseleave="showHandleNumber = false" -->
<span :class="InsuredNumText=='自定义'?'color_text':''"> <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;" v-if="showHandleNumber">
v-if="showHandleNumber">
<div class="jabph_popper_wrap"> <div class="jabph_popper_wrap">
从 <el-input class="jabph_popper_input" v-model="startInsuredNum"> 从 <el-input class="jabph_popper_input" v-model="startInsuredNum">
</el-input> 人 </el-input> 人
...@@ -416,13 +391,11 @@ ...@@ -416,13 +391,11 @@
</el-dropdown> </el-dropdown>
</div> </div>
</div> </div>
</div> </div>
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="search-new" > <div class="search-new">
<span @click="search()">查询</span> <span @click="search()">查询</span>
<span @click="reset()">重置</span> <span @click="reset()">重置</span>
</div> </div>
...@@ -435,17 +408,14 @@ ...@@ -435,17 +408,14 @@
<p class="title-left"> <p class="title-left">
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条 <span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</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">
<ul class="pup_list"> <ul class="pup_list">
<li v-for="(itme,i) in fieldOptions" :class="itme.status?'activefield':''" <li v-for="(itme,i) in fieldOptions" :class="itme.status?'activefield':''" @click="handsequencingList(i)" :key="i">
@click="handsequencingList(i)" :key="i">
{{itme.value}} {{itme.value}}
</li> </li>
</ul> </ul>
<span slot="reference" class="toolbar-right-download" > <span slot="reference" class="toolbar-right-download">
{{fieldText}}<i class="el-icon-arrow-down" {{fieldText}}<i class="el-icon-arrow-down" :style="{transform:fieldshow?'rotate(180deg)':''}"></i>
:style="{transform:fieldshow?'rotate(180deg)':''}"></i>
</span> </span>
</el-popover> </el-popover>
<div class="toolbar-right-search"> <div class="toolbar-right-search">
...@@ -476,16 +446,17 @@ ...@@ -476,16 +446,17 @@
</div> </div>
<div class="info-list-right"> <div class="info-list-right">
<p class="card-right-title"> <p class="card-right-title">
<router-link :to="toEnterpriseDetail(item.jskEid)" > <router-link :to="toEnterpriseDetail(item.jskEid)">
<span class="title" v-html="item.name"> </span> <span class="title" v-html="item.name"> </span>
</router-link> </router-link>
</p> </p>
<p class="card-right-title card-right-title1" :ref="'labels'+item.id" :style="{padding: '16px 0px 12px 0px'}"> <p class="card-right-title card-right-title1" :ref="'labels'+item.id" :style="{padding: '16px 0px 12px 0px'}">
<span :ref="'cardRightTitle1span'+item.id" > <span :ref="'cardRightTitle1span'+item.id">
<span class="positive positive1" v-if="item.businessStatus" >{{item.businessStatus}}</span> <span class="positive positive1" v-if="item.businessStatus">{{item.businessStatus}}</span>
<template v-for="(itemLabels,indexLabels) in item.labels"> <template v-for="(itemLabels,indexLabels) in item.labels">
<span class="positive positive1" :style="{'background':itemLabels.bgColor,'color':itemLabels.fontColor}">{{ itemLabels.labelName }} <template v-if="itemLabels.num>1">{{itemLabels.num}}</template></span> <span class="positive positive1" :style="{'background':itemLabels.bgColor,'color':itemLabels.fontColor}">{{ itemLabels.labelName }}
<template v-if="itemLabels.num>1">{{itemLabels.num}}</template></span>
</template> </template>
</span> </span>
<!-- <span class="positive-gdbq" :ref="'positivegdbq'+item.id" v-if="labelsWidth('labels'+item.id,1)" @click="labelsClick('labels'+item.id,'positivegdbq'+item.id,'cardRightTitle1span'+item.id)">更多标签 <i class="el-icon-caret-bottom"></i></span> --> <!-- <span class="positive-gdbq" :ref="'positivegdbq'+item.id" v-if="labelsWidth('labels'+item.id,1)" @click="labelsClick('labels'+item.id,'positivegdbq'+item.id,'cardRightTitle1span'+item.id)">更多标签 <i class="el-icon-caret-bottom"></i></span> -->
...@@ -510,59 +481,59 @@ ...@@ -510,59 +481,59 @@
<span class="right-title-black">{{item.creditCode}}</span> <span class="right-title-black">{{item.creditCode}}</span>
</template> </template>
</p> </p>
<p class="card-right-title" style="padding-top: 8px ;"> <p class="card-right-title" style="padding-top: 8px ;">
<template v-if="item.aptitudeCountNew!=null"> <template v-if="item.aptitudeCountNew!=null">
<span class="right-title-grey">资质资格：</span> <span class="right-title-grey">资质资格：</span>
<router-link :to="toEnterprise(item.jskEid,'')" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'')" target="_blank">
<span class="right-title-blue" v-html="item.aptitudeCountNew"> </span> <span class="right-title-blue" v-html="item.aptitudeCountNew"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.recentlyCount!=null"> <template v-if="item.recentlyCount!=null">
<span class="right-title-grey">中标业绩：</span> <span class="right-title-grey">中标业绩：</span>
<router-link :to="toEnterprise(item.jskEid,'performance')" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'performance')" target="_blank">
<span class="right-title-blue" v-html="item.recentlyCount"> </span> <span class="right-title-blue" v-html="item.recentlyCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.skyCount!=null"> <template v-if="item.skyCount!=null">
<span class="right-title-grey">四库业绩：</span> <span class="right-title-grey">四库业绩：</span>
<router-link :to="toEnterprise(item.jskEid,'performance',2)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'performance',2)" target="_blank">
<span class="right-title-blue" v-html="item.skyCount"> </span> <span class="right-title-blue" v-html="item.skyCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.registeredPersonnelCount!=null"> <template v-if="item.registeredPersonnelCount!=null">
<span class="right-title-grey">注册人员：</span> <span class="right-title-grey">注册人员：</span>
<router-link :to="toEnterprise(item.jskEid,'personnel',2)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'personnel',2)" target="_blank">
<span class="right-title-blue" v-html="item.registeredPersonnelCount"> </span> <span class="right-title-blue" v-html="item.registeredPersonnelCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.threePersonnelCount!=null"> <template v-if="item.threePersonnelCount!=null">
<span class="right-title-grey">三类人员：</span> <span class="right-title-grey">三类人员：</span>
<router-link :to="toEnterprise(item.jskEid,'personnel',5)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'personnel',5)" target="_blank">
<span class="right-title-blue" v-html="item.threePersonnelCount"> </span> <span class="right-title-blue" v-html="item.threePersonnelCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.jskBidCount>0"> <template v-if="item.jskBidCount>0">
<span class="right-title-grey">招标公告：</span> <span class="right-title-grey">招标公告：</span>
<router-link :to="toEnterprise(item.jskEid,'business',5)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'business',5)" target="_blank">
<span class="right-title-blue" v-html="item.jskBidCount"> </span> <span class="right-title-blue" v-html="item.jskBidCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.customerCount>0"> <template v-if="item.customerCount>0">
<span class="right-title-grey">客户：</span> <span class="right-title-grey">客户：</span>
<router-link :to="toEnterprise(item.jskEid,'business',1)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'business',1)" target="_blank">
<span class="right-title-blue" v-html="item.customerCount"> </span> <span class="right-title-blue" v-html="item.customerCount"> </span>
</router-link> </router-link>
</template> </template>
<template v-if="item.supplierCount>0"> <template v-if="item.supplierCount>0">
<span class="right-title-grey">供应商：</span> <span class="right-title-grey">供应商：</span>
<router-link :to="toEnterprise(item.jskEid,'business',2)" target="_blank" > <router-link :to="toEnterprise(item.jskEid,'business',2)" target="_blank">
<span class="right-title-blue" v-html="item.supplierCount"> </span> <span class="right-title-blue" v-html="item.supplierCount"> </span>
</router-link> </router-link>
</template> </template>
</p> </p>
<p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)" style="padding: 10px 0px 0px 0px;"> <p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)"
style="padding: 10px 0px 0px 0px;">
<span class="right-title-grey">曾用名：</span> <span class="right-title-grey">曾用名：</span>
<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span> <span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
</p> </p>
...@@ -573,12 +544,7 @@ ...@@ -573,12 +544,7 @@
</li> </li>
</ul> </ul>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
<el-pagination <el-pagination background :page-size="limit" :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next"
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"> :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -587,30 +553,30 @@ ...@@ -587,30 +553,30 @@
</div> </div>
</template> </template>
<script> <script>
import jsk_data from '@/assets/json/jsk.json'; import jsk_data from '@/assets/json/jsk.json';
import aptitudeCode from '@/assets/json/aptitudeCode.json'; import aptitudeCode from '@/assets/json/aptitudeCode.json';
import jabph from '@/assets/json/jabph.json'; import jabph from '@/assets/json/jabph.json';
import options from '@/assets/json/options.json'; import options from '@/assets/json/options.json';
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js" import { encodeStr } from "@/assets/js/common.js";
import skeleton from '@/views/project/projectList/component/skeleton' import skeleton from '@/views/project/projectList/component/skeleton';
import "@/assets/styles/public.scss"; import "@/assets/styles/public.scss";
export default { export default {
name: 'EnterpriseQuery', name: 'EnterpriseQuery',
components:{skeleton}, components: { skeleton },
directives: { directives: {
numberOnly: { numberOnly: {
bind: function(el) { bind: function (el) {
el.handler = function() { el.handler = function () {
if(el.children[1].value){ if (el.children[1].value) {
el.children[1].value = el.children[1].value.replace(/\D+/g,''); el.children[1].value = el.children[1].value.replace(/\D+/g, '');
}
} }
el.addEventListener('input', el.handler) };
el.addEventListener('input', el.handler);
}, },
unbind: function(el) { unbind: function (el) {
el.removeEventListener('input', el.handler) el.removeEventListener('input', el.handler);
} }
} }
}, },
...@@ -618,7 +584,7 @@ ...@@ -618,7 +584,7 @@
return { return {
encodeStr, encodeStr,
ename: '', ename: '',
isSkeleton:true, isSkeleton: true,
enameQueryTypeList: [{ enameQueryTypeList: [{
key: 'and', key: 'and',
status: false, status: false,
...@@ -1326,8 +1292,8 @@ ...@@ -1326,8 +1292,8 @@
} }
], ],
aptitudelist: [], aptitudelist: [],
regionWeb:[], regionWeb: [],
regionWebList:[], regionWebList: [],
hasPhoneList: [{ hasPhoneList: [{
value: '1', value: '1',
label: '有联系电话' label: '有联系电话'
...@@ -1416,16 +1382,20 @@ ...@@ -1416,16 +1382,20 @@
], ],
resultEname: '', resultEname: '',
tableData:[], tableData: [],
total:0, total: 0,
page:1, page: 1,
limit:20 limit: 20
} };
}, },
created() { created() {
api.aptitudeCode().then(res=>{ if (this.$route.query.keyword) {
this.ename = this.$route.query.keyword;
this.projectNamebtn('ename', this.ename, '关键字:');
}
api.aptitudeCode().then(res => {
if (res) { if (res) {
this.optionss = res; this.optionss = res;
...@@ -1433,7 +1403,7 @@ ...@@ -1433,7 +1403,7 @@
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
} }
}).catch(error=>{ }).catch(error => {
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
}); });
this.getRegionWebList(); this.getRegionWebList();
...@@ -1442,13 +1412,8 @@ ...@@ -1442,13 +1412,8 @@
}, },
mounted() { mounted() {
if (this.$route.query.keyword) {
this.ename = this.$route.query.keyword;
this.projectNamebtn('ename', this.ename, '关键字:');
}
if (this.$route.query.province_city) { if (this.$route.query.province_city) {
var addressType = [] var addressType = [];
for (let i = 0; i < this.addressList.length; i++) { for (let i = 0; i < this.addressList.length; i++) {
if (this.addressList[i].label.indexOf(this.$route.query.territory) != -1) { if (this.addressList[i].label.indexOf(this.$route.query.territory) != -1) {
for (let j in this.addressList[i].children) { for (let j in this.addressList[i].children) {
...@@ -1457,7 +1422,7 @@ ...@@ -1457,7 +1422,7 @@
for (let k in this.addressList[i].children[j].children) { for (let k in this.addressList[i].children[j].children) {
addressType.push([this.addressList[i].id, this.addressList[i].children[j].id, this addressType.push([this.addressList[i].id, this.addressList[i].children[j].id, this
.addressList[i].children[j].children[k].id .addressList[i].children[j].children[k].id
]) ]);
} }
} }
...@@ -1468,7 +1433,7 @@ ...@@ -1468,7 +1433,7 @@
this.addressType = addressType; this.addressType = addressType;
this.$nextTick(() => { this.$nextTick(() => {
this.addressListbtn(); this.addressListbtn();
}) });
} }
...@@ -1482,7 +1447,7 @@ ...@@ -1482,7 +1447,7 @@
value: text, value: text,
keyid: key, keyid: key,
title: teiti title: teiti
} };
if (text) { if (text) {
var n = -1; var n = -1;
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
...@@ -1491,7 +1456,7 @@ ...@@ -1491,7 +1456,7 @@
} }
} }
if (n == -1) { if (n == -1) {
this.aptitudelist.push(data) this.aptitudelist.push(data);
} else { } else {
this.aptitudelist[n] = data; this.aptitudelist[n] = data;
} }
...@@ -1503,20 +1468,20 @@ ...@@ -1503,20 +1468,20 @@
} }
} }
} }
this.aptitudelist = JSON.parse(JSON.stringify(this.aptitudelist)) this.aptitudelist = JSON.parse(JSON.stringify(this.aptitudelist));
}, },
// 资质级联 // 资质级联
optionsbtn(i) { optionsbtn(i) {
if (this.aptitudeDtoList.length > 1 && this.aptitudeDtoList[i].codeStr.length < 1) { if (this.aptitudeDtoList.length > 1 && this.aptitudeDtoList[i].codeStr.length < 1) {
this.aptitudeDtoList.splice(i, 1); this.aptitudeDtoList.splice(i, 1);
i-- i--;
} }
this.$refs[i] && this.$refs[i][0].toggleDropDownVisible(false); this.$refs[i] && this.$refs[i][0].toggleDropDownVisible(false);
var _this = this; var _this = this;
//延迟500毫秒执行 //延迟500毫秒执行
if (this.$refs[i]) { if (this.$refs[i]) {
setTimeout(function() { setTimeout(function () {
_this.aptitudeDtoList[i].nameStr = _this.$refs[i][0].$refs.input.$options.propsData.value; _this.aptitudeDtoList[i].nameStr = _this.$refs[i][0].$refs.input.$options.propsData.value;
}, 100); }, 100);
} }
...@@ -1525,13 +1490,13 @@ ...@@ -1525,13 +1490,13 @@
optionsbtnOut(i) { optionsbtnOut(i) {
if (this.aptitudeDtoListOut.length > 1 && this.aptitudeDtoListOut[i].codeStr.length < 1) { if (this.aptitudeDtoListOut.length > 1 && this.aptitudeDtoListOut[i].codeStr.length < 1) {
this.aptitudeDtoListOut.splice(i, 1); this.aptitudeDtoListOut.splice(i, 1);
i-- i--;
} }
this.$refs[i + 'out'] && this.$refs[i + 'out'][0].toggleDropDownVisible(false); this.$refs[i + 'out'] && this.$refs[i + 'out'][0].toggleDropDownVisible(false);
var _this = this; var _this = this;
//延迟500毫秒执行 //延迟500毫秒执行
if (this.$refs[i + 'out']) { if (this.$refs[i + 'out']) {
setTimeout(function() { setTimeout(function () {
_this.aptitudeDtoListOut[i].nameStr = _this.$refs[i + 'out'][0].$refs.input.$options _this.aptitudeDtoListOut[i].nameStr = _this.$refs[i + 'out'][0].$refs.input.$options
.propsData.value; .propsData.value;
}, 100); }, 100);
...@@ -1543,18 +1508,18 @@ ...@@ -1543,18 +1508,18 @@
var n = 0; var n = 0;
for (let i = 0; i < this.aptitudeDtoList.length; i++) { for (let i = 0; i < this.aptitudeDtoList.length; i++) {
if (!this.aptitudeDtoList[i].nameStr) { if (!this.aptitudeDtoList[i].nameStr) {
n++ n++;
} }
} }
if (n > 0) { if (n > 0) {
this.$message.warning("请选择资质条件后，增加资质！") this.$message.warning("请选择资质条件后，增加资质！");
} else { } else {
this.aptitudeDtoList.push({ this.aptitudeDtoList.push({
nameStr: '', nameStr: '',
codeStr: [], codeStr: [],
queryTypelist: this.aptitudeDtoList[this.aptitudeDtoList.length - 1].queryTypelist, queryTypelist: this.aptitudeDtoList[this.aptitudeDtoList.length - 1].queryTypelist,
queryType: this.aptitudeDtoList[this.aptitudeDtoList.length - 1].queryType, queryType: this.aptitudeDtoList[this.aptitudeDtoList.length - 1].queryType,
}) });
} }
}, },
...@@ -1563,18 +1528,18 @@ ...@@ -1563,18 +1528,18 @@
var n = 0; var n = 0;
for (let i = 0; i < this.aptitudeDtoListOut.length; i++) { for (let i = 0; i < this.aptitudeDtoListOut.length; i++) {
if (!this.aptitudeDtoListOut[i].nameStr) { if (!this.aptitudeDtoListOut[i].nameStr) {
n++ n++;
} }
} }
if (n > 0) { if (n > 0) {
this.$message.warning("请选择资质条件后，增加资质！") this.$message.warning("请选择资质条件后，增加资质！");
} else { } else {
this.aptitudeDtoListOut.push({ this.aptitudeDtoListOut.push({
nameStr: '', nameStr: '',
codeStr: [], codeStr: [],
queryTypelist: this.aptitudeDtoListOut[this.aptitudeDtoListOut.length - 1].queryTypelist, queryTypelist: this.aptitudeDtoListOut[this.aptitudeDtoListOut.length - 1].queryTypelist,
queryType: this.aptitudeDtoListOut[this.aptitudeDtoListOut.length - 1].queryType, queryType: this.aptitudeDtoListOut[this.aptitudeDtoListOut.length - 1].queryType,
}) });
} }
}, },
...@@ -1584,7 +1549,7 @@ ...@@ -1584,7 +1549,7 @@
for (let j = 0; j < this.aptitudeDtoList[i].queryTypelist.length; j++) { for (let j = 0; j < this.aptitudeDtoList[i].queryTypelist.length; j++) {
this.aptitudeDtoList[i].queryTypelist[j].status = false; this.aptitudeDtoList[i].queryTypelist[j].status = false;
} }
this.aptitudeDtoList[i].queryType = this.aptitudeDtoList[i].queryTypelist[kindex].key this.aptitudeDtoList[i].queryType = this.aptitudeDtoList[i].queryTypelist[kindex].key;
this.aptitudeDtoList[i].queryTypelist[kindex].status = true; this.aptitudeDtoList[i].queryTypelist[kindex].status = true;
} }
}, },
...@@ -1594,7 +1559,7 @@ ...@@ -1594,7 +1559,7 @@
for (let j = 0; j < this.aptitudeDtoListOut[i].queryTypelist.length; j++) { for (let j = 0; j < this.aptitudeDtoListOut[i].queryTypelist.length; j++) {
this.aptitudeDtoListOut[i].queryTypelist[j].status = false; this.aptitudeDtoListOut[i].queryTypelist[j].status = false;
} }
this.aptitudeDtoListOut[i].queryType = this.aptitudeDtoListOut[i].queryTypelist[kindex].key this.aptitudeDtoListOut[i].queryType = this.aptitudeDtoListOut[i].queryTypelist[kindex].key;
this.aptitudeDtoListOut[i].queryTypelist[kindex].status = true; this.aptitudeDtoListOut[i].queryTypelist[kindex].status = true;
} }
...@@ -1619,7 +1584,7 @@ ...@@ -1619,7 +1584,7 @@
keyid: '', keyid: '',
key: '', key: '',
title: '进省备案:' title: '进省备案:'
} };
// console.log(this.filePlaceCodeList); // console.log(this.filePlaceCodeList);
for (let i = 0; i < this.filePlaceCodeList.length; i++) { for (let i = 0; i < this.filePlaceCodeList.length; i++) {
if (this.filePlaceCodeList[i].id == this.filePlaceCode) { if (this.filePlaceCodeList[i].id == this.filePlaceCode) {
...@@ -1628,7 +1593,7 @@ ...@@ -1628,7 +1593,7 @@
keyid: 'filePlaceCode', keyid: 'filePlaceCode',
key: this.filePlaceCode, key: this.filePlaceCode,
title: '进省备案:' title: '进省备案:'
} };
} }
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
...@@ -1653,7 +1618,7 @@ ...@@ -1653,7 +1618,7 @@
keyid: '', keyid: '',
key: '', key: '',
title: '本省与进省企业:' title: '本省与进省企业:'
} };
for (let i = 0; i < this.filePlaceTypeList.length; i++) { for (let i = 0; i < this.filePlaceTypeList.length; i++) {
if (this.filePlaceTypeList[i].value == this.filePlaceType) { if (this.filePlaceTypeList[i].value == this.filePlaceType) {
data = { data = {
...@@ -1661,19 +1626,19 @@ ...@@ -1661,19 +1626,19 @@
keyid: 'filePlaceType', keyid: 'filePlaceType',
key: this.filePlaceType, key: this.filePlaceType,
title: '本省与进省企业:' title: '本省与进省企业:'
} };
} }
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
} }
}, },
//备案网站 //备案网站
getRegionWebList(){ getRegionWebList() {
api.searchDic().then(res=>{ api.searchDic().then(res => {
if (res) { if (res) {
this.regionWebList = res.regionWeb; this.regionWebList = res.regionWeb;
} }
}).catch(error=>{ }).catch(error => {
}); });
...@@ -1690,7 +1655,7 @@ ...@@ -1690,7 +1655,7 @@
"short": jsk_data[i].short, "short": jsk_data[i].short,
"value": jsk_data[i].parentId, "value": jsk_data[i].parentId,
"children": jsk_data[i].id == 900000 ? undefined : [] "children": jsk_data[i].id == 900000 ? undefined : []
}) });
} else if (jsk_data[i].regionLevel == (x + 1) && (x + 1) == 2 && str) { } else if (jsk_data[i].regionLevel == (x + 1) && (x + 1) == 2 && str) {
for (let j = 0; j < str.length; j++) { for (let j = 0; j < str.length; j++) {
if (str[j].id == jsk_data[i].parentId) { if (str[j].id == jsk_data[i].parentId) {
...@@ -1700,7 +1665,7 @@ ...@@ -1700,7 +1665,7 @@
"short": jsk_data[i].short, "short": jsk_data[i].short,
"value": jsk_data[i].parentId, "value": jsk_data[i].parentId,
"children": [] "children": []
}) });
} }
} }
} else if (jsk_data[i].regionLevel == (x + 1) && (x + 1) == 3) { } else if (jsk_data[i].regionLevel == (x + 1) && (x + 1) == 3) {
...@@ -1715,7 +1680,7 @@ ...@@ -1715,7 +1680,7 @@
"short": jsk_data[i].short, "short": jsk_data[i].short,
"value": jsk_data[i].parentId, "value": jsk_data[i].parentId,
// "children":[] // "children":[]
}) });
} }
...@@ -1754,7 +1719,7 @@ ...@@ -1754,7 +1719,7 @@
!arr[i].hasChildren && countyCode.push(arr[i].value); !arr[i].hasChildren && countyCode.push(arr[i].value);
} }
} else { } else {
provinceCode.push(arr[i].value) provinceCode.push(arr[i].value);
} }
} }
...@@ -1765,7 +1730,7 @@ ...@@ -1765,7 +1730,7 @@
if (provinceCode[i] == jsk_data[j].id) { if (provinceCode[i] == jsk_data[j].id) {
province.push( province.push(
jsk_data[j].regionName jsk_data[j].regionName
) );
} }
} }
...@@ -1776,7 +1741,7 @@ ...@@ -1776,7 +1741,7 @@
if (cityCode[i] == jsk_data[j].id) { if (cityCode[i] == jsk_data[j].id) {
city.push( city.push(
jsk_data[j].regionName jsk_data[j].regionName
) );
} }
} }
...@@ -1787,7 +1752,7 @@ ...@@ -1787,7 +1752,7 @@
county.push( county.push(
jsk_data[j].regionName jsk_data[j].regionName
) );
} }
} }
...@@ -1806,7 +1771,7 @@ ...@@ -1806,7 +1771,7 @@
countyCode: countyCode, countyCode: countyCode,
key: '', key: '',
title: '工商注册地:' title: '工商注册地:'
}) });
this.addresslength = provinceCode.length + cityCode.length + countyCode.length; this.addresslength = provinceCode.length + cityCode.length + countyCode.length;
} else { } else {
this.addresslength = 0; this.addresslength = 0;
...@@ -1827,7 +1792,7 @@ ...@@ -1827,7 +1792,7 @@
keyid: '', keyid: '',
key: '', key: '',
title: '有无资质:' title: '有无资质:'
} };
for (let i = 0; i < this.qualifiedType.length; i++) { for (let i = 0; i < this.qualifiedType.length; i++) {
if (this.qualifiedType[i].key == this.radioQuali) { if (this.qualifiedType[i].key == this.radioQuali) {
data = { data = {
...@@ -1835,7 +1800,7 @@ ...@@ -1835,7 +1800,7 @@
keyid: 'hasAptitude', keyid: 'hasAptitude',
key: this.radioQuali, key: this.radioQuali,
title: '有无资质:' title: '有无资质:'
} };
} }
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
...@@ -1857,7 +1822,7 @@ ...@@ -1857,7 +1822,7 @@
keyid: '', keyid: '',
key: '', key: '',
title: '有无联系电话:' title: '有无联系电话:'
} };
for (let i = 0; i < this.hasPhoneType.length; i++) { for (let i = 0; i < this.hasPhoneType.length; i++) {
if (this.hasPhoneType[i].key == this.hasPhone) { if (this.hasPhoneType[i].key == this.hasPhone) {
data = { data = {
...@@ -1865,7 +1830,7 @@ ...@@ -1865,7 +1830,7 @@
keyid: 'hasPhone', keyid: 'hasPhone',
key: this.hasPhone, key: this.hasPhone,
title: '有无联系电话:' title: '有无联系电话:'
} };
} }
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
...@@ -1887,7 +1852,7 @@ ...@@ -1887,7 +1852,7 @@
value: '', value: '',
keyid: '', keyid: '',
key: '' key: ''
} };
for (let i = 0; i < this.hasLiceCertList.length; i++) { for (let i = 0; i < this.hasLiceCertList.length; i++) {
if (this.hasLiceCertList[i].key == this.hasLiceCert) { if (this.hasLiceCertList[i].key == this.hasLiceCert) {
data = { data = {
...@@ -1895,7 +1860,7 @@ ...@@ -1895,7 +1860,7 @@
keyid: 'hasLiceCert', keyid: 'hasLiceCert',
key: this.hasLiceCert, key: this.hasLiceCert,
title: '有无安许证:' title: '有无安许证:'
} };
} }
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
...@@ -1911,12 +1876,12 @@ ...@@ -1911,12 +1876,12 @@
} }
if (this.systemValue.length > 0) { if (this.systemValue.length > 0) {
var systemlabel = [] var systemlabel = [];
for (let i = 0; i < this.systemValue.length; i++) { for (let i = 0; i < this.systemValue.length; i++) {
for (let j = 0; j < this.systemCertification.length; j++) { for (let j = 0; j < this.systemCertification.length; j++) {
if (this.systemValue[i] == this.systemCertification[j].key) { if (this.systemValue[i] == this.systemCertification[j].key) {
systemlabel.push(this.systemCertification[j].value) systemlabel.push(this.systemCertification[j].value);
} }
} }
...@@ -1929,7 +1894,7 @@ ...@@ -1929,7 +1894,7 @@
key: '', key: '',
title: '管理体系认证:' title: '管理体系认证:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
} }
...@@ -1945,12 +1910,12 @@ ...@@ -1945,12 +1910,12 @@
} }
if (this.regionWeb.length > 0) { if (this.regionWeb.length > 0) {
var systemlabel = [] var systemlabel = [];
for (let i = 0; i < this.regionWeb.length; i++) { for (let i = 0; i < this.regionWeb.length; i++) {
for (let j = 0; j < this.regionWebList.length; j++) { for (let j = 0; j < this.regionWebList.length; j++) {
if (this.regionWeb[i] == this.regionWebList[j]) { if (this.regionWeb[i] == this.regionWebList[j]) {
systemlabel.push(this.regionWebList[j]) systemlabel.push(this.regionWebList[j]);
} }
} }
...@@ -1963,7 +1928,7 @@ ...@@ -1963,7 +1928,7 @@
key: '', key: '',
title: '备案网站:' title: '备案网站:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
} }
...@@ -1982,7 +1947,7 @@ ...@@ -1982,7 +1947,7 @@
keyid: 'isHighTech', keyid: 'isHighTech',
key: this.isHighTechtext, key: this.isHighTechtext,
title: '高新企业:' title: '高新企业:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
} }
...@@ -2015,12 +1980,12 @@ ...@@ -2015,12 +1980,12 @@
if (n != -1) { if (n != -1) {
this.aTaxYeartext = ['不限']; this.aTaxYeartext = ['不限'];
return return;
} }
var arr = []; var arr = [];
for (let i = 0; i < this.aTaxYeartext.length; i++) { for (let i = 0; i < this.aTaxYeartext.length; i++) {
arr.push(this.aTaxYeartext[i] + 'A级纳税人') arr.push(this.aTaxYeartext[i] + 'A级纳税人');
} }
var data = { var data = {
...@@ -2029,7 +1994,7 @@ ...@@ -2029,7 +1994,7 @@
key: this.aTaxYeartext, key: this.aTaxYeartext,
title: '纳税信用等级:' title: '纳税信用等级:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
...@@ -2061,14 +2026,14 @@ ...@@ -2061,14 +2026,14 @@
if (n != -1) { if (n != -1) {
this.companyTypeText = ['不限']; this.companyTypeText = ['不限'];
return return;
} }
var arr = []; var arr = [];
for (let i = 0; i < this.companyTypeText.length; i++) { for (let i = 0; i < this.companyTypeText.length; i++) {
for (let j = 0; j < this.companyTypeList.length; j++) { for (let j = 0; j < this.companyTypeList.length; j++) {
if (this.companyTypeText[i] == this.companyTypeList[j].label) { if (this.companyTypeText[i] == this.companyTypeList[j].label) {
arr.push(this.companyTypeList[j].value) arr.push(this.companyTypeList[j].value);
} }
} }
} }
...@@ -2077,7 +2042,7 @@ ...@@ -2077,7 +2042,7 @@
keyid: 'companyType', keyid: 'companyType',
key: this.companyTypeText, key: this.companyTypeText,
title: '企业类型:' title: '企业类型:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
}, },
...@@ -2108,14 +2073,14 @@ ...@@ -2108,14 +2073,14 @@
if (n != -1) { if (n != -1) {
this.businessStatusText = ['不限']; this.businessStatusText = ['不限'];
return return;
} }
var arr = []; var arr = [];
for (let i = 0; i < this.businessStatusText.length; i++) { for (let i = 0; i < this.businessStatusText.length; i++) {
for (let j = 0; j < this.businessStatusList.length; j++) { for (let j = 0; j < this.businessStatusList.length; j++) {
if (this.businessStatusText[i] == this.businessStatusList[j].label) { if (this.businessStatusText[i] == this.businessStatusList[j].label) {
arr.push(this.businessStatusList[j].value) arr.push(this.businessStatusList[j].value);
} }
} }
} }
...@@ -2124,7 +2089,7 @@ ...@@ -2124,7 +2089,7 @@
keyid: 'businessStatus', keyid: 'businessStatus',
key: this.businessStatusText, key: this.businessStatusText,
title: '登记状态:' title: '登记状态:'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
}, },
...@@ -2199,23 +2164,23 @@ ...@@ -2199,23 +2164,23 @@
var start = startTime.split('-'); var start = startTime.split('-');
startTime = start.map((item) => { startTime = start.map((item) => {
if (item.length == 1) { if (item.length == 1) {
return '0' + item return '0' + item;
} else { } else {
return item return item;
} }
}) });
startTime = startTime.join('-') startTime = startTime.join('-');
} }
if (endTime) { if (endTime) {
var end = endTime.split('-'); var end = endTime.split('-');
endTime = end.map((item) => { endTime = end.map((item) => {
if (item.length == 1) { if (item.length == 1) {
return '0' + item return '0' + item;
} else { } else {
return item return item;
} }
}) });
endTime = endTime.join('-') endTime = endTime.join('-');
} }
var data = { var data = {
value: this.establishText, value: this.establishText,
...@@ -2224,7 +2189,7 @@ ...@@ -2224,7 +2189,7 @@
startTime: startTime, startTime: startTime,
endTime: endTime, endTime: endTime,
title: '成立年限：' title: '成立年限：'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
}, },
getinputDate() { getinputDate() {
...@@ -2238,12 +2203,12 @@ ...@@ -2238,12 +2203,12 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'establish') { if (this.aptitudelist[x].keyid == 'establish') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
if (this.startTimetext.length > 0) { if (this.startTimetext.length > 0) {
this.establishText = '自定义' this.establishText = '自定义';
} }
...@@ -2254,7 +2219,7 @@ ...@@ -2254,7 +2219,7 @@
startTime: this.startTimetext[0], startTime: this.startTimetext[0],
endTime: this.startTimetext[1], endTime: this.startTimetext[1],
title: '成立年限：' title: '成立年限：'
} };
this.aptitudelist.push(data); this.aptitudelist.push(data);
}, },
// 注册资本 实缴资本 社保人数 // 注册资本 实缴资本 社保人数
...@@ -2265,7 +2230,7 @@ ...@@ -2265,7 +2230,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'RegisteredCapital') { if (this.aptitudelist[x].keyid == 'RegisteredCapital') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var valuestr = command.value.split("-"); var valuestr = command.value.split("-");
...@@ -2276,7 +2241,7 @@ ...@@ -2276,7 +2241,7 @@
start: command.label[0], start: command.label[0],
end: command.label[1] ? command.label[1] : '', end: command.label[1] ? command.label[1] : '',
title: '注册资本：' title: '注册资本：'
} };
if (command.label.length == 1) { if (command.label.length == 1) {
data.end = ''; data.end = '';
} }
...@@ -2288,7 +2253,7 @@ ...@@ -2288,7 +2253,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'actualCapi') { if (this.aptitudelist[x].keyid == 'actualCapi') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var valuestr = command.value.split("-"); var valuestr = command.value.split("-");
...@@ -2299,7 +2264,7 @@ ...@@ -2299,7 +2264,7 @@
start: command.label[0], start: command.label[0],
end: command.label[1] ? command.label[1] : '', end: command.label[1] ? command.label[1] : '',
title: '实缴资本：' title: '实缴资本：'
} };
if (command.label.length == 1) { if (command.label.length == 1) {
data.end = ''; data.end = '';
} }
...@@ -2311,7 +2276,7 @@ ...@@ -2311,7 +2276,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'InsuredNum') { if (this.aptitudelist[x].keyid == 'InsuredNum') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var valuestr = command.label.split("-"); var valuestr = command.label.split("-");
...@@ -2322,7 +2287,7 @@ ...@@ -2322,7 +2287,7 @@
start: valuestr[0], start: valuestr[0],
end: valuestr[1] ? valuestr[1] : '', end: valuestr[1] ? valuestr[1] : '',
title: '社保人数：' title: '社保人数：'
} };
if (valuestr.length == 1) { if (valuestr.length == 1) {
data.end = ''; data.end = '';
} }
...@@ -2336,7 +2301,7 @@ ...@@ -2336,7 +2301,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'RegisteredCapital') { if (this.aptitudelist[x].keyid == 'RegisteredCapital') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
} }
...@@ -2344,7 +2309,7 @@ ...@@ -2344,7 +2309,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'InsuredNum') { if (this.aptitudelist[x].keyid == 'InsuredNum') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
} }
...@@ -2352,7 +2317,7 @@ ...@@ -2352,7 +2317,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'actualCapi') { if (this.aptitudelist[x].keyid == 'actualCapi') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
} }
...@@ -2361,11 +2326,11 @@ ...@@ -2361,11 +2326,11 @@
// 注册资本 实缴资本 社保人数 自定义输入确定 // 注册资本 实缴资本 社保人数 自定义输入确定
popperConfirm(type) { popperConfirm(type) {
if (type == '注册资本') { if (type == '注册资本') {
this.showHandleNumber = false this.showHandleNumber = false;
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'RegisteredCapital') { if (this.aptitudelist[x].keyid == 'RegisteredCapital') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var data = { var data = {
...@@ -2375,7 +2340,7 @@ ...@@ -2375,7 +2340,7 @@
start: this.startNumMoney, start: this.startNumMoney,
end: this.endNumMoney, end: this.endNumMoney,
title: '注册资本：' title: '注册资本：'
} };
if (this.startNumMoney && !this.endNumMoney) { if (this.startNumMoney && !this.endNumMoney) {
data.value = data.value + this.startNumMoney + '万以上'; data.value = data.value + this.startNumMoney + '万以上';
} else if (!this.startNumMoney && this.endNumMoney) { } else if (!this.startNumMoney && this.endNumMoney) {
...@@ -2385,13 +2350,13 @@ ...@@ -2385,13 +2350,13 @@
} }
this.aptitudelist.push(data); this.aptitudelist.push(data);
this.registeredAssetsText = '自定义'; this.registeredAssetsText = '自定义';
this.$refs.popperMoney.hide() this.$refs.popperMoney.hide();
} else if (type == '实缴资本') { } else if (type == '实缴资本') {
this.showHandleNumber = false this.showHandleNumber = false;
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'actualCapi') { if (this.aptitudelist[x].keyid == 'actualCapi') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var data = { var data = {
...@@ -2401,7 +2366,7 @@ ...@@ -2401,7 +2366,7 @@
start: this.leftActualCapi, start: this.leftActualCapi,
end: this.rightActualCapi, end: this.rightActualCapi,
title: '实缴资本：' title: '实缴资本：'
} };
if (this.leftActualCapi && !this.rightActualCapi) { if (this.leftActualCapi && !this.rightActualCapi) {
data.value = data.value + this.leftActualCapi + '万以上'; data.value = data.value + this.leftActualCapi + '万以上';
} else if (!this.leftActualCapi && this.rightActualCapi) { } else if (!this.leftActualCapi && this.rightActualCapi) {
...@@ -2414,11 +2379,11 @@ ...@@ -2414,11 +2379,11 @@
this.actualCapi = '自定义'; this.actualCapi = '自定义';
this.$refs.popperActualCapi.hide(); this.$refs.popperActualCapi.hide();
} else if (type == '社保人数') { } else if (type == '社保人数') {
this.showHandleNumber = false this.showHandleNumber = false;
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'InsuredNum') { if (this.aptitudelist[x].keyid == 'InsuredNum') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
var data = { var data = {
...@@ -2428,7 +2393,7 @@ ...@@ -2428,7 +2393,7 @@
start: this.startInsuredNum, start: this.startInsuredNum,
end: this.endInsuredNum, end: this.endInsuredNum,
title: '社保人数：' title: '社保人数：'
} };
if (this.startInsuredNum && !this.endInsuredNum) { if (this.startInsuredNum && !this.endInsuredNum) {
data.value = data.value + this.startInsuredNum + '人'; data.value = data.value + this.startInsuredNum + '人';
} else if (!this.startInsuredNum && this.endInsuredNum) { } else if (!this.startInsuredNum && this.endInsuredNum) {
...@@ -2451,36 +2416,36 @@ ...@@ -2451,36 +2416,36 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'RegisteredCapital') { if (this.aptitudelist[x].keyid == 'RegisteredCapital') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
this.registeredAssetsText = '不限'; this.registeredAssetsText = '不限';
this.showHandleNumber = false; this.showHandleNumber = false;
this.$refs.popperMoney.hide() this.$refs.popperMoney.hide();
} else if (type == '实缴资本') { } else if (type == '实缴资本') {
this.leftActualCapi = ''; this.leftActualCapi = '';
this.rightActualCapi = ''; this.rightActualCapi = '';
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'actualCapi') { if (this.aptitudelist[x].keyid == 'actualCapi') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
this.actualCapi = '不限'; this.actualCapi = '不限';
this.showHandleNumber = false; this.showHandleNumber = false;
this.$refs.popperActualCapi.hide() this.$refs.popperActualCapi.hide();
} else if (type == '社保人数') { } else if (type == '社保人数') {
this.startInsuredNum = ''; this.startInsuredNum = '';
this.endInsuredNum = ''; this.endInsuredNum = '';
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'InsuredNum') { if (this.aptitudelist[x].keyid == 'InsuredNum') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
this.startInsuredNum = ''; this.startInsuredNum = '';
this.showHandleNumber = false; this.showHandleNumber = false;
this.$refs.popperActualCapi.hide() this.$refs.popperActualCapi.hide();
} }
}, },
...@@ -2496,7 +2461,7 @@ ...@@ -2496,7 +2461,7 @@
for (let x = 0; x < this.aptitudelist.length; x++) { for (let x = 0; x < this.aptitudelist.length; x++) {
if (this.aptitudelist[x].keyid == 'filePlaceType') { if (this.aptitudelist[x].keyid == 'filePlaceType') {
this.aptitudelist.splice(x, 1); this.aptitudelist.splice(x, 1);
x-- x--;
} }
} }
this.filePlaceType = '1'; this.filePlaceType = '1';
...@@ -2585,7 +2550,7 @@ ...@@ -2585,7 +2550,7 @@
} }
], ],
queryType: 'and' queryType: 'and'
}] }];
}, },
...@@ -2606,15 +2571,15 @@ ...@@ -2606,15 +2571,15 @@
}, },
], ],
queryType: 'and' queryType: 'and'
}] }];
}, },
reset() { reset() {
Object.assign(this.$data, this.$options.data()) //重置data Object.assign(this.$data, this.$options.data()); //重置data
api.aptitudeCode().then(res=>{ api.aptitudeCode().then(res => {
if (res) { if (res) {
this.optionss = res; this.optionss = res;
...@@ -2622,7 +2587,7 @@ ...@@ -2622,7 +2587,7 @@
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
} }
}).catch(error=>{ }).catch(error => {
this.optionss = aptitudeCode; this.optionss = aptitudeCode;
}); });
...@@ -2655,16 +2620,16 @@ ...@@ -2655,16 +2620,16 @@
// 空白点击 // 空白点击
outClick(e) { outClick(e) {
if (this) { if (this) {
let dropRef = this.$refs.dropRef.$el let dropRef = this.$refs.dropRef.$el;
// console.log('dropRef',dropRef) // console.log('dropRef',dropRef)
if (!dropRef.contains(e.target) && this.visible) { if (!dropRef.contains(e.target) && this.visible) {
this.visible = false this.visible = false;
} }
} }
}, },
search(page, limit,exportFlag){ search(page, limit, exportFlag) {
// return false; // return false;
if (!page) { if (!page) {
this.page = 1; this.page = 1;
...@@ -2688,10 +2653,10 @@ ...@@ -2688,10 +2653,10 @@
"field": this.field, "field": this.field,
"order": this.orderText "order": this.orderText
}, },
} };
this.showList = true this.showList = true;
if (this.resultEname) { if (this.resultEname) {
data.aptitudeQueryDto['resultEname'] = this.resultEname; data.aptitudeQueryDto['resultEname'] = this.resultEname;
} }
...@@ -2704,14 +2669,14 @@ ...@@ -2704,14 +2669,14 @@
var dataList = { var dataList = {
codeStr: [], codeStr: [],
queryType: '', queryType: '',
aptitudeType:'' aptitudeType: ''
}; };
var aptitudeType = ''; var aptitudeType = '';
if(this.qualificationsTab == '按资质项'){ if (this.qualificationsTab == '按资质项') {
aptitudeType = 'qualification' aptitudeType = 'qualification';
}else if(this.qualificationsTab == '按等级'){ } else if (this.qualificationsTab == '按等级') {
aptitudeType = 'level' aptitudeType = 'level';
} }
...@@ -2721,8 +2686,8 @@ ...@@ -2721,8 +2686,8 @@
dataList.codeStr.push(this.aptitudeDtoList[i].codeStr[this.aptitudeDtoList[i].codeStr.length - dataList.codeStr.push(this.aptitudeDtoList[i].codeStr[this.aptitudeDtoList[i].codeStr.length -
1]); 1]);
} }
dataList.queryType = this.aptitudeDtoList[this.aptitudeDtoList.length-1].queryType; dataList.queryType = this.aptitudeDtoList[this.aptitudeDtoList.length - 1].queryType;
dataList.aptitudeType=aptitudeType; dataList.aptitudeType = aptitudeType;
} }
dataList.codeStr = dataList.codeStr.join(','); dataList.codeStr = dataList.codeStr.join(',');
aptitudeDtoList.push(dataList); aptitudeDtoList.push(dataList);
...@@ -2746,17 +2711,17 @@ ...@@ -2746,17 +2711,17 @@
} else if (this.aptitudelist[i].keyid == "businessStatus") { } else if (this.aptitudelist[i].keyid == "businessStatus") {
data.aptitudeQueryDto['businessStatus'] = this.aptitudelist[i].key.join(','); data.aptitudeQueryDto['businessStatus'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "establish") { } else if (this.aptitudelist[i].keyid == "establish") {
data.aptitudeQueryDto['startRegisteredDate'] = this.aptitudelist[i].startTime data.aptitudeQueryDto['startRegisteredDate'] = this.aptitudelist[i].startTime;
data.aptitudeQueryDto['endRegisteredDate'] = this.aptitudelist[i].endTime data.aptitudeQueryDto['endRegisteredDate'] = this.aptitudelist[i].endTime;
} else if (this.aptitudelist[i].keyid == "RegisteredCapital") { } else if (this.aptitudelist[i].keyid == "RegisteredCapital") {
data.aptitudeQueryDto['leftRegisteredCapital'] = this.aptitudelist[i].start data.aptitudeQueryDto['leftRegisteredCapital'] = this.aptitudelist[i].start;
data.aptitudeQueryDto['rightRegisteredCapital'] = this.aptitudelist[i].end data.aptitudeQueryDto['rightRegisteredCapital'] = this.aptitudelist[i].end;
} else if (this.aptitudelist[i].keyid == "actualCapi") { } else if (this.aptitudelist[i].keyid == "actualCapi") {
data.aptitudeQueryDto['leftActualCapi'] = this.aptitudelist[i].start data.aptitudeQueryDto['leftActualCapi'] = this.aptitudelist[i].start;
data.aptitudeQueryDto['rightActualCapi'] = this.aptitudelist[i].end data.aptitudeQueryDto['rightActualCapi'] = this.aptitudelist[i].end;
} else if (this.aptitudelist[i].keyid == "InsuredNum") { } else if (this.aptitudelist[i].keyid == "InsuredNum") {
data.aptitudeQueryDto['startInsuredNum'] = this.aptitudelist[i].start data.aptitudeQueryDto['startInsuredNum'] = this.aptitudelist[i].start;
data.aptitudeQueryDto['endInsuredNum'] = this.aptitudelist[i].end data.aptitudeQueryDto['endInsuredNum'] = this.aptitudelist[i].end;
} else { } else {
data.aptitudeQueryDto[this.aptitudelist[i].keyid] = this.aptitudelist[i].key; data.aptitudeQueryDto[this.aptitudelist[i].keyid] = this.aptitudelist[i].key;
} }
...@@ -2771,51 +2736,51 @@ ...@@ -2771,51 +2736,51 @@
data.aptitudeQueryDto['aptitudeSource'] = 'new'; data.aptitudeQueryDto['aptitudeSource'] = 'new';
} }
this.isSkeleton = true; this.isSkeleton = true;
api.enterprisePage(data).then(res=>{ api.enterprisePage(data).then(res => {
this.isSkeleton = false this.isSkeleton = false;
if (res.code==200) { if (res.code == 200) {
this.tableData=res.data.list; this.tableData = res.data.list;
this.total=res.data.total; this.total = res.data.total;
} }
}).catch(error=>{ }).catch(error => {
}); });
}, },
toEnterprise(id, html,type) { toEnterprise(id, html, type) {
return '/company/' + encodeStr(id) + '/'+(html?'?html='+html:'')+(type?'&flag=true&type='+type:''); return '/company/' + encodeStr(id) + '/' + (html ? '?html=' + html : '') + (type ? '&flag=true&type=' + type : '');
}, },
toEnterpriseDetail(id) { toEnterpriseDetail(id) {
return '/company/' + encodeStr(id) + '/?index=true'; return '/company/' + encodeStr(id) + '/?index=true';
}, },
labelsWidth(e,t=0){ labelsWidth(e, t = 0) {
setTimeout(()=>{ setTimeout(() => {
if(this.$refs[e]){ if (this.$refs[e]) {
let k = 0; let k = 0;
for (var j=0;j<this.$refs[e][0].children.length;j++){ for (var j = 0; j < this.$refs[e][0].children.length; j++) {
k = k+ (this.$refs[e][0].children[j].offsetWidth+14) k = k + (this.$refs[e][0].children[j].offsetWidth + 14);
} }
if(k>1074){ if (k > 1074) {
if(t==1){ if (t == 1) {
return true return true;
} }
return '982px' return '982px';
}else { } else {
if(t==1){ if (t == 1) {
return false return false;
} }
return '100%' return '100%';
} }
} }
},1000) }, 1000);
}, },
labelsClick(e,i,s){ labelsClick(e, i, s) {
this.$refs[e][0].style.height = 'auto' this.$refs[e][0].style.height = 'auto';
this.$refs[s][0].style.width = '100%' this.$refs[s][0].style.width = '100%';
this.$refs[i][0].style.display = 'none' this.$refs[i][0].style.display = 'none';
}, },
chkPrice(obj) { chkPrice(obj) {
obj = obj.replace(/[^\d.]/g, ""); obj = obj.replace(/[^\d.]/g, "");
...@@ -2831,69 +2796,65 @@ ...@@ -2831,69 +2796,65 @@
message: '请输入大于0的数字', message: '请输入大于0的数字',
type: 'warning' type: 'warning'
}); });
return "" return "";
} }
return obj; return obj;
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content{ .content {
padding: 0px 16px; padding: 0px 16px;
padding-top: 16px; padding-top: 16px;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
background: #FFFFFF; background: #ffffff;
.content_item{ .content_item {
padding-top: 20px; padding-top: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
.label{ .label {
width: 84px; width: 84px;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(35,35,35,0.8); color: rgba(35, 35, 35, 0.8);
} }
.content_right{ .content_right {
.ename_input {
.ename_input{
width: 640px; width: 640px;
margin-right: 20px; margin-right: 20px;
} }
.el-input-group{ .el-input-group {
display: flex; display: flex;
align-items: center; align-items: center;
} }
::v-deep .el-input-group__append{ ::v-deep .el-input-group__append {
padding:0px; padding: 0px;
line-height: 34px; line-height: 34px;
font-weight: 400; font-weight: 400;
color: #0081FF; color: #0081ff;
height: 34px; height: 34px;
width: 80px; width: 80px;
background: #F5F5F5; background: #f5f5f5;
border-radius: 0px 0px 0px 0px; border-radius: 0px 0px 0px 0px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
} }
.item_ckquery_list { .item_ckquery_list {
display: flex; display: flex;
align-items: center; align-items: center;
.qualifications-tab{ .qualifications-tab {
margin-right: 4px; margin-right: 4px;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
padding: 2px 3px; padding: 2px 3px;
border-radius: 2px; border-radius: 2px;
height: 34px; height: 34px;
margin-top: 1px; margin-top: 1px;
span{ span {
background: #fff; background: #fff;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
...@@ -2902,7 +2863,7 @@ ...@@ -2902,7 +2863,7 @@
padding: 3px 8px; padding: 3px 8px;
margin-top: 0.5px; margin-top: 0.5px;
} }
.action{ .action {
color: #ffffff; color: #ffffff;
background: #0081ff; background: #0081ff;
} }
...@@ -2911,10 +2872,9 @@ ...@@ -2911,10 +2872,9 @@
.content_item_list { .content_item_list {
width: 280px; width: 280px;
} }
.ckquery_list_right{ .ckquery_list_right {
width: 670px; width: 670px;
} }
} }
.item_ckquery_list .el-input__icon { .item_ckquery_list .el-input__icon {
...@@ -2924,21 +2884,20 @@ ...@@ -2924,21 +2884,20 @@
.ckquery_list_right { .ckquery_list_right {
width: 640px; width: 640px;
} }
.register_count_ipt{ .register_count_ipt {
margin-left: 0px; margin-left: 0px;
} }
.register_count_ipt .el-input__inner{ .register_count_ipt .el-input__inner {
width: 174px; width: 174px;
} }
::v-deep .el-input-group__prepend{ ::v-deep .el-input-group__prepend {
padding: 0 8px; padding: 0 8px;
} }
.content-projecttype{ .content-projecttype {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.projecttype{ .projecttype {
font-weight: 400; font-weight: 400;
color: #232323; color: #232323;
padding: 1px 5px; padding: 1px 5px;
...@@ -2947,113 +2906,104 @@ ...@@ -2947,113 +2906,104 @@
border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px;
font-size: 14px; font-size: 14px;
} }
.projecttype:first-child{ .projecttype:first-child {
padding-left: 0px; padding-left: 0px;
} }
.projecttype:hover{ .projecttype:hover {
background: #F3F4F5; background: #f3f4f5;
padding: 1px 5px; padding: 1px 5px;
} }
.activetype{ .activetype {
background: #F3F4F5; background: #f3f4f5;
padding: 1px 5px !important; padding: 1px 5px !important;
} }
} }
} }
.content_item_padding0{ .content_item_padding0 {
padding: 0; padding: 0;
} }
.content_item1{ .content_item1 {
align-items: flex-start; align-items: flex-start;
.content_right{ .content_right {
width: 1400px; width: 1400px;
.select-popper{ .select-popper {
margin-bottom: 20px; margin-bottom: 20px;
} }
} }
} }
}
} .bottomlist {
.bottomlist{
width: 100%; width: 100%;
background-color: #FFFFFF; background-color: #ffffff;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
.bottomlist-title{ .bottomlist-title {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin: 0px 16px; margin: 0px 16px;
margin-top: 12px; margin-top: 12px;
padding: 16px 0px ; padding: 16px 0px;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #efefef;
.title-left{ .title-left {
height:16px; height: 16px;
line-height: 16px; line-height: 16px;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #3D3D3D; color: #3d3d3d;
} }
.title-right{ .title-right {
display: flex; display: flex;
align-items: center; align-items: center;
p:last-child{ p:last-child {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(35,35,35,0.8); color: rgba(35, 35, 35, 0.8);
} }
img{ img {
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
.excel{ .excel {
cursor: pointer; cursor: pointer;
} }
} }
} }
.bottomlist-content{ .bottomlist-content {
padding-bottom: 0px; padding-bottom: 0px;
} }
.pagination {
.pagination{ padding: 14px;
padding: 14px ; .el-pagination {
.el-pagination{
float: right; float: right;
} }
} }
.card-right-title1{ .card-right-title1 {
display: block !important; display: block !important;
overflow: hidden; overflow: hidden;
} }
.positive1{ .positive1 {
padding: 0 8px !important; padding: 0 8px !important;
margin-right: 7px !important; margin-right: 7px !important;
} }
.positive-gdbq{ .positive-gdbq {
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #0081FF; color: #0081ff;
cursor:pointer; cursor: pointer;
}
}
.content_item_ckquery{
.item_ckquery{
margin-bottom:0px;
} }
}
.content_item_ckquery {
.item_ckquery {
margin-bottom: 0px;
} }
}
.aptitude_choice_wrap {
.aptitude_choice_wrap {
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 1060px; width: 1060px;
...@@ -3071,6 +3021,5 @@ ...@@ -3071,6 +3021,5 @@
right: -16px; right: -16px;
bottom: 0; bottom: 0;
} }
}
}
</style> </style>
\ No newline at end of file
dsk-operate-ui/src/views/enterpriseData/components/searchTheOwner/index.vue
View file @ bbe71844
...@@ -100,11 +100,15 @@ ...@@ -100,11 +100,15 @@
</div> </div>
</div> </div>
<div class="table-item-jf table-item-jf1" v-if="tableData.length==0&& !isSkeleton"> <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length&& !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt=""> <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div> <div class="item-jf-titel">暂无相关数据</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div> <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
<div class="depth-search-box" v-if="onlySearchEname">
<div class="depth-search" @click="$router.push({path : `/enterpriseData/SearchEnterprise?keyword=${keys}`})">深度搜索企业</div>
</div> </div>
</div>
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0" @mouseleave="showClaim = false"> <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0" @mouseleave="showClaim = false">
...@@ -126,13 +130,9 @@ ...@@ -126,13 +130,9 @@
<!-- 优质甲方tag标签 --> <!-- 优质甲方tag标签 -->
<div class="high-quality-enterprise" v-if="scope.row.other">{{scope.row.other}}</div> <div class="high-quality-enterprise" v-if="scope.row.other">{{scope.row.other}}</div>
<div class="renling-btn" @click="claimbtn(scope.row)"> <div class="renling-btn" @click="claimbtn(scope.row)">
<p v-if="scope.row.claimStatus==1" class="renling-img-true"> <p v-if="scope.row.claimStatus==0" class="renling-img-true"></p>
<p v-else class="renling-img-false"></p>
</p> <span v-if="scope.row.claimStatus==0" @click.stop="cancelClaim(scope.row.name,scope.$index)" class="renling-hui">
<p v-else class="renling-img-false">
</p>
<span v-if="scope.row.claimStatus==1" @click.stop="cancelClaim(scope.row.name,scope.$index)" class="renling-hui">
已认领 已认领
</span> </span>
<span v-else class="renling-hei"> <span v-else class="renling-hei">
...@@ -299,7 +299,7 @@ export default { ...@@ -299,7 +299,7 @@ export default {
// 业主标签 // 业主标签
ownerLabels: [], ownerLabels: [],
// 当前选中的业主标签 // 当前选中的业主标签
currentOwnerLabels: ["5.1.1."], currentOwnerLabels: [],
// 业主全选状态 // 业主全选状态
checkOwnerLabel: false, checkOwnerLabel: false,
// 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备 // 选中两个及两个以上业主标签 添加选中条件 or任意均可 and同时具备
...@@ -355,7 +355,32 @@ export default { ...@@ -355,7 +355,32 @@ export default {
}; };
}, },
computed: { computed: {
// 仅搜索企业名
onlySearchEname() {
let that = this;
const keys = {
ename: that.keys,
tagCode: that.currentOwnerLabels,
...that.jskBidQueryDto
};
const temp = [];
for (const key in keys) {
const type = Object.prototype.toString.call(keys[key]);
if (keys[key]) {
switch (type) {
case "[object String]":
temp.push(key);
break;
case "[object Array]":
keys[key].length > 0 ? temp.push(key) : null;
break;
default:
break;
}
}
}
return temp.length == 1 && temp.includes("ename") ? true : false;
}
}, },
created() { created() {
this.init(); this.init();
...@@ -520,7 +545,7 @@ export default { ...@@ -520,7 +545,7 @@ export default {
this.checkOwnerLabel = false; this.checkOwnerLabel = false;
} else if (val.length == 0) { } else if (val.length == 0) {
this.checkOwnerLabel = true; this.checkOwnerLabel = true;
this.currentOwnerLabels = [this.ownerLabels[0].dictValue]; this.currentOwnerLabels = [];
} }
if (val.length >= 2) { if (val.length >= 2) {
this.tagCodeQueryType = "or"; this.tagCodeQueryType = "or";
...@@ -607,7 +632,7 @@ export default { ...@@ -607,7 +632,7 @@ export default {
api.cancelClaim(this.companyName).then(res => { api.cancelClaim(this.companyName).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.dialogVisible1 = false; this.dialogVisible1 = false;
this.tableData[this.cancelIndex].claimStatus = 0; this.tableData[this.cancelIndex].claimStatus = 1;
} else { } else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
...@@ -653,7 +678,7 @@ export default { ...@@ -653,7 +678,7 @@ export default {
// 搜索关键词处理 // 搜索关键词处理
if (this.keys) { if (this.keys) {
params.aptitudeQueryDto['ename'] = this.keys.split(' '); params.aptitudeQueryDto['ename'] = this.keys;
} }
// 处理地区选择 // 处理地区选择
...@@ -668,7 +693,7 @@ export default { ...@@ -668,7 +693,7 @@ export default {
} }
// 业主标签选中处理 // 业主标签选中处理
if (this.ownerLabels.length > 0) { if (this.currentOwnerLabels.length > 0) {
params.aptitudeQueryDto["tagCode"] = this.currentOwnerLabels.join(","); params.aptitudeQueryDto["tagCode"] = this.currentOwnerLabels.join(",");
} }
...@@ -1014,6 +1039,40 @@ export default { ...@@ -1014,6 +1039,40 @@ export default {
} }
::v-deep .table-item-jf { ::v-deep .table-item-jf {
&.empty-table {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding: 48px 0px;
.item-jf-text {
padding: 0px;
}
.item-jf-img {
margin: 0;
width: 108px;
height: 109px;
margin-bottom: 24px;
}
.depth-search-box {
display: flex;
align-items: center;
justify-content: center;
margin-top: 24px;
}
.depth-search {
width: 116px;
height: 36px;
line-height: 36px;
text-align: center;
cursor: pointer;
color: #fff;
background: #0081ff;
border-radius: 4px;
font-size: 14px;
}
}
.el-table { .el-table {
th, th,
td { td {
...@@ -1094,6 +1153,10 @@ export default { ...@@ -1094,6 +1153,10 @@ export default {
font-size: 13px; font-size: 13px;
font-weight: 400; font-weight: 400;
color: #3d3d3d; color: #3d3d3d;
&:hover {
color: #0081ff;
}
} }
} }
......
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