|
|
@@ -17,8 +17,8 @@
|
|
|
</el-tabs>
|
|
|
<!-- 数据表格 -->
|
|
|
<ele-pro-table ref="table" :key="activeName" :initLoad="false" :columns="newColumns" :datasource="datasource"
|
|
|
- row-key="code" :cache-key="`${activeName}produceOrderTable`" :selection.sync="selection"
|
|
|
- @sort-change="onSortChange" autoAmendPage :parse-data="parseData">
|
|
|
+ row-key="code" :cache-key="cacheKeyUrl" :selection.sync="selection"
|
|
|
+ @sort-change="onSortChange" autoAmendPage :parse-data="parseData" @columns-change="handleColumnChange">
|
|
|
<template v-slot:toolbar>
|
|
|
<el-button type="success">新建</el-button>
|
|
|
<el-button type="success">暂停</el-button>
|
|
|
@@ -139,9 +139,11 @@ import EquipmentDialog from './components/EquipmentDialog.vue'
|
|
|
import detailsPop from './components/details/index.vue'
|
|
|
|
|
|
import { debounce } from 'lodash';
|
|
|
+import tableColumnsMixin from '@/mixins/tableColumnsMixin';
|
|
|
|
|
|
|
|
|
export default {
|
|
|
+ mixins: [tableColumnsMixin],
|
|
|
components: {
|
|
|
produceOrderSearch,
|
|
|
pickingDialog,
|
|
|
@@ -182,7 +184,9 @@ export default {
|
|
|
{ label: '预制计划', value: '3' }
|
|
|
],
|
|
|
selection: [],
|
|
|
- newColumns: []
|
|
|
+ newColumns: [],
|
|
|
+ cacheKeyUrl:'7cc8e5d2-mes-produceOrder',
|
|
|
+ columnsVersion:0
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -297,8 +301,7 @@ export default {
|
|
|
},
|
|
|
columns() {
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ const num = this.columnsVersion
|
|
|
const opt = {
|
|
|
first: [
|
|
|
// {
|
|
|
@@ -340,6 +343,7 @@ export default {
|
|
|
// },
|
|
|
|
|
|
{
|
|
|
+ prop: 'code',
|
|
|
slot: 'code',
|
|
|
label: '生产工单号',
|
|
|
align: 'center',
|
|
|
@@ -353,6 +357,7 @@ export default {
|
|
|
// },
|
|
|
|
|
|
{
|
|
|
+ prop: 'QRcode',
|
|
|
slot: 'QRcode',
|
|
|
label: '二维码',
|
|
|
align: 'center',
|
|
|
@@ -466,7 +471,6 @@ export default {
|
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 110
|
|
|
},
|
|
|
-
|
|
|
...opt[this.activeName],
|
|
|
{
|
|
|
prop: 'createTime',
|
|
|
@@ -476,6 +480,7 @@ export default {
|
|
|
minWidth: 110
|
|
|
},
|
|
|
{
|
|
|
+ prop: 'status',
|
|
|
slot: 'status',
|
|
|
label: '状态',
|
|
|
align: 'center',
|
|
|
@@ -658,7 +663,7 @@ export default {
|
|
|
});
|
|
|
|
|
|
this.newColumns = [...this.columns, ...newRes, ...privateColumn];
|
|
|
-
|
|
|
+ this.getTabColumns();
|
|
|
this.$forceUpdate();
|
|
|
});
|
|
|
},
|