共享管理页面修改

This commit is contained in:
lSun 2026-01-22 14:27:17 +08:00
parent 683e4c8235
commit 411ef71891
18 changed files with 273 additions and 142 deletions

View File

@ -219,4 +219,9 @@ export default {
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
</style>

View File

@ -67,7 +67,7 @@
</el-card>
<el-card class="content-box">
<el-col :span="2">
<span style="font-size: 20px; font-weight: 800">出租记录列表</span>
<!-- <span style="font-size: 20px; font-weight: 800">出租记录列表</span>-->
</el-col>
<div class="table-container">
<template v-if="cardList.length > 0">
@ -115,7 +115,7 @@
</span>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #ccc; margin-bottom: 10px" class="order-title-info">
<el-row style="border-bottom: 1px solid #F0F0F0; margin-bottom: 10px" class="order-title-info">
<el-col :span="8">
<span> 出租单位 </span>
<span> {{ item.sellerName }} </span>
@ -138,7 +138,7 @@
v-for="(goods, j) in item.detailsList"
:key="j"
class="order-items order-info"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #F0F0F0' : ''"
style="min-height: 80px"
>
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt="" />
@ -159,7 +159,7 @@
font-size: 13px;
"
>
<el-row style="color: #169bd5; font-weight: bold">
<el-row style="color: #3F3F3F; font-weight: bold">
{{ goods.deviceName }}
</el-row>
<el-row>
@ -225,7 +225,7 @@
v-for="(goods, j) in item.detailsList"
:key="j"
class="order-info"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #F0F0F0' : ''"
style="min-height: 80px"
>
<div style="display: flex; justify-content: center; align-items: center; flex-direction: column">
@ -256,6 +256,7 @@
type="success"
plain
size="small"
style="background: rgba(52,226,199,0.1);border-radius: 4px 4px 4px 4px;border: 1px solid #34E2C7; color: #34E2C7;"
>
同意
</el-button>
@ -265,17 +266,19 @@
type="warning"
plain
size="small"
style="background: rgba(255,171,41,0.1);border-radius: 4px 4px 4px 4px;border: 1px solid #FFAB29;color: #FFAB29;"
>
不同意
</el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)">查看 </el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)" style="color: #34E2C7;background: rgba(52,226,199,0.1);border-radius: 4px 4px 4px 4px;border: 1px solid #34E2C7;">查看 </el-button>
<el-button
v-show="item.orderStatus == '2' && item.taskStatus != '3'"
@click="handleOut(item)"
type="primary"
plain
size="small"
style="color: #34E2C7;background: rgba(52,226,199,0.1);border-radius: 4px 4px 4px 4px;border: 1px solid #34E2C7;"
>
共享出库
</el-button>
@ -813,13 +816,13 @@ export default {
padding: 16px;
margin-bottom: 14px;
border-radius: 10px;
border: 1px solid #169bd5;
box-shadow: 0 0 0 1px rgba(22, 155, 213, 0.2), 0 0 8px rgba(22, 155, 213, 0.3);
transition: all 0.3s ease;
border: 1px solid #F0F0F0;
//box-shadow: 0 0 0 1px rgba(22, 155, 213, 0.2), 0 0 8px rgba(22, 155, 213, 0.3);
//transition: all 0.3s ease;
&:hover {
border-color: #0d7aa8;
box-shadow: 0 0 0 2px rgba(22, 155, 213, 0.3), 0 0 12px rgba(22, 155, 213, 0.4);
//box-shadow: 0 0 0 2px rgba(22, 155, 213, 0.3), 0 0 12px rgba(22, 155, 213, 0.4);
}
.cart-user-info {
@ -830,7 +833,7 @@ export default {
.code,
.orderTime {
padding: 3px 18px;
border: 1px solid #ccc;
border: 1px solid #F0F0F0;
}
.czcompanyName {
@ -862,7 +865,7 @@ export default {
.goods-info {
display: flex;
align-content: center;
border-bottom: 1px solid #00a288;
border-bottom: 1px solid #F0F0F0;
img {
width: 180px;
@ -936,7 +939,7 @@ export default {
}
.order-items {
border-right: 1px solid #ccc;
border-right: 1px solid #F0F0F0;
}
.order-info {
@ -951,7 +954,7 @@ export default {
flex-direction: column;
align-items: center;
justify-content: center;
border-right: 1px solid #ccc;
border-right: 1px solid #F0F0F0;
font-size: 13px;
height: 96px;
}
@ -1084,4 +1087,17 @@ export default {
height: 96px;
background: #ccc;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
.el-tag{
background: #F0F0F0;
}
.el-card{
border: 1px solid #F0F0F0;
}
</style>

View File

@ -63,7 +63,7 @@
<el-card class="content-box">
<el-col :span="2">
<span style="font-size: 20px; font-weight: 800">租赁记录列表</span>
<!-- <span style="font-size: 20px; font-weight: 800">租赁记录列表</span>-->
</el-col>
<div class="table-container">
<!-- 订单列表 -->
@ -104,7 +104,7 @@
</el-col>
</el-row>
<el-row class="order-title-info" style="border-bottom: 1px solid #ccc; margin-bottom: 10px">
<el-row class="order-title-info" style="border-bottom: 1px solid #F0F0F0; margin-bottom: 10px">
<el-col :span="8">
<span> 出租单位 </span>
<span>{{ item.sellerName }}</span>
@ -126,7 +126,7 @@
v-for="(goods, j) in item.detailsList"
:key="j"
class="order-items order-info"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #f0f0f0' : ''"
:style="j != item.detailsList.length - 1 ? 'border-bottom:1px solid #F0F0F0' : ''"
style="min-height: 80px"
>
<img v-if="goods.url" :src="goods.url" style="width: 110px; height: 70px" alt="" />
@ -147,7 +147,7 @@
font-size: 13px;
"
>
<el-row style="color: #169bd5; font-weight: bold">
<el-row style="color: #3F3F3F; font-weight: bold">
{{ goods.deviceName }}
</el-row>
<el-row>
@ -237,7 +237,7 @@ style="min-height: 80px; width: 95%"
<el-button v-if="item.orderStatus == 20" @click="handleViewRepair(item)" type="primary" size="small">
检修详情
</el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)">查看 </el-button>
<el-button type="primary" plain size="small" @click="handleApprove(item)" style="color: #ffffff;">查看 </el-button>
</div>
</el-col>
</el-row>
@ -612,15 +612,15 @@ export default {
padding: 16px;
margin-bottom: 14px;
border-radius: 10px;
border: 1px solid #169bd5;
box-shadow: 0 0 0 1px rgba(22, 155, 213, 0.2), 0 0 8px rgba(22, 155, 213, 0.3);
border: 1px solid #F0F0F0;
//box-shadow: 0 0 0 1px rgba(22, 155, 213, 0.2), 0 0 8px rgba(22, 155, 213, 0.3);
// 0 4px 12px rgba(0, 0, 0, 0.1);
transition: all 0.3s ease;
//transition: all 0.3s ease;
}
.cart-tbody:hover {
border-color: #0d7aa8;
box-shadow: 0 0 0 2px rgba(22, 155, 213, 0.3), 0 0 12px rgba(22, 155, 213, 0.4), 0 6px 16px rgba(0, 0, 0, 0.12);
//box-shadow: 0 0 0 2px rgba(22, 155, 213, 0.3), 0 0 12px rgba(22, 155, 213, 0.4), 0 6px 16px rgba(0, 0, 0, 0.12);
}
:deep .el-form--inline .el-form-item {
@ -655,7 +655,7 @@ export default {
}
.order-items {
border-right: 1px solid #ccc;
border-right: 1px solid #F0F0F0;
}
.order-info {
@ -670,13 +670,13 @@ export default {
flex-direction: column;
align-items: center;
justify-content: center;
border-right: 1px solid #ccc;
border-right: 1px solid #F0F0F0;
font-size: 13px;
height: 96px;
}
.red-font {
color: #ff4800;
color: #3F3F3F;
font-weight: bold;
margin-top: 10px;
}
@ -790,4 +790,17 @@ export default {
height: 96px;
background: #ccc;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
.el-tag{
background: #F0F0F0;
}
.el-card{
border: 1px solid #F0F0F0;
}
</style>

View File

@ -80,6 +80,14 @@
<span style="font-size: 20px; font-weight: 800">装备上下架列表</span>
</el-col>
<el-col :span="20">
<el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary"
class="primary-lease"
>
添加上架装备
</el-button>
<el-tooltip
placement="top-start"
content="请选择需要下架的装备后再操作"
@ -90,18 +98,12 @@
type="danger"
class="primary-lease"
@click="handleBatchDown"
style="float: right;margin-right: 10px"
style="float: right;margin-right: 10px;background: #FF5129;"
:disabled="selectedRows.length === 0"
>
批量下架
</el-button>
</el-tooltip>
<el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary"
class="primary-lease"
>
添加上架装备
</el-button>
</el-col>
</el-row>
@ -127,11 +129,11 @@
<el-table-column align="center" prop="code" label="装备编码"/>
<el-table-column align="center" prop="status" label="装备状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 1" type="success" size="mini">在库</el-tag>
<el-tag v-if="scope.row.status == 2" size="mini">自用</el-tag>
<el-tag v-if="scope.row.status == 3" size="mini">共享</el-tag>
<el-tag v-if="scope.row.status == 4" size="mini" type="danger">退役</el-tag>
<el-tag v-if="scope.row.status == 5" size="mini" type="warning">维修</el-tag>
<el-tag v-if="scope.row.status == 1" type="success" >在库</el-tag>
<el-tag v-if="scope.row.status == 2" >自用</el-tag>
<el-tag v-if="scope.row.status == 3" >共享</el-tag>
<el-tag v-if="scope.row.status == 4" type="danger">退役</el-tag>
<el-tag v-if="scope.row.status == 5" type="warning">维修</el-tag>
</template>
</el-table-column>
<el-table-column align="center" prop="serviceLife" label="使用年限"/>
@ -172,7 +174,7 @@
<el-button
size="mini"
type="text"
icon="el-icon-delete"
style="margin-left: 8px; color: red"
>
下架
@ -851,4 +853,17 @@ export default {
::v-deep .lease-price-error .el-input__inner {
border-color: #f56c6c !important;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
::v-deep .el-tag.el-tag--success{
background-color: rgba(52,226,199,0.1);
color: #34E2C7;
height: 22px;
border: 1px solid #34E2C7;
line-height: 22px;
}
</style>

View File

@ -77,22 +77,7 @@
<span style="font-size: 20px; font-weight: 800">工具上下架列表</span>
</el-col>
<el-col :span="20">
<el-tooltip
placement="top-start"
content="请选择需要下架的工具后再操作"
:disabled.sync="selectedRows.length !== 0"
>
<el-button
size="mini"
type="danger"
class="primary-lease"
@click="handleBatchDown"
style="float: right;margin-right: 10px"
:disabled="selectedRows.length === 0"
>
批量下架
</el-button>
</el-tooltip>
<el-button size="mini" style="float: right;margin-right: 10px" @click="numberTool" type="primary"
class="primary-lease"
>
@ -103,6 +88,23 @@
class="primary-lease"
> 上架编码工具
</el-button>
<el-tooltip
placement="top-start"
content="请选择需要下架的工具后再操作"
:disabled.sync="selectedRows.length !== 0"
>
<el-button
size="mini"
type="danger"
class="primary-lease"
@click="handleBatchDown"
style="float: right;margin-right: 10px;background: #FF5129;"
:disabled="selectedRows.length === 0"
>
批量下架
</el-button>
</el-tooltip>
</el-col>
</el-row>
@ -146,7 +148,6 @@
<el-button
size="mini"
type="text"
icon="el-icon-delete"
style="margin-left: 8px; color: red"
>
下架
@ -227,6 +228,7 @@
class="primary-lease"
@click="handleBatchUpNum"
:disabled="selectedNumberRows.length === 0"
style="background: #FF5129;"
>
批量上架
</el-button>
@ -363,6 +365,7 @@
class="primary-lease"
@click="handleBatchUpCode"
:disabled="selectedCodeRows.length === 0"
style="background: #FF5129;"
>
批量上架
</el-button>
@ -1364,4 +1367,18 @@ export default {
::v-deep .lease-price-error .el-input__inner {
border-color: #f56c6c !important;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
::v-deep .el-tag.el-tag--success{
background-color: rgba(52,226,199,0.1);
color: #34E2C7;
height: 22px;
border: 1px solid #34E2C7;
line-height: 22px;
}
</style>

View File

@ -54,7 +54,6 @@
<el-button
size="small"
type="text"
icon="el-icon-edit"
@click="handleEditAddress(row)"
>
编辑
@ -62,7 +61,6 @@
<el-button
size="small"
type="text"
icon="el-icon-delete"
class="danger-text"
@click="handleDeleteAddress(row.id)"
>
@ -546,7 +544,7 @@ export default {
}
.danger-text {
color: #F56C6C;
color: #FF5129;
&:hover {
color: #f78989;
@ -602,6 +600,23 @@ export default {
//
.dialog-footer {
text-align: center;
text-align: right;
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
::v-deep .el-button--text{
height: 22px;
font-family: Microsoft YaHei, Microsoft YaHei;
font-weight: 400;
font-size: 14px;
color: #2CBAB2;
line-height: 22px;
text-align: left;
font-style: normal;
text-transform: none;
}
</style>

View File

@ -83,7 +83,7 @@
<a
:href="scope.row.bmFileInfoList.length > 0 ? scope.row.bmFileInfoList[0].fileUrl : null"
target="_blank"
style="color: #00a288; text-decoration: underline"
style="color: #2CBAB2; text-decoration: underline"
>查看</a
>
</template>
@ -92,11 +92,11 @@
<el-table-column align="center" prop="updateTime" label="更新时间" />
<el-table-column align="center" label="操作" :width="220">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="onContract(scope.row)">编辑</el-button>
<el-button size="small" type="text" @click="onContract(scope.row)">编辑</el-button>
<el-button
size="mini"
size="small"
type="text"
icon="el-icon-delete"
class="danger-text"
@click="onDelete(scope.row.id)"
v-if="scope.row.status == 0"
>删除</el-button
@ -520,4 +520,29 @@ export default {
}
}
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
::v-deep .el-button--text{
height: 22px;
font-family: Microsoft YaHei, Microsoft YaHei;
font-weight: 400;
font-size: 14px;
color: #2CBAB2;
line-height: 22px;
text-align: left;
font-style: normal;
text-transform: none;
}
.danger-text {
color: #FF5129;
&:hover {
color: #f78989;
}
}
</style>

View File

@ -16,7 +16,7 @@
size="small"
maxlength="50"
v-model="typeName"
prefix-icon="el-icon-search"
suffix-icon="el-icon-search"
placeholder="请输入类型名称"
style="margin-bottom: 20px"
/>
@ -53,7 +53,7 @@
size="small"
maxlength="50"
v-model="typeName_1"
prefix-icon="el-icon-search"
suffix-icon="el-icon-search"
placeholder="请输入类型名称"
style="margin-bottom: 20px"
/>
@ -106,7 +106,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-edit" size="mini" @click="onBatchEditPrice">
<el-button type="warning" plain size="mini" @click="onBatchEditPrice" style="background: rgba(255,171,41,0.1);border: 1px solid #FFAB29;color: #FFAB29;font-weight: 400;">
批量修改租赁价
</el-button>
</el-col>
@ -117,6 +117,7 @@
v-loading="loading"
:data="typeList"
border
stripe
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
@ -496,7 +497,7 @@ export default {
}
}
::v-deep .el-tree .el-tree-node__expand-icon.expanded {
/*::v-deep .el-tree .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
@ -525,14 +526,14 @@ export default {
}
::v-deep .el-tree {
overflow-y: scroll; /* 必须保留scroll而不是auto */
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE/Edge */
overflow-y: scroll; !* 必须保留scroll而不是auto *!
scrollbar-width: none; !* Firefox *!
-ms-overflow-style: none; !* IE/Edge *!
}
::v-deep .el-tree::-webkit-scrollbar {
display: none; /* Chrome/Safari/Opera */
}
display: none; !* Chrome/Safari/Opera *!
}*/
.main-content {
height: 100%;
@ -593,4 +594,22 @@ export default {
transform: translateY(-50%);
}
}
::v-deep.el-button--primary{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
::v-deep .el-tag.el-tag--success{
background-color: rgba(52,226,199,0.1);
color: #34E2C7;
height: 22px;
border: 1px solid #34E2C7;
line-height: 22px;
}
::v-deep .el-checkbox__inner ::after{
background-color: #2CBAB2;
border-color: #2CBAB2;
}
</style>

View File

@ -63,6 +63,7 @@
highlight-current-row
style="width: 100%"
v-loading="isLoading"
border stripe
@selection-change="selectionChange"
>
<el-table-column type="selection" width="45" align="center" :selectable="selectable"/>

View File

@ -62,6 +62,7 @@
highlight-current-row
style="width: 100%"
v-loading="isLoading"
border stripe
@selection-change="selectionChange"
>
<el-table-column type="selection" width="45" align="center" />

View File

@ -48,7 +48,7 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" /> -->
</el-row>
<el-table class="my-table" :data="tableList" highlight-current-row style="width: 100%" v-loading="isLoading">
<el-table border stripe class="my-table" :data="tableList" highlight-current-row style="width: 100%" v-loading="isLoading">
<el-table-column
type="index"
width="55"
@ -239,7 +239,7 @@ export default {
this.recordData = res.data
} catch (error) {
console.log('🚀 ~ error:', error)
}
},
// PDF

View File

@ -109,7 +109,7 @@
</div>
</el-row>
<el-table v-loading="loading" :data="configList" height="546" @selection-change="handleSelectionChange">
<el-table border stripe v-loading="loading" :data="configList" height="546" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="参数主键" align="center" prop="configId" />
<el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
@ -147,7 +147,7 @@
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"

View File

@ -46,6 +46,7 @@
row-key="id"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
border
stripe
style="width: 100%">
<el-table-column type="index" width="50" align="center">
<template slot-scope="scope">
@ -146,6 +147,7 @@
row-key="id"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
border
stripe
style="width: 100%">
<el-table-column type="index" width="50" align="center">
<template slot-scope="scope">
@ -813,11 +815,11 @@
}
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -827,7 +829,7 @@
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
}
// ========== ==========
.org-container {

View File

@ -65,7 +65,7 @@
<div class="action-bar">
<el-col :span="1.5">
<el-button
type="primary"
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
@ -119,7 +119,7 @@
</el-col>
</el-row>
<el-table v-loading="loading" :data="typeList" class="my-table" @selection-change="handleSelectionChange">
<el-table border stripe v-loading="loading" :data="typeList" class="my-table" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="dictId" />
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
@ -143,12 +143,12 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
<el-button
type="text" style="color: #2CBAB2;"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
<el-button
type="text" style="color: #FF5129;"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
@ -370,7 +370,7 @@ export default {
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
::v-deep.el-tag.el-tag--info {
background-color: #F5F5F5;
border-color: #B3B3B3;
@ -385,14 +385,14 @@ export default {
background-color: rgba(52,226,199,0.1);
border-color: #34E2C7;
color: #34E2C7;
}
}
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -402,7 +402,7 @@ export default {
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
}
/* 新增:统一的操作栏容器样式,用于将所有按钮和工具栏放在右侧 */
.action-bar {
display: flex;

View File

@ -115,6 +115,7 @@
v-loading="listLoading"
:data="list"
border
stripe
fit
highlight-current-row
style="width: 100%"
@ -308,7 +309,7 @@ export default {
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
::v-deep.el-tag.el-tag--info {
background-color: #F5F5F5;
border-color: #B3B3B3;
@ -323,5 +324,5 @@ export default {
background-color: rgba(52,226,199,0.1);
border-color: #34E2C7;
color: #34E2C7;
}
}
</style>

View File

@ -39,7 +39,7 @@
<div class="action-bar">
<el-col :span="1.5">
<el-button
type="primary"
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
@ -63,6 +63,7 @@
v-if="refreshTable"
v-loading="loading"
:data="menuList"
border stripe
row-key="menuId"
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@ -89,17 +90,17 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="60" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
<el-button
type="text" style="color: #24B1B7;"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:menu:edit']"
>修改</el-button>
<el-button
<el-button
type="text" style="color: #24B1B7;"
@click="handleAdd(scope.row)"
v-hasPermi="['system:menu:add']"
>新增</el-button>
<el-button
<el-button
type="text" style="color: #FF5129;"
@click="handleDelete(scope.row)"
v-hasPermi="['system:menu:remove']"
@ -525,7 +526,7 @@ export default {
flex-direction: column;
}
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>
.app-container{
background: #F0F0F0;
}
@ -536,7 +537,7 @@ export default {
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
::v-deep.el-tag.el-tag--info {
background-color: #F5F5F5;
border-color: #B3B3B3;
@ -551,14 +552,14 @@ export default {
background-color: rgba(52,226,199,0.1);
border-color: #34E2C7;
color: #34E2C7;
}
}
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -568,5 +569,5 @@ export default {
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
</style>
}
</style>

View File

@ -3,7 +3,7 @@
<!-- 查询条件卡片 -->
<div class="card-container">
<div style="display: flex;align-items: center;padding: 10px 20px;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
<span style="font-size: 20px; font-weight: 800;margin-right: 48px;">角色管理</span>
<span style="font-size: 20px; font-weight: 800;margin-right: 48px;">角色管理</span>
</div>
<div class="card-header query-header">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" v-show="showSearch" class="query-form">
@ -79,7 +79,7 @@
<el-button
type="success"
icon="el-icon-edit"
size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
@ -97,7 +97,7 @@
<el-button
type="warning"
icon="el-icon-download"
size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
size="mini" style="background: rgba(44,186,178,0.2);color: #2CBAB2;border-color: rgba(44,186,178,0.2);"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出
@ -110,7 +110,7 @@
</el-row>
</div>
<el-table v-loading="loading" :data="roleList" class="my-table" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
<el-table border stripe v-loading="loading" :data="roleList" class="my-table" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
<el-table-column type="selection" min-width="55" align="center"/>
<el-table-column label="角色编号" prop="roleId" min-width="120" align="center"/>
<el-table-column label="角色名称" align="center" prop="roleName" :show-overflow-tooltip="true" min-width="150"/>
@ -164,13 +164,13 @@
</el-dropdown>
</template>
</el-table-column>
</el-table>
<pagination
</el-table>
<pagination
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
/>
</div>
@ -227,7 +227,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" size="mini"> </el-button>
<el-button type="primary" @click="submitForm" size="mini"> </el-button>
<el-button type="primary" @click="submitForm" size="mini"> </el-button>
</div>
</el-dialog>
</div>
@ -665,7 +665,7 @@ export default {
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
.button-group {
margin-left: auto; /* 自动填充左侧空间,使按钮靠右 */
@ -673,11 +673,11 @@ export default {
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -687,7 +687,7 @@ export default {
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
}
.card-container {
background-color: #fff;

View File

@ -25,9 +25,9 @@
<el-col :span="19" :xs="24">
<div class="card-container">
<div style="display: flex;align-items: center;padding: 10px 20px;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
<span style="font-size: 20px; font-weight: 800;margin-right: 48px;">用户管理</span>
<span style="font-size: 20px; font-weight: 800;margin-right: 48px;">用户管理</span>
</div>
<div class="card-header query-header">
<div class="card-header query-header">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
class="query-form" label-width="120px"
>
@ -75,7 +75,7 @@
<span style="font-size: 20px; font-weight: 800;margin-right: 48px;">用户管理列表</span>
<span style="font-size: 16px;color: #808080;">{{total}}条记录</span>
</el-col>
<el-col :span="18" style="display: flex; justify-content: flex-end">
<el-col :span="18" style="display: flex; justify-content: flex-end">
<div class="action-bar">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" style="background: #2CBAB2;" size="mini" @click="handleAdd"
@ -111,11 +111,11 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</div>
</el-col>
</el-col>
</el-row>
</div>
<el-table v-loading="loading" :data="userList" class="my-table" @selection-change="handleSelectionChange"
<el-table v-loading="loading" :data="userList" border stripe class="my-table" @selection-change="handleSelectionChange"
:selectable="checkSelectable" :row-class-name="getRowClassName">
<el-table-column type="selection" width="50" align="center"/>
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
@ -210,18 +210,18 @@
<!-- 添加或修改用户配置对话框 -->
<div class="container-box">
<el-dialog :title="title" :visible.sync="open" width="600px" custom-class="import-dialog" top="0px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
</el-form-item>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
</el-form-item>
</el-form-item>
<el-form-item label="组织机构" prop="deptId">
<treeselect v-model="form.deptId" :searchable="false" :disable-branch-nodes="false" :options="deptOptions"
:show-count="true" placeholder="请选择归属组织机构" @input="handleDeptChange"
/>
</el-form-item>
</el-form-item>
<el-form-item label="归属部门">
<treeselect
v-model="form.orgId"
@ -232,22 +232,22 @@
no-options-text="暂无数据"
no-results-text="未找到匹配数据"
/>
</el-form-item>
</el-form-item>
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
</el-form-item>
</el-form-item>
<el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
<el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
show-password
/>
</el-form-item>
</el-form-item>
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
@ -255,14 +255,14 @@
}}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
:disabled="item.status == 1"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="角色" prop="roleIds">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-option
@ -273,14 +273,14 @@
:disabled="item.status == 1 || item.roleId === 1"
></el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="登录权限" prop="loginTypeArr">
<el-checkbox-group v-model="loginTypeArr">
<el-checkbox v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form-item>
<!-- <el-form-item label="账号时效" prop="isPermanent">
<el-radio-group v-model="form.isPermanent">
<el-radio v-for="dict in dict.type.sys_user_permanent" :key="dict.value" :label="dict.value">
@ -905,14 +905,14 @@
}
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>
.container-box{
//
::v-deep .el-dialog.import-dialog{
position: fixed;
::v-deep .el-dialog.import-dialog{
position: fixed;
right: -70%;
height: 100vh;
}
//
::v-deep .el-dialog__body{
@ -922,7 +922,7 @@
::v-deep.el-dialog__header{
border-bottom: 1px solid #F0F0F0;
}
}
}
</style>
<style scoped>
@ -936,8 +936,8 @@
::v-deep.el-button--danger{
background-color: #FF5129;
border-color: #FF5129;
}
}
.button-group {
margin-left: auto; /* 自动填充左侧空间,使按钮靠右 */
}