Commit d1eaf91d authored by danfuman's avatar danfuman

修改

parent 3d39fde0
...@@ -127,7 +127,7 @@ export const constantRoutes = [ ...@@ -127,7 +127,7 @@ export const constantRoutes = [
path: 'profile', path: 'profile',
component: () => import('@/views/system/user/profile/index'), component: () => import('@/views/system/user/profile/index'),
name: 'Profile', name: 'Profile',
meta: { title: '个人中心', icon: 'user' } meta: { title: '个人中心', icon: 'user',noCache: true }
} }
] ]
}, },
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
import ExportDialog from "../../../component/export-dialog" import ExportDialog from "../../../component/export-dialog"
export default { export default {
name: 'members', name: 'members',
props: ['customerId'], props: ['customerId','combineName'],
mixins: [mixin], mixins: [mixin],
components:{ExportDialog}, components:{ExportDialog},
data(){ data(){
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
if(value > 2000){ if(value > 2000){
return return
} }
this.dataEXCEL.exportExeclName=this.exportData.title; this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
if(value){ if(value){
this.dataEXCEL.exportCount=value this.dataEXCEL.exportCount=value
}else { }else {
......
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
if(value > 2000){ if(value > 2000){
return return
} }
this.dataEXCEL.exportExeclName=this.exportData.title; this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
if(value){ if(value){
this.dataEXCEL.exportCount=value this.dataEXCEL.exportCount=value
}else { }else {
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
import ExportDialog from "../../../component/export-dialog" import ExportDialog from "../../../component/export-dialog"
export default { export default {
name: 'qualifications', name: 'qualifications',
props: ['customerId'], props: ['customerId','combineName'],
mixins: [mixin], mixins: [mixin],
components:{CustomTimeSelect,CustomMoneySelect,ExportDialog}, components:{CustomTimeSelect,CustomMoneySelect,ExportDialog},
data(){ data(){
...@@ -113,32 +113,6 @@ ...@@ -113,32 +113,6 @@
timeList: ['近三天', '近七天', '近半月', '自定义'], timeList: ['近三天', '近七天', '近半月', '自定义'],
moneyList: ['5000万以下', '5000万-1亿', '1亿-5亿', '5亿-10亿','10亿以上', '自定义'], moneyList: ['5000万以下', '5000万-1亿', '1亿-5亿', '5亿-10亿','10亿以上', '自定义'],
dataEXCEL:{}, dataEXCEL:{},
exportTableData:[
{
"address":"四川省-成都市",
"stockPercent":"18.43%",
"agency":'鞍钢股份有限公司',
"issueTime":"2023-09-22",
"subjectMatter":"其他",
"memberLevel":"二级企业",
"tenderee":"鞍钢冷轧钢板(莆田)有限公司综合部",
"projectType":"其他",
"bidAmount":"202万元",
"projectName":"2023年中铁一局集团第二工程有限公司江浙区域项目自购物资集中招标采购文件(一)(钢材)招标公告",
},
{
"address":"四川省-成都市",
"stockPercent":"18.43%",
"agency":'鞍钢股份有限公司',
"issueTime":"2023-09-22",
"subjectMatter":"其他",
"memberLevel":"二级企业",
"tenderee":"鞍钢股份有限公司",
"projectType":"其他",
"bidAmount":"202万元",
"projectName":"太极集团四川太极制药有限公司转让持有的成都市4套住宅-高新区玉虹巷2号1栋6单元7层13号",
},
],
value:'', value:'',
exportData:{ exportData:{
title:'集团招标', title:'集团招标',
...@@ -320,7 +294,7 @@ ...@@ -320,7 +294,7 @@
if(value > 2000){ if(value > 2000){
return return
} }
this.dataEXCEL.exportExeclName=this.exportData.title; this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
if(value){ if(value){
this.dataEXCEL.exportCount=value this.dataEXCEL.exportCount=value
}else { }else {
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
<Zbxmfx v-if="activeName === 'first'" :customer-id="id"></Zbxmfx> <Zbxmfx v-if="activeName === 'first'" :customer-id="id" :combineName="name"></Zbxmfx>
<Zbxmmx v-if="activeName === 'second'" :customer-id="id"></Zbxmmx> <Zbxmmx v-if="activeName === 'second'" :customer-id="id" :combineName="name"></Zbxmmx>
</div> </div>
</template> </template>
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
import Zbxmmx from './zbxmmx' import Zbxmmx from './zbxmmx'
export default { export default {
name: 'qualifications', name: 'qualifications',
props: ['customerId'], props: ['customerId','combineName'],
components:{Zbxmfx,Zbxmmx}, components:{Zbxmfx,Zbxmmx},
data(){ data(){
return{ return{
activeName: 'first', activeName: 'first',
id:this.customerId id:this.customerId,
name:this.combineName
} }
}, },
created() { created() {
......
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