Merge remote-tracking branch 'origin/master'

linwenling

2023-04-25 72b22be0d887d6793b8955b5a40ab5bbc6d9e7c4

 ruoyi-ui/src/views/contacts/index.vue

@@ -228,10 +228,7 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown
            size="mini"
            @command="(command) => handleCommand(command, scope.row)"
            v-hasPermi="['system:role:edit']">

           <el-button
             size="mini"
             type="text"
@@ -239,7 +236,7 @@
             @click="handleCheck(scope.row)">
查看详情</el-button>

          </el-dropdown>




@@ -257,7 +254,7 @@
      @pagination="getList"
    />

    <!-- 添加通讯录配置对话框
 
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

@@ -367,7 +364,6 @@
      </div>
    </el-dialog>

    <!-- 分配角色数据权限对话框
    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>

    </el-dialog>