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

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -25,7 +25,9 @@
                     v-model="form.brand"
                     :placeholder="$t('可修改')"
                     filterable
+                    remote
                     @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
                     clearable>
                     <el-option
                       v-for="item in brandList"
@@ -197,7 +199,9 @@
                     v-model="form1.brand"
                     :placeholder="$t('可修改')"
                     filterable
+                    remote
                     @change="handleBrandChange"
+                    :remote-method="getProductBrandPage"
                     clearable>
                     <el-option
                       v-for="item in brandList"
@@ -410,17 +414,6 @@ export default {
     }
   },
 
-  mounted() {
-    getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = r.data.list.map(e => {
-        if(e.id){
-          e.id = e.id.toString()
-        }
-        return e
-      })
-    })
-  },
-
   data() {
     return {
       DICT_TYPE,
@@ -497,6 +490,9 @@ export default {
         if (this.warehousing) {
           // this.orderItem = this.warehousing
           this.inTime = this.warehousing.inTime
+          if (!!this.warehousing.brandName){
+            this.getProductBrandPage(this.warehousing.brandName)
+          }
         }
       } else {
       }
@@ -535,8 +531,17 @@ export default {
       }
     }
   },
-
   methods: {
+    getProductBrandPage(titleZh = undefined) {
+      getProductBrankPage({pageSize: 20, titleZh}).then(r => {
+        this.brandList = r.data.list.map(e => {
+          if(e.id){
+            e.id = e.id.toString()
+          }
+          return e
+        })
+      })
+    },
     handleCancelProcessInstance(){
       this.$prompt('请输入取消原因？', this.$t("取消流程"), {
         type: 'warning',