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

src/components/WarehouseAreaSelect/index.vue

@@ -177,10 +177,6 @@ export default {
       this.initArea()
     },
     handleSave(){
-      this.$emit('input', this.inputValue)
-      this.dialogVisible = false
-
-      if (this.isEditing) {
       this.$nextTick(() => {
         const data = this.inputValue.map(e => {
           return {
@@ -189,10 +185,13 @@ export default {
             warehouseInId: this.warehouseInId
           }
         })
-          updateWarehouseInLocation(data)
+        this.$emit('input', data)
+        this.dialogVisible = false
 
-        })
+        if (this.isEditing || this.orderItemId) {
+            updateWarehouseInLocation(data)
         }
+      })
     },
     handleClose() {
       this.dialogVisible = false