Skip to content

J
jiedao-app-operator-master
Commit 7138f578 authored by 我在何方's avatar 我在何方
Browse files
Options

添加订单列表详情

parent 5fa2c517
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 43 deletions
src/views/ecw/offer/detail.vue
View file @ 7138f578
......@@ -22,43 +22,43 @@
</div>
<el-descriptions :column="3" border class="card">
<el-descriptions-item label="发货人:">
{{consigneeData[0].name}}
{{consigneeData[0].name || '无'}}
</el-descriptions-item>
<el-descriptions-item label="手机号：">
{{consigneeData[0].defaultContactPhone}}
{{consigneeData[0].defaultContactPhone || '无'}}
</el-descriptions-item>
<el-descriptions-item label="联系地址：">
{{consigneeData[0].address}}
{{consigneeData[0].address || '无'}}
</el-descriptions-item>
<el-descriptions-item label="客户来源：">
{{consigneeData[0].source}}
{{consigneeData[0].source || '无'}}
</el-descriptions-item>
<el-descriptions-item label="发货人公司名称:">
{{consigneeData[0].company}}
{{consigneeData[0].company || '无'}}
</el-descriptions-item>
<el-descriptions-item label="社交软件：">
{{consigneeData[0].defaultSocial?consigneeData[0].defaultSocial:''+' '+consigneeData[0].defaultSocialNumber?consigneeData[0].defaultSocialNumber:''}}
{{consigneeData[0].defaultSocial?consigneeData[0].defaultSocial:'无'+' '+consigneeData[0].defaultSocialNumber?consigneeData[0].defaultSocialNumber:''}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border class="card">
<el-descriptions-item label="收货人:">
{{consigneeData[1].name}}
{{consigneeData[1].name|| '无'}}
</el-descriptions-item>
<el-descriptions-item label="手机号：">
{{consigneeData[1].defaultContactPhone}}
{{consigneeData[1].defaultContactPhone|| '无'}}
</el-descriptions-item>
<el-descriptions-item label="联系地址：">
{{consigneeData[1].address}}
{{consigneeData[1].address|| '无'}}
</el-descriptions-item>
<el-descriptions-item label="客户来源：">
{{consigneeData[1].source}}
{{consigneeData[1].source|| '无'}}
</el-descriptions-item>
<el-descriptions-item label="收货人公司名称:">
{{consigneeData[1].company}}
{{consigneeData[1].company|| '无'}}
</el-descriptions-item>
<el-descriptions-item label="社交软件：">
{{consigneeData[1].defaultSocial?consigneeData[1].defaultSocial:''+' '+consigneeData[1].defaultSocialNumber?consigneeData[1].defaultSocialNumber:''}}
{{consigneeData[1].defaultSocial?consigneeData[1].defaultSocial:'无'+' '+consigneeData[1].defaultSocialNumber?consigneeData[1].defaultSocialNumber:''}}
</el-descriptions-item>
</el-descriptions>
<div class="title-font">
......@@ -107,7 +107,11 @@
</template>
</el-table-column>
<el-table-column label="出货渠道" width="100px" prop="channelName" />
<el-table-column label="线路" width="200px" prop="lineName" />
<el-table-column label="线路" width="200px" >
<template slot-scope="scope">
{{getRouterNameById(scope.row.lineId)}}
</template>
</el-table-column>
<el-table-column label="运费">
<template slot-scope="scope">
{{'运费'+scope.row.seaFreight+scope.row.seaFreightCurrency+'/'+ scope.row.seaFreightVolume+' 清关费'+scope.row.clearanceFreight+scope.row.clearanceFreightCurrency+'/'+ scope.row.clearanceFreightVolume}}
......@@ -142,7 +146,7 @@
<div class="line">
<el-descriptions v-for="(lineItem,k) in item.lineData">
<el-descriptions-item :label="[3,4].indexOf(item.transportId)>-1?('空运路线'+(k+1)):('海运路线'+(k+1))">
{{lineItem.warehouseLineDO.startTitleZh + ' >> >> >> ' + lineItem.warehouseLineDO.destTitleZh}}
{{getRouterNameById(lineItem)}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-for="(channelItem,k) in item.channelData">
......@@ -246,9 +250,9 @@
import {DICT_TYPE} from '@/utils/dict'
import {getOffer,deleteOffer} from '@/api/ecw/offer'
import {getProductAttrList} from '@/api/ecw/productAttr'
import {getProductPrice,getProductPriceList} from '@/api/ecw/productPrice'
import {getCustomerList,getCustomer} from '@/api/ecw/customer'
import {getChannelLists,getChannel} from '@/api/ecw/channel'
import {openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse'
export default {
name: "detail",
components: {
......@@ -262,9 +266,10 @@
types:'package,bag',
importance:1,
productAttrList:[],
offerId:134,
offerId:0,
//发货/收货人信息
consigneeData:[]
consigneeData:[],
routerList:[]
};
},
created() {
......@@ -273,7 +278,6 @@
this.offerId = this.$route.query.offerId
this.getList();
}
this.getList();
},
methods: {
/** 查询列表 */
......@@ -289,13 +293,16 @@
item.channelData = res.data
})
}
if(item.lineId){
getProductPriceList(item.lineIds).then(res=>{
item.lineData = res.data
})
if(item.lineIds){
let lineIdList = []
if(item.lineIds.indexOf(',')>-1){
lineIdList = item.lineIds.split(',')
}else{
lineIdList.push(item.lineIds)
}
item.lineData = lineIdList
}
})
var num = 0
that.list.offerProdRespVOList.forEach((item)=>{
if(item.channelId){
......@@ -303,11 +310,6 @@
item.channelName = res.data.nameZh
})
}
if(item.lineId){
getProductPrice(item.lineId).then(res=>{
item.lineName = res.data.warehouseLineDO.startTitleZh + ' >> ' + res.data.warehouseLineDO.destTitleZh
})
}
var arr = item.prodAttrIds.split(',')
var prodAttrName = []
arr.forEach((itemValue)=>{
......@@ -322,8 +324,31 @@
that.loading = false;
that.getCnsigneeData()
that.getOpenedRouterList()
});
},
// 获取路线
getOpenedRouterList(){
let params = {}
if(this.list.departureId){
params.startCityId = this.list.departureId
}
if(this.list.objectiveId){
params.destCityId = this.list.objectiveId
}
getOpenedRouterList(params).then(res => this.routerList = res.data)
},
// 根据线路id显示线路名称
getRouterNameById(routerId){
// return routerId => {
let router = this.routerList.find(item => item.id == routerId)
console.log({router})
if(router){
return router.startTitleZh + ' >>>' + router.destTitleZh
}
return '-'
// }
},
// 获取发货/收货人
getCnsigneeData(){
let that = this
......
src/views/ecw/offer/index.vue
View file @ 7138f578
......@@ -6,11 +6,11 @@
<el-form-item label="报价单号" prop="number">
<el-input v-model="queryParams.number" placeholder="请输入报价单号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="订单编号" prop="orderNo">
<el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
......@@ -58,7 +58,7 @@
暂无
</template>
</el-table-column>
<el-table-column label="预计销售额" align="center" prop="estCost">
<template slot-scope="{row}">
<div class="" v-if="row.estCostVO.clearanceNGN || row.estCostVO.clearanceRMB || row.estCostVO.clearanceUSD">
......@@ -73,31 +73,37 @@
<span v-if="row.estCostVO.seaRMB">{{row.estCostVO.seaRMB}}￥</span>
<span v-if="row.estCostVO.seaUSD">{{row.estCostVO.seaUSD}}$</span>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<template v-if="[1,2].indexOf(scope.row.status) > -1">
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('edit?id=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">编辑</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('createLog?id=' + scope.row.offerId)"
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('logList?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">跟进</el-button>
</template>
<template v-if="scope.row.status == 2">
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)"
v-hasPermi="['ecw:offer:update']">结果</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['ecw:offer:update']">特价</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['ecw:offer:update']">取消</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-edit"
v-hasPermi="['ecw:offer:update']">恢复</el-button>
</template>
<el-button size="mini" type="text" icon="el-icon-delete"
<el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('detail?offerId=' + scope.row.offerId)"
v-hasPermi="['ecw:offer:update']">详情</el-button>
<el-button size="mini" type="text" icon="el-icon-delete"
v-hasPermi="['ecw:offer:delete']">删除</el-button>
</template>
</el-table-column>
......@@ -106,7 +112,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
</div>
</template>
......@@ -190,7 +196,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
......@@ -213,7 +219,7 @@ export default {
handleUpdate(row) {
return this.$router.push('edit?id=' + row.offerId)
},
/** 删除按钮操作 */
handleDelete(row) {
const offerId = row.offerId;
......@@ -245,4 +251,4 @@ export default {
}
}
};
</script>
\ No newline at end of file
</script>
src/views/ecw/offer/logList.vue
View file @ 7138f578
......@@ -46,6 +46,7 @@
<script>
import {getOfferLogPage} from "@/api/ecw/offerLog";
import {DICT_TYPE} from '@/utils/dict'
import {getOffer} from '@/api/ecw/offer'
export default {
name: "OfferLog",
components: {
......@@ -70,8 +71,8 @@ export default {
created() {
if(this.$route.query.offerId){
this.params.offerId = this.$route.query.offerId
this.relationId = this.$route.query.relationId
this.getList();
this.getRelationID()
}
},
methods: {
......@@ -85,6 +86,12 @@ export default {
this.total = response.data.total;
this.loading = false;
});
},
getRelationID(){
getOffer(this.params.offerId).then(response => {
this.relationId = response.data.consignorId;
})
},
/** 新增按钮操作 */
handleAdd() {
......
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