|
@@ -154,6 +154,26 @@
|
|
|
<span v-else>-</span>
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="订单权限"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ width="120">
|
|
|
|
|
+ <template #header>
|
|
|
|
|
+ <span>
|
|
|
|
|
+ 订单权限
|
|
|
|
|
+ <el-tooltip
|
|
|
|
|
+ content="此列显示用户所属公司,决定了用户可以查看和操作哪些订单数据。不同公司对应不同的数据访问范围。"
|
|
|
|
|
+ placement="top">
|
|
|
|
|
+ <i class="el-icon-question" style="margin-left:4px;cursor:pointer;"></i>
|
|
|
|
|
+ </el-tooltip>
|
|
|
|
|
+ </span>
|
|
|
|
|
+ </template>
|
|
|
|
|
+
|
|
|
|
|
+ <template #default="{ row }">
|
|
|
|
|
+ <el-tag v-for="item in companys" v-if="item.companyId == row.companyId" >{{item.companyName}}</el-tag>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
|
|
+
|
|
|
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
|
|
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-switch
|
|
<el-switch
|
|
@@ -200,7 +220,7 @@
|
|
|
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
|
|
<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
|
|
|
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
|
v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
|
|
|
<el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
|
|
<el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
|
|
|
- v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>
|
|
|
|
|
|
|
+ v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
|
</template>
|
|
</template>
|
|
@@ -308,6 +328,18 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
|
|
+ <el-col :span="12">
|
|
|
|
|
+ <el-form-item label="订单权限">
|
|
|
|
|
+ <el-select filterable v-model="form.companyId" clearable placeholder="请选择公司名" size="small">
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in companys"
|
|
|
|
|
+ :key="item.companyId"
|
|
|
|
|
+ :label="item.companyName"
|
|
|
|
|
+ :value="item.companyId"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
@@ -362,6 +394,7 @@ import { getToken } from "@/utils/auth";
|
|
|
import { treeselect } from "@/api/system/dept";
|
|
import { treeselect } from "@/api/system/dept";
|
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
import Treeselect from "@riophae/vue-treeselect";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
|
|
+import { getCompanyList } from '@/api/company/company'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: "User",
|
|
name: "User",
|
|
@@ -493,8 +526,12 @@ export default {
|
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
this.getConfigKey("sys.user.initPassword").then(response => {
|
|
|
this.initPassword = response.msg;
|
|
this.initPassword = response.msg;
|
|
|
});
|
|
});
|
|
|
|
|
+ getCompanyList().then(response => {
|
|
|
|
|
+ this.companys = response.data;
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+
|
|
|
/** 查询用户列表 */
|
|
/** 查询用户列表 */
|
|
|
getList() {
|
|
getList() {
|
|
|
this.loading = true;
|
|
this.loading = true;
|
|
@@ -587,7 +624,7 @@ export default {
|
|
|
break;
|
|
break;
|
|
|
case "handleSetUser":
|
|
case "handleSetUser":
|
|
|
this.handleSetUser(row);
|
|
this.handleSetUser(row);
|
|
|
- break
|
|
|
|
|
|
|
+ break
|
|
|
default:
|
|
default:
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -760,4 +797,4 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
-</script>
|
|
|
|
|
|
|
+</script>
|