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/InventoryList.vue | 320 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 201 insertions(+), 119 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') {
--
Gitblit v1.9.3