bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ma-mall-ui' into ma-mall-ui

This commit is contained in:
jiang 2025-10-29 18:07:36 +08:00
parent ecc9e0ed5f be225d4015
commit 42333b5386
5 changed files with 2126 additions and 2039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/EquipmentEntryApply/EquipmentDetailList.vue
View File

@ -551,6 +551,9 @@ export default {
&.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell { &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
background-color: #CCF1E9 !important; background-color: #CCF1E9 !important;
} }
.el-table__body tr.hover-row > td.el-table__cell {
background-color: #ccf1e9 !important;
}
} }
} }

8
src/views/EquipmentEntryApply/equipmentInput/index.vue
View File

@ -147,11 +147,11 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button icon="el-icon-search" type="primary" @click="queryTableList"> <el-button icon="el-icon-search" type="primary" @click="queryTableList" size="mini">
查询 查询
</el-button> </el-button>
<el-button icon="el-icon-refresh" <el-button icon="el-icon-refresh"
@click="resetTableList" @click="resetTableList" size="mini"
> >
重置 重置
</el-button> </el-button>
@ -165,6 +165,7 @@
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button <el-button
type="primary" type="primary"
size="mini"
@click="equipmentDeployment" @click="equipmentDeployment"
v-show="!isAddVisible" v-show="!isAddVisible"
> >
@ -744,6 +745,9 @@ export default {
&.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell { &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
background-color: #CCF1E9 !important; background-color: #CCF1E9 !important;
} }
.el-table__body tr.hover-row > td.el-table__cell {
background-color: #ccf1e9 !important;
}
} }
} }
</style> </style>

8
src/views/EquipmentEntryApproval/EquipmentDetailList.vue
View File

@ -131,10 +131,10 @@
<el-col :span="18" style="text-align: right;"> <el-col :span="18" style="text-align: right;">
<el-button class="primary-lease" type="primary" icon="el-icon-search" @click="getEquipmentApplyList"> <el-button class="primary-lease" size="mini" type="primary" icon="el-icon-search" @click="getEquipmentApplyList">
查询 查询
</el-button> </el-button>
<el-button class="primary-lease" icon="el-icon-refresh" @click="resetForm"> <el-button class="primary-lease" size="mini" icon="el-icon-refresh" @click="resetForm">
重置 重置
</el-button> </el-button>
</el-col> </el-col>
@ -145,6 +145,7 @@
<el-row> <el-row>
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button <el-button
size="mini"
class="primary-lease" class="primary-lease"
type="primary" type="primary"
@click="showDetails('0')" @click="showDetails('0')"
@ -645,6 +646,9 @@ export default {
&.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell { &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
background-color: #CCF1E9 !important; background-color: #CCF1E9 !important;
} }
.el-table__body tr.hover-row > td.el-table__cell {
background-color: #ccf1e9 !important;
}
} }
} }
</style> </style>

6
src/views/EquipmentEntryApproval/EquipmentMainList.vue
View File

@ -37,9 +37,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" style="text-align:right;"> <el-col :span="12" style="text-align:right;">
<el-button icon="el-icon-search" class="primary-lease" type="primary" @click="getEquipmentApplyList"> <el-button icon="el-icon-search" size="mini" class="primary-lease" type="primary" @click="getEquipmentApplyList">
查询</el-button> 查询</el-button>
<el-button icon="el-icon-refresh" class="primary-lease" @click="resetForm"> <el-button icon="el-icon-refresh" size="mini" class="primary-lease" @click="resetForm">
重置</el-button> 重置</el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -48,7 +48,7 @@
<el-card class="content-box"> <el-card class="content-box">
<el-row> <el-row>
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button class="primary-lease" type="primary" @click="showDetails('1')">展开明细</el-button> <el-button class="primary-lease" size="mini" type="primary" @click="showDetails('1')">展开明细</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData" border stripe height="100%"> <el-table :data="tableData" border stripe height="100%">

4140
src/views/EquipmentTypeConfig/index.vue
View File

File diff suppressed because it is too large Load Diff