@@ -91,11 +91,7 @@ | |||
border | |||
highlight-current-row | |||
v-loading="tableLoading" | |||
<<<<<<< HEAD | |||
style="min-height: 425px" | |||
======= | |||
style="min-height:400px" | |||
>>>>>>> a747dcaa4427b7cb9cc512491b24d360ab3a8026 | |||
> | |||
<el-table-column | |||
type="index" | |||
@@ -829,7 +825,6 @@ export default { | |||
} | |||
}, | |||
close() { | |||
console.log("==============="); | |||
this.$router.back(-1); | |||
}, | |||
add(data) { |