|
@@ -711,7 +711,6 @@ export default {
|
|
|
}, {
|
|
|
label: '件数',
|
|
|
width: 100,
|
|
|
- search: true,
|
|
|
index: 6,
|
|
|
overHidden: true,
|
|
|
controls: false,
|
|
@@ -721,7 +720,6 @@ export default {
|
|
|
}, {
|
|
|
label: '包装',
|
|
|
width: 100,
|
|
|
- search: true,
|
|
|
index: 7,
|
|
|
overHidden: true,
|
|
|
prop: 'packing',
|
|
@@ -734,7 +732,6 @@ export default {
|
|
|
}, {
|
|
|
label: '尺码',
|
|
|
width: 100,
|
|
|
- search: true,
|
|
|
index:8,
|
|
|
overHidden: true,
|
|
|
prop: 'size',
|
|
@@ -816,6 +813,21 @@ export default {
|
|
|
message: " ",
|
|
|
trigger: "blur"
|
|
|
}],
|
|
|
+ }, {
|
|
|
+ label: '订单号',
|
|
|
+ prop: 'orderNo',
|
|
|
+ disabled: true
|
|
|
+ }, {
|
|
|
+ label: '场站',
|
|
|
+ prop: 'station',
|
|
|
+ rules: [{
|
|
|
+ required: false,
|
|
|
+ message: " ",
|
|
|
+ trigger: "blur"
|
|
|
+ }],
|
|
|
+ }, {
|
|
|
+ label: '业务员',
|
|
|
+ prop: 'salesman',
|
|
|
}]
|
|
|
},
|
|
|
goodsOptionFormTwo: {
|
|
@@ -832,18 +844,6 @@ export default {
|
|
|
trigger: "blur"
|
|
|
}],
|
|
|
}, {
|
|
|
- label: '订单号',
|
|
|
- prop: 'orderNo',
|
|
|
- disabled: true
|
|
|
- }, {
|
|
|
- label: '场站',
|
|
|
- prop: 'station',
|
|
|
- rules: [{
|
|
|
- required: false,
|
|
|
- message: " ",
|
|
|
- trigger: "blur"
|
|
|
- }],
|
|
|
- }, {
|
|
|
label: '船名航次',
|
|
|
prop: 'factory',
|
|
|
rules: [{
|
|
@@ -881,9 +881,6 @@ export default {
|
|
|
prop: 'siCutoffDate',
|
|
|
type: 'date'
|
|
|
}, {
|
|
|
- label: '业务员',
|
|
|
- prop: 'salesman',
|
|
|
- }, {
|
|
|
label: '备注',
|
|
|
span: 24,
|
|
|
prop: 'remarks'
|
|
@@ -1510,6 +1507,11 @@ export default {
|
|
|
item.region = ''
|
|
|
}
|
|
|
})
|
|
|
+ this.entrustList.forEach(item=> {
|
|
|
+ if (!item.arrivalTime){
|
|
|
+ item.arrivalTime = this.goodsForm.arrivalTime
|
|
|
+ }
|
|
|
+ })
|
|
|
saveSaveList({
|
|
|
...this.goodsForm,
|
|
|
kind: '1',
|