|
@@ -24,7 +24,7 @@
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
|
ref="table"
|
|
ref="table"
|
|
|
:cache-key="cacheKeyUrl"
|
|
:cache-key="cacheKeyUrl"
|
|
|
- :columns="newColumns"
|
|
|
|
|
|
|
+ :columns="columns"
|
|
|
:datasource="datasource"
|
|
:datasource="datasource"
|
|
|
:parse-data="parseData"
|
|
:parse-data="parseData"
|
|
|
autoAmendPage
|
|
autoAmendPage
|
|
@@ -118,7 +118,7 @@
|
|
|
派单
|
|
派单
|
|
|
</el-link>
|
|
</el-link>
|
|
|
<el-link
|
|
<el-link
|
|
|
- v-if="unpackShow(row)&&row.splitResidue!==0"
|
|
|
|
|
|
|
+ v-if="unpackShow(row) && row.splitResidue !== 0"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
type="primary"
|
|
type="primary"
|
|
|
@click="toUnpack(row)"
|
|
@click="toUnpack(row)"
|
|
@@ -229,12 +229,12 @@
|
|
|
{ label: '生产中', value: 5 },
|
|
{ label: '生产中', value: 5 },
|
|
|
{ label: '待下达', value: 8 }
|
|
{ label: '待下达', value: 8 }
|
|
|
],
|
|
],
|
|
|
- newColumns: [],
|
|
|
|
|
|
|
+ columns: [],
|
|
|
stationList: [],
|
|
stationList: [],
|
|
|
teamsList: [],
|
|
teamsList: [],
|
|
|
crewList: [],
|
|
crewList: [],
|
|
|
current: null,
|
|
current: null,
|
|
|
- cacheKeyUrl: '3cbbdff9-aps-workOrder',
|
|
|
|
|
|
|
+ cacheKeyUrl: '3cbbdff9-aps-workOrder-index',
|
|
|
columnsVersion: 1,
|
|
columnsVersion: 1,
|
|
|
dispatchRow: {},
|
|
dispatchRow: {},
|
|
|
dispatchVisible: false,
|
|
dispatchVisible: false,
|
|
@@ -283,10 +283,20 @@
|
|
|
clientEnvironmentId() {
|
|
clientEnvironmentId() {
|
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
|
},
|
|
},
|
|
|
- // 表格列配置
|
|
|
|
|
- columns() {
|
|
|
|
|
- // const num = this.columnsVersion;
|
|
|
|
|
- return [
|
|
|
|
|
|
|
+
|
|
|
|
|
+ checkRowData() {
|
|
|
|
|
+ return (row) => {
|
|
|
|
|
+ return row.checkedata ? true : false;
|
|
|
|
|
+ };
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ created() {
|
|
|
|
|
+ this.setColumns()
|
|
|
|
|
+ this.getFieldModel();
|
|
|
|
|
+ },
|
|
|
|
|
+ methods: {
|
|
|
|
|
+ setColumns() {
|
|
|
|
|
+ this.columns = [
|
|
|
{
|
|
{
|
|
|
width: 45,
|
|
width: 45,
|
|
|
type: 'selection',
|
|
type: 'selection',
|
|
@@ -553,16 +563,6 @@
|
|
|
}
|
|
}
|
|
|
];
|
|
];
|
|
|
},
|
|
},
|
|
|
- checkRowData() {
|
|
|
|
|
- return (row) => {
|
|
|
|
|
- return row.checkedata ? true : false;
|
|
|
|
|
- };
|
|
|
|
|
- }
|
|
|
|
|
- },
|
|
|
|
|
- created() {
|
|
|
|
|
- this.getFieldModel();
|
|
|
|
|
- },
|
|
|
|
|
- methods: {
|
|
|
|
|
// 进入详情
|
|
// 进入详情
|
|
|
openDetails(row) {
|
|
openDetails(row) {
|
|
|
let dispatchRow = { ...row };
|
|
let dispatchRow = { ...row };
|
|
@@ -728,7 +728,7 @@
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- this.newColumns = [...this.columns, ...newRes, ...privateColumn];
|
|
|
|
|
|
|
+ this.columns = [...this.columns, ...newRes, ...privateColumn];
|
|
|
|
|
|
|
|
this.$forceUpdate();
|
|
this.$forceUpdate();
|
|
|
});
|
|
});
|