From 08377c74b228caa3d2292f0315e0038fa0fcd93a Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Fri, 19 Apr 2019 11:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/virtual/orders/js/edit.js | 40 +++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/virtual/orders/js/edit.js b/frontend/src/views/virtual/orders/js/edit.js
index 4cbfe48c..946cbcc3 100644
--- a/frontend/src/views/virtual/orders/js/edit.js
+++ b/frontend/src/views/virtual/orders/js/edit.js
@@ -67,16 +67,17 @@ export default {
     show(bool) {
       this.my_show = bool;
       if (bool) {
-        this.initData().then(() => {
-          this.init();
-
-          if (this.data) {
-            for (let k in this.data) {
-              if (k in this.params) {
-                this.params[k] = this.data[k];
-              }
+        if (this.data) {
+          console.log("data", this.data);
+          for (let k in this.data) {
+            if (k in this.params) {
+              this.params[k] = this.data[k];
             }
           }
+        }
+
+        this.initData().then(() => {
+          this.init();
         });
       }
     },
@@ -109,7 +110,13 @@ export default {
               return item.status === 0;
             });
 
-            this.completePackagesFilter = this.packages;
+            if (typeof this.params.carrier_operator === "number") {
+              this.completePackagesFilter = this.packages.filter(item => {
+                return item.carrier_operator === this.params.carrier_operator;
+              });
+            } else {
+              this.completePackagesFilter = this.packages;
+            }
 
             resolve();
           })
@@ -140,6 +147,9 @@ export default {
 
       if (selectPackage) {
         this.params.carrier_operator = selectPackage.carrier_operator;
+        this.completePackagesFilter = this.packages.filter(item => {
+          return item.carrier_operator === this.params.carrier_operator;
+        });
       }
     },
     handleChangeCarrierOperator(value) {
@@ -329,6 +339,7 @@ export default {
       this.params.company_id = item[0].company_id;
 
       if ([0, 1].indexOf(this.type)) {
+        console.log(item);
         this.params.package_id = item[0].package_id;
         this.handleChangePackage(this.params.package_id);
       }
@@ -402,6 +413,13 @@ export default {
       for (let index = 0; index < needParams.length; index++) {
         const element = needParams[index];
 
+        if (
+          element === "carrier_operator" &&
+          typeof this.params.carrier_operator === "number"
+        ) {
+          continue;
+        }
+
         let node = orders
           .map(el => {
             return el[element];
@@ -423,6 +441,10 @@ export default {
         }
       }
 
+      if (this.params.company_id || this.params.package_id) {
+        return;
+      }
+
       this.$store.dispatch("getRelations").then(res => {
         let relations = res.filter(el => {
           return (