From 4f2be8de0ca63b9a69caa506d8cd478f6dac909f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 27 十二月 2022 14:16:50 +0800
Subject: [PATCH] 1.递交
---
src/views/zlgl/gxjyjl.vue | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index 01028e7..67b6739 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -11,12 +11,12 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-form-item label-width="70px" label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
@@ -28,7 +28,7 @@
<el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partapec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label-width="70px" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -55,22 +55,35 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
<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
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <div
- class="bodyTopFormExpand"
- @click="isExpandForm=!isExpandForm"
- >
- <i
- :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
- :style="{color:'#42B983'}"
- /></div>
- <div class="elTableDiv" style="margin-top: 0">
+
+ <div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -95,11 +108,13 @@
<el-table-column
prop="wo_code"
label="宸ュ崟缂栫爜"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="partcode"
+ show-tooltip-when-overflow
width="160"
label="浜у搧缂栫爜"
sortable="custom"
@@ -108,11 +123,13 @@
prop="partname"
label="浜у搧鍚嶇О"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
>
@@ -125,29 +142,34 @@
prop="step_code"
label="宸ュ簭缂栫爜"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭鍚嶇О"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="checkstaned_code"
label="鏍囧噯缂栫爜"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="checkstaned_name"
label="鏍囧噯鍚嶇О"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="check_type"
label="妫�楠岀被鍨�"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
>
@@ -161,6 +183,7 @@
prop="check_result"
label="妫�楠岀粨鏋�"
sortable="custom"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
@@ -184,17 +207,20 @@
prop="check_qty"
label="妫�楠屾暟閲�"
width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="lm_user"
label="妫�楠屼汉鍛�"
+ show-tooltip-when-overflow
sortable="custom"
width="120"
/>
<el-table-column
prop="lm_date"
label="妫�楠屾椂闂�"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -266,20 +292,24 @@
<el-table-column
prop="checkitem_code"
+ show-tooltip-when-overflow
label="妫�楠岄」鐩紪鍙�"
width="120"
/>
<el-table-column
prop="checkitem_name"
label="妫�楠岄」鐩悕绉�"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="checkitem_descr"
label="妫�楠岄」鐩弿杩�"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="check_result"
label="妫�楠岀粨鏋�"
+ show-tooltip-when-overflow
width="120"
>
<template slot-scope="{row}">
@@ -290,11 +320,13 @@
<el-table-column
prop="lm_user"
label="妫�楠屼汉鍛�"
+ show-tooltip-when-overflow
width="120"
/>
<el-table-column
prop="lm_date"
label="妫�楠屾椂闂�"
+ show-tooltip-when-overflow
width="160"
/>
<!-- <el-table-column-->
@@ -348,6 +380,7 @@
},
data() {
return {
+ mouseHoverType: 'mouseout',
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
@@ -526,6 +559,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 250
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -646,6 +680,14 @@
align-items: center;
justify-content: center;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3