Skip to content

T
techbook
Commit bc60d79c authored by anxixi's avatar anxixi
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9ac61400 a5426ac5
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
src/views/busgovernment/auditList.vue
View file @ bc60d79c
...@@ -68,15 +68,16 @@ ...@@ -68,15 +68,16 @@
<el-button type="primary" style="width: 140px;margin-left: 20px" @click="handleSearch"> <el-button type="primary" style="width: 140px;margin-left: 20px" @click="handleSearch">
{{$t('operationjson.search')}} {{$t('operationjson.search')}}
</el-button> </el-button>
<el-button type="primary" plain style="width: 140px;" @click="handleReset">重置
</el-button>
</div> </div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" plain style="width: 140px;margin-right: 20px;" @click="handleReset">重置
</el-button>
<!--<el-button type="primary" @click="handleReport" style="width: 140px;">导出数据</el-button>--> <!--<el-button type="primary" @click="handleReport" style="width: 140px;">导出数据</el-button>-->
<exportFieldBar :screenlist="tableHeaderList" @exportSuccess="handleReport"> <exportFieldBar :screenlist="tableHeaderList" style="display:inline-block;" @exportSuccess="handleReport">
</exportFieldBar> </exportFieldBar>
</template> </template>
......
src/views/partner/auditList.vue
View file @ bc60d79c
...@@ -75,15 +75,15 @@ ...@@ -75,15 +75,15 @@
<el-button type="primary" style="width: 140px;margin-left: 20px" @click="handleSearch"> <el-button type="primary" style="width: 140px;margin-left: 20px" @click="handleSearch">
{{$t('operationjson.search')}} {{$t('operationjson.search')}}
</el-button> </el-button>
<el-button type="primary" plain style="width: 140px;" @click="handleReset">重置
</el-button>
</div> </div>
</template> </template>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" plain style="width: 140px;margin-right: 20px;" @click="handleReset">重置
</el-button>
<!--<el-button type="primary" @click="handleReport" style="width: 140px;">导出数据</el-button>--> <!--<el-button type="primary" @click="handleReport" style="width: 140px;">导出数据</el-button>-->
<exportFieldBar :screenlist="tableHeaderList" @exportSuccess="handleReport"> <exportFieldBar style="display:inline-block;" :screenlist="tableHeaderList" @exportSuccess="handleReport">
</exportFieldBar> </exportFieldBar>
</template> </template>
......
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