From be347b964540ca82641d9d74c280718da469f351 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 18 四月 2023 09:53:03 +0800
Subject: [PATCH] 1.递交
---
src/views/reportManager/installationLampList.vue | 356 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 251 insertions(+), 105 deletions(-)
diff --git a/src/views/reportManager/installationLampList.vue b/src/views/reportManager/installationLampList.vue
index 5906668..3c0a719 100644
--- a/src/views/reportManager/installationLampList.vue
+++ b/src/views/reportManager/installationLampList.vue
@@ -215,8 +215,14 @@
>
<el-tab-pane label="瀹夌伅鏄庣粏">
<div class="elTableDiv">
+ <TableColumnSettings
+ v-if="false"
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
border
@@ -228,79 +234,32 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="wkshp_code"
- label="杞﹂棿缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="wkshp_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="typename"
- label="鍛煎彨绫诲瀷"
- sortable="custom"
- />
- <el-table-column
- prop="start_user"
- label="鍛煎彨浜�"
- sortable="custom"
- />
- <el-table-column
- prop="start_date"
- label="鍛煎彨鏃堕棿"
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="resp_user"
- label="鍝嶅簲浜�"
- sortable="custom"
- />
- <el-table-column
- prop="resp_date"
- label="鍝嶅簲鏃堕棿"
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="respondcont"
- label="鍝嶅簲鏃堕暱"
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="status"
- label="鐘舵��"
- sortable="custom"
+ 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.status==='宸插搷搴�'" style="display: flex;align-items: center">
- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 宸插搷搴�
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='status'">
+ <div v-if="row.status==='宸插搷搴�'" 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.status==='寰呭搷搴�'" style="display: flex;align-items: center">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寰呭搷搴�
+ </div>
</div>
- <div v-if="row.status==='寰呭搷搴�'" style="display: flex;align-items: center">
- <i class="el-icon-info" style="margin-right: 2px" />
- 寰呭搷搴�
- </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
@@ -319,8 +278,14 @@
</el-tab-pane>
<el-tab-pane label="瀹夌伅姹囨��">
<div class="elTableDiv">
+ <TableColumnSettings
+ v-if="false"
+ :list1="tableColumnSettingsArray2"
+ @tableColumnUpdate="tableColumnUpdate2"
+ />
<el-table
ref="tableDataRef2"
+ :key="tableTimeStampKey2"
class="tableFixed"
:data="tableDataSum"
border
@@ -332,42 +297,27 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="wkshp_name"
- label="鐢熶骇杞﹂棿"
- sortable="custom"
- />
- <el-table-column
- prop="eqp_name"
- label="璁惧鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="calltypename"
- label="鍛煎彨绫诲瀷"
- sortable="custom"
- />
- <el-table-column
- prop="callcount"
- label="鍛煎彨鎬绘鏁�"
- sortable="custom"
- />
- <el-table-column
- prop="repondcount"
- label="鍝嶅簲鎬绘鏁�"
- sortable="custom"
- />
- <el-table-column
- prop="repondtime"
- label="鎬诲搷搴旀椂闀匡紙鍒嗛挓锛�"
- sortable="custom"
- />
+ v-for="item in tableColumnSettingsArray2"
+ 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==='repondtime'">
+ {{ row.repondtime }} 鍒嗛挓
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
+ </template>
+ </el-table-column>
</el-table>
</div>
@@ -400,11 +350,12 @@
} from '@/api/reportManager'
import { ShopSearch } from '@/api/kanbanManager'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'Zzjg',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { waves },
data() {
@@ -431,6 +382,115 @@
wkshopSelectArr: [], // 鐢熶骇杞﹂棿涓嬫媺鏁扮粍
calltypeSelectArr: [], // 鍛煎彨绫诲瀷涓嬫媺鏁扮粍
tableData: [],
+ tableColumnSettingsArray: [
+ // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
+ { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'wkshp_code',
+ label: '杞﹂棿缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'wkshp_name',
+ label: '杞﹂棿鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_code',
+ label: '璁惧缂栫爜',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
+ label: '璁惧鍚嶇О',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'typename',
+ label: '鍛煎彨绫诲瀷',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'start_user',
+ label: '鍛煎彨浜�',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 160,
+ width: false,
+ prop: 'start_date',
+ label: '鍛煎彨鏃堕棿',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'resp_user',
+ label: '鍝嶅簲浜�',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 160,
+ width: false,
+ prop: 'resp_date',
+ label: '鍝嶅簲鏃堕棿',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 130,
+ width: false,
+ prop: 'respondcont',
+ label: '鍝嶅簲鏃堕暱',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'status',
+ label: '鐘舵��',
+ id: 13,
+ show: true,
+ fixed: 'right',
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
currentTabPositionName: '瀹夌伅鏄庣粏', // Tab鏍囩浣嶄簬鐨勪綅缃� 榛樿绗��0鈥欎釜
formSum: {
wkshopcode: '', // 杞﹂棿缂栫爜
@@ -445,6 +505,78 @@
},
tableDataSum: [],
totalSum: 0,
+ tableColumnSettingsArray2: [
+ // { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
+ { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'wkshp_name',
+ label: '鐢熶骇杞﹂棿',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_code',
+ label: '璁惧缂栫爜',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
+ label: '璁惧鍚嶇О',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'calltypename',
+ label: '鍛煎彨绫诲瀷',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'callcount',
+ label: '鍛煎彨鎬绘鏁�',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'repondcount',
+ label: '鍝嶅簲鎬绘鏁�',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'repondtime',
+ label: '鎬诲搷搴旀椂闀�',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey2: new Date().getTime(), // 琛ㄦ牸key
+
devicetypeArr: []// 鐢熶骇璁惧涓嬫媺鏁扮粍
}
},
@@ -457,6 +589,20 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
+ tableColumnUpdate2(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray2 = val
+ }
+ this.tableTimeStampKey2 = new Date().getTime()
+ this.$refs.tableDataRef2.doLayout()
+ },
handleRequest() {
this.getAnDonReportDefinitSearch().then(res => {
if (res.code === '200') {
--
Gitblit v1.9.3