admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-17 19:14:17 +08:00
parent 25ae8a3557
commit f651ba04c1
3 changed files with 13 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -5,8 +5,8 @@ NODE_ENV = "production"
# VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://jxjzw.zhgdyun.com:6688"
# VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://10.75.253.12:6090'
VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
VITE_API_URL = 'http://10.75.253.12:6090'
# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
# VITE_API_URL = "http://101.43.164.214:6688"
# VITE_API_URL = "https://wx.antjg.com:6081/"

84
src/views/goverment/huizhou/userManagement/roleManage/index.vue
View File

@ -34,16 +34,7 @@
<span class="title sle">所拥有的权限</span>
<el-scrollbar :style="{ height: title ? `calc(100% - 95px)` : `calc(100% - 56px)` }">
<!-- check-strictly 父子不关联 这样数据选择父 子不会默认被勾选 子被选择 父也不会 -->
<el-tree
ref="treeRef"
default-expand-all
check-strictly
:data="datas"
show-checkbox
node-key="name"
:props="defaultProps"
>
</el-tree>
<el-tree ref="treeRef" default-expand-all :data="datas" show-checkbox node-key="name" :props="defaultProps"> </el-tree>
</el-scrollbar>
<template #footer>
<div class="flx-center">
@ -67,11 +58,14 @@
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="角色类型：" prop="roleType" v-if="store.accountType == 2">
<el-form-item
label="角色类型："
prop="roleType"
v-if="store.accountType == 2 || (store.accountType == 3 && store.enterpriseType.includes(1))"
>
<el-radio-group v-model="formData.roleType" @change="getSelectData">
<el-radio :label="2">政务</el-radio>
<el-radio :label="3">企业</el-radio>
<el-radio :label="4">项目</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="指定类型：" prop="sn" v-if="formData.roleType != 2">
@ -204,72 +198,6 @@ const columns: ColumnProps[] = [
{ prop: "operation", label: "操作", fixed: "right", width: 320 }
];
// 弹窗中的配置
const formConfig = {
formItemConfig: [
{
label: "角色名称",
prop: "roleName",
type: "input"
},
{
label: "角色顺序",
prop: "priority",
type: "number"
},
{
label: "状态",
prop: "state",
type: "radio",
data: [
{ label: "启用", value: 1 },
{ label: "禁用", value: 0 }
]
},
{
label: "角色类型",
prop: "roleType",
type: "radio",
data: [
{ label: "政务", value: 2 },
{ label: "企业", value: 3 },
{ label: "项目", value: 4 }
]
},
{
label: "指定类型",
prop: "sn",
type: "select",
data: [],
hidden: true,
clearable: true
},
{
label: "备注",
prop: "roleDesc",
type: "input",
mapIcon: true
// 标记dialog
}
],
rules: {
roleName: [
{
required: true,
message: "请输入角色名称",
trigger: "blur"
}
],
priority: [
{
required: true,
message: "请输入角色顺序",
trigger: "blur"
}
]
}
};
// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
const dataCallback = (data: any) => {

7
src/views/goverment/huizhou/userManagement/userManage/index.vue
View File

@ -74,11 +74,14 @@
<el-option label="女" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="用户类型：" prop="accountType" v-if="store.accountType == 2">
<el-form-item
label="用户类型："
prop="accountType"
v-if="store.accountType == 2 || (store.accountType == 3 && store.enterpriseType.includes(1))"
>
<el-radio-group v-model="formData.accountType" @change="getSelectData">
<el-radio :label="2">政务</el-radio>
<el-radio :label="3">企业</el-radio>
<el-radio :label="4">项目</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="指定类型：" prop="sn" v-if="formData.accountType != 2">