Skip to content

J
jiedao-app-operator-master
Commit 9c2a70fd authored by 邓春圆's avatar 邓春圆
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 1ef2c61f aaf02179
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 66 deletions
src/views/ecw/order/exception/index.vue
View file @ 9c2a70fd
......@@ -204,6 +204,7 @@
<el-button v-else-if="scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/pending.vue
View file @ 9c2a70fd
......@@ -21,11 +21,13 @@
</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
<!-- v2.0空运专线，显示出货渠道 -->
<span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'" style="margin-left:10px">{{$t('出货渠道')}}:{{channelName}}</span>
</el-descriptions-item>
<!-- v2.0空运专线，显示出货渠道 -->
<el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
<!-- <el-descriptions-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
{{channelName}}
</el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item :label="$t('始发地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:$t('无')}}
</el-descriptions-item>
......@@ -139,6 +141,7 @@
<el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionStatus==2&&scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('查看')}}</el-button>
<el-tag style="margin-left:10px" v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
<el-button v-else-if="scope.row.orderExceptionType=='order_superfluous_box_exception'" v-hasPermi="['ecw:exception:superfluousBox']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
......@@ -166,6 +169,7 @@
<el-button v-else-if="scope.row.orderExceptionType=='goods_weight_exception'" v-hasPermi="['ecw:exception:goodsWeightException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
<el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -269,7 +273,7 @@ export default {
handEdit(row){
// 未报价异常
if(row.orderExceptionType=='order_no_quote_exception'){
if(row.orderExceptionType=='order_no_quote_exception'||row.orderExceptionType=='customs_fee_not_quote_exception'){
if(row.orderItemId){
var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
......@@ -320,7 +324,12 @@ export default {
}
}else{
return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
let url = '../../lineProject/product-price/edit'
let url = ''
if([3,4].indexOf(this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?'
}else{
url = '../../lineProject/product-price/edit-sea?'
}
this.$router.push(url)
})
......
src/views/ecw/order/prepayDeal.vue
View file @ 9c2a70fd
......@@ -11,7 +11,7 @@
{{orderData.orderNo || ''}}
</el-form-item>
</el-row>
<div v-if="shopData&&['goods_add_exception','line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<div v-if="shopData&&['goods_add_exception','line_loop_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception','channel_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<el-row>
<el-form-item :label="$t('产品名称')+':'" >
{{shopData.prodTitleZh || ''}}
......@@ -32,7 +32,7 @@
</el-row>
<!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','line_loop_exception','overweight_exception','stock_up_exception','in_warehousing_diff_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>
......@@ -115,7 +115,7 @@
</div>
</el-form>
<!-- 预付异常的表格 -->
<!-- 预付异常的表格-->
<el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException">
<el-table-column :label="$t('品名')" align="center">
<template slot-scope="scope">
......@@ -157,10 +157,15 @@
<dict-tag :type="DICT_TYPE.ECW_RECEIVABLE_STATE" :value="scope.row.state"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('付款状态')" prop="worth">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_RECEIVABLE_STATE" :value="scope.row.state"></dict-tag>
</template>
</el-table-column>
</el-table>
<!-- 单证异常，发货人异常，其他异常的表格 -->
<el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception','line_loop_exception','customs_fee_not_quote_exception','overweight_exception','stock_up_exception','in_warehousing_diff_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','line_loop_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception','channel_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
......@@ -177,7 +182,7 @@
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" prop="prodAttrIds">
<template slot-scope="scope">
{{getProdAtrr(scope.row.prodAtrIds)}}
{{getProdAtrr(scope.row.prodAttrIds)}}
</template>
</el-table-column>
<el-table-column :label="$t('入仓箱数')">
......@@ -188,7 +193,7 @@
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" prop="num">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAtrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAtrIds):''}}
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
</template>
</el-table-column>
<el-table-column :label="$t('方数')" prop="volume">
......@@ -328,7 +333,7 @@
</template>
</el-form-item>
<!--货物重量异常-->
<el-row :span="8" v-if="orderExceptionData.orderExceptionType=='goods_weight_exception' ">
<el-row :span="8" v-if="['goods_weight_exception','channel_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) >-1">
<el-form-item :label="$t('备注')+':'" size="medium">
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" :disabled="orderExceptionData.orderExceptionStatus==2" />
</el-form-item>
......@@ -343,7 +348,7 @@
</el-select>
</el-form-item>
</el-row>
<el-row v-else-if="['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<el-row v-else-if="['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable @change="handlerResultChange" :disabled="orderExceptionData.orderExceptionStatus==2">
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
......@@ -426,13 +431,13 @@
</el-select>
</el-form-item>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'&&orderExceptionData.orderExceptionType!='goods_add_exception'&&orderExceptionData.orderExceptionType!='goods_weight_exception'">
<el-row :span="8" v-if="['not_customer_service_exception','goods_add_exception','goods_weight_exception','channel_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) == -1" >
<el-form-item :label="$t('备注')+':'" size="medium">
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" :disabled="orderExceptionData.orderExceptionStatus==2" />
</el-form-item>
</el-row>
<div v-if="['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception','not_shipping_channel_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
<div v-if="['order_miss_exception','order_superfluous_goods_exception', 'order_in_water_exception','order_damage_exception','goods_weight_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
<el-row >
<el-form-item :label="$t('状态')+':'">
<el-radio-group v-model="handlerParams.orderExceptionStatus" @change="changeExceptionStatus" :disabled="orderExceptionData.orderExceptionStatus==2">
......@@ -457,7 +462,7 @@
:key="dict.id" :label="dict.titleZh" :value="dict.id"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('赔付金额')+':'" size="medium" required v-else-if="handlerParams.orderExceptionStatus==2&&orderExceptionData.orderExceptionType!='goods_weight_exception'&&orderExceptionData.orderExceptionType!='not_shipping_channel_exception'">
<el-form-item :label="$t('赔付金额')+':'" size="medium" required v-else-if="handlerParams.orderExceptionStatus==2&&orderExceptionData.orderExceptionType!='goods_weight_exception'">
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" :disabled="orderExceptionData.orderExceptionStatus==2" />
<el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
<el-option v-for="dict in currencyList "
......@@ -465,21 +470,23 @@
</el-select>
</el-form-item>
</el-row>
<el-row v-if="handlerParams.orderExceptionStatus==1">
<el-form-item :label="$t('查明原因')+':'" required v-if="orderExceptionData.orderExceptionType!='not_shipping_channel_exception'">
<div v-if="handlerParams.orderExceptionStatus==1">
<el-form-item :label="$t('查明原因')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('查明原因')+':'" required v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'">
</div>
</div>
<!-- <el-form-item :label="$t('查明原因')+':'" required v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'">
<el-select v-model="handlerParams.orderExceptionHandlerResult" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- 不可出渠道异常 -->
<div v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&handlerParams.orderExceptionHandlerResult=='change_channel'">
</el-form-item> -->
<!-- 不可出渠道异常,渠道异常 -->
<div v-if="(orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&handlerParams.orderExceptionHandlerResult=='change_channel')||(orderExceptionData.orderExceptionType=='channel_exception'&&handlerParams.orderExceptionHandlerResult=='set_shipment_channel')">
<el-form-item :label="$t('出货渠道')" prop="channelId" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">
<!--嵌套一个form来脱离disabled控制-->
<el-form>
......@@ -492,42 +499,63 @@
</el-form>
</el-form-item>
<el-form-item :label="$t('选择线路')" prop="lineId">
<el-input :value="selectedRouter ? $l(selectedRouter, 'startTitle') + ' > ' + $l(selectedRouter, 'destTitle') : ''" disabled :placeholder="$t('请在右侧选择线路')"></el-input>
<el-input :value="selectLine ? $l(selectLine, 'startTitle') + ' > ' + $l(selectLine, 'destTitle') : ''" disabled :placeholder="$t('请在右侧选择线路')"></el-input>
</el-form-item>
<!--select是原生组件，不受el-form的disabled控制-->
<select size="5" v-model="handlerParams.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px">
<select size="5" v-model="handlerParams.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px" @change="changeLined">
<option v-for="item in routerList" :value="item.id" :key="item.id">
{{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}
(<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportType"></dict-tag>)
</option>
</select>
</div>
<div v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='hand_confirm')">
<div>
<el-form-item :label="$t('运费成交单价')+':'" size="medium">
<el-select v-model="handlerParams.currency" style="width: 120px !important;" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id"/>
</el-select>
<!-- 不可出渠道异常 -->
<div v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='continue_channel')">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId">
<div v-if="row.charging ==1">
<el-form-item style="margin-left:40px" :label="$t('全包价成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,2)">{{!row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
</div>
<div v-else class="feeList">
<el-form-item :label="$t('运费成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,1)">{{!row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
<el-form-item :label="$t('清关费成交单价')+':'" size="medium">
<span v-if="!row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,2)">{{!row.oneClearanceFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
</div>
</div>
</div>
<!-- 渠道异常 -->
<div v-if="orderExceptionData.orderExceptionType=='channel_exception'&&handlerParams.orderExceptionHandlerResult=='set_shipment_channel'">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId">
<div v-if="row.charging ==1">
<el-form-item style="margin-left:40px" :label="$t('全包价成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
</el-form-item>
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
<span style="margin:0 20px;font-size:16px">/</span>
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
</div>
<div>
<div v-else class="feeList">
<el-form-item :label="$t('运费成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
</el-form-item>
<el-form-item :label="$t('清关费成交单价')+':'" size="medium">
<el-select v-model="handlerParams.currency" style="width: 12 0px !important;" clearable :disabled="orderExceptionData.orderExceptionStatus==2">
<el-option v-for="dict in currencyList "
:key="dict.id" :label="dict.titleZh" :value="dict.id"/>
</el-select>
<span v-if="!row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
</el-form-item>
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
<span style="margin:0 20px;font-size:16px">/</span>
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
</div>
</div>
</el-row>
</div>
</div>
</el-form>
</el-card>
<!-- 只有不需要预付才需要审核 -->
......@@ -578,9 +606,12 @@
import Selector from '@/components/Selector'
import {openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse'
import {getTradeCityList} from '@/api/ecw/region'
import { getUnitList } from '@/api/ecw/unit';
import {getProduct} from '@/api/ecw/product'
import {getProductPriceGetPrice} from '@/api/ecw/productPrice'
export default {
name: "PrepayDeal",
name: "EcwOrderPrepaydeal",
components: {
FileUpload, WorkFlow,FilePreview,ProductSelector,Selector
},
......@@ -621,9 +652,14 @@
productAttrList:[], // 商品属性
channelName:'/',
channelList: [], // 出货取到
tradeCityList:[]
tradeCityList:[],
unitList: [],
selectLine:null
};
},
activated(){
this.getOrderData()
},
async created() {
if(this.$route.query.id){
this.orderExceptionId = this.$route.query.id
......@@ -631,6 +667,7 @@
this.getList()
}
getUnitList().then(res => this.unitList = res.data)
this.channelList = (await getChannelList()).data
this.productAttrList = (await getProductAttrList()).data
listServiceUser().then(r=>{
......@@ -644,7 +681,9 @@
'handlerParams.orderExceptionHandlerResult'(val){
if(val == 'no_pay'){
this.showWorkFlow = true
}else this.showWorkFlow = false
}else if(val=="continue_channel"){
this.showWorkFlow = true
} else this.showWorkFlow = false
// 如果是代收货款，则给默认单位
if(val == 'cod' && this.orderExceptionData.orderExceptionAmountCurrencyId){
......@@ -665,9 +704,6 @@
'orderData.channelId'(){
this.getChannel()
},
'orderData.transportId'(){
this.getOpenedRouterList()
}
},
computed: {
currencyMap(){
......@@ -677,11 +713,19 @@
})
return map
},
unitMap(){
let map = {}
this.unitList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
},
// 是否已完成入仓
inWarehouse(){
return (!!this.orderData.inWarehouseState && this.orderData.inWarehouseState > 201) || this.orderData.shipmentState > 0
},
selectedRouter(){
console.log(this.handlerParams.lineId)
// otherService 1 集运服务 2 送货上门 3 非控货订单代收货款 4 海外仓 5 提货异常
if(!this.handlerParams.lineId)return null
return this.routerList.find(item => item.id == this.handlerParams.lineId)
......@@ -722,27 +766,31 @@
},
},
methods: {
getDictData,
changeLined(e){
this.selectLine = this.routerList.find(item => item.id == this.handlerParams.lineId)
},
// getDictData,
onTableMounted(e){
// console.warn('onTableMounted', e)
},
getProdAtrr(ids){
if(!ids) return ''
let attr = []
let attrIds = ids.split(',')
this.productAttrList.forEach(item=>{
if(attrIds.indexOf(item.id) > -1||attrIds.indexOf(item.id+'')){
attr.push(this.$l(item, 'attrName'))
}
})
return attr.join(',')
},
/** 查询列表 */
getCurrencyLabel(id){
var label = this.currencyList.filter(item=>item.id == id)
if(label.length>0) return label[0].titleZh
return ''
},
getProdAtrr(ids){
if(!ids) return ''
let attr = []
let attrIds = ids.split(',')
this.productAttrList.forEach(item=>{
if(attrIds.indexOf(item.id)!==-1){
attr.push(this.$l(item, 'attrName'))
}
})
return attr.join(',')
},
getChannel(){
if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
getChannel(this.order.channelId).then(res => {
......@@ -758,6 +806,7 @@
// that.orderExceptionData.orderExceptionType = 'order_miss_exception'
// that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
// that.orderExceptionData.orderExceptionType = 'not_shipping_channel_exception'
// that.orderExceptionData.orderExceptionType = 'channel_exception'
that.loading = false;
that.orderId = response.data.orderId
that.getOrderData()
......@@ -788,7 +837,7 @@
params.destCityId = this.orderData.objectiveVO.objectiveId
}
if(this.orderData.transportId){
params.transportType = this.handlerParams.transportId
params.transportType = this.orderData.transportId
}
// 始发，目的和运输方式都没有的时候不获取
if(!params.startCityId && !params.destCityId && !params.transportType) return false
......@@ -796,6 +845,9 @@
this.routerList = res.data.filter(item => {
return this.exportCityIds.indexOf(item.startCityId) > -1 && this.importCityIds.indexOf(item.destCityId) > -1
})
if(this.orderExceptionData.orderExceptionType == 'channel_exception'||this.orderExceptionData.orderExceptionType == 'not_shipping_channel_exception'){
this.selectLine = this.routerList.find(item => item.id == this.handlerParams.lineId)
}
}
)
......@@ -808,6 +860,7 @@
this.orderData = response.data
this.handlerParams.channelId = this.orderData.channelId
this.handlerParams.lineId = this.orderData.lineId
this.getOpenedRouterList()
if(response.data.customerId){
this.getCustomerData(response.data.customerId)
}
......@@ -976,6 +1029,73 @@
this.productId1 = product.id
this.productId2 = product.id
},
//不可出渠道异常 ，未报价跳转
routeToPrice(row,index){
if(index==2){
this.$router.push('/product/product-list?prodId=' + row.prodId)
return
}
// 未报价异常lk ,
if(row.orderItemId){
var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
if(productData){
getProduct(productData.prodId).then(res=>{
let params = {
product_id: productData.prodId,
product_type: res.data.typeId,
transportId: this.orderData.transportId,
exportCity: this.orderData.logisticsInfoDto.startCityId,
importCity: this.orderData.logisticsInfoDto.destCityId,
startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
let queryParams = {
productId: productData.prodId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
let url = ''
if([3,4].indexOf(this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
}else{
url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
}
getProductPriceGetPrice(queryParams).then(res=>{
console.log(res)
if(res.data){
if([3,4].indexOf(+this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
}else{
url = '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
}
}
return this.$router.push(url)
})
/* +productData.prodId
+'&product_type='+res.data.typeId
+'&transportId='+this.orderData.transportId
+'&exportCity='+this.orderData.logisticsInfoDto.startCityId+'&importCity='+this.orderData.logisticsInfoDto.destCityId */
})
}
}else{
return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
let url = ''
if([3,4].indexOf(this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?'
}else{
url = '../../lineProject/product-price/edit-sea?'
}
this.$router.push(url)
})
}
},
}
};
</script>
......@@ -1025,4 +1145,11 @@
.el-select{
width:300px !important;
}
.button{
margin-left:40px;
}
.feeList{
display: flex;
flex-direction: column
}
</style>
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ 9c2a70fd
......@@ -157,10 +157,10 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('数量')" width="130px">
<el-table-column :label="$t('数量')" width="140px">
<template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.quantityAll">
<el-input :disabled="$index < protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder="">
<el-input :disabled="$index < protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder="" type="number">
<template slot="append">{{ $t('个') }}</template>
</el-input>
</el-form-item>
......@@ -371,11 +371,11 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column :label="$t('数量')" width="130px">
<el-table-column :label="$t('数量')" width="140px">
<template v-slot="{r,c,$index}">
<el-form-item>
<span v-if="form1.table[$index].id">{{ form1.table[$index].quantityAll }}</span>
<el-input v-else v-model.number="form1.table[$index].quantityAll" placeholder="">
<el-input v-else type="number" v-model.number="form1.table[$index].quantityAll" placeholder="">
<template slot="append">{{ $t('个') }}</template>
</el-input>
</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