部分Bug

src/views/ecw/box/indexFutureBox.vue

@@ -126,9 +126,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="运输方式" prop="transportType">
-          <!-- <el-radio-group v-model="form.transportType">
-            <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
-          </el-radio-group> -->
           <dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" v-model="form.transportType" form-type="radio" />
         </el-form-item>
         <el-form-item label="出货渠道" prop="shippingChannelId" v-if="form.transportType == 3 || form.transportType == 4">
@@ -304,38 +301,62 @@ export default {
     this.getList();
   },
   watch:{
-    'form.transportType'(transportId){
-      if(!transportId){
-        this.$set(this.form, 'loadingNumber', 0)
-        this.$set(this.form, 'readyWarehousingNumber', 0)
-        this.$set(this.form, 'warehousedNumber', 0)
-        this.$set(this.form, 'warehousingNumber', 0)
-
-        return 
+    'form.transportType'(){
+      this.getVolume()
+    },
+    'form.startWarehouseId'(){
+      this.getVolume()
+    },
+    'form.destWarehouseId'(){
+      this.getVolume()
+    },
+    'form.shippingChannelId'(){
+      console.log('123shippingChannelId')
+      this.getVolume()
+    },
+    'form.warehousedNumber'(){
+      //在仓 = 已入仓-已封柜
+      this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
+    },
+    'form.loadingNumber'(){
+      //在仓 = 已入仓-已封柜
+      this.$set(this.form, 'warehousingNumber',  Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
+    }
+  },
+  methods: {
+    getVolume(){
+      if(!this.form.transportType || !this.form.startWarehouseId || !this.form.destWarehouseId){
+        return this.setDefaultVolume()
+      }
+      // 空运需要选择渠道
+      if((this.form.transportType == 3 || this.form.transportType == 4) && !this.form.shippingChannelId){
+        return this.setDefaultVolume()
+      }
+      let data = {
+        transportId: this.form.transportType,
+        channelId: this.form.shippingChannelId,
+        departureId: this.form.startWarehouseId,
+        objectiveId: this.form.destWarehouseId
       }
       // 获得已封柜方数
-      getBoxedVolume({transportId}).then(res => {
+      getBoxedVolume(data).then(res => {
         this.$set(this.form, 'loadingNumber', res.data || 0)
       })
       // 获得待入仓方数
-      getToBeWareHousedVolume({transportId}).then(res => {
+      getToBeWareHousedVolume(data).then(res => {
         this.$set(this.form, 'readyWarehousingNumber', res.data || 0)
       })
       // 获得已入仓方数
-      getWareHousedVolume({transportId}).then(res => {
+      getWareHousedVolume(data).then(res => {
         this.$set(this.form, 'warehousedNumber', res.data || 0)
       })
     },
-    'form.warehousedNumber'(){
-      //在仓 = 已入仓-已封柜
-      this.$set(this.form, 'warehousingNumber', Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
+    setDefaultVolume(){
+      this.$set(this.form, 'loadingNumber', 0)
+      this.$set(this.form, 'readyWarehousingNumber', 0)
+      this.$set(this.form, 'warehousedNumber', 0)
+      this.$set(this.form, 'warehousingNumber', 0)
     },
-    'form.loadingNumber'(){
-      //在仓 = 已入仓-已封柜
-      this.$set(this.form, 'warehousingNumber',  Decimal(this.form.warehousedNumber).minus(this.form.loadingNumber))
-    }
-  },
-  methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/ecw/order/components/TransferCargo.vue

@@ -45,12 +45,12 @@
           </el-table-column>
           <el-table-column :label="$t('体积') + '(m³)'">
             <template slot-scope="{row}">
-              {{row.sumVolume}}
+              {{releaseVolme(row)}}
             </template>
           </el-table-column>
           <el-table-column :label="$t('重量') + '(kg)'">
             <template slot-scope="{row}">
-              {{row.sumWeight}}
+              {{releaseWeight(row)}}
             </template>
           </el-table-column>
         </el-table>
@@ -80,6 +80,7 @@ import {createPick, getRleaseInfo, seasoningCondimentsSelect, updateApply} from
 import AreaCodeSelector from '@/components/AreaCodeSelector'
 import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
 import WorkFlow from '@/components/WorkFlow'
+import Decimal from 'decimal.js'
 export default {
     props:{
         orderId: [String, Number],
@@ -111,6 +112,18 @@ export default {
         this.formData.ccIds = val.join(',')
       }
     },
+    computed:{
+      releaseVolme(){
+        return row => {
+          return new Decimal(row.sumVolume).mul(row.releaseNum).div(row.sumNum).toFixed(2)
+        }
+      },
+      releaseWeight(){
+        return row => {
+          return new Decimal(row.sumWeight).mul(row.releaseNum).div(row.sumNum).toFixed(2)
+        }
+      }
+    },
     created(){
         this.show = true
         this.loadData()

src/views/ecw/order/detail.vue

@@ -3,7 +3,7 @@
     <el-card class="card">
       <div slot="header" class="card-title">
         {{$t('订单编号')}}：{{order.orderNo}}
-        <template v-if="order.containerNumber">- {{order.containerNumber}}</template>
+        <template v-if="order.tidanNo">- {{order.tidanNo}}</template>
       </div>
       <el-row :gutter="20">
         <el-col :span="8" v-if="order.consignorVO">

src/views/ecw/order/edit.vue

@@ -248,7 +248,7 @@
                     <div>{{fee.seaRMB || 0}}{{$t('人民币')}}</div>
                     <div>{{fee.seaUSD || 0}}{{$t('美元')}}</div>
                 </el-descriptions-item>
-                <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
+                
                 <el-descriptions-item :label="$t('总清关费')">
                     <div>{{fee.clearanceNGN || 0}}{{$t('奈拉')}}</div>
                     <div>{{fee.clearanceRMB || 0}}{{$t('人民币')}}</div>
@@ -560,6 +560,7 @@ export default {
         status:0,
         sendstatus:0,
         isCargoControl: false,
+        isCollection: false,
         type:[],
         isExternalWarehouse: false,
         externalWarehouseDtoList:[{}],

src/views/ecw/order/index.vue

@@ -10,11 +10,11 @@
         <el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" />
       </el-form-item> -->
 
-      <el-form-item :label="$t('发货人')" prop="consignorId">
-        <el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('发货人')" prop="consignorKey">
+        <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('收货人')" prop="consigneeId">
-        <el-input v-model="queryParams.consigneeId" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('收货人')" prop="consigneeKey">
+        <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />

src/views/ecw/order/pending.vue

@@ -174,8 +174,11 @@ export default {
             })
           }
         }else{
-          let url = '../../lineProject/product-price/edit'
-           return this.$router.push(url)
+          return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
+            let url = '../../lineProject/product-price/edit'
+            this.$router.push(url)
+          })
+          
         }
 
       }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){