From ef9633e0d1689fd8869170f3aa0af6c90c2e5e7f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 九月 2022 16:18:24 +0800
Subject: [PATCH] 1.优化项目2.搜索栏多行的变为一行可展开
---
src/views/jcsz/yhqd.vue | 411 ++++++++++++++++++++++++++--------------------------------
1 files changed, 185 insertions(+), 226 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index db4f7be..4022e6e 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,7 +1,17 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+
+ <div style="display: flex">
+ <el-button icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -61,29 +71,23 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
+ <div style="display: flex;align-items: flex-start;margin-top: 3px">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
</div>
- <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-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
- </div>
- <el-divider />
+
<div class="elTableDiv">
<el-table
:data="tableData"
- border
- stripe
:height="tableHeight+'px'"
highlight-current-row
:style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
+ :row-class-name="tableRowClassName"
:cell-style="this.$cellStyle"
+ border
@sort-change="sortChange"
>
<!-- <el-table-column-->
@@ -119,13 +123,23 @@
label="鎵�灞炵粍缁�"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.org_name">{{ row.org_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
min-width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.group_name">{{ row.group_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
@@ -166,8 +180,14 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'">鍦ㄨ亴</div>
- <div v-if="row.enable==='N'">绂昏亴</div>
+ <div v-if="row.enable==='Y'">
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ 鍦ㄨ亴
+ </div>
+ <div v-if="row.enable==='N'">
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ 绂昏亴
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -189,17 +209,27 @@
>
<template slot-scope="{row}">
<i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
- <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
+ <i
+ v-if="row.is_role==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="roleClick({row})"
+ />
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row.id)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -207,12 +237,11 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total ,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getUserSearch"
/>
@@ -318,8 +347,8 @@
title="鍏宠仈瑙掕壊"
:visible.sync="dialogVisibleRoles"
width="800px"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'3vh':'15vh'"
+ :fullscreen="isIpad"
:close-on-click-modal="false"
class="dialogVisibleRoles"
@closed="handleCloseRoles"
@@ -392,17 +421,24 @@
class="workingDialogVisible"
@close="handleCloseWorking"
>
+ <!-- <div style="margin-bottom: 10px; padding: 10px 0; background-color: #f8f8fa; display: flex">-->
+ <!-- <el-button style="margin-left: 10px;" type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>-->
+ <!-- <!– <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>–>-->
+ <!-- </div>-->
+
<div style="margin-bottom: 20px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>
<!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
+ ref="workingTableData"
:data="workingTableData"
border
- height="300"
+ height="377"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :row-class-name="tableRowClassName"
@sort-change="sortChangeOfWorking"
>
<!-- :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
@@ -422,7 +458,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />
+ <el-input v-if="row.isVisible===1" v-model="row.group_code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
<div v-else> {{ row.group_code }}</div>
</template>
</el-table-column>
@@ -458,12 +494,12 @@
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="workingTableDataLength>0"
:total="workingTableDataLength"
:page.sync="formWorking.page"
:limit.sync="formWorking.rows"
align="right"
- layout="prev, pager, next,sizes"
+ style="margin-top: 10px"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getUserGroupSearch"
/>
@@ -476,7 +512,7 @@
</el-dialog>
<!--瀵煎叆缁勪欢-->
- <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+ <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
</div>
</template>
@@ -498,27 +534,15 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
-import clearAllChildren from '@/utils/global'
+import clearAllChildren, { validateCode } from '@/utils/global'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'YYQD',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
const validateMobile = (rule, value, callback) => {
if (!value) {
callback()
@@ -548,9 +572,8 @@
}
}
}
-
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -583,7 +606,7 @@
id: '',
UserCode: '',
UserName: '',
- Password: '',
+ Password: '123456',
Enable: 'Y',
StuOrg: '',
Mobile: '',
@@ -591,7 +614,7 @@
groupcode: '',
Operator: '',
OperType: '',
- wagetype: ''
+ wagetype: '2'
},
usergroupArr: [], // 鐢熶骇鐝粍鏁扮粍
wagetypeArr: [
@@ -601,7 +624,7 @@
operation: '',
dialogFormRules: {
UserCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
UserName: [
{ required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�', trigger: ['blur', 'change'] }
@@ -786,6 +809,9 @@
DeleteUser({ Userid: id }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getUserSearch()
}
})
@@ -798,14 +824,14 @@
this.dialogForm.UserCode = ''
this.dialogForm.UserCode = ''
this.dialogForm.UserName = ''
- this.dialogForm.Password = ''
+ this.dialogForm.Password = '123456'
this.dialogForm.Enable = 'Y'
this.$refs.dialogCascader.checkedValue = ''
this.dialogForm.StuOrg = ''
this.dialogForm.Mobile = ''
this.dialogForm.Email = ''
this.dialogForm.groupcode = ''
- this.dialogForm.wagetype = ''
+ this.dialogForm.wagetype = '2'
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -845,15 +871,14 @@
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
- console.log(window.innerHeight)
- console.log(window.innerWidth)
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (window.innerHeight < 800) {
- this.tableHeight = this.tableHeight - 50
+ // this.mainHeight = window.innerHeight - 250
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 40
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
@@ -1146,6 +1171,10 @@
workingTramClick() {
this.workingDialogVisible = true
this.getUserGroupSearch()
+ // 椤甸潰鍔犺浇瀹屽悗閲嶆柊娓叉煋琛ㄦ牸
+ this.$nextTick(() => {
+ this.$refs.workingTableData.doLayout()
+ })
},
// 鐢熶骇鐝粍瀵硅瘽妗嗗叧闂簨浠�
handleCloseWorking() {
@@ -1195,6 +1224,9 @@
UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
+ this.formWorking.page--
+ }
this.getUserGroupSearch()
}
})
@@ -1235,145 +1267,23 @@
// 鐢熶骇鐝粍杩斿洖鎸夐挳
WorkingDialogVisibleCancel() {
this.workingDialogVisible = false
+ },
+ tableRowClassName({ row, rowIndex }) {
+ // console.log(row, rowIndex, 12)
+ // if (rowIndex === 1) {
+ // return 'warning-row'
+ // } else if (rowIndex === 3) {
+ // return 'success-row'
+ // }
+ return 'custom-row'
}
+
}
}
</script>
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::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 {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-.workingDialogVisible ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
-}
.dialogVisibleRoles {
.myCheckboxGroup {
@@ -1429,6 +1339,92 @@
}
}
+.workingDialogVisible ::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+</style>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+
+::v-deep .el-button--text{
+ font-size: 14px ;
+ cursor: pointer ;
+}
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
@@ -1439,47 +1435,10 @@
margin-bottom: 0;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: #42b983 !important;
-}
-
-//::v-deep .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
-// border-color: #42b983 !important;
-//}
</style>
-<style lang="scss">
-.elCascader {
- //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
- // color: #42b983 ;
- //}
- .el-cascader-node.is-selectable.in-checked-path {
- color: #42b983;
- }
+<style>
- .el-radio__input.is-checked .el-radio__inner {
- background-color: #42b983;
- border-color: #42b983;
- }
-
- .el-radio__input.is-checked .el-radio__inner:hover {
- border-color: #42b983;
- }
-
- .el-input__inner {
- border-color: #42b983 !important;
- }
-
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
--
Gitblit v1.9.3