Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!103

src/views/order/channel/components/SendGoods.vue

@@ -20,9 +20,9 @@
             `${goodsInfo.receiver}，${goodsInfo.tel}，${goodsInfo.province}${goodsInfo.city}${goodsInfo.area}${goodsInfo.address}`
           }}</span>
         </el-form-item>
-        <el-form-item label="快递公司：" prop="companyName">
+        <el-form-item label="快递公司：" prop="deliveryId">
           <el-select
-            v-model="shipForm.companyName"
+            v-model="shipForm.deliveryId"
             placeholder="请选择快递公司"
             clearable
             size="small"
@@ -32,7 +32,7 @@
               v-for="item in companyData"
               :key="item.areaId"
               :label="item.companyName"
-              :value="item.companyName"
+              :value="item.deliveryId"
             />
           </el-select>
         </el-form-item>
@@ -154,7 +154,7 @@ export default {
     return {
       loading: false,
       shipForm: {
-        companyName: "",
+        deliveryId: "",
         deliveryFlowId: "",
         boxId: "",
       },
@@ -165,7 +165,7 @@ export default {
       // 选中盲票组列表
       list: [],
       rules: {
-        companyName: [
+        deliveryId: [
           { required: true, message: "请选择快递公司", trigger: "change" },
         ],
         deliveryFlowId: [

src/views/order/channel/detail.vue

@@ -172,6 +172,14 @@ export default {
     this.getDetail();
     this.getChannelList();
   },
+  activated() {
+    const orderId = this.$route.query.id;
+    if (orderId != null && orderId != this.orderId) {
+      this.orderId = orderId;
+      this.getDetail();
+      this.getChannelList();
+    }
+  },
   methods: {
     // 盲票组列表
     getChannelList(row) {
@@ -254,4 +262,4 @@ export default {
     margin-left: 20px;
   }
 }
-</style>
+</style>

src/views/order/deliver/components/SendGoods.vue

@@ -20,9 +20,9 @@
             `${goodsInfo.receiver}，${goodsInfo.tel}，${goodsInfo.province}${goodsInfo.city}${goodsInfo.area}${goodsInfo.address}`
           }}</span>
         </el-form-item>
-        <el-form-item label="快递公司：" prop="companyName">
+        <el-form-item label="快递公司：" prop="deliveryId">
           <el-select
-            v-model="shipForm.companyName"
+            v-model="shipForm.deliveryId"
             placeholder="请选择快递公司"
             clearable
             size="small"
@@ -32,7 +32,7 @@
               v-for="item in companyData"
               :key="item.areaId"
               :label="item.companyName"
-              :value="item.companyName"
+              :value="item.deliveryId"
             />
           </el-select>
         </el-form-item>
@@ -119,7 +119,7 @@ export default {
     return {
       loading: false,
       shipForm: {
-        companyName: "",
+        deliveryId: "",
         deliveryFlowId: "",
       },
       // 快递下拉列表
@@ -129,7 +129,7 @@ export default {
       // 选中商品ID
       ids: [],
       rules: {
-        companyName: [
+        deliveryId: [
           { required: true, message: "请选择快递公司", trigger: "change" },
         ],
         deliveryFlowId: [

src/views/order/deliver/detail.vue

@@ -189,6 +189,13 @@ export default {
     this.orderId = this.$route.query.id;
     this.getDetail();
   },
+  activated() {
+    const orderId = this.$route.query.id;
+    if (orderId != null && orderId != this.orderId) {
+      this.orderId = orderId;
+      this.getDetail();
+    }
+  },
   methods: {
     // 订单详情
     getDetail() {
@@ -312,4 +319,4 @@ export default {
     margin-left: 20px;
   }
 }
-</style>
+</style>