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 @@ ...@@ -175,18 +175,18 @@
175 </el-row> 175 </el-row>
176 <div style="margin: 0 0 0 10px"> 176 <div style="margin: 0 0 0 10px">
177 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button> 177 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
178 - <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 178 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" icon="el-icon-download"
179 v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading" 179 v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
180 :disabled="tableData.length <= 0">{{ 180 :disabled="tableData.length <= 0">{{
181 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 181 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
182 }}</el-button> 182 }}</el-button>
183 - <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 183 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" icon="el-icon-download"
184 v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading" 184 v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
185 :disabled="tableData.length <= 0">{{ 185 :disabled="tableData.length <= 0">{{
186 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 186 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
187 }}</el-button> 187 }}</el-button>
188 - <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit" 188 + <el-button type="primary" size="mini" icon="el-icon-plus" v-hasPermi="['allocation:cargo:allocation']"
189 - :disabled="tableSelection.length <= 0">添加到航班</el-button> 189 + @click="addFit" :disabled="tableSelection.length <= 0">添加到航班</el-button>
190 <div class="tips"> 190 <div class="tips">
191 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 191 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
192 <span>总件数:{{ allQty }}</span> 192 <span>总件数:{{ allQty }}</span>
......
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
5 <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel" 5 <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
6 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" 6 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
7 class="upload-demo" v-hasPermi="['base:caImport:import']"> 7 class="upload-demo" v-hasPermi="['base:caImport:import']">
8 - <el-button type="primary">点击上传</el-button> 8 + <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
9 </el-upload> 9 </el-upload>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item> 11 <el-form-item>
12 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:caImport:download']">下载模板</el-button> 12 + <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
13 + v-hasPermi="['base:caImport:download']">下载模板</el-button>
13 </el-form-item> 14 </el-form-item>
14 </el-form> 15 </el-form>
15 <div style="font-size: 12px; font-weight: 700"> 16 <div style="font-size: 12px; font-weight: 700">
......
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
12 <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel" 12 <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
13 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" 13 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
14 class="upload-demo" v-hasPermi="['base:flightImport:importFlight']"> 14 class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
15 - <el-button type="primary">点击上传</el-button> 15 + <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
16 </el-upload> 16 </el-upload>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item> 18 <el-form-item>
19 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板 19 + <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
20 + v-hasPermi="['base:flightImport:exportExcel']">下载模板
20 </el-button> 21 </el-button>
21 </el-form-item> 22 </el-form-item>
22 </el-form> 23 </el-form>
......
...@@ -153,12 +153,14 @@ ...@@ -153,12 +153,14 @@
153 <div class="pl10 mt20"> 153 <div class="pl10 mt20">
154 <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询 154 <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
155 </el-button> 155 </el-button>
156 - <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'" 156 + <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
157 - size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{ 157 + :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(0)"
158 + :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
158 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 159 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
159 }}</el-button> 160 }}</el-button>
160 - <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'" 161 + <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
161 - size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{ 162 + :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(1)"
163 + :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
162 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 164 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
163 }}</el-button> 165 }}</el-button>
164 <el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0" 166 <el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0"
......
...@@ -47,11 +47,22 @@ ...@@ -47,11 +47,22 @@
47 }} 47 }}
48 </span> 48 </span>
49 </template> 49 </template>
50 + <template v-slot:remark="scope">
51 + <el-popover placement="top" width="400" trigger="hover"
52 + v-if="scope.row.remark != null && scope.row.remark != ''">
53 + <ul style="height:300px;overflow-y:scroll;">
54 + <li v-for="(item, index) in scope.row.remark.split('\n')" :key="index"
55 + style="border-bottom:1px solid #E4E7ED;margin-bottom:5px">{{ item }}</li>
56 + </ul>
57 + <el-button type="text" slot="reference">查 看</el-button>
58 + </el-popover>
59 + </template>
50 <template v-slot:requestParameters="scope"> 60 <template v-slot:requestParameters="scope">
51 - <el-popover placement="top" width="350" trigger="hover"> 61 + <el-popover placement="top" width="400" trigger="hover"
52 - <ul v-if="scope.row.requestParameters != null && scope.row.requestParameters != ''"> 62 + v-if="scope.row.requestParameters != null && scope.row.requestParameters != ''">
63 + <ul style="height:300px;overflow-y:scroll;">
53 <li v-for="(item, index) in JSON.stringify(JSON.parse(scope.row.requestParameters)).split(',')" 64 <li v-for="(item, index) in JSON.stringify(JSON.parse(scope.row.requestParameters)).split(',')"
54 - :key="index">{{ item }}</li> 65 + :key="index" style="border-bottom:1px solid #E4E7ED;margin-bottom:5px">{{ item }}</li>
55 </ul> 66 </ul>
56 <el-button type="text" slot="reference">查 看</el-button> 67 <el-button type="text" slot="reference">查 看</el-button>
57 </el-popover> 68 </el-popover>
......