From aae53f420a50b06095d25989da1e59d2deaaab87 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 11 四月 2023 10:00:34 +0800
Subject: [PATCH] 1.设备管理模块动态列表完成
---
src/views/deviceManager/repairRecord.vue | 271 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 170 insertions(+), 101 deletions(-)
diff --git a/src/views/deviceManager/repairRecord.vue b/src/views/deviceManager/repairRecord.vue
index a1f9707..41b935b 100644
--- a/src/views/deviceManager/repairRecord.vue
+++ b/src/views/deviceManager/repairRecord.vue
@@ -108,8 +108,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
@@ -122,113 +127,36 @@
@sort-change="sortChange"
>
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="repair_code"
- label="缁翠慨鍗曞彿"
+ v-for="item in tableColumnSettingsArray"
+ v-if="item.show"
+ :key="item.id"
+ :sortable="item.sortable"
+ :prop="item.prop"
+ :min-width="item.minWidth"
+ :label="item.label"
+ :width="item.width"
show-tooltip-when-overflow
- min-width="160"
- sortable="custom"
- />
- <el-table-column
- prop="wksp_name"
- label="鎵�灞炶溅闂�"
- show-tooltip-when-overflow
- min-width="120"
- sortable="custom"
- />
- <el-table-column
- prop="eqp_code"
- width="120"
- label="璁惧缂栫爜"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="eqp_name"
- label="璁惧鍚嶇О"
- width="120"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="request_person"
- label="鎶ヤ慨浜�"
- sortable="custom"
- show-tooltip-when-overflow
- width="100"
- />
- <el-table-column
- prop="request_date"
- label="鎶ヤ慨鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="repair_person"
- label="缁翠慨浜�"
- show-tooltip-when-overflow
- width="100"
- sortable="custom"
- />
- <el-table-column
- prop="repair_date"
- label="缁翠慨瀹屾垚鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="cycleDate"
- show-tooltip-when-overflow
- label="缁翠慨鏃堕暱"
- width="120"
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div>{{ row.cycleDate }} 灏忔椂</div>
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='verify_result'">
+ <div v-if="row[item.prop]==='閫氳繃'" style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 閫氳繃
+ </div>
+ <div v-if="row[item.prop]==='涓嶉�氳繃'" style="display: flex;align-items: center">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 涓嶉�氳繃
+ </div>
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
+
<el-table-column
- prop="verify_person"
- label="楠岃瘉浜�"
- width="100"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="verify_date"
- label="楠岃瘉鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="verify_result"
- label="楠岃瘉缁撴灉"
+ label="鏄庣粏"
width="120"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.verify_result==='閫氳繃'" style="display: flex;align-items: center">
- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 閫氳繃
- </div>
- <div v-if="row.verify_result==='涓嶉�氳繃'" style="display: flex;align-items: center">
- <i class="el-icon-info" style="margin-right: 2px" />
- 涓嶉�氳繃
- </div>
- </template>
- </el-table-column>
- <el-table-column
- label="鏌ョ湅璁板綍"
- width="80"
fixed="right"
>
<template slot-scope="{row}">
@@ -403,11 +331,12 @@
import { ShopSearch } from '@/api/kanbanManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'Zzjg',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -434,6 +363,138 @@
wkshopSelectArr: [],
total: 10,
tableData: [],
+
+ tableColumnSettingsArray: [
+ // { minWidth: false, width: 55, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
+ { minWidth: false, width: 55, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'repair_code',
+ label: '缁翠慨鍗曞彿',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'wksp_code',
+ label: '鎵�灞炶溅闂寸紪鐮�',
+ id: 4,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'wksp_name',
+ label: '鎵�灞炶溅闂�',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'eqp_code',
+ label: '璁惧缂栫爜',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
+ label: '璁惧鍚嶇О',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'request_person',
+ label: '鎶ヤ慨浜�',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 160,
+ prop: 'request_date',
+ label: '淇濅慨鏃堕棿',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'repair_person',
+ label: '缁翠慨浜�',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 160,
+ prop: 'repair_date',
+ label: '缁翠慨瀹屾垚鏃堕棿',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'cycleDate',
+ label: '缁翠慨鏃堕暱',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'verify_person',
+ label: '楠岃瘉浜�',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'verify_date',
+ label: '楠岃瘉鏃堕棿',
+ id: 14,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'verify_result',
+ label: '楠岃瘉缁撴灉',
+ id: 15,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
dialogVisible: false,
dialogData1: {},
dialogData2: {},
@@ -470,6 +531,14 @@
this.baseUrl = process.env.VUE_APP_BASE_API_FILE
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getDeviceUpdateSearch().then(res => {
if (res.code === '200') {
--
Gitblit v1.9.3