From 0835d82f4b56113258f2be1fcbddee5dba81602e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 21 Dec 2024 10:19:24 +0800
Subject: [PATCH] md

---
 .../oms/emisWaybill/BatchOrderRecord.vue      | 44 +------------------
 src/views/oms/emisWaybill/OrderRecord.vue     |  8 ++--
 2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/src/views/oms/emisWaybill/BatchOrderRecord.vue b/src/views/oms/emisWaybill/BatchOrderRecord.vue
index 00500fc..400dbc5 100644
--- a/src/views/oms/emisWaybill/BatchOrderRecord.vue
+++ b/src/views/oms/emisWaybill/BatchOrderRecord.vue
@@ -457,49 +457,6 @@ export default {
         // 取件方式	派送方式	运费	支付方式	月结客户	回款联系人	销售联系人	费用备注
         // 取件员/操作员
         // 发货/签收短信
-        // let rowIndex=element['__rowNum__']
-        // let orderData={
-        //         billCode: element['运单号'],
-        //         sendDate: parseTime(new Date()),
-        //         custNo:  element['月结客户'],
-        //         receiveName: element['收件人'],
-        //         receiveCompany:element['收件公司'],
-        //         receiveMobile:element['收件电话'],
-        //         receiveCountry: element['收件国'],
-        //         receiveProvince: element['收件省'],
-        //         receiveCity: element['收件市'],
-        //         receiveCounty:  element['收件区'],
-        //         receiveAddress: element['收件地址'],
-        //         sendName: element['发货人'],
-        //         sendCompany: element['发货公司'],
-        //         sendMobile: element['发货电话'],
-        //         sendCountry: element['发货国'],
-        //         sendProvince: element['发货省'],
-        //         sendCity:element['发货市'],
-        //         sendCounty:element['发货区'],
-        //         sendAddress: element['发货地址'],
-        //         paymentType: element['支付方式'],
-        //         calcFeeType: element['计费方式'],
-        //         transLineType:  element['线路'],
-        //         productType: element['产品类型'],
-        //         customsClear: element['清关方式'],
-        //         customsEclaration:  element['报关方式'],
-        //         dispatchMethod:  element['派送方式'],
-        //         pickupMethod: element['取件方式'],
-        //         goodsInfo: element['货物名称'],
-        //         // totalVolume: element['体积'],
-        //         totalVolume: '0.00',
-        //         parcelQty: element['件数'],
-        //         billWeight: element['重量'],
-        //         operateEmployeeCode: element['专属业务员'],
-        //         orderRemark:  element['备注'],
-        //         packType: '纸箱',
-        //         freight:0.00,
-
-        //         uploadStatus: 0,
-        //         errorInfo:'',
-        // }
-        // this.tmpDataList.push(orderData);
 
         let rowIndex=element['__rowNum__']
         let orderData={
@@ -539,6 +496,7 @@ export default {
                 feeRemark:element['费用备注'],
                 payee: element['销售联系人'],
                 salesmen: element['销售联系人'],
+                intoWarehouseName: element['收货仓库名称'],
                 // operateEmployeeCode: element['取件员/操作员'],
                 orderRemark:  element['下单备注'],
                 // blMessage:  element['寄件/签收短信'],
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 00f1fd1..ccfd749 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -1643,16 +1643,16 @@ methods: {
             customsEclaration:this.form.customsEclaration||'1'
           }
 
-          const loadingInstance = this.$loading({
-            text: '正在计算报价,请稍候...'
-          })
+          // const loadingInstance = this.$loading({
+          //   text: '正在计算报价,请稍候...'
+          // })
           // 通过服务器其计算，保留自定义费用
           calcProductFee(postData).then(response => {
                   this.productFeeList = response.data;
                   if(!this.productFeeList || this.productFeeList.length==0){
                     this.$message.error(`无报价`);
                   }
-              loadingInstance.close();
+              // loadingInstance.close();
           });
         }
     },