From 95af123562c0a05ae8955d53fcdcd4c8b310ced8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 29 六月 2022 17:32:00 +0800
Subject: [PATCH] 1.制造模型：工艺路线(新增、删除、预览)功能开发 2.制造模型：工序定义(查询) 功能开发 3.系统设置：编码规则(查询)功能开发4.修改实施部提出的bug
---
src/views/jcsz/zzjg.vue | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 46ae373..9ed8ac4 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
- <el-select v-model="form.OrgType" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in OrgTypeArr"
:key="item.value"
@@ -48,6 +48,7 @@
stripe
:style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
+ :height="tableHeight"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -127,10 +128,11 @@
</div>
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="50%"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
@@ -138,7 +140,6 @@
<el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
<el-radio-group
v-model="dialogForm.OrgType"
- style="display: flex; align-items: center; height: 40px;"
@change="changeRadio"
>
<el-radio
@@ -160,6 +161,7 @@
v-model="dialogForm.SupUnit"
style="width: 220px"
filterable
+ :popper-append-to-body="false"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -400,7 +402,7 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
})
}
@@ -415,8 +417,12 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info{
@@ -503,7 +509,19 @@
width: 99%;
margin: 10px auto;
}
-::v-deep .el-form-item{
+.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;
+}
</style>
--
Gitblit v1.9.3