From 9b825939b7f0a7439d704b379812362dd95697fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 11 七月 2022 17:49:26 +0800
Subject: [PATCH] 1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分
---
src/views/sbgl/sbqd.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 21 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 1dbc057..9e80834 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -17,7 +17,13 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.Status"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +33,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.WorkShop"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @focus="getWorkShopSelect"
+ >
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -37,7 +50,15 @@
</el-select>
</el-form-item>
<el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-select
+ v-model="form.DeviceType"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ @focus="getDeviceTypeSelect"
+ @change="deviceTypeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -49,6 +70,7 @@
<el-form-item label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ filterable
:popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
@@ -81,7 +103,7 @@
<el-table
:data="tableData"
border
- :height="tableHeight"
+ :height="tableHeight+'px'"
stripe
highlight-current-row
:style="{width: 100+'%',height:(tableHeight-50)+'px'}"
@@ -213,7 +235,14 @@
<el-input v-model="dialogForm.devicename" style="width: 200px" />
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
- <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
+ <el-select
+ v-model="dialogForm.devicetypecode"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="devicetypecodeChange"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -223,7 +252,14 @@
</el-select>
</el-form-item>
<el-form-item label="璁惧缁�" prop="devicegroupcode">
- <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.devicegroupcode"
+ :popper-append-to-body="false"
+ :disabled="dialogForm.devicetypecode===''"
+ style="width: 200px"
+ filterable
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceGroupDialogArr"
:key="item.code"
@@ -242,7 +278,14 @@
/>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
- <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="workshopcodeChange"
+ >
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -252,7 +295,14 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.linecode"
+ filterable
+ :popper-append-to-body="false"
+ :disabled="dialogForm.workshopcode===''"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in WorkLineArr"
:key="item.linecode"
@@ -262,7 +312,13 @@
</el-select>
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" prop="status">
- <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="dialogForm.status"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -272,7 +328,8 @@
</el-select>
</el-form-item>
<el-form-item label="绋煎姩鐜�" prop="ratio">
- <el-input v-model="dialogForm.ratio" style="width: 195px" /><span style="margin-left: 10px">%</span>
+ <el-input v-model="dialogForm.ratio" style="width: 195px" />
+ <span style="margin-left: 10px">%</span>
</el-form-item>
</el-form>
@@ -424,7 +481,13 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.eqptype_code"
+ filterable
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -602,9 +665,9 @@
// 鑾峰彇璁惧娓呭崟鍒楄〃
this.getDeviceMangerSearch()
// 鑾峰彇璁惧绫诲瀷涓嬫媺
- this.getDeviceTypeSelect()
+ // this.getDeviceTypeSelect()
// 鑾峰彇鎵�灞炶溅闂翠笅鎷�
- this.getWorkShopSelect()
+ // this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -723,7 +786,7 @@
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗘墍灞炶溅闂翠笅鎷夐�夋嫨鏀瑰彉鏃�
- async workshopcodeChange(val) {
+ async workshopcodeChange(val) {
const { data: res } = await WorkShopSelectLine({ workshopcode: val })
this.WorkLineArr = res
this.dialogForm.linecode = ''
@@ -895,7 +958,15 @@
addDeviceGroup() {
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
- this.DeviceGroupArray.unshift({ code: '', name: '', eqptype_code: '', eqptype_name: '', remark: '', isVisible: 1, number: number })
+ this.DeviceGroupArray.unshift({
+ code: '',
+ name: '',
+ eqptype_code: '',
+ eqptype_name: '',
+ remark: '',
+ isVisible: 1,
+ number: number
+ })
},
// 鎺掑簭
sortChangeOfDeviceGroup({ column, prop, order }) {
@@ -989,9 +1060,11 @@
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;
@@ -1121,29 +1194,31 @@
margin: 10px 30px 0px 0;
}
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-.body ::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{
+::v-deep .el-select .el-input__inner:focus {
border-color: $main_color;
}
-::v-deep .el-select-dropdown__item.selected{
+::v-deep .el-select-dropdown__item.selected {
color: $main_color;
}
</style>
<style lang="scss">
-.dateStyle{
- .el-date-table td.today span{
+.dateStyle {
+ .el-date-table td.today span {
color: #42b983;
}
}
--
Gitblit v1.9.3