订单快递公司显示修改

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

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="deliveryId">
+        <el-form-item label="快递公司：" prop="companyName">
           <el-select
-            v-model="shipForm.deliveryId"
+            v-model="shipForm.companyName"
             placeholder="请选择快递公司"
             clearable
             size="small"
@@ -32,7 +32,7 @@
               v-for="item in companyData"
               :key="item.areaId"
               :label="item.companyName"
-              :value="item.deliveryId"
+              :value="item.companyName"
             />
           </el-select>
         </el-form-item>
@@ -72,7 +72,7 @@
         </el-table-column>
         <el-table-column label="快递公司">
           <template slot-scope="{ row }">
-            <div>{{ row.deliveryId || "--" }}</div>
+            <div>{{ row.companyName || "--" }}</div>
           </template>
         </el-table-column>
         <el-table-column label="快递单号">
@@ -119,7 +119,7 @@ export default {
     return {
       loading: false,
       shipForm: {
-        deliveryId: "",
+        companyName: "",
         deliveryFlowId: "",
       },
       // 快递下拉列表
@@ -129,7 +129,7 @@ export default {
       // 选中商品ID
       ids: [],
       rules: {
-        deliveryId: [
+        companyName: [
           { required: true, message: "请选择快递公司", trigger: "change" },
         ],
         deliveryFlowId: [