|
|
@@ -6,6 +6,7 @@
|
|
|
:close-on-click-modal="false"
|
|
|
:before-close="handleClose"
|
|
|
:close-on-press-escape="false"
|
|
|
+ destroy-on-close
|
|
|
top="5vh"
|
|
|
append-to-body
|
|
|
width="70%"
|
|
|
@@ -133,7 +134,8 @@
|
|
|
treeList: [],
|
|
|
treeLoading: false,
|
|
|
// cacheKeyUrl: '',
|
|
|
- columnsVersion: 1
|
|
|
+ columnsVersion: 1,
|
|
|
+ tabMixinsInit: false
|
|
|
};
|
|
|
},
|
|
|
watch: {},
|
|
|
@@ -159,7 +161,10 @@
|
|
|
align: 'center',
|
|
|
reserveSelection: true,
|
|
|
selectable: (row) => {
|
|
|
- return row.measureQuantity != 0;
|
|
|
+ const measureQuantity = parseFloat(row.measureQuantity) || 0;
|
|
|
+ const lockQuantity = parseFloat(row.lockQuantity) || 0;
|
|
|
+ const available = measureQuantity - lockQuantity;
|
|
|
+ return available != 0;
|
|
|
}
|
|
|
|
|
|
};
|
|
|
@@ -360,15 +365,18 @@
|
|
|
},
|
|
|
|
|
|
/* 表格数据源 */
|
|
|
- datasource({ page, limit, where, order }) {
|
|
|
+ async datasource({ page, limit, where, order }) {
|
|
|
this.dimension = where.dimension||'2';
|
|
|
let api = where.dimension == '1' ? getOutindetailtwoList : getBatchList;
|
|
|
- return api({
|
|
|
+
|
|
|
+ const data = await api({
|
|
|
...where,
|
|
|
...order,
|
|
|
pageNum: page,
|
|
|
size: limit
|
|
|
});
|
|
|
+ this.getTabColumns();
|
|
|
+ return data
|
|
|
},
|
|
|
|
|
|
/* 刷新表格 */
|