Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW

TreeWish

2023-02-16 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585

 src/views/userManage/roleManage.vue

@@ -15,7 +15,7 @@
          :label="$t('userManage.RM.roleName')"
          prop="username"
        >
          <el-input v-model="roleForm.username" />
          <el-input v-model="roleForm.username" style="width:200px"/>
        </el-form-item>
        <el-form-item
          :label="$t('userManage.RM.ownedSystem')"
@@ -25,7 +25,7 @@
            :popper-append-to-body="false"
            v-model="roleForm.depValue"
            placeholder="请选择"
            style="width:93%"
            style="width:200px"
          >
            <el-option
              :value="roleForm.depid"
@@ -55,7 +55,7 @@
            @click="showDepTree(1)"
          >{{ $t('common.choose') }}</el-button>
        </el-form-item> -->
        <el-form-item>
        <!-- <el-form-item style="float:right">
          <el-button
            type="success"
            size="small"
@@ -65,7 +65,7 @@
              $t('userManage.RM.add')
            }}</el-button>
        </el-form-item>
        <el-form-item>
        <el-form-item style="float:right">
          <el-button
            size="small"
            type="primary"
@@ -74,7 +74,7 @@
              $t('userManage.RM.query')
            }}</el-button>
        </el-form-item>
        <el-form-item>
        <el-form-item style="float:right">
          <el-button
            type="info"
            size="small"
@@ -83,7 +83,7 @@
              $t('userManage.RM.reset')
            }}</el-button>
        </el-form-item>
        <el-form-item>
        <el-form-item style="float:right">
          <el-button
            type="danger"
            size="small"
@@ -92,6 +92,44 @@
          ><i class="el-icon-delete"></i>&nbsp;{{
              $t('common.delete')
            }}</el-button>
        </el-form-item> -->
        <el-form-item style="float:right">
          <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 style="float:right">
          <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 style="float:right">
          <el-button
            type="danger"
            size="small"
            @click="handleDelete()"
            v-if="menuStatus.delete"
          ><i class="el-icon-delete"></i>&nbsp;{{
              $t('common.delete')
            }}</el-button>
        </el-form-item>
        <el-form-item style="float:right">
          <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')
            }}</el-button>
        </el-form-item>
      </el-form>
    </div>