From b12f66d871593ec6f8e28aa63e45dbd92aab760b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 11 四月 2023 15:54:36 +0800
Subject: [PATCH] 1.制造模型、采购管理模块下的动态列表完成
---
src/views/makeModel/processRoute.vue | 227 +++++-
src/views/makeModel/InventoryList.vue | 320 ++++++---
src/views/makeModel/meterPrice.vue | 379 ++++++++---
src/views/purchasesManager/purchasesList.vue | 399 ++++++++---
src/views/makeModel/materialList.vue | 365 +++++++---
src/views/makeModel/processDefine.vue | 247 ++++--
6 files changed, 1,342 insertions(+), 595 deletions(-)
diff --git a/src/views/makeModel/InventoryList.vue b/src/views/makeModel/InventoryList.vue
index f63ee5a..6edf62f 100644
--- a/src/views/makeModel/InventoryList.vue
+++ b/src/views/makeModel/InventoryList.vue
@@ -127,8 +127,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
border
@@ -141,139 +146,49 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
+
<el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="partcode"
+ 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
- label="鐗╂枡缂栫爜"
- min-width="160"
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- min-width="160"
- show-tooltip-when-overflow
- label="鐗╂枡鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="鐗╂枡瑙勬牸"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="uom_name"
- label="鍗曚綅"
- width="75"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="stocktypename"
- label="瀛樿揣绫诲瀷"
- sortable="custom"
- show-tooltip-when-overflow
- min-width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.stocktypename">{{ row.stocktypename }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="materialtypename"-->
- <!-- label="鐗╂枡绫诲埆"-->
- <!-- sortable="custom"-->
- <!-- />-->
- <el-table-column
- prop="stck_name"
- label="浠撳簱鍚嶇О"
- show-tooltip-when-overflow
- sortable="custom"
- min-width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.stck_name">{{ row.stck_name }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="maxqty"
- label="搴撳瓨涓婇檺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.maxqty">{{ row.maxqty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="minqty"
- label="搴撳瓨涓嬮檺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.minqty">{{ row.minqty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- show-tooltip-when-overflow
- label="鍒涘缓浜哄憳"
- sortable="custom"
- width="110"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- width="160"
- />
- <el-table-column
- label="宸ヨ壓璺嚎"
- width="80"
- show-tooltip-when-overflow
- prop="proute_id"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='proute_id'">
<i
- v-if="row.proute_id==='Y'"
+ v-if="row[item.prop]==='Y'"
:style="{color:$store.state.settings.theme}"
class="el-icon-share"
@click="routeClick(row)"
/>
<i
- v-if="row.proute_id==='N'"
+ v-if="row[item.prop]==='N'"
style="color:rgb(180 ,181, 185)"
class="el-icon-share"
@click="routeClick(row)"
/>
</div>
+ <div v-else-if="item.prop==='is_batchno'||item.prop==='is_fifo'||item.prop==='is_incheck'||item.prop==='is_outcheck'">
+ <div v-if="row[item.prop]==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row[item.prop]==='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
label="鎿嶄綔"
fixed="right"
@@ -432,7 +347,9 @@
/>楂樼骇璁剧疆锛�
</div>
</template>
- <div style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between">
+ <div
+ style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between"
+ >
<div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
<div>
<el-tooltip
@@ -441,7 +358,9 @@
content=""
placement="top"
>
- <div slot="content" style="width: 300px">鍚敤绠＄悊鍚庡簱瀛樻暟閲忎細鎸夋爣绛惧垎寮�鏄剧ず锛岄渶瑕佸仛閲囪喘鍒拌揣鎵嶈兘鍏ュ簱锛屼笖鐢熶骇鍙戞枡闇�瑕佹壂鐮佹爣绛捐繘琛屽彂鏂欙紝涓嶅惎鐢ㄦ壒娆＄鐞嗙殑涓嶉渶瑕侀噰璐埌璐э紝鍙互鐩存帴閫夋嫨鐗╂枡閲囪喘鍏ュ簱锛屼笖鍏ュ簱鍚庝細鍚堝苟鏄剧ず璇ョ墿鏂欑殑搴撳瓨锛岀敓浜у彂鏂欏垯鎸夊簱浣嶈繘琛屽嚭搴撱��</div>
+ <div slot="content" style="width: 300px">
+ 鍚敤绠＄悊鍚庡簱瀛樻暟閲忎細鎸夋爣绛惧垎寮�鏄剧ず锛岄渶瑕佸仛閲囪喘鍒拌揣鎵嶈兘鍏ュ簱锛屼笖鐢熶骇鍙戞枡闇�瑕佹壂鐮佹爣绛捐繘琛屽彂鏂欙紝涓嶅惎鐢ㄦ壒娆＄鐞嗙殑涓嶉渶瑕侀噰璐埌璐э紝鍙互鐩存帴閫夋嫨鐗╂枡閲囪喘鍏ュ簱锛屼笖鍏ュ簱鍚庝細鍚堝苟鏄剧ず璇ョ墿鏂欑殑搴撳瓨锛岀敓浜у彂鏂欏垯鎸夊簱浣嶈繘琛屽嚭搴撱��
+ </div>
<i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
</el-tooltip>
</div>
@@ -800,11 +719,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: 'CHDA',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -832,6 +752,161 @@
storehouseArr: [], // 鎵�灞炰粨搴撴暟缁�
storehouseArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
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: 'partcode',
+ label: '鐗╂枡缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partname',
+ label: '鐗╂枡鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partspec',
+ label: '鐗╂枡瑙勬牸',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'uom_name',
+ label: '鍗曚綅',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'stocktypename',
+ label: '瀛樿揣绫诲瀷',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'stck_name',
+ label: '浠撳簱鍚嶇О',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'maxqty',
+ label: '搴撳瓨涓婇檺',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'minqty',
+ label: '搴撳瓨涓嬮檺',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'proute_id',
+ label: '宸ヨ壓璺嚎',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: false
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'is_batchno',
+ label: '鎵规绠＄悊',
+ id: 14,
+ show: false,
+ fixed: false,
+ sortable: false
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'is_fifo',
+ label: '鍏堣繘鍏堝嚭',
+ id: 15,
+ show: false,
+ fixed: false,
+ sortable: false
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'is_incheck',
+ label: '鍏ュ巶妫�楠�',
+ id: 16,
+ show: false,
+ fixed: false,
+ sortable: false
+ },
+ {
+ minWidth: false,
+ width: 80,
+ prop: 'is_outcheck',
+ label: '鍑哄巶妫�楠�',
+ id: 17,
+ show: false,
+ fixed: false,
+ sortable: false
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
dialogVisible: false,
dialogForm: {
id: '', // 鐗╂枡id
@@ -917,6 +992,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getInventoryFileSelect().then(res => {
if (res.code === '200') {
diff --git a/src/views/makeModel/materialList.vue b/src/views/makeModel/materialList.vue
index e0e2092..4fa42f3 100644
--- a/src/views/makeModel/materialList.vue
+++ b/src/views/makeModel/materialList.vue
@@ -92,8 +92,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'"
@@ -105,115 +110,146 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="partcode"
- label="姣嶄欢缂栫爜"
- min-width="160"
+ 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"
- />
- <el-table-column
- prop="partname"
- label="姣嶄欢鍚嶇О"
- min-width="160"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="姣嶄欢瑙勬牸"
- min-width="160"
- show-tooltip-when-overflow
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="stocktype_name"
- label="瀛樿揣绫诲瀷"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="uom_name"
- label="璁￠噺鍗曚綅"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="quantity"
- label="鍩虹鏁伴噺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="status"
- width="110"
- show-tooltip-when-overflow
- label="鍚敤鐘舵��"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.status==='Y'">
- <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==='startdate'">{{ row.startdate.substring(0,11) }}</div>
+ <div v-else-if="item.prop==='status'">
+ <div v-if="row[item.prop]==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row[item.prop]==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
</div>
- <div v-if="row.status==='N'">
- <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="startdate"
- label="鍚敤鏃ユ湡"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.startdate">{{ row.startdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="version"
- label="鐗堟湰鍙�"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="username"
- label="鍒涘缓浜哄憳"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- label="姣嶄欢缂栫爜"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partname"-->
+ <!-- label="姣嶄欢鍚嶇О"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="姣嶄欢瑙勬牸"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="stocktype_name"-->
+ <!-- label="瀛樿揣绫诲瀷"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="uom_name"-->
+ <!-- label="璁￠噺鍗曚綅"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="quantity"-->
+ <!-- label="鍩虹鏁伴噺"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="鍚敤鐘舵��"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.status==='Y'">-->
+ <!-- <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+ <!-- 鏄�-->
+ <!-- </div>-->
+ <!-- <div v-if="row.status==='N'">-->
+ <!-- <i class="el-icon-info" style="margin-right: 2px" />-->
+ <!-- 鍚�-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="startdate"-->
+ <!-- label="鍚敤鏃ユ湡"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.startdate">{{ row.startdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="version"-->
+ <!-- label="鐗堟湰鍙�"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="username"-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
label="鎿嶄綔"
width="120"
@@ -598,11 +634,12 @@
} from '@/api/makeModel'
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() {
@@ -633,6 +670,121 @@
total: 10,
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: 'partcode',
+ label: '姣嶄欢缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partname',
+ label: '姣嶄欢鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partspec',
+ label: '姣嶄欢瑙勬牸',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'stocktype_name',
+ label: '瀛樿揣绫诲瀷',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'uom_name',
+ label: '璁￠噺鍗曚綅',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'quantity',
+ label: '鍩虹鏁伴噺',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'status',
+ label: '鍚姩鐘舵��',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'startdate',
+ label: '鍚敤鏃ユ湡',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'version',
+ label: '鐗堟湰鍙�',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'username',
+ label: '鍒涘缓浜哄憳',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
dialogVisible: false,
dialogForm: {
bomid: '',
@@ -701,6 +853,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getBoIventorySelect().then(res => {
if (res.code === '200') {
diff --git a/src/views/makeModel/meterPrice.vue b/src/views/makeModel/meterPrice.vue
index 9ce6304..29789fc 100644
--- a/src/views/makeModel/meterPrice.vue
+++ b/src/views/makeModel/meterPrice.vue
@@ -102,8 +102,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampArrayKey"
class="tableFixed"
:data="tableData"
:height="tableHeight"
@@ -115,108 +120,130 @@
: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==='eqp_value'||item.prop==='stand_value'">
+ {{ row[item.prop] }} 绉�
+ </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="partcode"
- min-width="160"
- show-tooltip-when-overflow
- label="浜у搧缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- show-tooltip-when-overflow
- min-width="160"
- sortable="custom"
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.partspec">{{ row.partspec }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="wksp_name"
- label="鐢熶骇杞﹂棿"
- min-width="110"
- sortable="custom"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="route_name"
- label="宸ヨ壓璺嚎"
- sortable="custom"
- min-width="120"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="stepname"
- label="鍔犲伐宸ュ簭"
- sortable="custom"
- min-width="110"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="eqp_name"
- label="鍔犲伐璁惧"
- show-tooltip-when-overflow
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="eqp_value"
- label="璁惧鑺傛媿"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="stand_value"
- label="鐢熶骇鑺傛媿"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="cavity_qty"
- label="鍨嬭厰鏁�"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="unprice"
- width="110"
- label="璁′欢鍗曚环"
- show-tooltip-when-overflow
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="浜у搧缂栫爜"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partname"-->
+ <!-- label="浜у搧鍚嶇О"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="160"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="浜у搧瑙勬牸"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.partspec">{{ row.partspec }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="wksp_name"-->
+ <!-- label="鐢熶骇杞﹂棿"-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="route_name"-->
+ <!-- label="宸ヨ壓璺嚎"-->
+ <!-- sortable="custom"-->
+ <!-- min-width="120"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="stepname"-->
+ <!-- label="鍔犲伐宸ュ簭"-->
+ <!-- sortable="custom"-->
+ <!-- min-width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqp_name"-->
+ <!-- label="鍔犲伐璁惧"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- min-width="110"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="eqp_value"-->
+ <!-- label="璁惧鑺傛媿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.eqp_value">{{ row.eqp_value }} <span style="margin-left: 2px">绉�</span></div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="stand_value"-->
+ <!-- label="鐢熶骇鑺傛媿"-->
+ <!-- width="110"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.stand_value">{{ row.stand_value }} <span style="margin-left: 2px">绉�</span></div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="cavity_qty"-->
+ <!-- label="鍨嬭厰鏁�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="unprice"-->
+ <!-- width="110"-->
+ <!-- label="璁′欢鍗曚环"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
label="鎿嶄綔"
@@ -518,11 +545,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: 'JPGJ',
components: {
- Pagination, ImportPicker
+ Pagination, ImportPicker, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -547,6 +575,152 @@
eqpArr: [], // 浜у搧闆嗗悎
total: 10,
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: 'partcode',
+ label: '浜у搧缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partname',
+ label: '浜у搧鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'partspec',
+ label: '浜у搧瑙勬牸',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 130,
+ prop: 'wksp_code',
+ label: '鐢熶骇杞﹂棿缂栫爜',
+ id: 6,
+ show: false,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'wksp_name',
+ label: '鐢熶骇杞﹂棿',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'route_code',
+ label: '宸ヨ壓璺嚎缂栫爜',
+ id: 8,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'route_name',
+ label: '宸ヨ壓璺嚎',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'stepcode',
+ label: '鍔犲伐宸ュ簭缂栫爜',
+ id: 10,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'stepname',
+ label: '鍔犲伐璁惧',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 130,
+ prop: 'eqp_code',
+ label: '鍔犲伐璁惧缂栫爜',
+ id: 12,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
+ label: '鍔犲伐宸ュ簭',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'eqp_value',
+ label: '璁惧鑺傛媿',
+ id: 14,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'stand_value',
+ label: '鐢熶骇鑺傛媿',
+ id: 15,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'cavity_qty',
+ label: '鑵斿瀷鏁�',
+ id: 16,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'cavity_qty',
+ label: '璁′欢鍗曚环',
+ id: 17,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+
+ ],
+ tableTimeStampArrayKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
partcode: '', // 浜у搧缂栫爜
@@ -603,6 +777,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampArrayKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
diff --git a/src/views/makeModel/processDefine.vue b/src/views/makeModel/processDefine.vue
index a378721..9b9ddd3 100644
--- a/src/views/makeModel/processDefine.vue
+++ b/src/views/makeModel/processDefine.vue
@@ -83,8 +83,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'"
@@ -96,96 +101,45 @@
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
+
<el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="stepcode"
+ 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
- label="宸ュ簭缂栫爜"
- min-width="150"
- sortable="custom"
- />
- <el-table-column
- prop="stepname"
- min-width="150"
- show-tooltip-when-overflow
- label="宸ュ簭鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="flwtype"
- min-width="150"
- show-tooltip-when-overflow
- label="宸ュ簭绫诲瀷"
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.flwtype.indexOf(';')!==-1">鑷埗;澶栧崗</div>
- <div v-if="row.flwtype==='W'">澶栧崗</div>
- <div v-if="row.flwtype==='Z'">鑷埗</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="descr"
- show-tooltip-when-overflow
- label="宸ュ簭鎻忚堪"
- min-width="180"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.descr">{{ row.descr }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="enable"
- label="鍚敤鐘舵��"
- show-tooltip-when-overflow
- sortable="custom"
- width="110"
- >
- <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 v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='flwtype'">
+ {{ steptypeArr.find(i=>i.code===row[item.prop]).name }}
</div>
- <div v-if="row.enable==='N'">
- <i class="el-icon-info" style="margin-right: 2px" />
- 鍚�
+ <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>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- show-tooltip-when-overflow
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- width="160"
- sortable="custom"
- />
- <el-table-column
- label="鍏宠仈宸ヤ綔绔�"
- prop="is_eqp"
- show-tooltip-when-overflow
- width="110"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <i v-if="row.is_eqp==='Y'" :style="{color:$store.state.settings.theme}" class="el-icon-share" @click="workClick(row)" />
+ <div v-else-if="item.prop==='is_eqp'">
+ <i
+ v-if="row.is_eqp==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="workClick(row)"
+ />
<i
v-if="row.is_eqp==='N'"
class="el-icon-share"
@@ -193,17 +147,13 @@
@click="workClick(row)"
/>
</div>
- </template>
- </el-table-column>
- <el-table-column
- label="鍏宠仈缂洪櫡"
- prop="is_defect"
- show-tooltip-when-overflow
- width="110"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <i v-if="row.is_defect==='Y'" :style="{color:$store.state.settings.theme}" class="el-icon-share" @click="defectClick(row)" />
+ <div v-else-if="item.prop==='is_defect'">
+ <i
+ v-if="row.is_defect==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="defectClick(row)"
+ />
<i
v-if="row.is_defect==='N'"
class="el-icon-share"
@@ -211,8 +161,10 @@
@click="defectClick(row)"
/>
</div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
+
<el-table-column
label="鎿嶄綔"
fixed="right"
@@ -476,11 +428,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: 'GXDY',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -512,6 +465,101 @@
],
total: 10,
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: 'stepcode',
+ label: '宸ュ簭缂栫爜',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'stepname',
+ label: '宸ュ簭鍚嶇О',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'flwtype',
+ label: '宸ュ簭绫诲瀷',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 330,
+ width: false,
+ prop: 'descr',
+ label: '宸ュ簭鎻忚堪',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'enable',
+ label: '鍚敤鐘舵��',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 160,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 9,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'is_eqp',
+ label: '鍏宠仈宸ヤ綔绔�',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: false
+ },
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'is_defect',
+ label: '鍏宠仈缂洪櫡',
+ id: 11,
+ show: true,
+ fixed: false,
+ sortable: false
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
'id': '',
@@ -567,6 +615,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
diff --git a/src/views/makeModel/processRoute.vue b/src/views/makeModel/processRoute.vue
index 89c4c18..572ae4c 100644
--- a/src/views/makeModel/processRoute.vue
+++ b/src/views/makeModel/processRoute.vue
@@ -40,8 +40,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
:height="tableHeight"
@@ -53,69 +58,98 @@
: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==='enable'">
+ <div v-if="row[item.prop]==='Y'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row[item.prop]==='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="缂栫爜"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="name"
- show-tooltip-when-overflow
- label="鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="description"
- label="宸ヨ壓璺嚎鎻忚堪"
- sortable="custom"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.description">{{ row.description }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="enable"
- show-tooltip-when-overflow
- label="浣跨敤鐘舵��"
- sortable="custom"
- >
- <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="lm_user"
- show-tooltip-when-overflow
- label="鍒涘缓浜哄憳"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- width="160"
- />
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- fixed-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="缂栫爜"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="鍚嶇О"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="description"-->
+ <!-- label="宸ヨ壓璺嚎鎻忚堪"-->
+ <!-- sortable="custom"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.description">{{ row.description }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="enable"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="浣跨敤鐘舵��"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <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="lm_user"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="160"-->
+ <!-- />-->
<el-table-column
label="鎿嶄綔"
width="120"
@@ -314,11 +348,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: 'GYLX',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { elDragDialog, waves },
data() {
@@ -342,6 +377,71 @@
],
total: 10,
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: '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: 330,
+ width: false,
+ prop: 'description',
+ label: '宸ヨ壓璺嚎鎻忚堪',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'enable',
+ label: '浣跨敤鐘舵��',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'lm_user',
+ label: '鍒涘缓浜哄憳',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 160,
+ width: false,
+ prop: 'lm_date',
+ label: '鍒涘缓鏃堕棿',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
dialogVisible: false,
dialogForm: {
id: '',
@@ -390,6 +490,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
// 杩滅▼鎼滅储
querySearch(queryString, cb) {
const routeArr = this.routeArr
diff --git a/src/views/purchasesManager/purchasesList.vue b/src/views/purchasesManager/purchasesList.vue
index 28989c4..8973697 100644
--- a/src/views/purchasesManager/purchasesList.vue
+++ b/src/views/purchasesManager/purchasesList.vue
@@ -134,8 +134,13 @@
</div>
<div class="elTableDiv">
+ <TableColumnSettings
+ :list1="tableColumnSettingsArray"
+ @tableColumnUpdate="tableColumnUpdate"
+ />
<el-table
ref="tableDataRef"
+ :key="tableTimeStampKey"
class="tableFixed"
:data="tableData"
:height="isExpandForm?(tableHeight+40):(tableHeight+80)+'px'"
@@ -160,126 +165,157 @@
/>
</template>
</el-table-column>
+
<el-table-column
- prop="RowNum"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="status"
- label="璁㈠崟鐘舵��"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div>{{ mesorderstusArr.find(i=>i.value===row.status).label }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="orderdate"
- label="鍗曟嵁鏃ユ湡"
- sortable="custom"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.orderdate">{{ row.orderdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="ordercode"
- label="璁㈠崟缂栧彿"
- sortable="custom"
- width="160"
+ 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
- />
- <el-table-column
- prop="deptname"
- label="閮ㄩ棬鍚嶇О"
- width="130"
- show-tooltip-when-overflow
- sortable="custom"
+ :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
>
<template slot-scope="{row}">
- <div v-if="row.deptname">{{ row.deptname }}</div>
- <div v-else>/</div>
+ <div v-if="!row[item.prop]">/</div>
+ <div v-else-if="item.prop==='status'">
+ {{ mesorderstusArr.find(i => i.value === row[item.prop]).label }}
+ </div>
+ <div v-else-if="item.prop==='acceptdate'">
+ {{ row.acceptdate ? row.acceptdate.substring(0, 11) : '/' }}
+ </div>
+ <div v-else-if="item.prop==='orderdate'">
+ {{ row.orderdate ? row.orderdate.substring(0, 11) : '/' }}
+ </div>
+ <div v-else-if="item.prop==='lm_date'">
+ {{ row.lm_date ? row.lm_date.substring(0, 11) : '/' }}
+ </div>
+ <div v-else>{{ row[item.prop] }}</div>
</template>
</el-table-column>
- <el-table-column
- prop="customername"
- label="閲囪喘渚涙柟"
- sortable="custom"
- min-width="180"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.customername">{{ row.customername }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="saleorderCode"
- label="婧愬崟鍗曞彿"
- sortable="custom"
- width="160"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.saleorderCode">{{ row.saleorderCode }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="acceptdate"
- label="棰勮鍒拌揣鏃ユ湡"
- width="130"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.acceptdate">{{ row.acceptdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- width="110"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="auditoruser"
- label="瀹℃牳浜�"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.auditoruser">{{ row.auditoruser }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="auditordate"
- label="瀹℃牳鏃堕棿"
- width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.auditordate">{{ row.auditordate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+
+ <!-- <el-table-column-->
+ <!-- prop="RowNum"-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="status"-->
+ <!-- label="璁㈠崟鐘舵��"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ mesorderstusArr.find(i=>i.value===row.status).label }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="orderdate"-->
+ <!-- label="鍗曟嵁鏃ユ湡"-->
+ <!-- sortable="custom"-->
+ <!-- width="110"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.orderdate">{{ row.orderdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="ordercode"-->
+ <!-- label="璁㈠崟缂栧彿"-->
+ <!-- sortable="custom"-->
+ <!-- width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="deptname"-->
+ <!-- label="閮ㄩ棬鍚嶇О"-->
+ <!-- width="130"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.deptname">{{ row.deptname }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="customername"-->
+ <!-- label="閲囪喘渚涙柟"-->
+ <!-- sortable="custom"-->
+ <!-- min-width="180"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.customername">{{ row.customername }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="saleorderCode"-->
+ <!-- label="婧愬崟鍗曞彿"-->
+ <!-- sortable="custom"-->
+ <!-- width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.saleorderCode">{{ row.saleorderCode }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="acceptdate"-->
+ <!-- label="棰勮鍒拌揣鏃ユ湡"-->
+ <!-- width="130"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.acceptdate">{{ row.acceptdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_user"-->
+ <!-- label="鍒涘缓浜哄憳"-->
+ <!-- sortable="custom"-->
+ <!-- width="110"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="lm_date"-->
+ <!-- label="鍒涘缓鏃堕棿"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="auditoruser"-->
+ <!-- label="瀹℃牳浜�"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.auditoruser">{{ row.auditoruser }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="auditordate"-->
+ <!-- label="瀹℃牳鏃堕棿"-->
+ <!-- width="110"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.auditordate">{{ row.auditordate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
label="鎿嶄綔"
width="120"
@@ -460,13 +496,19 @@
import { handleDatetime } from '@/utils/global'
import waves from '@/directive/waves'
import { SeaveSearchErpPurchaseOrder } from '@/api/ErpSyncMes'
-import { ClosedPurchaseOrder, DeletePurchaseOrder, PurchaseOrderSearch, PurchaseOrderSubSearch } from '@/api/purchasesManager'
+import {
+ ClosedPurchaseOrder,
+ DeletePurchaseOrder,
+ PurchaseOrderSearch,
+ PurchaseOrderSubSearch
+} from '@/api/purchasesManager'
import { DepartMentSelect, PurchSupplierSelect } from '@/api/basicInfo'
+import TableColumnSettings from '@/components/TableColumnSettings'
export default {
name: 'Zzjg',
components: {
- Pagination
+ Pagination, TableColumnSettings
},
directives: { waves },
data() {
@@ -502,7 +544,121 @@
radioSelected: '',
deptcodeArr: [], // 閮ㄩ棬淇℃伅鏁扮粍
customercodeArr: [], // 閲囪喘渚涙柟鏁扮粍
- tableDataDetail: []
+ tableDataDetail: [],
+ 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: false,
+ width: 110,
+ prop: 'status',
+ label: '璁㈠崟鐘舵��',
+ id: 3,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'orderdate',
+ label: '鍗曟嵁鏃ユ湡',
+ id: 4,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 130,
+ width: false,
+ prop: 'ordercode',
+ label: '璁㈠崟缂栧彿',
+ id: 5,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'deptname',
+ label: '閮ㄩ棬鍚嶇О',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 220,
+ width: false,
+ prop: 'customername',
+ label: '閲囪喘渚涙柟',
+ id: 7,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'saleorderCode',
+ label: '婧愬崟鍗曞彿',
+ id: 8,
+ show: true,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 130,
+ width: false,
+ prop: 'acceptdate',
+ 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
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'auditoruser',
+ label: '瀹℃牳浜�',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
+ minWidth: 110,
+ width: false,
+ prop: 'auditordate',
+ label: '瀹℃牳鏃堕棿',
+ id: 13,
+ show: true,
+ fixed: false,
+ sortable: true
+ }
+ ],
+ tableTimeStampKey: new Date().getTime() // 琛ㄦ牸key
}
},
@@ -515,6 +671,13 @@
this.getHeight()
},
methods: {
+ tableColumnUpdate(val, isCopyTrue) {
+ if (isCopyTrue) {
+ this.tableColumnSettingsArray = val
+ }
+ this.tableTimeStampKey = new Date().getTime()
+ this.$refs.tableDataRef.doLayout()
+ },
handleRequest() {
this.getPurchaseOrderSearch().then(res => {
if (res.code === '200') {
@@ -564,7 +727,7 @@
this.deptcodeArr = res
},
// 閲囪喘渚涙柟淇℃伅鏌ヨ
- async getPurchSupplierSelect() {
+ async getPurchSupplierSelect() {
const { data: res } = await PurchSupplierSelect()
this.customercodeArr = res
},
--
Gitblit v1.9.3