Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/distribution/stockup/distributionStockupDetails.vue

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -276,7 +276,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'state',
+          prop: 'deliveryStatus',
           label: '配送状态',
           type: 3,
           values: '',

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -562,7 +562,7 @@ export default {
         column: [
           {
             label: "包条码",
-            prop: "packetBarCode",
+            prop: "orderPackageCode",
             search: true,
             width:"100px"
           },

src/views/distribution/stockup/distributionStockupDetails.vue

@@ -642,7 +642,6 @@ export default {
         const serveTypes = !!serveType ? serveType.split(',') : null;
         const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null;
         const deliveryTypes = !!deliveryType ?  deliveryType.split(',') : null;
-        // console.log("123456",serveTypes,deliveryWays,deliveryTypes);
         const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null;
         const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null;
         const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null;
@@ -724,6 +723,9 @@ export default {
     //转换类型
     getOwnServer(row,name,list){
       // console.log(">>>>>",row,name,list);
+      console.log(">>>>>",row);
+      console.log(">>>>>",name);
+      console.log(">>>>>",list);
       row.forEach( i =>{
         console.log(i,"-=-=-=-");
         let a = list.find( s => s.dictKey == i);