From 0286939336746905caeadf2f31748ecbd4aee9b4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 10 四月 2023 16:45:18 +0800
Subject: [PATCH] 1.基础设置下模块下的动态列渲染完成
---
src/views/basicSettings/roleList.vue | 255 ++++++++++------
src/views/basicSettings/userList.vue | 8
src/views/qualityManager/qualityPlaning.vue | 1
src/views/basicSettings/contactUnitList.vue | 235 +++++++++------
src/views/deviceManager/deviceList.vue | 376 ++++++++++++++++++------
5 files changed, 572 insertions(+), 303 deletions(-)
diff --git a/src/views/basicSettings/contactUnitList.vue b/src/views/basicSettings/contactUnitList.vue
index 5630fc9..8c83bb4 100644
--- a/src/views/basicSettings/contactUnitList.vue
+++ b/src/views/basicSettings/contactUnitList.vue
@@ -64,8 +64,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
:data="tableData"
border
class="tableFixed"
@@ -77,101 +82,26 @@
:style="{width: 100+'%',height:tableHeight+'px'}"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="code"
- label="鍗曚綅缂栫爜"
- show-tooltip-when-overflow
- sortable="custom"
- min-width="110"
- />
- <el-table-column
- prop="name"
- label="鍗曚綅鍚嶇О"
- sortable="custom"
- min-width="240px"
- show-tooltip-when-overflow
- />
- <el-table-column
- label="鍗曚綅灞炴��"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- prop="type"
- >
- <!-- sortable="custom"-->
- <template slot-scope="{row}">
- <div v-if="row.type==='226'">瀹㈡埛</div>
- <div v-else-if="row.type==='211'">渚涘簲鍟�</div>
- <div v-else-if="row.type==='228'">瀹㈡埛/渚涘簲鍟�</div>
- <div v-else>/</div>
- <!-- <div style="display: flex;justify-content: flex-start">-->
- <!-- <div v-if="row.mtype==='211'" style="margin-right: 15px">渚涘簲鍟�</div>-->
- <!-- <div v-if="row.btype==='228'" style="margin-right: 15px;">瀹㈡埛/渚涘簲鍟�</div>-->
- <!-- <div v-if="row.htype==='226'">瀹㈡埛</div>-->
- <!-- </div>-->
- </template>
- </el-table-column>
<el-table-column
- prop="conttacts"
- label="鑱旂郴浜�"
- width="110"
+ 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
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.conttacts">{{ row.conttacts }}</div>
- <div v-else>/</div>
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='type'">{{ UnitAttrArr.find(i=>i.value===row[item.prop]).label }}</div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="conttphone"
- label="鑱旂郴鏂瑰紡"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.conttphone">{{ row.conttphone }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="addr"
- min-width="160"
- label="琛ュ厖鎻忚堪"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.addr">{{ row.addr }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- sortable="custom"
- width="160"
- show-tooltip-when-overflow
- />
+
<el-table-column
label="鎿嶄綔"
fixed="right"
@@ -180,7 +110,11 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-edit-outline"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
<i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
@@ -266,7 +200,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>
@@ -281,10 +222,12 @@
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
+
export default {
name: 'WLDW',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -324,6 +267,91 @@
],
tableData: [],
total: 10,
+ 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: 'code',
+ label: '鍗曚綅缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 330,
+ width: false,
+ prop: 'name',
+ label: '鍗曚綅鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'type',
+ label: '鍗曚綅灞炴��',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'conttacts',
+ label: '鑱旂郴浜�',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'conttphone',
+ label: '鑱旂郴鏂瑰紡',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'addr',
+ label: '琛ュ厖鎻忚堪',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
id: '', // 寰�鏉ュ崟浣峣d
@@ -386,6 +414,13 @@
// }
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
async getCurrentUnitSearch() {
const res = await CurrentUnitSearch(this.form)
this.tableData = res.data
@@ -556,11 +591,12 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.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;
}
@@ -621,8 +657,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 {
@@ -638,14 +674,17 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index baf80a1..a079c45 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -63,8 +63,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
:data="tableData"
class="tableFixed"
border
@@ -77,111 +82,50 @@
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
<el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="role_code"
- 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
- min-width="110"
- />
- <el-table-column
- prop="role_name"
- label="瑙掕壊鍚嶇О"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- />
- <el-table-column
- prop="roletype_name"
- label="瑙掕壊绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- />
- <el-table-column
- prop="description"
- min-width="160"
- label="瑙掕壊鎻忚堪"
- sortable="custom"
- show-tooltip-when-overflow
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.description">{{ row.description }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- width="110"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.lm_user===null">/</div>
- <div v-else>{{ row.lm_user }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="is_user"
- label="鍏宠仈鐢ㄦ埛"
- show-tooltip-when-overflow
- width="120"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <i
- v-if="row.is_user==='Y'"
- class="el-icon-user-solid"
- style=" cursor: pointer"
- :style="{color:styleObject}"
- @click="userClick(row)"
- />
- <i
- v-if="row.is_user==='N'"
- class="el-icon-user-solid"
- style="color: rgb(180 ,181, 185);cursor: pointer"
- @click="userClick(row)"
- />
- </template>
- </el-table-column>
- <el-table-column
- prop="is_right"
- label="鍒嗛厤鏉冮檺"
- sortable="custom"
- show-tooltip-when-overflow
- width="120"
- >
- <template slot-scope="{row}">
- <i
- v-if="row.is_right==='Y'"
- :style="{color:styleObject}"
- class="el-icon-share"
- @click="rightClick(row)"
- />
- <i
- v-if="row.is_right==='N'"
- class="el-icon-share"
- style="color: rgb(180 ,181, 185)"
- @click="rightClick(row)"
- />
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='is_user'">
+ <i
+ v-if="row[item.prop]==='Y'"
+ class="el-icon-user-solid"
+ style=" cursor: pointer"
+ :style="{color:styleObject}"
+ @click="userClick(row)"
+ />
+ <i
+ v-if="row[item.prop]==='N'"
+ class="el-icon-user-solid"
+ style="color: rgb(180 ,181, 185);cursor: pointer"
+ @click="userClick(row)"
+ />
+ </div>
+ <div v-else-if="item.prop==='is_right'">
+ <i
+ v-if="row[item.prop]==='Y'"
+ :style="{color:styleObject}"
+ class="el-icon-share"
+ @click="rightClick(row)"
+ />
+ <i
+ v-if="row[item.prop]==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="rightClick(row)"
+ />
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
<el-table-column
@@ -668,11 +612,12 @@
import clearAllChildren, { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'JSQD',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -701,6 +646,103 @@
order: 'desc'
},
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: 'role_code',
+ label: '瑙掕壊缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'role_name',
+ label: '瑙掕壊鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'roletype_code',
+ label: '瑙掕壊绫诲瀷缂栫爜',
+ id: 5,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'roletype_name',
+ label: '瑙掕壊绫诲瀷',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 330,
+ width: false,
+ prop: 'description',
+ label: '瑙掕壊鎻忚堪',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'is_user',
+ label: '鍏宠仈鐢ㄦ埛',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'is_right',
+ label: '鍒嗛厤鏉冮檺',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
dialogVisible: false,
dialogForm: {
RoleId: '',
@@ -800,6 +842,15 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+
+ this.tableTimeStampKey = new Date().getTime()
+
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getRoleSearch().then(res => {
if (res.code === '200') {
diff --git a/src/views/basicSettings/userList.vue b/src/views/basicSettings/userList.vue
index 69a246f..fbb0235 100644
--- a/src/views/basicSettings/userList.vue
+++ b/src/views/basicSettings/userList.vue
@@ -99,10 +99,10 @@
</div>
<div class="elTableDiv">
- <!-- <TableColumnSettings-->
- <!-- :list1="tableColumnSettingsArray"-->
- <!-- @tableColumnUpdate="tableColumnUpdate"-->
- <!-- />-->
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
:key="tableTimeStampKey"
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
index a232cba..7936d4c 100644
--- a/src/views/deviceManager/deviceList.vue
+++ b/src/views/deviceManager/deviceList.vue
@@ -126,8 +126,13 @@
</div>
<div class="elTableDiv" style="margin-top: 0;">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
:data="tableData"
border
class="tableFixed"
@@ -139,111 +144,141 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
+ <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==='input_date'">{{ row[item.prop]? row[item.prop].substring(0,11):'' }}</div>
+ <div v-else-if="item.prop==='enable'">
+ <div v-if="row.enable==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <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-->
<!-- type="selection"-->
<!-- width="50"-->
<!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="code"
- label="璁惧缂栫爜"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="name"
- label="璁惧鍚嶇О"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqptype_name"
- label="璁惧绫诲瀷"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqpgroup_name"
- label="璁惧缁�"
- show-tooltip-when-overflow
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="enable"
- label="浣跨敤鐘舵��"
- sortable="custom"
- show-tooltip-when-overflow
- width="120"
- >
- <template slot-scope="{row}">
- <div v-if="row.enable==='Y'">
- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
- 鏄�
- </div>
- <div v-if="row.enable==='N'">
- <i class="el-icon-info" style="margin-right: 2px" />
- 鍚�
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="input_date"
- label="鎶曞叆鏃ユ湡"
- show-tooltip-when-overflow
- sortable="custom"
- width="120"
- >
- <template slot-scope="{row}">
- <div>{{ row.input_date.substring(0, 10) }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wksp_name"
- label="鐢熶骇杞﹂棿"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="120"
- />
<!-- <el-table-column-->
- <!-- prop="Line_name"-->
- <!-- label="鎵�灞炰骇绾�"-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="璁惧缂栫爜"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- label="璁惧鍚嶇О"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqptype_name"-->
+ <!-- label="璁惧绫诲瀷"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqpgroup_name"-->
+ <!-- label="璁惧缁�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="110"-->
<!-- sortable="custom"-->
<!-- />-->
- <el-table-column
- prop="operation_ration"
- label="绋煎姩鐜�"
- show-tooltip-when-overflow
- sortable="custom"
- width="100"
- >
- <template slot-scope="{row}">
- <div v-if=" parseFloat(row.operation_ration)===0">/</div>
- <div v-else>{{ row.operation_ration }}%</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- width="120"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="lm_date"
- width="160"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="enable"-->
+ <!-- label="浣跨敤鐘舵��"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.enable==='Y'">-->
+ <!-- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+ <!-- 鏄�-->
+ <!-- </div>-->
+ <!-- <div v-if="row.enable==='N'">-->
+ <!-- <i class="el-icon-info" style="margin-right: 2px" />-->
+ <!-- 鍚�-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="input_date"-->
+ <!-- label="鎶曞叆鏃ユ湡"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="120"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ row.input_date.substring(0, 10) }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="wksp_name"-->
+ <!-- label="鐢熶骇杞﹂棿"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="120"-->
+ <!-- />-->
+ <!-- <!– <el-table-column–>-->
+ <!-- <!– prop="Line_name"–>-->
+ <!-- <!– label="鎵�灞炰骇绾�"–>-->
+ <!-- <!– sortable="custom"–>-->
+ <!-- <!– />–>-->
+ <!-- <el-table-column-->
+ <!-- prop="operation_ration"-->
+ <!-- label="绋煎姩鐜�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="100"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if=" parseFloat(row.operation_ration)===0">/</div>-->
+ <!-- <div v-else>{{ row.operation_ration }}%</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_user"-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- sortable="custom"-->
+ <!-- width="120"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- width="160"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
label="鎿嶄綔"
fixed="right"
@@ -657,11 +692,12 @@
import ImportPicker from '@/components/ImportPicker'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'SBQD',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -691,6 +727,141 @@
DeviceGroupArr: [], // 璁惧缁勬暟缁�
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: false,
+ width: 110,
+ prop: 'code',
+ label: '璁惧缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'name',
+ label: '璁惧鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'eqptype_code',
+ label: '璁惧绫诲瀷缂栫爜',
+ id: 5,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqptype_name',
+ label: '璁惧绫诲瀷',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 120,
+ prop: 'eqpgroup_code',
+ label: '璁惧缁勭紪鐮�',
+ id: 7,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'eqpgroup_name',
+ label: '璁惧缁�',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'enable',
+ label: '浣跨敤鐘舵��',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'input_date',
+ label: '鎶曞叆鏃ユ湡',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'wksp_code',
+ label: '鐢熶骇杞﹂棿缂栫爜',
+ id: 11,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'wksp_name',
+ label: '鐢熶骇杞﹂棿',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'operation_ration',
+ label: '绋煎姩鐜�',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 14,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 15,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
id: '',
@@ -772,6 +943,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
// 璁惧娓呭崟瀵煎叆
upload() {
this.shows = true
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index 1aac85e..3c4c773 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -586,6 +586,7 @@
<el-table-column
prop="stepcheckitem_desc"
label="鎻忚堪"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input
--
Gitblit v1.9.3