Skip to content

D
dsk-cr20g
Commit a8a37940 authored by chenyuefang's avatar chenyuefang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b5a03847 c3a69c1d
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 39 deletions
dsk-operate-ui/src/views/detail/groupAccount/component/members.vue
View file @ a8a37940
......@@ -387,14 +387,14 @@
}
}
if(key === '2'){
this.queryParams.maxStockPercent=''
// this.paramsData.maxStockPercent=''
if(name === this.cgblName){
this.cgblName=''
this.queryParams.minStockPercent=''
this.queryParams.maxStockPercent=''
}else {
this.cgblName=name;
}
this.queryParams.maxStockPercent=''
this.paramsData.maxStockPercent=''
if(this.cgblName){
if(name === '100%'){
this.queryParams.minStockPercent=1
}
......@@ -411,14 +411,11 @@
this.queryParams.minStockPercent=0.01
this.queryParams.maxStockPercent=0.05
}
}else {
this.queryParams.minStockPercent=''
this.queryParams.maxStockPercent=''
}
if(this.paramsData){
if(!this.paramsData.combineId){
// if(!this.paramsData.combineId){
this.paramsData=this.queryParams
}
// }
this.paramsData.pageNum =1
this.queryParams.pageNum =1
}
......
dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue
View file @ a8a37940
......@@ -289,15 +289,16 @@
queryParams1: {
combineId: this.customerId,
},
yearValue:'',
formData: [
{ type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [], uid: this.getUid()},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
{ type: 1, fieldName: 'year', value: '2023年', placeholder: '选择年份', options: [],width:100, uid: this.getUid()},
{ type: 1, fieldName: 'year', value:'', placeholder: '选择年份', options: [],width:100, uid: this.getUid()},
],
formData1: [
{ type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [], uid: this.getUid()},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
{ type: 1, fieldName: 'year', value: '2023年', placeholder: '选择年份', options: [],width:100, uid: this.getUid()},
{ type: 1, fieldName: 'year', value: '', placeholder: '选择年份', options: [],width:100, uid: this.getUid()},
],
cgblList: [
{name:'100%',value:'100%'},
......@@ -313,9 +314,9 @@
peojectTopData:[],
ndzbList:[],
yearOptions:[],
year1:'2023年',
year2:'2023年',
year3:'2023年',
year1:'',
year2:'',
year3:'',
isSkeleton:true,
isSkeleton2:true,
isSkeleton3:true,
......@@ -325,9 +326,10 @@
}
},
created() {
this.yearsData()
this.formData[1].options=this.cgblList;
this.formData1[1].options=this.cgblList;
this.yearsData()
//项目类型
getDictType('project_type_new').then(result=>{
let data = result.code == 200 ? result.data:[];
......@@ -380,8 +382,18 @@
})
}
this.yearOptions=Years.reverse()
this.formData[2].value=this.yearOptions[0].value;
this.formData1[2].value=this.yearOptions[0].value;
this.year1=this.yearOptions[0].value
this.year2=this.yearOptions[0].value
this.year3=this.yearOptions[0].value
this.formData[2].options=Years
this.formData1[2].options=Years
this.$forceUpdate()
},
handleQuery(params){
// this.isSkeleton = true
......@@ -483,7 +495,6 @@
})
},
getPeojectTop(params){
console.log(params)
let data = params || this.queryParams1;
if(data.cgbl){
if(data.cgbl === '100%'){
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ a8a37940
......@@ -213,7 +213,9 @@ export default {
statisticObj: {
handler(val) {
this.sideRoute = JSON.parse(JSON.stringify(this.defaultRoute));
console.log(this.sideRoute)
let arr = JSON.parse(JSON.stringify(val));
console.log(arr,"||||||||")
for (var i in arr) {
for (var j in arr[i]) {
switch (j) {
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ a8a37940
......@@ -60,12 +60,12 @@
</div>
</div>
</div>
<div class="company-menu">
<el-button v-if="companyInfo.claimStatus==0" @click="cancelClaimClick()" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i>
已认领</el-button>
<el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i>
认领客户</el-button>
</div>
<!--<div class="company-menu">-->
<!--<el-button v-if="companyInfo.claimStatus==0" @click="cancelClaimClick()" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i>-->
<!--已认领</el-button>-->
<!--<el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i>-->
<!--认领客户</el-button>-->
<!--</div>-->
<div class="company-info">
<div class="info-item flex-box">
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ a8a37940
......@@ -148,20 +148,20 @@
<div class="renling">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a"
v-html="scope.row.companyName"></router-link>
<div class="renling-btn" @click="claimbtn(scope.row)">
<p v-if="scope.row.claimStatus==0" class="renling-img-true">
<!--<div class="renling-btn" @click="claimbtn(scope.row)">-->
<!--<p v-if="scope.row.claimStatus==0" class="renling-img-true">-->
</p>
<p v-else class="renling-img-false">
<!--</p>-->
<!--<p v-else class="renling-img-false">-->
</p>
<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">
已认领
</span>
<span v-else class="renling-hei">
认领
</span>
</div>
<!--</p>-->
<!--&lt;!&ndash;<span v-if="scope.row.claimStatus==0" @click="cancelClaim(scope.row.companyName,scope.$index)" class="renling-hui">&ndash;&gt;-->
<!--&lt;!&ndash;已认领&ndash;&gt;-->
<!--&lt;!&ndash;</span>&ndash;&gt;-->
<!--&lt;!&ndash;<span v-else class="renling-hei">&ndash;&gt;-->
<!--&lt;!&ndash;认领&ndash;&gt;-->
<!--&lt;!&ndash;</span>&ndash;&gt;-->
<!--</div>-->
</div>
</template>
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ a8a37940
......@@ -2,8 +2,8 @@
<div class="app-container enterprise_contatiner">
<div class="title_wrap">
<div class="enterprise_title">
查企业
<img style="position: relative;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt="">
竞争对手查询
<!--<img style="position: relative;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt="">-->
</div>
</div>
......@@ -214,6 +214,17 @@
</el-option>
</el-select>
</div>
<div class="select-popper">
<div class=" " :class="(companyXzText.length>0&&companyXzText[0]!='不限')?'select-active':''">
企业性质{{(companyXzText.length>0&&companyXzText[0]!='不限')>0?(companyXzText.length+'项'):''}}
<i class="el-icon-caret-bottom"></i>
</div>
<el-select v-model="companyXzText" popper-class='select-multiple-pop' class="select-multiple" style="min-width: 110px;" @change="companyXzbtn" multiple
placeholder="请选择">
<el-option v-for=" (itme,i) in companyXzList" :key="i" :label="itme.value" :value="itme.label">
</el-option>
</el-select>
</div>
<div class="select-popper">
<div class=" " :class="(companyTypeText.length>0&&companyTypeText[0]!='不限')?'select-active':''">
企业类型{{(companyTypeText.length>0&&companyTypeText[0]!='不限')>0?(companyTypeText.length+'项'):''}}
......@@ -574,7 +585,7 @@
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-show="show_page && total>0">
<el-pagination background :page-size="limit" :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total">
</el-pagination>
......@@ -617,6 +628,8 @@ export default {
encodeStr,
ename: '',
isSkeleton: true,
show_page:true,
MaxPage:500,
enameQueryTypeList: [
{
key: 'and',
......@@ -852,6 +865,29 @@ export default {
},
],
aTaxYeartext: ['不限'],
companyXzText: ['不限'],
companyXzList: [
{
label: '',
value: '不限'
},
{
label: '5.1.1.',
value: '央企'
},
{
label: '5.1.2.',
value: '央企子公司'
},
{
label: '5.2.1.,5.2.2.',
value: '国有企业'
},
{
label: '5.8.',
value: '民营企业'
},
],
companyTypeList: [
{
label: '不限',
......@@ -2109,6 +2145,52 @@ export default {
this.aptitudelist.push(data);
},
companyXzbtn(){
for (let i = 0; i < this.aptitudelist.length; i++) {
if (this.aptitudelist[i].keyid == 'tagCode') {
this.aptitudelist.splice(i, 1);
i--;
}
}
if (this.companyXzText.length > 0 && this.companyXzText[0] == '不限') {
for (let i = 0; i < this.companyXzText.length; i++) {
if (this.companyXzText[i] == '不限') {
this.companyXzText.splice(i, 1);
}
}
} else if (this.companyXzText.length == 0) {
this.companyXzText = ['不限'];
}
var n = -1;
for (let i = 0; i < this.companyXzText.length; i++) {
if (this.companyXzText[i] == '不限') {
n = i;
}
}
if (n != -1) {
this.companyXzText = ['不限'];
return;
}
var arr = [];
for (let i = 0; i < this.companyXzText.length; i++) {
for (let j = 0; j < this.companyXzList.length; j++) {
if (this.companyXzText[i] == this.companyXzList[j].label) {
arr.push(this.companyXzList[j].value);
}
}
}
var data = {
value: arr,
keyid: 'tagCode',
key: this.companyXzText,
title: '企业性质:'
};
this.aptitudelist.push(data);
},
companyTypebtn() {
for (let i = 0; i < this.aptitudelist.length; i++) {
......@@ -2606,6 +2688,9 @@ export default {
case 'taxYear':
this.aTaxYeartext = ['不限'];
break;
case 'tagCode':
this.companyXzText = ['不限'];
break;
case 'companyType':
this.companyTypeText = ['不限'];
break;
......@@ -2725,7 +2810,16 @@ export default {
},
handleCurrentChange(page) {
this.page = page;
if(this.MaxPage<page){
this.show_page = false
this.$nextTick(() => {
this.page = 1
this.$message.warning(`对不起，最多只能访问${this.MaxPage}页`)
this.show_page = true
})
}else {
this.search(page, this.limit);
}
},
// 空白点击
outClick(e) {
......@@ -2815,9 +2909,10 @@ export default {
} else if (this.aptitudelist[i].keyid == "taxYear") {
data.aptitudeQueryDto['taxYear'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "tagCode") {
data.aptitudeQueryDto['tagCode'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "companyType") {
data.aptitudeQueryDto['companyType'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "businessStatus") {
data.aptitudeQueryDto['businessStatus'] = this.aptitudelist[i].key.join(',');
} else if (this.aptitudelist[i].keyid == "establish") {
......
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