20240-06-21提交

src/views/ecw/order/prepayDeal.vue

@@ -1970,8 +1970,6 @@
                         >{{ currencyMap[scope.row.clearanceFreightCurrency] }} /
                         {{ unitMap[scope.row.clearanceFreightVolume] }}</span
                       >
-                      <!--              <selector v-model="scope.row.clearanceFreightCurrency"  :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" />
-                            / <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2  class="w100" /> -->
                     </div>
                   </div>
                   <div v-else>
@@ -2557,6 +2555,7 @@ export default {
           this.orderExceptionData.orderExceptionType ==
             "not_shipping_channel_exception"
         ) {
+          //not_shipping_channel_exception 不可出渠道异常
           this.selectLine = this.routerList.find(
             (item) => item.id == this.handlerParams.lineId
           );
@@ -2568,6 +2567,7 @@ export default {
     },
     //订单详情
     getOrderData() {
+      //not_shipping_channel_exception 不可出渠道异常
       getOrder(this.orderId).then((response) => {
         this.orderData = response.data;
         if (this.orderData.channelId != 0) {
@@ -3071,11 +3071,12 @@ export default {
         if (!item.prodId) {
           calcable = false;
         }
+        //alert(item.oneClearanceFreight);
       });
       console.log("calculationPrice", this.handlerParams.channelId);
       if (this.calculating || !calcable) return false;
       this.calculating = true;
-      console.log("calculating ---> ");
+      //console.log("calculating ---> ");
       const params = {
         lineId: this.handlerParams.lineId,
         transportId: this.orderData.transportId,
@@ -3093,8 +3094,10 @@ export default {
       calculationPrice(params)
         .then((res) => {
           this.orderData.orderItemVOList.map((item, index) => {
+            //清关价问题关键点在这，后台获取的值的变量名称换了
             item.oneClearanceFreight =
               res.data.prodCostDtoList[index].oneClearanceFee;
+            //alert( item.oneClearanceFreight);
             item.clearanceFreightCurrency =
               res.data.prodCostDtoList[index].clearanceFeeCurrency;
             item.clearanceFreightVolume =

src/views/ecw/order/stocking/index.vue

@@ -301,13 +301,24 @@
           })
         }}
       </el-form-item>
+      <!--lanbm 2024-06-21 处理问题
       <el-form-item :label="$t('入仓统计')" class="mb-0">
         {{
           $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
-            num: statistics.sumCartonsNumFinishedWarehouseIn,
-            weight: statistics.sumWeightFinishedWarehouseIn,
-            volume: statistics.sumVolumeFinishedWarehouseIn,
-            quantity: statistics.sumQuantityAllFinishedWarehouseIn,
+            num:statistics.sumCartonsNumFinishedWarehouseIn,
+            weight:statistics.sumWeightFinishedWarehouseIn,
+            volume:statistics.sumVolumeFinishedWarehouseIn,
+            quantity:statistics.sumQuantityAllFinishedWarehouseIn,
+          })
+        }}
+      </el-form-item>-->
+      <el-form-item :label="$t('入仓统计')" class="mb-0">
+        {{
+          $t(`{num}箱 {weight}Kg {volume}m³ {quantity}个`, {
+            num:form.sumNum,
+            weight:form.sumWeight,
+            volume:form.sumVolume,
+            quantity:form.sumQuantity,
           })
         }}
       </el-form-item>
@@ -502,6 +513,8 @@ export default {
         manualExceptionType: [],
         sumVolume: "",
         sumWeight: "",
+        sumNum:"",//入仓件数 lanbm 2024-06-21 add
+        sumQuantity:"",//入仓数量
       },
       currencyList: [],
       order: {},
@@ -599,6 +612,8 @@ export default {
           this.order = r.data;
           this.form.sumVolume = this.order.sumVolume;
           this.form.sumWeight = this.order.sumWeight;
+          this.form.sumNum=this.order.sumNum;
+          this.form.sumQuantity=this.order.sumQuantity;
         })
         .then(() => {
           // this.getLabelByOrder()