Commit 01e0bd26 authored by 我在何方's avatar 我在何方

异常订单显示优化

parent 1340ed28
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- 单证异常,发货人异常,其他异常 不显示这部分内容 --> <!-- 单证异常,发货人异常,其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1"> <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常,代收货款是针对整个订单的 --> <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
<template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1"> <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
<el-row> <el-row>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</el-table> </el-table>
<!-- 单证异常,发货人异常,其他异常的表格 --> <!-- 单证异常,发货人异常,其他异常的表格 -->
<el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList"> <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','fee_exception','overweight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index"> <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.$index + 1}}</span> <span>{{scope.$index + 1}}</span>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<!-- v2.0 入仓特性异常 --> <!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" prop="num"> <el-table-column :label="$t('入仓特性')" prop="num">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}} {{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('方数')" prop="volume"> <el-table-column :label="$t('方数')" prop="volume">
...@@ -548,7 +548,7 @@ ...@@ -548,7 +548,7 @@
<!-- v2.0 入仓特性异常 --> <!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" align="center" prop="num" min-width="60"> <el-table-column :label="$t('入仓特性')" align="center" prop="num" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}} {{getProdAtrr(scope.row.warehouseInProdAttrIds)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('方数')" align="center" prop="volume" min-width="30"> <el-table-column :label="$t('方数')" align="center" prop="volume" min-width="30">
......
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