供应商角色与内部角色错乱问题

ywj_dev
anthonywj 2 years ago
parent ed3dfd096c
commit 6eaebd3e92

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-tabs type="border-card" > <el-tabs type="border-card">
<el-tab-pane> <el-tab-pane>
<span slot="label">内部角色</span> <span slot="label">内部角色</span>
<el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
@ -33,78 +33,78 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="Adminloading" :data="AdminroleList" <el-table v-loading="Adminloading" :data="AdminroleList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
style="width: 100%" style="width: 100%"
border highlight-current-row> border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"/> <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150"/>--> <!-- <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150"/>-->
<!-- <el-table-column label="显示顺序" prop="roleSort" width="100"/>--> <!-- <el-table-column label="显示顺序" prop="roleSort" width="100"/>-->
<el-table-column label="状态"> <el-table-column label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.status | statusFilterType">{{ <el-tag :type="scope.row.status | statusFilterType">{{
scope.row.status | statusFilterName scope.row.status | statusFilterName
}} }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="状态" align="center" width="100">--> <!-- <el-table-column label="状态" align="center" width="100">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-switch--> <!-- <el-switch-->
<!-- v-model="scope.row.status"--> <!-- v-model="scope.row.status"-->
<!-- active-value="0"--> <!-- active-value="0"-->
<!-- inactive-value="1"--> <!-- inactive-value="1"-->
<!-- @change="handleStatusChange(scope.row)"--> <!-- @change="handleStatusChange(scope.row)"-->
<!-- ></el-switch>--> <!-- ></el-switch>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建时间" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="scope.row.roleId === 1" :disabled="scope.row.roleId === 1"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.roleId === 1" :disabled="scope.row.roleId === 1"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"--> <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
<!-- >--> <!-- >-->
<!-- <span class="el-dropdown-link">--> <!-- <span class="el-dropdown-link">-->
<!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多--> <!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
<!-- </span>--> <!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"--> <!-- <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
<!-- >数据权限--> <!-- >数据权限-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item command="handleAuthUser" icon="el-icon-user"--> <!-- <el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
<!-- >分配用户--> <!-- >分配用户-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="Admintotal>0" v-show="Admintotal>0"
:total="Admintotal" :total="Admintotal"
:page.sync="AdminParams.page" :page.sync="AdminParams.page"
:limit.sync="AdminParams.limit" :limit.sync="AdminParams.limit"
@pagination="getList" @pagination="getList"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane> <el-tab-pane>
@ -213,8 +213,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs>
</el-tabs>
<!-- 添加或修改角色配置对话框 --> <!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="40%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
@ -235,9 +234,9 @@
<el-input-number v-model="form.roleSort" controls-position="right" :min="0"/> <el-input-number v-model="form.roleSort" controls-position="right" :min="0"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status" > <el-radio-group v-model="form.status">
<el-radio label="0" >正常</el-radio> <el-radio label="0">正常</el-radio>
<el-radio label="1" >禁用</el-radio> <el-radio label="1">禁用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<!--<el-form-item label="供应商角色" prop="isCustomer">--> <!--<el-form-item label="供应商角色" prop="isCustomer">-->
@ -337,10 +336,10 @@ export default {
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
userStatus:null, userStatus: null,
// //
loading: true, loading: true,
Adminloading:true, Adminloading: true,
// //
ids: [], ids: [],
// //
@ -351,9 +350,9 @@ export default {
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
Admintotal:0, Admintotal: 0,
// //
AdminroleList:[], AdminroleList: [],
// //
roleList: [], roleList: [],
// //
@ -403,8 +402,8 @@ export default {
roleKey: undefined, roleKey: undefined,
status: undefined status: undefined
}, },
AdminParams:{}, AdminParams: {},
Params:{}, Params: {},
// //
form: {}, form: {},
defaultProps: { defaultProps: {
@ -451,22 +450,22 @@ export default {
methods: { methods: {
/** 查询角色列表 */ /** 查询角色列表 */
getList() { getList() {
this.Adminloading =true; this.Adminloading = true;
this.AdminParams=this.queryParams this.AdminParams = this.queryParams
this.AdminParams.isCustomer=0; this.AdminParams.isCustomer = 0;
listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => { listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => {
this.AdminroleList=response.data.list this.AdminroleList = response.data.list
this.Admintotal = response.data.total; this.Admintotal = response.data.total;
this.Adminloading =false; this.Adminloading = false;
} }
); );
}, },
getCustomerList() { getCustomerList() {
this.loading = true; this.loading = true;
this.Params=this.queryParams this.Params = this.queryParams
this.Params.isCustomer=1; this.Params.isCustomer = 1;
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.roleList=response.data.list this.roleList = response.data.list
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
} }
@ -619,11 +618,10 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd(val) { handleAdd(val) {
this.userStatus=val; this.userStatus = val;
this.reset(); this.reset();
this.getMenuTreeselect(); this.getMenuTreeselect();
this.open = true; this.open = true;
this.form.isCustomer=0;
this.title = "角色管理-新增"; this.title = "角色管理-新增";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
@ -680,10 +678,12 @@ export default {
// return // return
// } // }
debugger debugger
if(this.userStatus == 0){ if(this.form.isCustomer == null){
this.form.isCustomer=0; if (this.userStatus == 0) {
}else{ this.form.isCustomer = 0;
this.form.isCustomer=1; } else {
this.form.isCustomer = 1;
}
} }
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {

Loading…
Cancel
Save