dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-28 09:46:08 +08:00
commit aa52eee7b6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin_zt/src/api/login.js
View File

@ -9,7 +9,7 @@ export function login(username, password, captchaCode, uuid) {
uuid uuid
} }
return request({ return request({
url: 'backendApi/login/doLogin', url: 'backendApi/login/doLogins',
headers: { headers: {
isToken: false isToken: false
}, },

3
fuintAdmin_zt/src/views/tag/oilTag/index.vue
View File

@ -82,6 +82,7 @@
<el-tag v-if="scope.row.status == 0">未绑</el-tag> <el-tag v-if="scope.row.status == 0">未绑</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所绑油站" align="center" prop="storeName" />
<el-table-column label="是否已绑定员工" align="center" prop="mtStatus" > <el-table-column label="是否已绑定员工" align="center" prop="mtStatus" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="success" v-if="scope.row.mtStatus == 1">已绑</el-tag> <el-tag type="success" v-if="scope.row.mtStatus == 1">已绑</el-tag>
@ -369,7 +370,7 @@ export default {
return delTag(ids); return delTag(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("操作成功!");
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */