From ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期日, 26 二月 2023 12:25:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/userManage/roleManage.vue | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index d445fcb..10a3907 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -17,19 +17,6 @@
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item
- :label="$t('userManage.RM.roleName')"
- prop="username"
- >
- <el-input
- v-model="roleForm.username"
- :placeholder="$t('userManage.RM.roleNameHolder')"
- size="small"
- style="width: 200px"
- >
- <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
- </el-input>
- </el-form-item>
- <el-form-item
:label="$t('userManage.RM.ownedSystem')"
prop="ownedSystem"
>
@@ -60,24 +47,38 @@
:placeholder="$t('common.pleaseInput')"
/> -->
</el-form-item>
+ <el-form-item
+ :label="$t('userManage.RM.roleName')"
+ prop="username"
+ >
+ <el-input
+ v-model="roleForm.username"
+ :placeholder="$t('userManage.RM.roleNameHolder')"
+ size="small"
+ style="width: 200px"
+ >
+ <i slot="suffix" class="el-icon-search" @click="onSubmit"></i>
+ </el-input>
+ </el-form-item>
</div>
<div>
+<!-- <el-form-item>-->
+<!-- <el-button-->
+<!-- size="small"-->
+<!-- type="primary"-->
+<!-- @click="onSubmit('ruleForm')"-->
+<!-- ><i class="el-icon-search"></i> {{-->
+<!-- $t("userManage.RM.query")-->
+<!-- }}</el-button>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button
- type="info"
- size="small"
- @click="resetForm('ruleForm')"
- ><i class="el-icon-delete"></i> {{
- $t("userManage.RM.reset")
- }}</el-button>
- </el-form-item>
- <el-form-item>
- <el-button
- size="small"
- type="primary"
- @click="onSubmit('ruleForm')"
- ><i class="el-icon-search"></i> {{
- $t("userManage.RM.query")
+ type="success"
+ size="small"
+ @click="setInsertFormdialog"
+ v-if="menuStatus.insert"
+ ><i class="el-icon-circle-plus-outline"></i> {{
+ $t("userManage.RM.add")
}}</el-button>
</el-form-item>
<el-form-item>
@@ -92,12 +93,11 @@
</el-form-item>
<el-form-item>
<el-button
- type="success"
- size="small"
- @click="setInsertFormdialog"
- v-if="menuStatus.insert"
- ><i class="el-icon-circle-plus-outline"></i> {{
- $t("userManage.RM.add")
+ type="info"
+ size="small"
+ @click="resetForm('ruleForm')"
+ ><i class="el-icon-delete"></i> {{
+ $t("userManage.RM.reset")
}}</el-button>
</el-form-item>
</div>
--
Gitblit v1.9.3