Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/oms/order/components/deliveryGoodsInfo.vue

@@ -270,16 +270,6 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       }],
-      [{
-        label:'备注',
-        prop:'tmsRemark',
-        component:'by-input',
-        compConfig:{
-          attr:{
-            clearable:true
-          }
-        }
-      }],
       [{
         label:'发货人',
         prop:'tmsShipmentConsignor',
@@ -408,6 +398,26 @@ export default class DeliveryGoodsInfo extends Vue {
       },{
         label:'运输方式',
         prop:'tmsTransportMethod',
+        component:'by-select',
+        compConfig:{
+          attr:{
+            clearable:true,
+            data: [{
+              label:'整车',
+              value:'整车'
+            },{
+              label:'零担',
+              value:'零担'
+            },{
+              label:'短驳',
+              value:'短驳'
+            }]
+          }
+        }
+      }],
+      [{
+        label:'备注',
+        prop:'tmsRemark',
         component:'by-input',
         compConfig:{
           attr:{