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/checkRecord.vue | 227 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 144 insertions(+), 83 deletions(-)
diff --git a/src/views/deviceManager/checkRecord.vue b/src/views/deviceManager/checkRecord.vue
index bd258ea..3125985 100644
--- a/src/views/deviceManager/checkRecord.vue
+++ b/src/views/deviceManager/checkRecord.vue
@@ -87,8 +87,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
:height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
@@ -100,92 +105,38 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="djwo"
- label="鐐规鍗曞彿"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="org_name"
- label="鐢熶骇杞﹂棿"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqp_code"
- label="璁惧缂栧彿"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqp_name"
- label="璁惧鍚嶇О"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="stanedcode"
- label="鐐规鏍囧噯缂栫爜"
- width="160"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="stanedname"
- label="鐐规鏍囧噯鍚嶇О"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="chk_user"
- label="鐐规浜哄憳"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.chk_user&&row.chk_user!=='null'">{{ row.chk_user }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="chk_result"
- label="鐐规缁撴灉"
- width="160"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center">
- <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 姝ｅ父
+ <el-table-column
+ 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
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
+ >
+ <template slot-scope="{row}">
+ <div v-if="!row[item.prop]">/</div>
+
+ <div v-else-if="item.prop==='chk_result'">
+ <div v-if="row[item.prop]==='OK'" 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]==='NG'" style="display: flex;align-items: center">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父
+ </div>
</div>
- <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center">
- <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
- <i class="el-icon-info" style="margin-right: 2px" />
- 寮傚父
- </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
+
<el-table-column
- prop="chk_date"
- label="鐐规鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- label="鏌ョ湅璁板綍"
+ label="鏄庣粏"
width="120"
fixed="right"
>
@@ -318,11 +269,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() {
@@ -344,9 +296,110 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
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: 'djwo',
+ label: '鐐规鍗曞彿',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'org_code',
+ label: '鐢熶骇杞﹂棿缂栫爜',
+ id: 4,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'org_name',
+ label: '鐢熶骇杞﹂棿',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ 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: 130,
+ prop: 'stanedcode',
+ label: '鐐规鏍囧噯缂栫爜',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 130,
+ width: false,
+ prop: 'stanedname',
+ label: '鐐规鏍囧噯鍚嶇О',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'chk_user',
+ label: '鐐规浜哄憳',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'chk_result',
+ label: '鐐规缁撴灉',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'chk_date',
+ label: '鐐规鏃堕棿',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
// dialogForm: {
// OrgType: '',
@@ -379,6 +432,14 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getDeviceCheckTakeSearch().then(res => {
if (res.code === '200') {
--
Gitblit v1.9.3