Skip to content

J
jiedao-app-operator-master
Commit da9c9ef6 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

完善订单详情外部仓信息

parent 3d1ab2fa
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 52 deletions
src/views/ecw/order/detail.vue
View file @ da9c9ef6
...@@ -42,58 +42,61 @@ ...@@ -42,58 +42,61 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-row :gutter="20"> <el-descriptions border :title="$t('物流信息')" :column="2">
<el-col :span="12"> <el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions class="margin-top" border :title="$t('物流信息')" :column="2"> <el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('运输方式')" :span="2">
<el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
<el-descriptions-item :label="$t('运输方式')" :span="2"> </el-descriptions-item>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /> <el-descriptions-item :label="$t('出货渠道')" :span="2">{{channelName}}</el-descriptions-item>
</el-descriptions-item> </el-descriptions>
<el-descriptions-item :label="$t('出货渠道')" :span="2">{{channelName}}</el-descriptions-item> </el-card>
</el-descriptions>
</el-col> <el-card class="card">
<el-col :span="12"> <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2">
<el-descriptions class="margin-top" border :title="$t('基础信息')" :column="2"> <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item> <el-descriptions-item :label="$t('送货时间')">{{order.deliveryDate}}</el-descriptions-item>
<el-descriptions-item :label="$t('送货时间')">{{order.deliveryDate}}</el-descriptions-item> <el-descriptions-item :label="$t('是否控货')">
<el-descriptions-item :label="$t('是否控货')"> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" /> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('填单信息')">
<el-descriptions-item :label="$t('填单信息')"> {{order.costVO.totalNum}}{{$t('箱')}}
{{order.costVO.totalNum}}{{$t('箱')}} {{order.costVO.totalWeight}}Kg
{{order.costVO.totalWeight}}Kg {{order.costVO.totalVolume}}m³
{{order.costVO.totalVolume}}m³ {{order.costVO.totalQuantity}}{{$t('个')}}
{{order.costVO.totalQuantity}}{{$t('个')}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('仓库实测')">
<el-descriptions-item :label="$t('仓库实测')"> {{order.sumNum}}{{$t('箱')}}
{{order.sumNum}}{{$t('箱')}} {{order.sumWeight}}Kg
{{order.sumWeight}}Kg {{order.sumVolume}}m³
{{order.sumVolume}}m³ {{order.sumQuantity}}{{$t('个')}}
{{order.sumQuantity}}{{$t('个')}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('收款数据')">
<el-descriptions-item :label="$t('收款数据')"> {{order.sumNum}}{{$t('箱')}}
{{order.sumNum}}{{$t('箱')}} {{order.vweight}}Kg
{{order.vweight}}Kg {{order.wvolume}}m³
{{order.wvolume}}m³ {{order.sumQuantity}}{{$t('个')}}
{{order.sumQuantity}}{{$t('个')}} </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('入仓类型')">
<el-descriptions-item :label="$t('入仓类型')"> <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" /> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('单证报关')">
<el-descriptions-item :label="$t('单证报关')"> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('出单方式')">
<el-descriptions-item :label="$t('出单方式')"> <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" /> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('代收货款')">
<el-descriptions-item :label="$t('代收货款')"> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" /> </el-descriptions-item>
</el-descriptions-item> <el-descriptions-item :label="$t('集运仓库')">
</el-descriptions> {{isExternalWarehouse ? '自有仓' : '外部仓'}}
</el-col> <div v-for="(item, index) in order.externalWarehouseDtoList" :key="index">
</el-row> 装柜时间： {{item.estLoadingTime}} 装柜地址：{{item.loadingAddress}}
</div>
</el-descriptions-item>
</el-descriptions>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
......
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