空运拆单

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

@@ -165,12 +165,12 @@
               </template>
             </el-table-column>
 
-            <el-table-column :label="$t('入仓体积')" align="center" >
+            <el-table-column :label="$t('入仓体积')" align="center" width="100px" >
               <template slot-scope="scope">
                 {{scope.row.volume}}m³
               </template>
             </el-table-column>
-            <el-table-column :label="$t('收费体积')" align="center" >
+            <el-table-column :label="$t('收费体积')" align="center"  width="100px">
               <template slot-scope="scope">
                 {{scope.row.chargeVolume}}m³
                 <!--<el-input v-model="scope.row.chargeVolume" @change="updateField(scope.row, 'chargeVolume')" size="mini" disabled>
@@ -178,12 +178,12 @@
                 </el-input>-->
               </template>
             </el-table-column>
-            <el-table-column :label="$t('入仓重量')" align="center">
+            <el-table-column :label="$t('入仓重量')" align="center" width="100px">
               <template slot-scope="scope">
                 {{scope.row.weight}}kg
               </template>
             </el-table-column>
-            <el-table-column :label="$t('收费重量')" align="center">
+            <el-table-column :label="$t('收费重量')" align="center" width="100px">
               <template slot-scope="scope">
                 {{scope.row.chargeWeight}}kg
                 <!--<el-input v-model="scope.row.chargeWeight" @change="updateField(scope.row, 'chargeWeight')" size="mini" disabled>
@@ -191,7 +191,7 @@
                 </el-input>-->
               </template>
             </el-table-column>
-            <el-table-column :label="$t('货值')" align="center">
+            <el-table-column :label="$t('货值')" align="center" width="100px">
               <template slot-scope="scope">
                 {{scope.row.worth}}{{ $t('元') }}
                 <!--<el-input v-model="scope.row.worth" @change="updateField(scope.row, 'worth')" size="mini" disabled>
@@ -199,14 +199,35 @@
                 </el-input>-->
               </template>
             </el-table-column>
-            <el-table-column :label="$t('箱数')" align="center" prop="num">
+            <el-table-column :label="$t('箱数')" align="center" prop="num" width="70">
               <template slot-scope="scope">
                 <el-button type="text" @click="currentWarehouseRecord=scope.row.specsRecordVOList">
                   {{ scope.row.num }}
                 </el-button>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('数量(个)')" align="center" prop="quantity"></el-table-column>
+            <el-table-column :label="$t('数量(个)')" align="center" prop="quantity" width="80"></el-table-column>
+						<el-table-column :label="$t('成交单价')" align="center" min-width="220px" v-if="[3,4].indexOf(orderData.transportId) > -1">
+							<template slot-scope="scope">
+								<template v-if="scope.row.charging != 1">
+									<div class="flex">
+                    {{$t('运费')}}
+                    <el-input v-model="scope.row.oneSeaFreight" @change="updateField(scope.row, 'oneSeaFreight')" size="mini" style="width: 80px"></el-input>
+                    {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}
+                  </div>
+									<div class="flex">
+                    {{$t('清关费')}}
+                    <el-input v-model="scope.row.oneClearanceFreight" @change="updateField(scope.row, 'oneClearanceFreight')" size="mini" style="width: 80px"></el-input>
+										{{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}
+                  </div>
+                </template>
+                <template v-else>
+									{{$t('全包价')}}<el-input v-model="scope.row.oneSeaFreight" @change="updateField(scope.row, 'oneSeaFreight')" size="mini" style="width: 80px"></el-input>
+									{{currencyMap[scope.row.currencyId]}}
+									{{unitMap[scope.row.clearanceFreightVolume]}}
+                </template>
+							</template>
+						</el-table-column>
             <el-table-column :label="$t('操作')" align="center">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
@@ -503,6 +524,8 @@ import WarehouseDetail from "@/views/ecw/order/components/WarehouseDetail";
 import WarehouseRecord from "@/views/ecw/order/splitApply/components/WarehouseRecord";
 import PutIn from "@/views/ecw/order/splitApply/components/PutIn.vue";
 import Template from "@/views/cms/template/index.vue";
+import {getCurrencyList} from "@/api/ecw/currency";
+import {getUnitList} from "@/api/ecw/unit";
 
 export default {
   name: "SplitApply",
@@ -568,7 +591,11 @@ export default {
       // 当前正在放入的入仓记录
       currentPutIn: null,
       // 订单剩余数据，sumNum,splitNum,splitResidueNum,totalWorth,splitWorth,splitResidueWorth
-      orderLeftData: null
+      orderLeftData: null,
+      // 货币
+      currencyList: [],
+      // 体积单位
+      unitList: []
     };
   },
   async created() {
@@ -590,6 +617,9 @@ export default {
     getOrderWarehouseIn(this.queryParams.orderId).then(res => {
       this.warehouseInList = res.data
     })
+
+    getCurrencyList().then(res => this.currencyList = res.data)
+    getUnitList().then(res => this.unitList = res.data)
   },
   watch: {
     //监听table这个对象
@@ -817,7 +847,21 @@ export default {
         })
         return total.toNumber()
       }
-    }
+    },
+    currencyMap(){
+      let map = {}
+      this.currencyList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
+    unitMap(){
+      let map = {}
+      this.unitList.forEach(item => {
+        map[item.id] = this.$l(item, 'title')
+      })
+      return map
+    },
   },
   methods: {
     /*检查并提交字段(体积，重量)修改*/