Commit 262e29a2 authored by wux's avatar wux

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

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