Merge remote-tracking branch 'origin/master'

xing

2023-02-26 ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0

 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> &nbsp;{{-->
<!--                  $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>&nbsp;{{
                  $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> &nbsp;{{
                  $t("userManage.RM.query")
                  type="success"
                  size="small"
                  @click="setInsertFormdialog"
                  v-if="menuStatus.insert"
              ><i class="el-icon-circle-plus-outline"></i> &nbsp;{{
                  $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> &nbsp;{{
                  $t("userManage.RM.add")
                  type="info"
                  size="small"
                  @click="resetForm('ruleForm')"
              ><i class="el-icon-delete"></i>&nbsp;{{
                  $t("userManage.RM.reset")
                }}</el-button>
            </el-form-item>
          </div>