提交 53c8cdf9 编写于 作者: zhentian.jia's avatar zhentian.jia

发dev

上级 82de5d95
...@@ -105,28 +105,32 @@ ...@@ -105,28 +105,32 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="400" align="left"> <el-table-column fixed="right" label="操作" width="350" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" class="button-text"
type="text"
size="small" size="small"
v-show="showButton(scope.row,'L2')" v-show="showButton(scope.row,'L2')"
@click="openDialog(scope.row,'L2')" @click="openDialog(scope.row,'L2')"
>升级项目负责人</el-button> >升级项目负责人</el-button>
<el-button <el-button
type="primary" class="button-text"
type="text"
size="small" size="small"
v-show="showButton(scope.row,'L3')" v-show="showButton(scope.row,'L3')"
@click="openDialog(scope.row,'L3')" @click="openDialog(scope.row,'L3')"
>升级次级负责人</el-button> >升级次级负责人</el-button>
<el-button <el-button
type="primary" class="button-text"
type="text"
size="small" size="small"
v-show="showButton(scope.row,'L0')" v-show="showButton(scope.row,'L0')"
@click="openDialog(scope.row,'L0')" @click="openDialog(scope.row,'L0')"
>降为普通用户</el-button> >降为普通用户</el-button>
<el-button <el-button
type="primary" class="button-text"
type="text"
size="small" size="small"
v-show="showAppend(scope.row.projeceRole)" v-show="showAppend(scope.row.projeceRole)"
@click="addArea(scope.row)" @click="addArea(scope.row)"
...@@ -356,7 +360,7 @@ export default { ...@@ -356,7 +360,7 @@ export default {
updateNum: 0, updateNum: 0,
dialogSuccess: false, dialogSuccess: false,
failType: 2, failType: 2,
failNum: 2, failNum: 0,
failExcelUrl: "", failExcelUrl: "",
dialogFail: false, dialogFail: false,
...@@ -428,6 +432,7 @@ export default { ...@@ -428,6 +432,7 @@ export default {
console.log("reqStr", reqStr); console.log("reqStr", reqStr);
openLoading(vm); openLoading(vm);
uploadExcel(reqStr, projectId).then(res => { uploadExcel(reqStr, projectId).then(res => {
setTimeout(function() {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
if (res.data.success == true) { if (res.data.success == true) {
...@@ -444,12 +449,12 @@ export default { ...@@ -444,12 +449,12 @@ export default {
vm.failExcelUrl = res.data.url; vm.failExcelUrl = res.data.url;
} else { } else {
//导入失败 //导入失败
setTimeout(function() { // setTimeout(function() {
vm.failType = 2; vm.failType = 2;
vm.dialogFail = true; vm.dialogFail = true;
vm.failNum = res.data.total; vm.failNum = res.data.total;
vm.failExcelUrl = res.data.url; vm.failExcelUrl = res.data.url;
}, 700); // }, 800);
} }
} }
} else { } else {
...@@ -457,6 +462,7 @@ export default { ...@@ -457,6 +462,7 @@ export default {
vm.$message.error(res.message); vm.$message.error(res.message);
} }
console.log(res); console.log(res);
}, 1000);
}); });
}; };
reader.readAsDataURL(file); reader.readAsDataURL(file);
...@@ -907,6 +913,9 @@ export default { ...@@ -907,6 +913,9 @@ export default {
margin-left: 10px; margin-left: 10px;
} }
} }
.button-text {
color: #449284;
}
.user-name { .user-name {
color: #449284; color: #449284;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册