Commit 44775d65 authored by dcy's avatar dcy

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

parents 1639f08b f3f195bc
......@@ -22,50 +22,50 @@
</div>
<el-descriptions :column="3" border class="card">
<el-descriptions-item :label="$t('发货人:')">
{{consigneeData.length>0?consigneeData[0].customerName||$t(''):$t('')}}
{{consignorData.contactsName||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('手机号:')">
{{consigneeData.length>0?(checkCode(consigneeData[0].areaCode)+consigneeData[0].phoneNew)||$t(''):$t('')}}
{{consignorData?(checkCode(consignorData.areaCode)+consignorData.phoneNew)||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('联系地址:')">
{{consigneeData.length>0?consigneeData[0].address||$t(''):$t('')}}
{{consignorData.address||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户来源:')">
{{consigneeData.length>0?consigneeData[0].source||$t(''):$t('')}}
{{consignorData.source||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('发货人公司名称:')">
{{consigneeData.length>0?consigneeData[0].company||$t(''):$t('')}}
{{consignorData.company||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('社交软件:')">
{{consigneeData.length>0?consigneeData[0].social||$t(''):$t('')+' '+consigneeData.length>0?consigneeData[0].socialNumber||'':''}}
{{consignorData.social||$t('')+' '+consignorData.socialNumber||''}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border class="card">
<el-descriptions-item :label="$t('收货人:')">
{{consigneeData.length>1?consigneeData[1].customerName||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('手机号:')">
{{consigneeData.length>1?(checkCode(consigneeData[1].areaCode)+consigneeData[1].phoneNew)||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('联系地址:')">
{{consigneeData.length>1?consigneeData[1].address||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户来源:')">
{{consigneeData.length>1?consigneeData[1].source||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('收货人公司名称:')">
{{consigneeData.length>1?consigneeData[1].company||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('社交软件:')">
{{consigneeData.length>1?consigneeData[1].social||$t(''):$t('')+' '+consigneeData.length>1?consigneeData[1].socialNumber||'':''}}
</el-descriptions-item>
{{consigneeData.contactsName||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('手机号:')">
{{consigneeData?(checkCode(consigneeData.areaCode)+consigneeData.phoneNew)||$t(''):$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('联系地址:')">
{{consigneeData.address||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户来源:')">
{{consigneeData.source||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('发货人公司名称:')">
{{consigneeData.company||$t('')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('社交软件:')">
{{consigneeData.social||$t('')+' '+consigneeData.socialNumber||''}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4" class="card">
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId" />
</el-descriptions-item>
<el-descriptions-item :label="$t('出货渠道')">
<el-descriptions-item :label="$t('出货渠道')" v-if="[3,4].indexOf(list.transportId) > -1">
{{channelName}}
</el-descriptions-item>
</el-descriptions>
......@@ -339,7 +339,7 @@
</template>
<script>
import {DICT_TYPE} from '@/utils/dict'
import {DICT_TYPE,getDictDatas} from '@/utils/dict'
import {getOffer,deleteOffer} from '@/api/ecw/offer'
import {getProductAttrList} from '@/api/ecw/productAttr'
import {getCustomerList,getCustomer} from '@/api/ecw/customer'
......@@ -364,7 +364,7 @@
productAttrList:[],
offerId:0,
//发货/收货人信息
consigneeData:[],
consigneeData:{},
routerList:[],
channelName:'/',
tradeCityList:[],
......@@ -372,6 +372,8 @@
currencyList:[],
unitList:[],
orderData:[],
consignorData:{},
customerSource: getDictDatas(DICT_TYPE.CUSTOMER_SOURCE),
couponAvailableGroupDtoList: [], // 可用优惠
couponTotalAmountList: [], // 优惠总额
};
......@@ -391,7 +393,6 @@
})
return map
},
// 总有优惠金额
couponList(){
let arr = []
......@@ -414,7 +415,11 @@
},
// 计算返回的费用清单
feeDtoList(){
return this.list.estCostVO.feeDtoList || []
if(this.list&&this.list.estCostVO){
return this.list.estCostVO.feeDtoList || []
}else{
return []
}
},
// 清关费
clearanceFeeList(){
......@@ -466,7 +471,16 @@
}
},
methods: {
sourceLabel(data){
let label=''
var source = this.customerSource.find(item=>item.value==data)
if(source) label = source.label
return label
},
checkCode(data){
if(!data){
return ''
}
if(data.indexOf('+')==-1){
return '+'+data
}
......@@ -524,9 +538,11 @@
if(that.list.orderId){
that.getOrderData(that.list.orderId)
}
getCustomerContactsSelect({ids: [that.list.consigneeId, that.list.consignorId].join(',')}).then((res) => {
that.consigneeData.push(res.data.list.find(item => item.customerContactsId == that.list.consignorId))
that.consigneeData.push(res.data.list.find(item => item.customerContactsId == that.list.consigneeId))
getCustomerContactsSelect({ids: [that.list.consignorId, that.list.consigneeId].join(',')}).then((res) => {
let consignor = res.data.list.find(item => item.customerContactsId == that.list.consignorId)
if(consignor) that.consignorData=consignor
let consignee = res.data.list.find(item => item.customerContactsId == that.list.consigneeId)
if(consignee) that.consigneeData=consignee
that.getCnsigneeData()
})
that.list.offerProdRespVOList.forEach((item)=>{
......@@ -588,12 +604,19 @@
// 获取发货/收货人
getCnsigneeData(){
let that = this
if(that.consigneeData.length>0){
getCustomer(that.consigneeData[0].customerId).then(result=>{
that.consigneeData[0] = Object.assign(that.consigneeData[0],result.data)
if(that.consigneeData&&that.consigneeData.customerId){
getCustomer(that.consigneeData.customerId).then(result=>{
result.data.source = this.sourceLabel(result.data.source)
that.$set(that.consigneeData,'source',result.data.source)
that.$set(that.consigneeData,'address',result.data.address)
})
getCustomer(that.consigneeData[1].customerId).then(ress=>{
that.consigneeData[1] = Object.assign(that.consigneeData[1],ress.data)
}
if(that.consignorData&&that.consignorData.customerId){
getCustomer(that.consignorData.customerId).then(ress=>{
ress.data.source = this.sourceLabel(ress.data.source)
that.$set(that.consignorData,'source',ress.data.source)
that.$set(that.consignorData,'address',ress.data.address)
})
}
},
......
......@@ -9,7 +9,7 @@
<!-- <el-form-item label="唛头" prop="marks">
<el-input v-model="queryParams.marks" placeholder="唛头" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item :label="$t('发货人')" prop="consignorId">
<el-input v-model="queryParams.consignorId" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -187,6 +187,7 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓')}}</el-dropdown-item>
<el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
<el-dropdown-item v-show="scope.row.statusMsg === '已入仓'" @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
<el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/' + 1 })" >{{$t('调拨出仓')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/' + 2 })" >{{$t('调拨到仓')}}</el-dropdown-item>
......
......@@ -214,6 +214,8 @@ export default {
getOrderSpecial(){
getOrderSpecial(this.form.orderItemId).then(r => {
this.form = r.data
this.form.freight = ''
this.form.clearanceFreight = ''
})
},
getOrderSpecialByApproveId(){
......
......@@ -79,9 +79,11 @@
prop="address"
label="操作">
<template v-slot="{row}">
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount/${row.orderItemId}?orderId=${row.orderId}`)">优惠申请</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/specialCommission/${row.orderItemId}`)">佣金规则</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount1/${row.orderItemId}?orderId=${row.orderId}&discount=1`)">管理折扣</el-button>
<template v-if="row.originalSeaFreight !== 0 && row.originalClearanceFreight !== 0">
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount/${row.orderItemId}?orderId=${row.orderId}`)">优惠申请</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/specialCommission/${row.orderItemId}`)">佣金规则</el-button>
<el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="$router.push(`/order/discount1/${row.orderItemId}?orderId=${row.orderId}&discount=1`)">管理折扣</el-button>
</template>
</template>
</el-table-column>
......
......@@ -76,11 +76,12 @@
<template v-slot="{ row, column, $index }">
<el-button v-if="order.status === 5" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
<template v-else>
<el-button v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
<template v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
<el-button size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
</template>
<el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
</template>
</template>
</el-table-column>
</el-table>
......
......@@ -3,9 +3,9 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="来源" prop="fromId">
<!-- <el-form-item label="来源" prop="fromId">
<el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-form-item>-->
<el-form-item label="发送时间">
<el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
......@@ -39,7 +39,7 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<el-table-column label="" align="center" prop="id" />
<el-table-column label="来源" align="center" prop="fromId" />
<!-- <el-table-column label="来源" align="center" prop="fromId" />-->
<el-table-column label="发送时间" align="center" prop="sendTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.sendTime) }}</span>
......
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