Merge branch 'release' into dev

src/views/system/organize/index.vue

@@ -28,7 +28,7 @@
 				:tools="[{ toolRender: { name: 'exportAll' } }]"
 			>
 				<template #buttons>
-					<el-button type="primary" @click="onOpenAddOrg('')" v-auth="'system:organize:add'" v-if="showAdd">
+					<el-button type="primary" @click="onOpenAddOrg('')" v-auth="'system:organize:add'">
 						<SvgIcon name="ele-Plus" class="mr5" /> 新增部门
 					</el-button>
 				</template>
@@ -93,7 +93,7 @@
 					<vxe-column title="操作" fixed="right" width="170" align="center">
 						<template #default="{ row }">
 							<el-button link type="primary" @click="onOpenEditOrg(row)" title="修改" v-auth="'system:organize:edit'"> 修改 </el-button>
-							<el-button link type="primary" @click="onOpenAddOrg(row)" title="新增" v-auth="'system:organize:add'" v-if="showAdd"> 新增 </el-button>
+							<el-button link type="primary" @click="onOpenAddOrg(row)" title="新增" v-auth="'system:organize:add'"> 新增 </el-button>
 							<el-button link type="danger" @click="onDelete(row)" title="删除" v-auth="'system:organize:delete'"> 删除 </el-button>
 						</template>
 					</vxe-column>
@@ -126,10 +126,6 @@ const state = reactive<any>({
 	areas: [], // 区域
 });
 const ruleFormRef = ref<RefType>(); // 搜索表单ref
-//  在正式上线前 先隐藏用户和部门的新增
-const showAdd = computed(() => {
-	return !['LuZhou'].includes(import.meta.env.VITE_MODE_NAME);
-});
 /** 搜索按钮操作 节流操作 */
 const handleQuery = throttle(() => {
 	getOrgListApi();

src/views/system/user/index.vue

@@ -66,7 +66,7 @@
 						:tools="[{ toolRender: { name: 'exportCurrent' } }, { toolRender: { name: 'exportAll' } }]"
 					>
 						<template #buttons>
-							<el-button type="primary" @click="onOpenAddUser" v-auth="'system:user:add'" v-if="showAdd" :loading="state.tableLoading">
+							<el-button type="primary" @click="onOpenAddUser" v-auth="'system:user:add'" :loading="state.tableLoading">
 								<SvgIcon name="ele-Plus" class="mr5" />新增用户
 							</el-button>
 						</template>
@@ -193,10 +193,6 @@ const state = reactive<any>({
 	telsListGroup: [], //分机组
 });
 const ruleFormRef = ref<FormInstance>(); //表单ref
-//  在正式上线前 先隐藏用户和部门的新增
-const showAdd = computed(() => {
-	return !['LuZhou'].includes(import.meta.env.VITE_MODE_NAME);
-});
 /** 搜索按钮操作 节流操作 */
 const handleQuery = () => {
 	state.queryParams.PageIndex = 1;