|
@@ -525,9 +525,7 @@
|
|
|
canHandl() {
|
|
canHandl() {
|
|
|
return this.form.datasource.length;
|
|
return this.form.datasource.length;
|
|
|
},
|
|
},
|
|
|
- contractId() {
|
|
|
|
|
- return this.$store.state.order.contractId;
|
|
|
|
|
- },
|
|
|
|
|
|
|
+
|
|
|
clientEnvironmentId() {
|
|
clientEnvironmentId() {
|
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
|
},
|
|
},
|
|
@@ -696,14 +694,14 @@
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
- {
|
|
|
|
|
- width: 120,
|
|
|
|
|
- prop: 'blockCount',
|
|
|
|
|
- label: '发货块数',
|
|
|
|
|
- slot: 'blockCount',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
- show: this.clientEnvironmentId == 4
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // width: 120,
|
|
|
|
|
+ // prop: 'blockCount',
|
|
|
|
|
+ // label: '发货块数',
|
|
|
|
|
+ // slot: 'blockCount',
|
|
|
|
|
+ // align: 'center',
|
|
|
|
|
+ // show: this.clientEnvironmentId == 4
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
width: 120,
|
|
width: 120,
|
|
|
prop: 'singleWeight',
|
|
prop: 'singleWeight',
|