Commit 56c000d1 authored by dragondean@qq.com's avatar dragondean@qq.com

完善异常处理

parent 62da92d6
...@@ -164,6 +164,7 @@ export default { ...@@ -164,6 +164,7 @@ export default {
}, },
handEdit(row){ handEdit(row){
// 未报价异常
if(row.orderExceptionType=='order_no_quote_exception'){ if(row.orderExceptionType=='order_no_quote_exception'){
if(row.orderItemId){ if(row.orderItemId){
var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId) var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
...@@ -181,11 +182,15 @@ export default { ...@@ -181,11 +182,15 @@ export default {
} }
}else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){ }
// 重泡货异常
else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
this.$router.push({ this.$router.push({
path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType, path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,
}) })
}else{ }
// 其他异常
else{
this.$router.push({ this.$router.push({
path:"/order/prepayDeal?id="+row.id, path:"/order/prepayDeal?id="+row.id,
}) })
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-card> <el-card>
<div slot="header" class="header"> <div slot="header" class="header">
<div class="card-title">{{$t('查看')}}</div> <div class="card-title">{{$t('查看')}}</div>
<el-button type="primary" icon="el-icon-arrow-left" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button> <el-button type="primary" icon="el-icon-arrow-left" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div> </div>
<el-form v-if="orderData" :model="orderData" ref="queryForm" size="small" :inline="true" label-width="120px" class="card"> <el-form v-if="orderData" :model="orderData" ref="queryForm" size="small" :inline="true" label-width="120px" class="card">
<el-row> <el-row>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{{orderData.orderNo || ''}} {{orderData.orderNo || ''}}
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="orderExceptionData.orderExceptionType=='order_superfluous_box_exception'||orderExceptionData.orderExceptionType=='order_lack_box_exception'||orderExceptionData.orderExceptionType=='order_miss_exception'||orderExceptionData.orderExceptionType=='order_superfluous_goods_exception'||orderExceptionData.orderExceptionType=='order_in_water_exception'||orderExceptionData.orderExceptionType=='order_damage_exception'"> <div v-if="shopData">
<el-row> <el-row>
<el-form-item :label="$t('产品名称')+':'" > <el-form-item :label="$t('产品名称')+':'" >
{{shopData.prodTitleZh || ''}} {{shopData.prodTitleZh || ''}}
...@@ -29,7 +29,28 @@ ...@@ -29,7 +29,28 @@
{{orderData?getRouterNameById():''}} {{orderData?getRouterNameById():''}}
</el-form-item> </el-form-item>
</el-row> </el-row>
<div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
<!-- 单证异常,发货人异常,其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常是针对整个订单的 -->
<template v-if="['order_pay_exception','order_pick_up_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
<el-row>
<el-form-item :label="$t('填单参数')+':'">
<template v-if="orderData && orderData.costVO">
{{(orderData.costVO.totalNum||0)+$t('')+(orderData.costVO.totalVolume||0)+''+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('')}}
</template>
</el-form-item>
</el-row>
<el-row>
<el-form-item :label="$t('入仓参数')+':'">
<template v-if="orderData && orderData.costVO">
<span>{{(orderData.sumNum||0)+$t('')+(orderData.sumVolume||0)+''+(orderData.sumWeight||0)+'kg '+(orderData.sumQuantity||0) +$t('')}}</span>
</template>
</el-form-item>
</el-row>
</template>
<template v-else>
<el-row> <el-row>
<el-form-item :label="$t('填单参数')+':'"> <el-form-item :label="$t('填单参数')+':'">
<template v-if="shopData"> <template v-if="shopData">
...@@ -54,6 +75,8 @@ ...@@ -54,6 +75,8 @@
</el-form-item> </el-form-item>
<template v-else>{{$t('无入仓数据')}}</template> <template v-else>{{$t('无入仓数据')}}</template>
</el-row> </el-row>
</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" />
...@@ -73,6 +96,7 @@ ...@@ -73,6 +96,7 @@
</el-row> </el-row>
</div> </div>
</el-form> </el-form>
<!-- 预付异常的表格 -->
<el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException"> <el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException">
<el-table-column :label="$t('品名')" align="center"> <el-table-column :label="$t('品名')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -113,6 +137,8 @@ ...@@ -113,6 +137,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 单证异常,发货人异常,其他异常的表格 -->
<el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_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'].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">
...@@ -149,6 +175,7 @@ ...@@ -149,6 +175,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('货值')" prop="worth" /> <el-table-column :label="$t('货值')" prop="worth" />
</el-table> </el-table>
<el-form :model="handlerParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card"> <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'"> <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item :label="$t('订单总金额')+':'"> <el-form-item :label="$t('订单总金额')+':'">
...@@ -282,7 +309,7 @@ ...@@ -282,7 +309,7 @@
</el-card> </el-card>
<!-- 只有不需要预付才需要审核 --> <!-- 只有不需要预付才需要审核 -->
<template v-if="showWorkFlow"> <template v-if="showWorkFlow">
<div class="page-title">审批流程</div> <div class="page-title">{{$t('审批流程')}}</div>
<work-flow xmlkey="commission_config" v-model="handlerParams.ccIds" /> <work-flow xmlkey="commission_config" v-model="handlerParams.ccIds" />
</template> </template>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
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