Commit 71c01571 authored by 我在何方's avatar 我在何方

不可出渠道修复

parent cac48787
...@@ -116,6 +116,12 @@ ...@@ -116,6 +116,12 @@
<el-descriptions-item :label="$t('单证报关')"> <el-descriptions-item :label="$t('单证报关')">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('关联报价单')">
<router-link v-if="offerData" :to="{path: '/offer/detail',query: {offerId: offerData.offerId}}" class="link-type">
<span>{{ offerData.number }}</span>
</router-link>
<span v-else>/</span>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}"> <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-descriptions-item :label="$t('出单方式')"> <el-descriptions-item :label="$t('出单方式')">
...@@ -486,6 +492,7 @@ import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue"; ...@@ -486,6 +492,7 @@ import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
import FeeDetail from "@/views/ecw/order/components/FeeDetail.vue"; import FeeDetail from "@/views/ecw/order/components/FeeDetail.vue";
import PackHistory from './components/PackHistory'; import PackHistory from './components/PackHistory';
import PackHistoryDetail from './components/PackHistoryDetail'; import PackHistoryDetail from './components/PackHistoryDetail';
import {getOfferCheck} from '@/api/ecw/offer'
export default { export default {
name: "detail", name: "detail",
...@@ -608,6 +615,7 @@ export default { ...@@ -608,6 +615,7 @@ export default {
if (this.$route.query.orderId) { if (this.$route.query.orderId) {
this.orderId = this.$route.query.orderId this.orderId = this.$route.query.orderId
this.getOrder(); this.getOrder();
this.getOfferNumber()
} }
getCurrencyList().then(res => this.currencyList = res.data) getCurrencyList().then(res => this.currencyList = res.data)
...@@ -789,6 +797,13 @@ export default { ...@@ -789,6 +797,13 @@ export default {
showPackDetail(packAfterData){ showPackDetail(packAfterData){
this.packAfterData = packAfterData this.packAfterData = packAfterData
}, },
getOfferNumber() {
const that = this
getOfferCheck({ orderId: that.orderId }).then(response => {
that.offerData = response.data
})
}
} }
}; };
</script> </script>
......
...@@ -1410,6 +1410,7 @@ ...@@ -1410,6 +1410,7 @@
let that = this let that = this
if(type=='line_loop_exception'){ if(type=='line_loop_exception'){
this.loopOrderItem =[]
that.orderData.orderItemVOList.map((v,i)=>{ that.orderData.orderItemVOList.map((v,i)=>{
if(v.orderItemId==this.orderExceptionData.orderItemId){ if(v.orderItemId==this.orderExceptionData.orderItemId){
this.loopOrderItem.push(v) this.loopOrderItem.push(v)
......
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