|
|
@@ -530,23 +530,7 @@
|
|
|
},
|
|
|
|
|
|
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;
|
|
|
+ return this.$store.state.user.info.clientEnvironmentId;
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -723,7 +707,14 @@
|
|
|
slot: 'measuringUnit',
|
|
|
align: 'center'
|
|
|
},
|
|
|
- this.blockCountColumn,
|
|
|
+ {
|
|
|
+ width: 150,
|
|
|
+ prop: 'blockCount',
|
|
|
+ label: '发货块数',
|
|
|
+ slot: 'blockCount',
|
|
|
+ align: 'center',
|
|
|
+ show: false
|
|
|
+ },
|
|
|
|
|
|
{
|
|
|
width: 120,
|