修改细节的样式

This commit is contained in:
zhoulingpo
2023-04-18 15:51:26 +08:00
parent 7b246400da
commit 3d7c55acca
5 changed files with 52 additions and 22 deletions
+2 -2
View File
@@ -17,7 +17,7 @@
margin-top: 25px;
width:100%;
padding: 10px 30px;
border: 1px dotted #ccc;
border: 1px solid rgb(242,242,242);
}
.base_title{
display: inline-block;
@@ -38,7 +38,7 @@
color:#555 !important;
}
.el-form-item.el-input__inner,.el-form-item {
height: 40px;
line-height: 40px;
font-size: 15px;
}
+33 -11
View File
@@ -15,22 +15,28 @@
:model="searchForm"
inline
class="label-input-form"
label-width="55px"
label-width="100px"
@keyup.enter.native="handleSearch">
<el-row :gutter="24">
<el-col :xl="6" :lg="8">
<el-form-item label="名" class="search-item">
<el-form-item label="用户名" class="search-item">
<!-- <el-input-->
<!-- v-model="searchForm.uname"-->
<!-- placeholder="根据姓名查询"-->
<!-- clearable></el-input>-->
<el-input :placeholder="'根据姓名查询'" class="search-item" v-model="searchForm.uname"/>
<el-input :placeholder="'请输入用户名'" class="search-item" v-model="searchForm.account"/>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="8">
<el-form-item label="工号" class="search-item">
<el-input :placeholder="'根据工号查询'" class="search-item" v-model="searchForm.workNum"/>
<el-form-item label="角色名" class="search-item">
<!-- <el-input :placeholder="'根据角色名查询'" class="search-item" v-model="searchForm.roleName"/>-->
<el-select v-model="searchForm.roleName" class="icon-auth" placeholder="请选择角色名">
<el-option label="全部" value=""></el-option>
<template v-for="item in roleList">
<el-option :label="item.rname" :value="item.rname" :key="item.rid"></el-option>
</template>
</el-select>
</el-form-item>
</el-col>
<el-col :xl="6" :lg="24">
@@ -85,7 +91,7 @@
</el-table-column>
<!-- v-if="workNumFlag"-->
<el-table-column
label="工号"
label="用户名"
width="120"
prop="ACCOUNT"
align="center"
@@ -98,6 +104,12 @@
align="center"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="ROLENAME"
label="角色"
align="center"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="EMAIL"
label="邮箱"
@@ -122,7 +134,7 @@
label="部门"
align="center"
show-overflow-tooltip>
<template #default="{ row }">{{ row.departmentName || row.DEPATMENT || row.orgName }}
<template #default="{ row }">{{ row.departmentName || row.DEPARTMENT || row.orgName }}
</template>
</el-table-column>
@@ -315,6 +327,7 @@ export default {
},
data () {
return {
roleList: [],
activeName: 'first',
menuTreeLoading: false,
zNodesTree: [],
@@ -326,7 +339,9 @@ export default {
orgId: '',
orgName: '',
USNAME: '',
uname: ''
uname: '',
roleName: '',
account: ''
},
tableData: [],
tableChecked: null,
@@ -346,7 +361,6 @@ export default {
treeCheckNode: [],
checkedName: '',
zNodesRole: [],
roleList: [],
repeatFlag: false,
isShowOrg: true
}
@@ -460,7 +474,9 @@ export default {
orgId: '',
orgName: '',
USNAME: '',
uname: ''
uname: '',
account: '',
roleName: ''
}
this.getRoleAndUserByOrgIdPage()
},
@@ -681,7 +697,12 @@ export default {
handleMouseLeave () {
this.visibleOrgClearBtn = false
},
// 角色列表
getSysRole () {
this.$api.role.getSysRole().then(({ data }) => {
this.roleList = data
})
},
handleCleanChecked () {
this.$confirm('您是否确定移除全部已选中', '确定移除', {
confirmButtonText: '确定',
@@ -784,6 +805,7 @@ export default {
},
mounted () {
this.isVisible = this.visible
this.getSysRole()
if (!this.dialogModel) {
this.checkedName = this.config.valueName || ''
if (this.config.value !== '') {
+14 -6
View File
@@ -51,7 +51,7 @@
class="common-button-primary"
@click="handleTransfer"
:loading="TransferLoading"
v-if="showTransfer"
v-if="showTransfer" round
>转办</el-button>
<el-button
type="primary"
@@ -59,25 +59,25 @@
class="common-button-primary"
@click="handleSave"
:loading="saveLoading"
v-if="showSave">
v-if="showSave" round>
保存
</el-button>
<el-button
type="primary"
size="large"
class="common-button-primary"
class="common-button-primary resetColor"
@click="handleReset"
:loading="resetLoading"
v-if="showReset">
v-if="showReset" round>
重置
</el-button>
<el-button
type="primary"
size="large"
class="common-button-primary"
class="common-button-primary submitColor"
@click="handleSubmit"
:loading="submitLoading"
v-if="showSubmit"
v-if="showSubmit" round
>{{ submitBTNTextShow }}</el-button>
</div>
<!-- <el-button-->
@@ -391,4 +391,12 @@ export default {
box-shadow: 0 -1px 2px 0px #e8e8e8;
}
}
.resetColor{
background-color:#02a7f0 ;
border: none;
}
.submitColor{
background-color:#8400ff;
border: none;
}
</style>
@@ -1,7 +1,7 @@
<template>
<div class="reportTable">
<el-button v-if="!disabled" class="addbtn" size="big" @click="addReport">添加报告</el-button>
<el-button v-if="!disabled" class="delbtn" size="big" @click="deleteAll">批量删除</el-button>
<el-button v-if="!disabled" class="addbtn" size="small" @click="addReport">添加报告</el-button>
<el-button v-if="!disabled" class="delbtn" size="small" @click="deleteAll">批量删除</el-button>
<div class="table">
<vxe-table :data="processTable" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="500"
ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
+1 -1
View File
@@ -75,7 +75,7 @@
<el-row>
<el-col :span="24" >
<el-form-item label="说明:">
<el-input type="textarea" v-model="assignForm.remark"></el-input>
<el-input type="textarea" v-model="assignForm.remark" placeholder="请输入说明"></el-input>
</el-form-item>
</el-col>
</el-row>