From 7d0a954d23d21c0cdaff6ed20ad7291b3dbf889a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 30 六月 2022 17:45:39 +0800
Subject: [PATCH] 1.完成制造模型（工序定义）页面开发
---
src/views/jcsz/yhqd.vue | 185 ++++++++++++++++++++++++++++++----------------
1 files changed, 121 insertions(+), 64 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index fa4d2b0..9a79653 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,8 +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>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -10,25 +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" filterable 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"
@@ -37,7 +38,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select v-model="form.Enable" filterable 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"
@@ -53,14 +54,18 @@
</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-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"
@@ -173,9 +178,10 @@
<!-- 鐢ㄦ埛娓呭崟鏂板銆佷慨鏀�-->
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
+ :close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
@@ -193,6 +199,7 @@
<el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
<el-select
v-model="dialogForm.Enable"
+ :popper-append-to-body="false"
filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
@@ -205,34 +212,35 @@
/>
</el-select>
</el-form-item>
- <div style="display: flex">
- <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex">
- <el-cascader
- ref="dialogCascader"
- key="cascaderKey"
- filterable
- :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: 220px;"
+ @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: 220px"
+ 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"
- filterable
- 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-form-item>
@@ -254,6 +262,7 @@
:visible.sync="dialogVisibleRoles"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
class="dialogVisibleRoles"
@closed="handleCloseRoles"
@close="handleCloseRoles"
@@ -387,8 +396,8 @@
wagetype: ''
},
wagetypeArr: [
- { value: '1', label: '璁′欢鍒�' },
- { value: '2', label: '璁℃椂鍒�' }
+ { value: '2', label: '璁′欢鍒�' },
+ { value: '1', label: '璁℃椂鍒�' }
],
operation: '',
dialogFormRules: {
@@ -579,7 +588,7 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
},
@@ -737,12 +746,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)
}
})
}
@@ -777,7 +786,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,
@@ -840,12 +849,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)
}
})
}
@@ -875,6 +884,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 {
@@ -882,10 +897,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 {
@@ -898,6 +919,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -924,11 +946,10 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -976,7 +997,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 {
@@ -988,20 +1008,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;
@@ -1017,10 +1028,6 @@
}
- //.myCheckbox{
- // border: 1px solid $main_color;
- //}
-
input[type=checkbox] {
cursor: pointer;
position: relative;
@@ -1032,13 +1039,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
@@ -1053,6 +1059,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