Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/transferWarehousing.vue

@@ -222,7 +222,7 @@ export default {
         arrivalRemark: this.params.arrivalRemark,
         descZh: this.params.descZh,
         id: this.params.id,
-        manualExceptionType:this.params.manualExceptionType,
+        manualExceptionType:this.params.manualExceptionType.join(','),
         orderLocationCreateReqVOList: this.params.orderLocationCreateReqVOList,
         urls: this.params.urls,
         exceptionUrls:this.params.exceptionUrls.split(','),
@@ -281,7 +281,7 @@ export default {
                    if(itemmm.id === item.areaId){
                      if(itemmm.positionList.length > 0){
                        itemmm.positionList.forEach(ic =>{
-                         if(ic.children.length > 0){
+                         if(ic.children && ic.children.length > 0){
                            ic.children.forEach(icc => {
                              if(icc.id === item.locationId){
                                obj.push({
@@ -308,7 +308,6 @@ export default {
       this.params.phone = this.warehouseDetails.phone || '';
       this.params.logisticsNo = this.warehouseDetails.logisticsNo;
       this.params.id = this.warehouseDetails.id;
-      this.params.deliveryDate = new Date(this.warehouseDetails.deliveryDate);
       this.params.logisticsCompany = this.warehouseDetails.logisticsCompany ? parseInt(this.warehouseDetails.logisticsCompany) :undefined;
       orderWarehousePicturePage({rows:100,bizId:this.params.id,type:this.type == 1 ? 2 : 3 }).then(r => {
         if(r.code === 0){