From 68eaf315b64145e487d10e66183d542ee7f94d10 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 05 七月 2022 17:35:33 +0800
Subject: [PATCH] 1.生产管理完成部分功能2.自定义页面打印、二维码图形、水印显示实现了一个demo
---
src/views/jcsz/yhqd.vue | 225 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 148 insertions(+), 77 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 7df3eca..3763d4f 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.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,24 +9,27 @@
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.UserCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
- <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�" style=" display: flex;">
<el-cascader
ref="cascader"
+ filterable
+ popper-class="elCascader"
:options="StuOrgArr"
:props="defaultProps"
@change="cascaderChange"
/>
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
- <el-select v-model="form.wagetype" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
+
v-for="item in wagetypeArr"
:key="item.value"
:label="item.label"
@@ -35,7 +38,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select v-model="form.Enable" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in EnableArr"
:key="item.value"
@@ -51,15 +54,18 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <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-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
+ stripe
+ :height="tableHeight"
highlight-current-row
:style="{width: 100+'%',height:tableHeight+'px'}"
:header-cell-style="this.$headerCellStyle"
@@ -149,7 +155,7 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
</div>
</template>
@@ -169,29 +175,32 @@
/>
</div>
- <!-- 鐢ㄦ埛娓呭崟鏂板銆佷慨鏀�-->
+ <!-- 鐢ㄦ埛娓呭崟鏂板銆佺紪杈�-->
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="65%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜" prop="UserCode">
- <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="UserName">
- <el-input v-model="dialogForm.UserName" style="width: 220px" />
+ <el-input v-model="dialogForm.UserName" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛瀵嗙爜" prop="Password">
- <el-input v-model="dialogForm.Password" style="width: 220px" />
+ <el-input v-model="dialogForm.Password" style="width: 200px" />
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
<el-select
v-model="dialogForm.Enable"
- style="width: 220px"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -202,37 +211,40 @@
/>
</el-select>
</el-form-item>
- <div style="display: flex">
- <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex">
- <el-cascader
- ref="dialogCascader"
- key="cascaderKey"
- :options="StuOrgArr"
- :props="defaultProps"
- style="width: 220px;"
- @change="dialogCascaderChange"
+ <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex;float: left">
+ <el-cascader
+ ref="dialogCascader"
+ key="cascaderKey"
+ filterable
+ popper-class="elCascader"
+ :options="StuOrgArr"
+ :props="defaultProps"
+ style="width: 200px;"
+ @change="dialogCascaderChange"
+ />
+ </el-form-item>
+ <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
+ <el-select
+ v-model="dialogForm.wagetype"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wagetypeArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
- </el-form-item>
- <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
- <el-select
- v-model="dialogForm.wagetype"
- style="width: 220px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wagetypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </div>
+ </el-select>
+ </el-form-item>
+
<el-form-item label="鑱旂郴鏂瑰紡">
- <el-input v-model="dialogForm.Mobile" style="width: 220px" />
+ <el-input v-model="dialogForm.Mobile" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢靛瓙閭">
- <el-input v-model="dialogForm.Email" style="width: 220px" />
+ <el-input v-model="dialogForm.Email" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -247,8 +259,10 @@
<el-dialog
title="鍏宠仈瑙掕壊"
:visible.sync="dialogVisibleRoles"
- width="50%"
+ width="65%"
top="15vh"
+ :fullscreen="isFullscreen"
+ :close-on-click-modal="false"
class="dialogVisibleRoles"
@closed="handleCloseRoles"
@close="handleCloseRoles"
@@ -295,6 +309,7 @@
show-checkbox
node-key="code"
default-expand-all
+ style="height: 300px"
:props="defaultPropsOfRoleTree"
@check="checkBoxClick"
/>
@@ -341,6 +356,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -352,7 +368,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
StuOrgArr: [], // 鎵�灞炵粍缁囨暟缁�
defaultProps: {
@@ -382,8 +398,8 @@
wagetype: ''
},
wagetypeArr: [
- { value: '1', label: '璁′欢鍒�' },
- { value: '2', label: '璁℃椂鍒�' }
+ { value: '2', label: '璁′欢鍒�' },
+ { value: '1', label: '璁℃椂鍒�' }
],
operation: '',
dialogFormRules: {
@@ -562,20 +578,26 @@
AddUpdateUser(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
this.getUserSearch()
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
- this.dialogVisible = false
})
}
})
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
+ console.log(window.innerHeight)
+ console.log(window.innerWidth)
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.isFullscreen = window.innerHeight < 800
+ if (window.innerHeight < 800) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
@@ -732,12 +754,12 @@
this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
if (it.Code === checkedFatherCode) {
console.log(it.Code, 9)
- console.log(this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 7)
+ this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
}
})
this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
if (i === checkedFatherCode) {
- console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
+ this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
}
})
}
@@ -772,7 +794,7 @@
} else { // 褰撶埗绫荤敱鍗婂彾鍙樹负鍏ㄥ彾鏃�
this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
if (i1.Code === checkedFatherCode) { // i1娌℃壘瀵�
- console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
+ this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
temp.forEach(it => {
this.dialogFormRoles.roleTreeSelectedArr.push({
Code: it.code,
@@ -835,12 +857,12 @@
console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
if (i === it.code) {
- console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 6664)
+ this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
}
})
this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
if (i.Code === it.code) {
- console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
+ this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1)
}
})
}
@@ -870,6 +892,12 @@
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 {
@@ -877,10 +905,16 @@
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 {
@@ -893,15 +927,16 @@
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;
-}
+//::v-deep .el-dialog__body {
+// padding: 20px 100px !important;
+//}
::v-deep .el-radio__input.is-checked .el-radio__inner {
background-color: $main_color;
@@ -918,11 +953,11 @@
}
::v-deep .el-input__inner {
- height: 30px
+ height: 30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -970,7 +1005,6 @@
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin: 10px 30px 0px 0;
- //cursor: default !important;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
@@ -982,20 +1016,11 @@
}
.dialogVisibleRoles {
- //::v-deep .el-checkbox.is-bordered.el-checkbox--medium{
- // pointer-events: none;
- //}
-
- //::v-deep .el-checkbox__label{
- // pointer-events: none !important;
- // color: red;
- //}
.myCheckboxGroup {
display: flex;
flex-wrap: wrap;
.myCheckbox {
- //border: 1px solid $main_color;
border: 1px solid #eee;
display: flex;
min-width: 100px;
@@ -1011,10 +1036,6 @@
}
- //.myCheckbox{
- // border: 1px solid $main_color;
- //}
-
input[type=checkbox] {
cursor: pointer;
position: relative;
@@ -1026,13 +1047,12 @@
input[type=checkbox]::after {
position: absolute;
top: 0;
- //color: rgb(130, 35, 35);
color: $main_color;
width: 14px;
height: 14px;
display: inline-block;
visibility: visible;
- padding-left: 0px;
+ padding-left: 0;
text-align: center;
content: ' ';
border-radius: 3px
@@ -1047,6 +1067,57 @@
background-color: $main_color;
}
}
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ 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;
+ }
+
+ .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;
+ }
}
</style>
--
Gitblit v1.9.3