修改bug

This commit is contained in:
haozq 2025-02-08 18:17:21 +08:00
parent 7e7c68e78d
commit ab8842345f
2 changed files with 20 additions and 16 deletions

View File

@ -79,11 +79,15 @@ const user = {
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
let data = res.data
setToken(data.access_token)
commit('SET_TOKEN', data.access_token)
setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in)
resolve()
if(data.code && data.code===500){
reject(data);
}else {
setToken(data.access_token)
commit('SET_TOKEN', data.access_token)
setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in)
resolve()
}
}).catch(error => {
reject(error)
})

View File

@ -35,17 +35,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:proList:export']"
>导出数据
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:proList:export']"-->
<!-- >导出数据-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5" v-for="dict in dict.type.sys_pro_material_type" :key="dict.value">
<el-button
type="primary"