Commit 9a6ae98c authored by chenjiuping's avatar chenjiuping

修改添加BUG

parent 99962c27
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
{{orderData?getRouterNameById():''}} {{orderData?getRouterNameById():''}}
</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'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常是针对整个订单的 --> <!-- 预付异常,提货异常是针对整个订单的 -->
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<template v-else>{{$t('无入仓数据')}}</template> <template v-else>{{$t('无入仓数据')}}</template>
</el-row> </el-row>
</template> </template>
<el-row :span="12"> <el-row :span="12">
<el-form-item :label="$t('异常描述')+':'"> <el-form-item :label="$t('异常描述')+':'">
<dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
{{ currencyMap[row.currencyId] }} {{ currencyMap[row.currencyId] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('付款人')"> <el-table-column :label="$t('付款人')">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.consigneeName}}({{$t('收货人')}})</span> <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px"> <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="200px">
{{orderFee.paymentGoodsWorthScale}}% {{orderFee.paymentGoodsWorthScale}}%
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
orderExceptionStatus:"1", orderExceptionStatus:"1",
orderExceptionHandlerResult:'' orderExceptionHandlerResult:''
}, },
//发货/收货人信息 //发货/收货人信息
consigneeData:[], consigneeData:[],
routerList:[], routerList:[],
...@@ -522,4 +522,4 @@ ...@@ -522,4 +522,4 @@
display: flex; display: flex;
/* justify-content: space-between; */ /* justify-content: space-between; */
} }
</style> </style>
\ No newline at end of file
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