|
|
@@ -504,6 +504,7 @@
|
|
|
dynamicsColumns: [],
|
|
|
columnsVersion: 1,
|
|
|
isWarehouseId: 0,
|
|
|
+ blockCountColumn: {},
|
|
|
form: {
|
|
|
datasource: []
|
|
|
},
|
|
|
@@ -527,7 +528,23 @@
|
|
|
},
|
|
|
|
|
|
clientEnvironmentId() {
|
|
|
- return this.$store.state.user.info.clientEnvironmentId;
|
|
|
+ let clientEnvironmentId =
|
|
|
+ this.$store.state.user.info.clientEnvironmentId;
|
|
|
+ if (clientEnvironmentId == 3) {
|
|
|
+ this.blockCountColumn = {
|
|
|
+ width: 150,
|
|
|
+ prop: 'blockCount',
|
|
|
+ label: '发货数量',
|
|
|
+ slot: 'blockCount',
|
|
|
+ headerSlot: 'headerBlockCount',
|
|
|
+ align: 'center'
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ this.blockCountColumn = {
|
|
|
+ width: 1
|
|
|
+ };
|
|
|
+ }
|
|
|
+ return clientEnvironmentId;
|
|
|
},
|
|
|
columns() {
|
|
|
let columnsVersion = this.columnsVersion;
|
|
|
@@ -693,15 +710,8 @@
|
|
|
slot: 'measuringUnit',
|
|
|
align: 'center'
|
|
|
},
|
|
|
+ this.blockCountColumn,
|
|
|
|
|
|
- // {
|
|
|
- // width: 120,
|
|
|
- // prop: 'blockCount',
|
|
|
- // label: '发货块数',
|
|
|
- // slot: 'blockCount',
|
|
|
- // align: 'center',
|
|
|
- // show: this.clientEnvironmentId == 4
|
|
|
- // },
|
|
|
{
|
|
|
width: 120,
|
|
|
prop: 'singleWeight',
|
