From 6379e064d1bd765981439c8a31d100c45eb31c2b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 23 六月 2022 10:16:16 +0800
Subject: [PATCH] 1.处理浏览器兼容问题
---
src/views/jcsz/jsqd.vue | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0eaa63c..3feb640 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;">
- <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">-->
+ <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">-->
+ <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
<div>
<el-form
ref="form"
@@ -10,7 +10,7 @@
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-form-item>
@@ -18,7 +18,7 @@
<el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
</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: calc(100%-30px)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -47,12 +47,12 @@
<el-table
:data="tableData"
border
+ :style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- :style="{width: 100+'%',height:tableHeight+'px'}"-->
<!-- <el-table-column-->
<!-- type="selection"-->
@@ -159,6 +159,7 @@
<el-form-item prop="RoleTypeCode" label="瑙掕壊绫诲瀷">
<el-select
v-model="dialogForm.RoleTypeCode"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
>
@@ -233,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">
@@ -297,6 +298,7 @@
<el-cascader
ref="dialogCascaderUser"
key="cascaderKey"
+ filterable
:options="StuOrgArr"
:props="defaultProps"
class="userDialogVisibleInput"
@@ -308,6 +310,7 @@
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
v-model="dialogFormUser.isrole"
+ filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
class="userDialogVisibleInput"
@@ -491,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'
@@ -532,7 +535,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
RoleTypeCodeArr: [], // 瑙掕壊绫诲瀷缂栫爜鏁扮粍
@@ -644,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() {
@@ -1072,7 +1069,7 @@
this.dialogVisibleRight = false
},
// 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
- async rightDialogVisibleConfirm() {
+ async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
@@ -1279,17 +1276,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 {
@@ -1302,6 +1307,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -1404,7 +1410,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -1465,4 +1471,11 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 85%;
+ flex-wrap: wrap;
+}
</style>
--
Gitblit v1.9.3