From 2c59863afca9475562c4c3a99e66b4b4a4122b0f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 23 九月 2022 17:12:17 +0800
Subject: [PATCH] 1.设备保养记录开发完成2.修改页面放大时table表错位问题
---
src/views/jcsz/zzjg.vue | 12
src/views/zzmx/chda.vue | 12
src/views/sbgl/djjl.vue | 14
src/views/scgl/scdd.vue | 12
src/views/jcsz/wldw.vue | 12
src/views/scgl/gd.vue | 12
src/views/zlgl/gxjyjl.vue | 11
src/views/scgl/sckbg.vue | 30 +
src/views/bbgl/blmx.vue | 12
src/views/sbgl/djbz.vue | 12
src/views/bbgl/wwgx.vue | 60 ++
src/views/zlgl/gxjyxm.vue | 12
src/views/sbgl/bybw.vue | 12
src/views/sbgl/bybz.vue | 13
src/views/scgl/gdplgb.vue | 11
src/views/zzmx/jpgj.vue | 12
src/views/zlgl/qxdy.vue | 12
src/views/xtsz/bmgz.vue | 12
src/views/wlgl/kwdy.vue | 11
src/views/sbgl/djbw.vue | 12
src/views/zzmx/gylx.vue | 12
src/views/bbgl/bzgz.vue | 11
src/views/sbgl/sbqd.vue | 12
src/views/sbgl/byjl.vue | 671 +++++++++++++++++++++++++++++++++++
src/views/template.vue | 12
src/views/bbgl/wxmx.vue | 12
src/views/xtsz/cjgg.vue | 12
src/views/jcsz/yhqd.vue | 12
src/views/jcsz/jsqd.vue | 12
src/views/wlgl/ckdy.vue | 12
src/views/zzmx/gxdy.vue | 12
src/views/zlgl/gxjybz.vue | 12
src/views/zzmx/wllx.vue | 12
src/views/bbgl/rygz.vue | 12
34 files changed, 1,100 insertions(+), 32 deletions(-)
diff --git a/src/views/bbgl/blmx.vue b/src/views/bbgl/blmx.vue
index d1f1242..7d1c8b4 100644
--- a/src/views/bbgl/blmx.vue
+++ b/src/views/bbgl/blmx.vue
@@ -73,6 +73,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -497,6 +499,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -626,6 +629,15 @@
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>
diff --git a/src/views/bbgl/bzgz.vue b/src/views/bbgl/bzgz.vue
index 6861547..d7a7a00 100644
--- a/src/views/bbgl/bzgz.vue
+++ b/src/views/bbgl/bzgz.vue
@@ -77,6 +77,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -521,6 +523,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -650,6 +653,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>
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 844cf5b..37dc13c 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -77,6 +77,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -508,6 +510,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -637,6 +640,15 @@
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>
diff --git a/src/views/bbgl/wwgx.vue b/src/views/bbgl/wwgx.vue
index f121c7c..3bfc82e 100644
--- a/src/views/bbgl/wwgx.vue
+++ b/src/views/bbgl/wwgx.vue
@@ -1,4 +1,3 @@
-
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
@@ -43,7 +42,11 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" style="display: flex;align-items: center" :label="form.type==='F'?'鍙戞枡鏃堕棿':'鏀舵枡鏃堕棿'">
+ <el-form-item
+ v-show="isExpandForm"
+ style="display: flex;align-items: center"
+ :label="form.type==='F'?'鍙戞枡鏃堕棿':'鏀舵枡鏃堕棿'"
+ >
<el-date-picker
v-model="form.receivdate"
type="daterange"
@@ -79,6 +82,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -286,7 +291,14 @@
</el-dialog>
<!--瀵煎叆缁勪欢-->
- <import-picker ref="importPickerFunc" class="importPickerClass" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
</div>
</template>
@@ -409,7 +421,7 @@
this.form.prop = prop
this.getOutSourceReportSearch()
},
- async download() {
+ async download() {
let tempDate = this.form.receivdate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
@@ -529,6 +541,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -541,30 +554,35 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-range__icon{
+::v-deep .el-range__icon {
line-height: 28px !important;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
line-height: 28px !important;
}
-::v-deep .el-range-input{
+
+::v-deep .el-range-input {
font-size: 14px;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
display: flex;
justify-content: center;
align-items: center;
}
-::v-deep .el-button--text{
- font-size: 14px ;
- cursor: pointer ;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -625,8 +643,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -647,11 +665,21 @@
margin-bottom: 0;
}
-::v-deep .el-select__caret{
+::v-deep .el-select__caret {
display: flex;
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>
diff --git a/src/views/bbgl/wxmx.vue b/src/views/bbgl/wxmx.vue
index a6da43b..9faa96d 100644
--- a/src/views/bbgl/wxmx.vue
+++ b/src/views/bbgl/wxmx.vue
@@ -81,6 +81,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -511,6 +513,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -640,6 +643,15 @@
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>
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index d22efa2..bc703f2 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -56,7 +56,9 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
+ class="tableFixed"
border
:row-class-name="tableRowClassName"
:height="tableHeight+'px'"
@@ -865,12 +867,14 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -1693,6 +1697,14 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index daa9a55..6f1d888 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -58,8 +58,10 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
:height="tableHeight+'px'"
:row-class-name="tableRowClassName"
highlight-current-row
@@ -546,6 +548,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -653,7 +656,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index e88ea5c..5718c68 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -80,7 +80,9 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
+ class="tableFixed"
:height="tableHeight+'px'"
highlight-current-row
:style="{width: 100+'%',height:tableHeight+'px'}"
@@ -879,6 +881,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
@@ -1433,6 +1436,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 103772d..6420674 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -49,6 +49,8 @@
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
:row-class-name="tableRowClassName"
@@ -466,6 +468,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -562,6 +565,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
//::v-deep .cell {
// display: flex;
// flex-wrap: nowrap;
diff --git a/src/views/sbgl/bybw.vue b/src/views/sbgl/bybw.vue
index 77e457c..a0a14c9 100644
--- a/src/views/sbgl/bybw.vue
+++ b/src/views/sbgl/bybw.vue
@@ -45,9 +45,11 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -385,6 +387,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -490,6 +493,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index b7a49af..f4fd3b8 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -34,9 +34,11 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -763,6 +765,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -1156,6 +1159,16 @@
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>
diff --git a/src/views/sbgl/byjl.vue b/src/views/sbgl/byjl.vue
index e69de29..941bdc3 100644
--- a/src/views/sbgl/byjl.vue
+++ b/src/views/sbgl/byjl.vue
@@ -0,0 +1,671 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup">
+ <!-- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
+ <!-- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
+ <el-button type="primary" icon="el-icon-download" @click="download">瀵煎嚭</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in wkshopSelectArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁惧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.eqpcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="璁惧鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.eqpname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stanedname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="淇濆吇浜哄憳" style=" display: flex;">
+ <el-input v-model="form.repairuser" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="淇濆吇鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
+ <el-date-picker
+ v-model="form.repairdate"
+ type="daterange"
+ :clearable="false"
+ class="timeMini"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 200px;display: flex;line-height: 34px ;height: 34px;"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
+ />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="淇濆吇缁撴灉" style=" display: flex;">
+ <el-select v-model="form.repairresult" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in repairresultArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ </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>
+ </el-form>
+ </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">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="bywo"
+ label="淇濆吇鍗曞彿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="org_name"
+ label="鐢熶骇杞﹂棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_code"
+ label="璁惧缂栧彿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="eqp_name"
+ label="璁惧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stanedcode"
+ label="淇濆吇鏍囧噯缂栫爜"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stanedname"
+ label="淇濆吇鏍囧噯鍚嶇О"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="maint_cyc"
+ label="淇濆吇鍛ㄦ湡"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_cyc==='M'">鏈�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_user"
+ label="淇濆吇浜哄憳"
+ width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_user">{{ row.maint_user }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_result"
+ label="淇濆吇缁撴灉"
+ width="160"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.maint_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
+ <div v-if="row.maint_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_date"
+ label="淇濆吇鏃堕棿"
+ width="160"
+ fixed="right"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鏌ョ湅璁板綍"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <i
+ class="el-icon-tickets"
+ style="cursor: pointer;color: #42b983;margin-right: 15px"
+ @click="edit('edit',row)"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getDeviceRepairTakeSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'鏂板':'淇濆吇鏄庣粏'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+
+ <div class="elTableDiv" style="margin-top: 0">
+ <el-table
+ :data="tableDataDialog"
+ :height="500+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:500+'px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="seq"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="itemcode"
+ label="閮ㄤ綅缂栫爜"
+ />
+ <el-table-column
+ prop="itemname"
+ label="閮ㄤ綅鍚嶇О"
+ />
+ <el-table-column
+ prop="result"
+ label="鐐规缁撴灉"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
+ <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="maint_value"
+ label="鏁板��"
+ />
+ <el-table-column
+ prop="remark"
+ label="澶囨敞"
+ show-tooltip-when-overflow
+ />
+ </el-table>
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisible = false">杩� 鍥�</el-button>
+ <!-- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>-->
+ <!-- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker
+ ref="importPickerFunc"
+ class="importPickerClass"
+ :shows.sync="shows"
+ :title="title_value"
+ :colos="colos"
+ :code="code"
+ />
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+import ImportPicker from '@/components/ImportPicker'
+import { handleDatetime } from '@/utils/global'
+import { DeviceRepairSubTakeSearch, DeviceRepairTakeOutExcel, DeviceRepairTakeSearch
+} from '@/api/sbgl'
+import { ShopSearch } from '@/api/dzkb'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination, ImportPicker
+ },
+ data() {
+ return {
+ isExpandForm: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
+ eqpcode: '', // 璁惧缂栫爜
+ eqpname: '', // 璁惧鍚嶇О
+ stanedname: '', // 鏍囧噯鍚嶇О
+ repairuser: '', // 鐐规浜哄憳
+ repairdate: '', // 鐐规鏃堕棿
+ repairresult: '', // 淇濆吇缁撴灉
+ prop: 'maint_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ wkshopSelectArr: [],
+ repairresultArr: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
+ ],
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ // dialogForm: {
+ // OrgType: '',
+ // OrgCode: '',
+ // OrgName: '',
+ // SupUnit: ''// 涓婄骇鍗曚綅
+ // },
+ operation: '',
+
+ tableDataDialog: [], // 鐐规鏄庣粏瀵硅瘽妗唗able
+
+ title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
+ code: '4',
+ shows: false
+
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getDeviceRepairTakeSearch()
+ }
+ }
+ // 'tableData': {
+ // handler() {
+ // this.$nextTick(() => {
+ // this.$refs.tableDataRef.doLayout()
+ // })
+ // },
+ // deep: true
+ // }
+ },
+ created() {
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ handleRequest() {
+ this.getDeviceRepairTakeSearch().then(res => {
+ if (res.code === '200') {
+ this.getShopSearch()
+ }
+ })
+ },
+ async getDeviceRepairTakeSearch() {
+ let tempDate = this.form.repairdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ eqpcode: this.form.eqpcode,
+ eqpname: this.form.eqpname,
+ stanedname: this.form.stanedname,
+ repairuser: this.form.repairuser,
+ repairdate: tempDate,
+ repairresult: this.form.repairresult,
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
+ }
+
+ const res = await DeviceRepairTakeSearch(data)
+ this.tableData = res.data
+ this.total = res.count
+ return { code: res.code }
+ },
+ // 鑾峰彇鎵ц杞﹂棿涓嬫媺鏁扮粍
+ async getShopSearch() {
+ const { data: res } = await ShopSearch()
+ this.wkshopSelectArr = res
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getDeviceRepairTakeSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getDeviceRepairTakeSearch()
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.wkshopcode = ''
+ this.form.eqpcode = ''
+ this.form.eqpname = ''
+ this.form.stanedname = ''
+ this.form.repairuser = ''
+ this.form.repairdate = ''
+ this.form.repairresult = ''
+ this.getDeviceRepairTakeSearch()
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ const res = await DeviceRepairSubTakeSearch({ bywo: row.bywo })
+
+ this.tableDataDialog = res.data
+ // this.$nextTick(() => {
+ // this.dialogForm.OrgCode = row.org_code
+ // this.dialogForm.OrgName = row.org_name
+ // this.dialogForm.SupUnit = row.parent_id
+ // })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: row.code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getDeviceRepairTakeSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ // this.dialogForm.OrgType = ''
+ // this.dialogForm.OrgCode = ''
+ // this.dialogForm.OrgName = ''
+ // this.dialogForm.SupUnit = ''
+ // this.$refs.dialogForm.clearValidate()
+ this.tableDataDialog = []
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getDeviceRepairTakeSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ async download() {
+ let tempDate = this.form.repairdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+ const data = {
+ wkshopcode: this.form.wkshopcode,
+ eqpcode: this.form.eqpcode,
+ eqpname: this.form.eqpname,
+ stanedname: this.form.stanedname,
+ repairuser: this.form.repairuser,
+ repairdate: tempDate,
+ repairresult: this.form.repairresult
+ }
+ const { data: res } = await DeviceRepairTakeOutExcel(data)
+ window.location.href = res
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 245
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ }
+
+ }
+}
+</script>
+
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-range__icon{
+ line-height: 28px !important;
+}
+::v-deep .el-range-separator{
+ line-height: 28px !important;
+}
+::v-deep .el-range-input{
+ font-size: 14px;
+}
+::v-deep .el-range-separator{
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+//::v-deep .el-dialog__body {
+// padding: 20px 100px !important;
+//}
+::v-deep .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ 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>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/sbgl/djbw.vue b/src/views/sbgl/djbw.vue
index feea23b..4ad1dfb 100644
--- a/src/views/sbgl/djbw.vue
+++ b/src/views/sbgl/djbw.vue
@@ -54,9 +54,11 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -431,6 +433,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -544,6 +547,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index 72b8b45..2c8e6ab 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -41,9 +41,11 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -804,6 +806,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -1197,6 +1200,15 @@
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>
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index ea95387..1a4ee6b 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -78,6 +78,8 @@
/></div>
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -117,6 +119,7 @@
<el-table-column
prop="stanedcode"
label="鐐规鏍囧噯缂栫爜"
+ width="160"
sortable="custom"
/>
<el-table-column
@@ -501,6 +504,8 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 245
+
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -630,6 +635,15 @@
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>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index f754968..1e3be5b 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -112,8 +112,10 @@
/></div>
<div class="elTableDiv" style="margin-top: 0;">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
highlight-current-row
:row-class-name="tableRowClassName"
@@ -866,6 +868,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 250
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -1197,6 +1200,15 @@
justify-content: center;
align-items: center;
}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index e6762b4..5e90e95 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -125,6 +125,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -2148,6 +2150,7 @@
this.tableHeight = this.tableHeight - 20
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
// 宸ヨ壓璺嚎鏀惧ぇ闀滅偣鍑�
@@ -2839,7 +2842,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>
diff --git a/src/views/scgl/gdplgb.vue b/src/views/scgl/gdplgb.vue
index 059f6eb..b08b0dc 100644
--- a/src/views/scgl/gdplgb.vue
+++ b/src/views/scgl/gdplgb.vue
@@ -70,6 +70,7 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
ref="multipleTable"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -488,6 +489,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 250
+ this.$refs.multipleTable.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -598,6 +600,15 @@
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>
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 841fdae..a0bcfa6 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -144,6 +144,8 @@
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -729,6 +731,7 @@
if (this.isIpad) {
this.tableHeight = this.tableHeight - 20
}
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -850,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 {
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index f28de38..75dc889 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -31,6 +31,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -138,7 +140,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -150,7 +152,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -220,6 +222,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="WXtableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -326,7 +330,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -338,7 +342,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0,11) }}</div>
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -386,6 +390,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="badTableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
@@ -877,7 +883,9 @@
>
<div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
</div>
- <div style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center">
+ <div
+ style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
<div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
{{ qrForm.startqty }}
</div>
@@ -2098,6 +2106,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -2145,7 +2154,7 @@
this.badTableDataDialog = []
this.judgeIsScanningArr = []
},
- async getMesOrderSelectUserAll() {
+ async getMesOrderSelectUserAll() {
const { data: res } = await MesOrderSelectUser({ usercode: '' })
this.OperationArr = res
},
@@ -2428,6 +2437,15 @@
margin-bottom: 0;
}
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/template.vue b/src/views/template.vue
index 4546eca..3baf0a0 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -44,6 +44,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -359,6 +361,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -467,6 +470,15 @@
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>
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 42e2256..4cada03 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -45,6 +45,8 @@
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
:height="tableHeight+'px'"
@@ -366,6 +368,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -465,6 +468,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
diff --git a/src/views/wlgl/kwdy.vue b/src/views/wlgl/kwdy.vue
index b864d75..2b2ad01 100644
--- a/src/views/wlgl/kwdy.vue
+++ b/src/views/wlgl/kwdy.vue
@@ -55,6 +55,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
:row-class-name="tableRowClassName"
@@ -381,6 +383,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
}
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -480,6 +483,14 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index ebd0ddc..13c16ae 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -42,6 +42,8 @@
<!-- <el-divider />-->
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -382,6 +384,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 140
+ this.$refs.tableDataRef.doLayout()
})
}
}
@@ -489,7 +492,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/xtsz/cjgg.vue b/src/views/xtsz/cjgg.vue
index 21de5c2..69bc5ec 100644
--- a/src/views/xtsz/cjgg.vue
+++ b/src/views/xtsz/cjgg.vue
@@ -61,6 +61,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -458,6 +460,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -566,6 +569,15 @@
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>
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 42bf348..9409aff 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -33,6 +33,8 @@
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -475,6 +477,7 @@
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
this.isIpad = window.innerHeight < 769
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -697,7 +700,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zlgl/gxjyjl.vue b/src/views/zlgl/gxjyjl.vue
index 01028e7..a65f490 100644
--- a/src/views/zlgl/gxjyjl.vue
+++ b/src/views/zlgl/gxjyjl.vue
@@ -71,6 +71,8 @@
/></div>
<div class="elTableDiv" style="margin-top: 0">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
@@ -526,6 +528,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 250
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -646,6 +649,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>
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 807c247..ffe05d0 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -33,6 +33,8 @@
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -300,6 +302,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -400,7 +403,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index ddfb0e4..458e2d2 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -34,6 +34,8 @@
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight+'px'"
border
@@ -321,6 +323,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
@@ -421,7 +424,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index b382f41..aec95f5 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -105,6 +105,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
:height="tableHeight"
@@ -965,6 +967,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
/* 鐐瑰嚮鍏宠仈宸ヨ壓璺嚎妯″潡*/
@@ -1341,7 +1344,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 75a7848..356e76e 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -67,6 +67,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -620,6 +622,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
@@ -1114,7 +1117,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index 7ebb8df..85855fc 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -38,6 +38,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -739,6 +741,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
@@ -957,6 +960,15 @@
margin-bottom: 0;
}
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
+
</style>
<style>
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index a131d6c..8a179ae 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -97,6 +97,8 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="tableHeight"
border
@@ -869,6 +871,7 @@
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
}
}
@@ -967,7 +970,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
diff --git a/src/views/zzmx/wllx.vue b/src/views/zzmx/wllx.vue
index ac14aed..b8cd724 100644
--- a/src/views/zzmx/wllx.vue
+++ b/src/views/zzmx/wllx.vue
@@ -41,6 +41,8 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
border
stripe
@@ -325,6 +327,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.$refs.tableDataRef.doLayout()
})
}
}
@@ -483,5 +486,12 @@
::v-deep .el-select-dropdown__item.selected{
color: $main_color;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
--
Gitblit v1.9.3