diff --git a/src/utils/request.js b/src/utils/request.js index eb70b3637ec7422fd7429c523b04096534920d4d..fba7d02c0adfb1174f30cd90356e8473b8ac3fed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,7 +13,7 @@ const service = axios.create({ service.interceptors.request.use(config => { // Do something before request is sent if (store.getters.token) { - config.headers['X-Token'] = getToken() // 让æ¯ä¸ªè¯·æ±‚æºå¸¦token-- ['X-Token']为自定义key è¯·æ ¹æ®å®žé™…情况自行修改 + config.headers['X-Auth-Token'] = getToken() // 让æ¯ä¸ªè¯·æ±‚æºå¸¦token-- ['X-Token']为自定义key è¯·æ ¹æ®å®žé™…情况自行修改 } return config }, error => { diff --git a/src/views/haomo/components/tables/HmComplexTable.vue b/src/views/haomo/components/tables/HmComplexTable.vue index fae9b776012717e3af0db2c986f34192fe3e2c4b..3be5f6c2c99527ae28482a427088d850a5bd55c4 100644 --- a/src/views/haomo/components/tables/HmComplexTable.vue +++ b/src/views/haomo/components/tables/HmComplexTable.vue @@ -32,10 +32,10 @@ <span>{{ scope.row[column.codeCamel] }}</span> </template> </el-table-column> - <el-table-column fixed="right" label="æ“作" width="100"> + <el-table-column fixed="right" label="æ“作" width="100" v-if="isShowEditDataButton || isShowDeleteButton"> <template slot-scope="scope"> <el-button @click="openDialog('editData',scope.row)" v-if="isShowEditDataButton" type="text" size="small">编辑</el-button> - <el-button @click="deleteData(scope.row)" type="text" size="small">åˆ é™¤</el-button> + <el-button @click="deleteData(scope.row)" type="text" v-if="isShowDeleteButton" size="small">åˆ é™¤</el-button> </template> </el-table-column> </el-table> @@ -215,6 +215,7 @@ isShowNewButton: false, // æ˜¯å¦æ˜¾ç¤ºæ–°å»º isShowEditDataButton: false, // æ˜¯å¦æ˜¾ç¤ºç¼–辑 + isShowDeleteButton: false, // æ˜¯å¦æ˜¾ç¤ºåˆ 除 isShowExport: false, // æ˜¯å¦æ˜¾ç¤ºå¯¼å‡ºæŒ‰é’® formSchema: {}, // form弹窗的Schema定义 showUserColumns: [], // form弹窗的Columns定义 @@ -328,6 +329,9 @@ if (self.options.showExport) { // åˆ¤æ–æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’® self.isShowExport = self.options.showExport } + if (self.options.showDeleteButton) { // åˆ¤æ–æ˜¯å¦æ˜¾ç¤ºåˆ·æ–°æŒ‰é’® + self.isShowDeleteButton = self.options.showDeleteButton + } console.log(request.defaults) console.log(`request.defaults.baseURL: ${request.defaults.baseURL}`) }, @@ -386,11 +390,13 @@ formConfirm() { this.options.newData.formConfirm() this.dialogFormVisible = false + self.getList() }, // 表å•çš„å–æ¶ˆ formCancel() { this.options.newData.formCancel() this.dialogFormVisible = false + self.getList() }, // åˆ é™¤è¿‡æ»¤æ¡ä»¶ä¸ºç©ºçš„filter deleteFilter(filters) { diff --git a/src/views/haomo/components/tables/index.vue b/src/views/haomo/components/tables/index.vue index 4e49486e8d56441d8d444ecbb110eb4768ca38eb..cc482c1debc13e4b3f0632fc882d0a2094ae36db 100644 --- a/src/views/haomo/components/tables/index.vue +++ b/src/views/haomo/components/tables/index.vue @@ -61,7 +61,8 @@ } }, showRefresh: true, - showExport: true + showExport: true, + showDeleteButton: true } }, methods: {}