From 3d14449abab5055e2f370be4fa1a31c15c715453 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 24 六月 2022 10:05:51 +0800
Subject: [PATCH] 1.修改部分页面样式
---
src/views/jcsz/jsqd.vue | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 4580a21..9c8fe83 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div style="height: 50px;">
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -9,15 +9,15 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
- <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
- <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊绫诲瀷" style=" display: flex;">
- <el-select v-model="form.RoleTypeCode" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.RoleTypeCode" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -27,7 +27,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;">
@@ -36,22 +36,25 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex; z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
- highlight-current-row
+ stripe
:style="{width: 100+'%',height:tableHeight+'px'}"
+ highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
@@ -91,6 +94,7 @@
prop="lm_date"
label="鍒涘缓鏃堕棿"
sortable="custom"
+ show-overflow-tooltip
/>
<el-table-column
prop="lm_date"
@@ -156,6 +160,7 @@
<el-form-item prop="RoleTypeCode" label="瑙掕壊绫诲瀷">
<el-select
v-model="dialogForm.RoleTypeCode"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
>
@@ -185,7 +190,6 @@
width="50%"
top="15vh"
class="settingDialogVisible"
- @closed="handleCloseSetting"
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
@@ -208,7 +212,7 @@
<el-table-column
width="50"
label="搴忓彿"
- type="index"
+ prop="RowNum"
/>
<el-table-column
prop="roletype_code"
@@ -230,7 +234,7 @@
<div v-else> {{ row.roletype_name }}</div>
</template>
</el-table-column>
- <el-table-column>
+ <el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
@@ -294,6 +298,7 @@
<el-cascader
ref="dialogCascaderUser"
key="cascaderKey"
+ filterable
:options="StuOrgArr"
:props="defaultProps"
class="userDialogVisibleInput"
@@ -305,6 +310,7 @@
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
v-model="dialogFormUser.isrole"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
class="userDialogVisibleInput"
@@ -488,7 +494,7 @@
DeleteRole, RoleAssociationRight,
RoleAssociationUser,
RoleSearch, RoleTypeAdd,
- RoleTypeDelete, RoleTypeSearch, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
+ RoleTypeDelete, RoleTypeSearch, RoleTypeSelect, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
@@ -529,7 +535,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
RoleTypeCodeArr: [], // 瑙掕壊绫诲瀷缂栫爜鏁扮粍
@@ -641,13 +647,7 @@
})
},
async getRoleTypeSearch2() { // 鎼滅储灞曠ず鐨勫唴瀹�
- const data = {
- page: 1,
- rows: 1000000,
- prop: 'roletype_code',
- order: 'desc'
- }
- const res = await RoleTypeSearch(data)
+ const res = await RoleTypeSelect()
this.RoleTypeCodeArr2 = res.data
},
settingButton() {
@@ -765,13 +765,12 @@
AddUpdateRole(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
this.getRoleSearch()
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
})
-
- this.dialogVisible = false
}
})
},
@@ -790,6 +789,7 @@
this.RoleTypeCodeArr.splice(index, 1)
}
})
+ this.getRoleTypeSearch2()
},
// 璁剧疆瀵硅瘽妗嗗彇娑堜簨浠�
settingDialogVisibleCancel() {
@@ -841,7 +841,7 @@
// 璁剧疆琛ㄥ崟鍙栨秷浜嬩欢
formSettingCancel(row) {
this.RoleTypeCodeArr.forEach((item, index) => {
- if (item.isVisible === 1) {
+ if (item.isVisible === 1 && item.roletype_code === row.roletype_code) {
this.RoleTypeCodeArr.splice(index, 1)
}
})
@@ -975,7 +975,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 1)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
// 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
@@ -986,7 +986,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 1)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
}
// 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
@@ -1000,7 +1000,7 @@
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 1)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
this.dialogFormRight.rightOperationArr.push({
@@ -1043,8 +1043,12 @@
}
})
this.$nextTick(() => {
- this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
- this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+ if (this.$refs.rightPCRef) {
+ this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
+ }
+ if (this.$refs.rightAPPRef) {
+ this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+ }
})
},
// 鍒嗛厤鏉冮檺鍏抽棴浜嬩欢
@@ -1054,15 +1058,19 @@
this.dialogFormRight.rightAPPArr = []
this.dialogFormRight.rightAPPArrSelected = []
this.dialogFormRight.rightOperationArr = []
- this.$refs.rightPCRef.setCheckedKeys([])
- this.$refs.rightAPPRef.setCheckedKeys([])
+ if (this.$refs.rightPCRef) {
+ this.$refs.rightPCRef.setCheckedKeys([])
+ }
+ if (this.$refs.rightAPPRef) {
+ this.$refs.rightAPPRef.setCheckedKeys([])
+ }
},
// 鏉冮檺瀵硅瘽妗嗗彇娑堜簨浠�
rightDialogVisibleCancel() {
this.dialogVisibleRight = false
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
- async rightDialogVisibleConfirm() {
+ async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
@@ -1071,7 +1079,7 @@
const children = []
let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
item.children.forEach(it => {
- if (this.dialogFormRight.rightPCArrSelected.includes(it.code)) {
+ if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
flag = true
children.push(
{ code: it.code, name: it.name, flag: 'Y' }
@@ -1090,7 +1098,7 @@
const children = []
let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
item.children.forEach(it => {
- if (this.dialogFormRight.rightAPPArrSelected.includes(it.code)) {
+ if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
flag = true
children.push(
{ code: it.code, name: it.name, flag: 'Y' }
@@ -1269,17 +1277,25 @@
height: 30px;
display: flex;
align-items: center;
+ border: 1px solid $main_color;
+ padding: 0 20px;
}
-::v-deep .el-button--info {
+::v-deep .el-button--info{
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -1292,6 +1308,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1393,7 +1410,8 @@
}
::v-deep .el-input__inner {
- height: 30px
+ height: 30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -1454,4 +1472,12 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+::v-deep .el-form-item{
+ margin-bottom: 0;
+}
</style>
--
Gitblit v1.9.3