Commit ffcacc51 authored by dragondean@qq.com's avatar dragondean@qq.com

完善bug

parent 47899552
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
{{consignor.social}} {{consignor.socialNumber}} {{consignor.social}} {{consignor.socialNumber}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="联系地址"> <el-descriptions-item label="联系地址">
{{consignor.address || ''}} --> {{consignor.address || ''}}
</el-descriptions-item> </el-descriptions-item> -->
</el-descriptions> </el-descriptions>
<el-descriptions :column="3" border> <el-descriptions :column="3" border>
<el-descriptions-item label="*收货人" :labelStyle="labelStyle"> <el-descriptions-item label="*收货人" :labelStyle="labelStyle">
......
...@@ -72,6 +72,9 @@ ...@@ -72,6 +72,9 @@
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane label="货物详情" name="first"> <el-tab-pane label="货物详情" name="first">
<el-table :data="order.orderItemVOList" border style="width: 100%"> <el-table :data="order.orderItemVOList" border style="width: 100%">
<el-table-column prop="prodTitleZh" label="序号">
<template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column>
<el-table-column prop="prodTitleZh" label="中文品名" /> <el-table-column prop="prodTitleZh" label="中文品名" />
<el-table-column prop="prodTitleEn" label="英文品名" /> <el-table-column prop="prodTitleEn" label="英文品名" />
<el-table-column prop="brand" label="品牌"> <el-table-column prop="brand" label="品牌">
...@@ -95,6 +98,26 @@ ...@@ -95,6 +98,26 @@
</el-table-column> </el-table-column>
<el-table-column prop="volume" label="体积(m3)" /> <el-table-column prop="volume" label="体积(m3)" />
<el-table-column prop="weight" label="重量(kg)" /> <el-table-column prop="weight" label="重量(kg)" />
<el-table-column prop="" label="费用类型">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="row.feeType" />
</template>
</el-table-column>
<el-table-column prop="" label="成交单价">
<template slot-scope="{row}">
<template v-if="row.charging ==1">
全包价 // TODO 缺少全包价字段
</template>
<template v-else>
<div>
运费:{{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
</div>
<div>
清关费:{{row.clearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
</div>
</template>
</template>
</el-table-column>
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="订单动态" name="second"> <el-tab-pane label="订单动态" name="second">
...@@ -111,6 +134,9 @@ ...@@ -111,6 +134,9 @@
<el-button type="text" @click.native="showLadingBill=true" :disabled="!order.tidanNo">查看提货单</el-button> <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.tidanNo">查看提货单</el-button>
<el-button :disabled="true" type="text">装箱单未上传</el-button> <el-button :disabled="true" type="text">装箱单未上传</el-button>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="费用明细" name="four">
</el-tab-pane>
</el-tabs> </el-tabs>
</el-card> </el-card>
...@@ -124,6 +150,9 @@ import { getOrder } from '@/api/ecw/order' ...@@ -124,6 +150,9 @@ import { getOrder } from '@/api/ecw/order'
import { getDictDatas, DICT_TYPE } from '@/utils/dict'; import { getDictDatas, DICT_TYPE } from '@/utils/dict';
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
import {getUnitList} from '@/api/ecw/unit'
import {getCurrencyList} from '@/api/ecw/currency'
export default { export default {
name: "detail", name: "detail",
components: { components: {
...@@ -149,20 +178,36 @@ export default { ...@@ -149,20 +178,36 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
}, },
activities: [{ activities: [],
content: '活动按期开始',
timestamp: '2018-04-15'
}, {
content: '通过审核',
timestamp: '2018-04-13'
}, {
content: '创建成功',
timestamp: '2018-04-11'
}],
customsTypeList: getDictDatas(DICT_TYPE.ECW_CUSTOMS_TYPE), //报关类型 customsTypeList: getDictDatas(DICT_TYPE.ECW_CUSTOMS_TYPE), //报关类型
transportList: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE), //运输方式 transportList: getDictDatas(DICT_TYPE.ECW_TRANSPORT_TYPE), //运输方式
showWarehouseReceipt: false, // 是否显示打印入仓单 showWarehouseReceipt: false, // 是否显示打印入仓单
showLadingBill: false, // 是否显示打印提单 showLadingBill: false, // 是否显示打印提单
currencyList: [],
unitList:[]
}
},
computed:{
currentcyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = item.titleZh
})
return map
},
unitMap(){
let map = {}
this.unitList.forEach(item => {
map[item.id] = item.titleZh
})
return map
},
},
watch:{
activeName(){
if(!this.feeList.length){
this.loadFeeList()
}
} }
}, },
created() { created() {
...@@ -170,6 +215,9 @@ export default { ...@@ -170,6 +215,9 @@ export default {
this.orderId = this.$route.query.orderId this.orderId = this.$route.query.orderId
this.getOrder(); this.getOrder();
} }
getCurrencyList().then(res => this.currencyList = res.data)
getUnitList().then(res => this.unitList = res.data)
}, },
methods: { methods: {
/** 查询列表 */ /** 查询列表 */
...@@ -181,6 +229,9 @@ export default { ...@@ -181,6 +229,9 @@ export default {
that.order = response.data; that.order = response.data;
}); });
}, },
loadFeeList(){
// TODO 暂无接口
}
} }
}; };
</script> </script>
......
...@@ -700,6 +700,7 @@ export default { ...@@ -700,6 +700,7 @@ export default {
// 计算商品运费 // 计算商品运费
calculationPrice(row){ calculationPrice(row){
let calcable = true let calcable = true
if(!this.productList.length) return false
this.productList.forEach(item => { this.productList.forEach(item => {
if(!item.weight || !item.prodId){ if(!item.weight || !item.prodId){
calcable = false calcable = false
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="form" label-position="left" label-width="120px"> <el-form :model="form" label-position="left" label-width="120px">
<el-form-item label="订单号" v-if="order">
{{order.orderNo}}
</el-form-item>
<el-form-item label="放货方式"> <el-form-item label="放货方式">
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector> <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment