空运拆单及审核

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

@@ -72,6 +72,27 @@
               <el-table-column :label="$t('备注')">
                   <template slot-scope="{row}">{{row.remark}}</template>
               </el-table-column>
+              <el-table-column :label="$t('成交单价')" align="center" min-width="220px" v-if="[3,4].indexOf(order.transportId) > -1">
+                <template slot-scope="scope">
+                  <template v-if="scope.row.charging != 1">
+                    <div class="flex">
+                      {{$t('运费')}}
+                      <el-input v-model="scope.row.oneSeaFreight" disabled 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" disabled 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>
         </template>
       <warehouse-record v-if="currentWarehouseRecord" :list="currentWarehouseRecord" append-to-body @close="currentWarehouseRecord=null"></warehouse-record>
@@ -82,8 +103,11 @@ import {getApproval, getOrder} from '@/api/ecw/order'
 import {getChannel} from '@/api/ecw/channel'
 import {getSplitList} from '@/api/ecw/orderHandle'
 import WarehouseRecord from "@/views/ecw/order/splitApply/components/WarehouseRecord";
+import Template from "@/views/cms/template/index.vue";
+import {getCurrencyList} from "@/api/ecw/currency";
+import {getUnitList} from "@/api/ecw/unit";
 export default {
-  components: {WarehouseRecord},
+  components: {Template, WarehouseRecord},
   props:{
         id: [String, Number]
     },
@@ -94,7 +118,9 @@ export default {
             channel: null,
             // orderSplitBackVOList: [],
           // 查看入仓记录的条目
-          currentWarehouseRecord: null
+          currentWarehouseRecord: null,
+          currencyList:[],
+          unitList: []
         }
     },
     watch:{
@@ -114,11 +140,30 @@ export default {
     computed:{
       orderSplitBackVOList(){
         return this.detail ? this.detail.orderSplitBackVOList : []
+      },
+      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
       }
     },
-    created(){
+    async created(){
         if(this.id){
-            this.getData()
+            await this.getData()
+
+            if([3, 4].indexOf(this.order.transportId) > -1){
+              getCurrencyList().then(res => this.currencyList = res.data)
+              getUnitList().then(res => this.unitList = res.data)
+            }
         }
     },
     methods:{

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

@@ -608,18 +608,22 @@ export default {
       this.queryParams.orderId = this.$route.query.orderId
     }
     Promise.all([this.getList(), this.getOrder()]).then(res => {
-      console.log("拆单数据", this.splitData, this.splitData.length)
       if(this.orderData.inWarehouseState != 207 &&  this.splitData.length){
         this.reset()
       }
+
+      // 空运需要获取货币和体积单位
+      if([3, 4].indexOf(this.orderData.transportId) > -1){
+        getCurrencyList().then(res => this.currencyList = res.data)
+        getUnitList().then(res => this.unitList = res.data)
+      }
     })
     // 获取入仓记录
     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这个对象