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

src/views/ecw/box/shippingAir/nodePage/agent.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
       <el-form-item :label="$t('代理商Agent')" prop="agentId">
-        <supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" @change="changesupplier" />
+        <supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
         <el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
       </el-form-item>
     </el-form>
@@ -63,11 +63,9 @@ export default {
       this.$emit("closeDialog", type);
     },
     SupplierDetail(){
+      this.supplierId = this.agentObj.agentId 
       this.$router.push('/supplier/detail?id='+this.supplierId)
     },
-    changesupplier(val){
-       this.supplierId = val
-    }
   },
 };
 </script>