添加物流公司

src/api/ecw/order.js

@@ -294,4 +294,11 @@ export function getCargoControlOrderPage(params){
        method:'put',
        data
      })
-}
\ No newline at end of file
+}
+export function listByOrderId(params){
+  return request({
+    url:'/order/location/list-by-order-id',
+    method:'get',
+    params,
+  })
+}

src/views/ecw/order/transferWarehousing.vue

@@ -73,9 +73,11 @@
     <el-descriptions style="margin-top: 20px" :column="4" border>
       <el-descriptions-item label="集运仓库">{{ warehouseDetails.warehouseOutName }}</el-descriptions-item>
       <el-descriptions-item label="储位">{{}}</el-descriptions-item>
-      <el-descriptions-item label="调拨目标仓">{{ warehouseDetails.warehouseInId }}</el-descriptions-item>
+      <el-descriptions-item label="调拨目标仓">{{ warehouseDetails.warehouseInName }}</el-descriptions-item>
       <el-descriptions-item label="物流公司">
-        <el-input v-model="params.logisticsCompany"></el-input>
+        <el-select v-model="params.logisticsCompany" >
+          <el-option v-for="(item,index) in expressList " :key="index"  :value="item.id" :label="item.companyZh"></el-option>
+        </el-select>
       </el-descriptions-item>
       <el-descriptions-item label="物流单号">
         <el-input v-model="params.logisticsNo"></el-input>
@@ -118,7 +120,7 @@
 <script>
 import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {
-  getOrder,
+  getOrder, listByOrderId,
   orderWarehouseInGetAdjustInfo,
   orderWarehousePicturePage, warehouseAdjustArrived, warehouseAdjustPage,
   warehouseAdjustSendOut
@@ -126,6 +128,7 @@ import {
 import Template from "@/views/cms/template";
 import {DICT_TYPE} from '@/utils/dict';
 import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index";
+import {getSupplierPage} from "@/api/ecw/supplier";
 let STATUS = {1:'审核中', 2:'已通过', 3:'已拒绝', 4:'已出仓', 5:'已到仓'}
 export default {
   name: "transferWarehousing",
@@ -149,14 +152,19 @@ export default {
         deliveryDate: "",
         deliveryRemark: "",
         id: undefined,
-        logisticsCompany: "",
+        logisticsCompany:undefined,
         logisticsNo: "",
         phone: "",
         urls: []
-      }
+      },
+      expressList:[]
     }
   },
   created() {
+
+    getSupplierPage({ pageNo: 1, pageSize: 10000}).then(r => {
+     this.expressList = r.data.list;
+    })
     getOrder(this.orderId).then(r => {
       if (r.code === 0) {
         this.orderDetails = r.data;
@@ -169,16 +177,19 @@ export default {
     }
     orderWarehouseInGetAdjustInfo({orderId: this.orderId, lang: 0}).then(r => {
       this.warehouseDetails = r.data[0]
+      listByOrderId({orderId:this.orderId}).then(r => {
+        console.log(r,'r')
+      })
       this.params.phone = this.warehouseDetails.phone;
       this.params.logisticsNo = this.warehouseDetails.logisticsNo;
       this.params.id = this.warehouseDetails.id;
       this.params.deliveryDate = this.warehouseDetails.deliveryDate
+      this.params.logisticsCompany = this.warehouseDetails.logisticsCompany ? parseInt(this.warehouseDetails.logisticsCompany) :undefined;
       orderWarehousePicturePage({rows:100,bizId:this.params.id,type:this.type == 1 ? 2 : 3 }).then(r => {
         if(r.code === 0){
           this.params.urls = r.data.list.map(e => e.url);
         }
       })
-
     })
   },
   methods:{