Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
658186b8 1 parent 136d566f

图标增加，显示修改

Inline Side-by-side
Showing 5 changed files with 30 additions and 15 deletions
......@@ -175,18 +175,18 @@
</el-row>
<div style="margin: 0 0 0 10px">
<el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" icon="el-icon-download"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button>
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" icon="el-icon-download"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button>
<el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
:disabled="tableSelection.length <= 0">添加到航班</el-button>
<el-button type="primary" size="mini" icon="el-icon-plus" v-hasPermi="['allocation:cargo:allocation']"
@click="addFit" :disabled="tableSelection.length <= 0">添加到航班</el-button>
<div class="tips">
<span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
<span>总件数:{{ allQty }}</span>
......
......@@ -5,11 +5,12 @@
<el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
:on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
class="upload-demo" v-hasPermi="['base:caImport:import']">
<el-button type="primary">点击上传</el-button>
<el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:caImport:download']">下载模板</el-button>
<el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
v-hasPermi="['base:caImport:download']">下载模板</el-button>
</el-form-item>
</el-form>
<div style="font-size: 12px; font-weight: 700">
......
......@@ -12,11 +12,12 @@
<el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
:on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
<el-button type="primary">点击上传</el-button>
<el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板
<el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
v-hasPermi="['base:flightImport:exportExcel']">下载模板
</el-button>
</el-form-item>
</el-form>
......
......@@ -153,12 +153,14 @@
<div class="pl10 mt20">
<el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
</el-button>
<el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
<el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
:type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(0)"
:disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button>
<el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
<el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
:type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(1)"
:disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button>
<el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0"
......
......@@ -47,11 +47,22 @@
}}
</span>
</template>
<template v-slot:remark="scope">
<el-popover placement="top" width="400" trigger="hover"
v-if="scope.row.remark != null && scope.row.remark != ''">
<ul style="height:300px;overflow-y:scroll;">
<li v-for="(item, index) in scope.row.remark.split('\n')" :key="index"
style="border-bottom:1px solid #E4E7ED;margin-bottom:5px">{{ item }}</li>
</ul>
<el-button type="text" slot="reference">查 看</el-button>
</el-popover>
</template>
<template v-slot:requestParameters="scope">
<el-popover placement="top" width="350" trigger="hover">
<ul v-if="scope.row.requestParameters != null && scope.row.requestParameters != ''">
<el-popover placement="top" width="400" trigger="hover"
v-if="scope.row.requestParameters != null && scope.row.requestParameters != ''">
<ul style="height:300px;overflow-y:scroll;">
<li v-for="(item, index) in JSON.stringify(JSON.parse(scope.row.requestParameters)).split(',')"
:key="index">{{ item }}</li>
:key="index" style="border-bottom:1px solid #E4E7ED;margin-bottom:5px">{{ item }}</li>
</ul>
<el-button type="text" slot="reference">查 看</el-button>
</el-popover>
......