|
|
@@ -44,7 +44,7 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<el-table stripe highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
|
|
|
- style="width: 100%" @sort-change="orderby" v-loading="importloading" >
|
|
|
+ style="width: 100%" @sort-change="orderby" >
|
|
|
<el-table-column label="操作" min-width="200" align="center" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<router-link :to="'/oilsupplier/goodsaptitude/' + scope.row.Id + '/operation'">
|
|
|
@@ -295,7 +295,7 @@
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
<el-dialog title="新导入" width="95%" top="5vh" :visible.sync="showimportvisible">
|
|
|
- <el-card class="box-card" v-loading="loading">
|
|
|
+ <el-card class="box-card" v-loading="importloading">
|
|
|
<div slot="header">
|
|
|
<span>
|
|
|
<i class="icon icon-table2"></i> 对照表(新导入)
|
|
|
@@ -871,12 +871,12 @@
|
|
|
ExcelUrl: this.Excelurl
|
|
|
}
|
|
|
api.importExcel(params, this.$axios).then(res => {
|
|
|
- this.importloading = false
|
|
|
if (res.data.code === 0) {
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
message: res.data.message
|
|
|
})
|
|
|
+ this.importloading = false
|
|
|
this.initImportDatas()
|
|
|
} else if (res.data.code === -1) {
|
|
|
this.errorDialogVisible = true
|