From a65112ecf7580c7d5a2ae60d05150cac34e59f5d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 26 九月 2022 16:30:33 +0800
Subject: [PATCH] 1.工艺路线工艺设置下拉选中之后自动回车2.工序定义检验人员选中默认当前登录人员
---
src/views/scgl/scdd.vue | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index f8b4fdc..a0bcfa6 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -49,29 +49,29 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="浜у搧瑙勬牸" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
-
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
+ <el-form-item v-show="isExpandForm" label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" line-height: 40px;;display: flex;font-size: 14px;">
<el-date-picker
v-model="form.paystartdate"
type="daterange"
range-separator="~"
class="timeMini"
size="mini"
- style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
+ style="width: 200px;display: flex;line-height: 34px;height: 34px;"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- font-size: 14px!important;-->
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
+ <el-form-item v-show="isExpandForm" label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;">
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -79,7 +79,7 @@
class="timeMini"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
- style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px ;"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
@@ -95,8 +95,8 @@
<!-- />-->
</el-form-item>
</div>
- <div style="min-height: 100px">
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
+ <div>
+ <div class="bodySearchReset">
<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>
@@ -132,13 +132,25 @@
</div>
</el-form>
</div>
- <div class="elTableDiv">
+
+ <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">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
- :height="tableHeight+'px'"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -473,7 +485,8 @@
{ required: true, message: '璇疯緭鍏ヤ笅鍗曞崟鏁�', trigger: ['blur', 'change'] }
]
- }
+ },
+ isExpandForm: false
// expireTimeOption: {
// disabledDate(time) {
// return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
@@ -712,12 +725,13 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 260
+ this.tableHeight = this.mainHeight - 250
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
if (this.isIpad) {
this.tableHeight = this.tableHeight - 20
}
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -731,7 +745,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range-input{
- font-size: 14px !important;
+ //font-size: 14px !important;
}
::v-deep .el-range__icon{
line-height: 28px !important;
@@ -740,7 +754,7 @@
line-height: 28px !important;
}
::v-deep .el-range-input{
- font-size: 14px ;
+ font-size: 14px;
}
::v-deep .el-range-separator{
display: flex;
@@ -839,6 +853,15 @@
display: none;
}
}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
.el-table .custom-row {
--
Gitblit v1.9.3