Commit 171ef0da authored by Smile's avatar Smile Committed by wux

研发需求33 海运-预装+空运-分拣查看订单信息

parent 64560f63
...@@ -150,9 +150,9 @@ ...@@ -150,9 +150,9 @@
<el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" /> <el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <el-link type="primary" @click="orderHandleClick(scope.row)">
{{scope.row.orderNo}} {{scope.row.orderNo}}
</div> </el-link>
<div style="color:blue;fontWeight:bold;"> <div style="color:blue;fontWeight:bold;">
{{ scope.row.isExternalWarehouse === 1 ? '(' +$t('外部仓')+')' : ''}} {{ scope.row.isExternalWarehouse === 1 ? '(' +$t('外部仓')+')' : ''}}
</div> </div>
...@@ -245,7 +245,9 @@ ...@@ -245,7 +245,9 @@
<el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row"> <el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row">
<el-row class="preinstall-title order-title"> <el-row class="preinstall-title order-title">
<div> <div>
<p>{{item.orderNo}}</p> <el-link type="primary" @click="orderHandleClick(item)">
{{item.orderNo}}
</el-link>
</div> </div>
<div> <div>
<p>{{$t('发往')}}</p> <p>{{$t('发往')}}</p>
...@@ -557,6 +559,10 @@ export default { ...@@ -557,6 +559,10 @@ export default {
getChannelList().then((res) => (this.channelList = res.data)); getChannelList().then((res) => (this.channelList = res.data));
}, },
methods: { methods: {
orderHandleClick(row){
const routeData = this.$router.resolve({ path: '/order/detail' ,query:{orderId: row.orderId}});
window.open(routeData.href, '_blank');
},
formatDate, formatDate,
getTotlContent, getTotlContent,
selectChannel(){ selectChannel(){
......
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
<el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" /> <el-table-column :label="$t('序号')" align="center" prop="tidanNum" width="50" />
<el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120"> <el-table-column :label="$t('订单号')" align="center" prop="orderNo" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <el-link type="primary" @click="orderHandleClick(scope.row)">
{{scope.row.orderNo}} {{scope.row.orderNo}}
</div> </el-link>
<div style="color:blue;fontWeight:bold;"> <div style="color:blue;fontWeight:bold;">
{{ scope.row.isExternalWarehouse === 1 ? '(' +$t('外部仓')+')' : ''}} {{ scope.row.isExternalWarehouse === 1 ? '(' +$t('外部仓')+')' : ''}}
</div> </div>
...@@ -211,7 +211,9 @@ ...@@ -211,7 +211,9 @@
<el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row"> <el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row">
<el-row class="preinstall-title order-title"> <el-row class="preinstall-title order-title">
<div> <div>
<p>{{item.orderNo}}</p> <el-link type="primary" @click="orderHandleClick(item)">
{{item.orderNo}}
</el-link>
</div> </div>
<div> <div>
<p>{{$t('发往')}}</p> <p>{{$t('发往')}}</p>
...@@ -488,6 +490,10 @@ export default { ...@@ -488,6 +490,10 @@ export default {
this.smartInstall = 0; this.smartInstall = 0;
}, },
methods: { methods: {
orderHandleClick(row){
const routeData = this.$router.resolve({ path: '/order/detail' ,query:{orderId: row.orderId}});
window.open(routeData.href, '_blank');
},
formatDate, formatDate,
getTotlContent, getTotlContent,
/* 获取城市 */ /* 获取城市 */
...@@ -553,7 +559,7 @@ export default { ...@@ -553,7 +559,7 @@ export default {
this.relationOrderListDialog.visible = true this.relationOrderListDialog.visible = true
this.relationOrderListDialog.data = res.msg.replace(/\n/g,'<br>') this.relationOrderListDialog.data = res.msg.replace(/\n/g,'<br>')
}) })
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery(type) { handleQuery(type) {
...@@ -759,7 +765,7 @@ export default { ...@@ -759,7 +765,7 @@ export default {
this.queryAllData(); this.queryAllData();
}); });
} }
if (res.code === 566) { if (res.code === 566) {
this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), { this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
......
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