whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改问题

Browse Source
master
sunzehua 1 year ago
parent 5e8ad6b6d2
commit 7333e7275f
5 changed files with 478 additions and 54 deletions
Show Stats Download Patch File Download Diff File

8
src/api/modular/main/BookingLedger.js
Unescape Escape View File

@ -1167,3 +1167,11 @@ export function GetDraftCompareResultInfo (parameter) {
params: parameter
})
}
export function GetShippingOrderCompareResult (parameter) {
return axios({
url: '/TaskShippingOrderCompare/GetShippingOrderCompareResult',
method: 'get',
params: parameter
})
}

5
src/views/main/BookingLedger/detail/modules/mailingInfo.vue
Unescape Escape View File

@ -1888,12 +1888,17 @@ export default {
} else if (['issuetype', 'blfrt'].includes(type)) {
this.details[type] = res.enName || ''
if (type === 'blfrt') {
if (this.details.blfrt === 'FREIGHT COLLECT') {
this.details.payableat = this.details.payableat ? this.details.payableat : this.details.portdischarge || ''
this.details.payableatid = this.details.payableatid ? this.details.payableatid : this.details.portdischargeid || ''
this.details.prepardat = ''
this.details.prepardatid = ''
} else {
this.details.prepardat = this.details.prepardat ? this.details.prepardat : this.details.portload || ''
this.details.prepardatid = this.details.prepardatid ? this.details.prepardatid : this.details.portloadid || ''
this.details.payableat = ''
this.details.payableatid = ''
}
}
} else if (['issueplace', 'prepardat', 'payableat'].includes(type)) {

256
src/views/main/BookingLedger/list/components/bookCard.vue
Unescape Escape View File

@ -0,0 +1,256 @@
<template>
<div class="main">
<div class="top">
<a-form-model layout="inline" :model="form">
<a-row>
<a-col :span="5">
<a-form-model-item label="Activity name">
<a-input v-model="form.name" />
</a-form-model-item>
</a-col>
<a-col :span="5">
<a-form-model-item label="Activity name">
<a-input v-model="form.name" />
</a-form-model-item>
</a-col>
<a-col :span="5">
<a-form-model-item label="Activity name">
<a-input v-model="form.name" />
</a-form-model-item>
</a-col>
<a-col :span="5">
<a-form-model-item label="Activity name">
<a-input v-model="form.name" />
</a-form-model-item>
</a-col>
<a-col :span="4">
<a-button type="primary">查询</a-button>
<a-button style="margin: 0 15px;">重置</a-button>
<a-button type="primary" @click="handleBack">返回</a-button>
</a-col>
</a-row>
</a-form-model>
</div>
<div class="content">
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top" style="background: red;">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top" style="background: rgb(104,208,32);">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
<div class="card-icon">
<a-icon style="font-size: 15px;position: absolute;top: -40px;left: -23px;" type="star" theme="filled" />
</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
<div class="card">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
</div>
<div class="card-bottom">
<div class="card-item"><span style="margin-right: 7px;">委托单位:</span><span>青岛德茂</span></div>
<div class="card-item"><span style="margin-right: 7px;">开船日期:</span><span>2023-10-2</span></div>
<div class="card-item"><span style="margin-right: 7px;">订舱代理:</span><span>测试数据测试数据</span></div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'BookCard',
props: {
},
data() {
return {
form: {}
}
},
mounted() {
},
methods: {
handleBack() {
this.$emit('back')
}
}
}
</script>
<style lang="less" scoped>
.main {
background: white;
padding: 10px;
padding-bottom: 30px;
}
.content {
margin-top: 50px;
padding: 0 100px;
display: flex;
flex-wrap: wrap;
}
.card {
border: 1px #ebebeb solid;
border-radius: 15px;
margin-right: 70px;
width: 200px;
padding-bottom: 8px;
-webkit-transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
margin-bottom: 40px;
cursor: pointer;
&::after {
content: "";
border-radius: 15px;
position: absolute;
z-index: -1;
top: 0;
left: 0;
width: 100%;
height: 100%;
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
opacity: 0;
-webkit-transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
}
&:hover {
-webkit-transform: scale(1.1, 1.1);
transform: scale(1.1, 1.1);
}
&:hover::after {
opacity: 1;
}
.card-top {
border-top-left-radius: 15px;
border-top-right-radius: 15px;
background-color: rgb(126, 206, 243);
padding: 5px;
color: white;
font-size: 35px;
font-weight: bold;
text-align: center;
position: relative;
.card-top-title {
color: black;
font-size: 12px;
text-align: left;
padding-left: 5px;
}
.card-icon {
width: 0;
height: 0;
border-top: 50px solid #d98d1c;
position: absolute;
border-left: 50px solid transparent;
top: 0px;
right: 0px;
border-top-right-radius: 15px;
}
}
.card-bottom {
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
background-color: #f9f9f9;
padding: 0 10px;
.card-item {
margin-top: 7px;
font-size: 13px;
color: #67aaef;
display: flex;
justify-content: flex-start;
}
}
}
</style>

64
src/views/main/BookingLedger/list/index.vue
Unescape Escape View File

@ -304,25 +304,32 @@
<template slot="content">
<p>
比对方式:
<span>{{
row.lstShipOrderCompareMode
? row.lstShipOrderCompareMode == 'MANUAL'
? '手动'
: '自动'
: ''
}}</span>
<span>{{ row.lstShipOrderCompareMode ? row.lstShipOrderCompareMode == 'MANUAL' ? '手动': '自动' : '' }}</span>
<span>-{{ row.lstShipOrderCompareRltName }}</span>
</p>
<p>
比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
</p>
</template>
<div v-if="row.lstShipOrderCompareRlt">
<div style="cursor: pointer;" @click="handleOpenResult(row)" v-if="row.lstShipOrderCompareRlt">
<div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
<a-icon type="close-circle" :style="{ color: 'red' }" />
</div>
<div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
<div v-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'BEFORE_EQUAL'">
<a-icon type="check-circle" :style="{ color: 'rgb(187,37,155)' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'BEFORE_DIFF'">
<a-icon type="close-circle" :style="{ color: 'red' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'NO_DIFF_U'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'DIFF_U'">
<a-icon type="close-circle" :style="{ color: '#red' }" />
</div>
<!-- <div v-else>
{{ row.lstShipOrderCompareRltName }}
</div> -->
@ -667,7 +674,7 @@
v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName=='箱号'"
style="display: flex;margin-top: 15px;align-items: flex-start;"
>
<div v-if="item.fieldName=='箱号'">箱号:{{ item.primaryKey }}</div>
<div v-if="item.fieldName=='箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
<p style="padding-top: 4px;" v-if="item.msg && item.isDiff">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
</p>
@ -1133,7 +1140,8 @@ import {
SaveDataInList,
SaveBookingTxxp,
GetDraftCompareResultInfo,
BookingOrderDownload
BookingOrderDownload,
GetShippingOrderCompareResult
} from '@/api/modular/main/BookingLedger'
import initData from './modules/initData'
@ -1916,6 +1924,30 @@ export default {
}
this.$forceUpdate()
},
handleOpenResult(row) {
this.spinning = true
GetShippingOrderCompareResult({ bookingId: row.id }).then(res => {
if (res.success) {
if (!res.data.succ) {
this.spinning = false
this.$message.success(res.data.msg)
} else {
if (res.data.extra) {
this.TaskShippingOrderCompareData = res.data.extra
this.TaskShippingOrderCompareData.total = res.data.total
this.TaskShippingOrderCompareVisible = true
this.spinning = false
} else {
this.$message.success(res.data.msg)
this.spinning = false
}
}
} else {
this.spinning = false
this.$message.error(res.data.msg)
}
})
},
customSortMethod() { },
setTableList(data) {
if (Object.keys(data).length > 0 && JSON.parse(data.configJson).length) {
@ -2567,11 +2599,17 @@ export default {
this.formatSheet = res.data.extra
this.formatSheet.total = res.data.total
this.formatSheetVisible = true
const arr = []
this.formatSheet.showDetailList.forEach(item => {
if (item.pCode === 'ContaList') {
this.formatSheet.primaryKey = item.primaryKey
if (item.pCode === 'ContaList' && item.isDiff) {
arr.push(1)
}
})
if (arr.length == 0) {
this.formatSheet.isShowCntall = false
} else {
this.formatSheet.isShowCntall = true
}
} else {
this.$message.success(res.data.msg)
}

199
src/views/main/BookingLedger/list/indexTest.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div style="margin-top: -16px; margin-left: -4px; margin-right: -4px" @click="pageClick">
<a-spin tip="Loading..." :spinning="spinning">
<a-row :gutter="24">
<a-row v-if="!showCard" :gutter="24">
<a-col :md="24" :sm="24" style="padding: 0 0 0 0" class="content-box">
<x-card class="content-nav">
<div slot="content" class="table-page-search-wrapper">
@ -131,6 +131,9 @@
</template>
<template #tools>
<div class="right BookTopButton">
<span class="tab-btn" @click="showCard=true">
<a-icon type="credit-card" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />
</span>
<span class="tab-btn" @click="tableRefreshFirst">
<a-icon type="redo" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />
</span>
@ -304,13 +307,14 @@
<template slot="content">
<p>
比对方式:
<span>{{
row.lstShipOrderCompareMode
? row.lstShipOrderCompareMode == 'MANUAL'
? '手动'
: '自动'
: ''
}}</span>
<span>{{ row.lstShipOrderCompareMode ? row.lstShipOrderCompareMode == 'MANUAL' ? '手动': '自动' : '' }}</span>
<span v-if="row.lstShipOrderCompareRlt == 'NO_YARD'">-无动态</span>
<span v-if="row.lstShipOrderCompareRlt == 'BEFORE_EQUAL'">-返场前比对正常</span>
<span v-if="row.lstShipOrderCompareRlt == 'BEFORE_DIFF'">-返场前比对有差异</span>
<span v-if="row.lstShipOrderCompareRlt == 'NO_DIFF_U'">-有差异未结束</span>
<span v-if="row.lstShipOrderCompareRlt == 'DIFF_U'">-无动态</span>
<span v-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">-正常</span>
<span v-if="row.lstShipOrderCompareRlt == 'DIFF'">-有差异</span>
</p>
<p>
比对时间: <span>{{ row.lstShipOrderCompareDate }}</span>
@ -320,9 +324,21 @@
<div v-if="row.lstShipOrderCompareRlt == 'DIFF'">
<a-icon type="close-circle" :style="{ color: 'red' }" />
</div>
<div v-else-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
<div v-if="row.lstShipOrderCompareRlt == 'NO_DIFF'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'BEFORE_EQUAL'">
<a-icon type="check-circle" :style="{ color: 'rgb(187,37,155)' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'BEFORE_DIFF'">
<a-icon type="check-circle" :style="{ color: 'red' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'NO_DIFF_U'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
</div>
<div v-if="row.lstShipOrderCompareRlt == 'DIFF_U'">
<a-icon type="check-circle" :style="{ color: '#red' }" />
</div>
<!-- <div v-else>
{{ row.lstShipOrderCompareRltName }}
</div> -->
@ -347,7 +363,7 @@
<div v-if="row.lstDraftCompareRlt == 'DIFF'">
<a-icon type="close-circle" :style="{ color: 'red' }" />
</div>
<div v-else-if="row.lstDraftCompareRlt == 'NO_DIFF'">
<div v-else-if="row.lstDraftCompareRlt == 'NO DIFF'">
<a-icon type="check-circle" :style="{ color: '#54bc25' }" />
</div>
</div>
@ -513,6 +529,7 @@
</x-card>
</a-col>
</a-row>
<bookCard v-else @back="showCard=false"></bookCard>
<a-modal
:title="TaskShippingOrderCompareData.isExistsDiff ? '下货纸比对（有差异）' : '下货纸比对（正常）'"
@cancel="TaskShippingOrderCompareHandleCancel"
@ -598,17 +615,31 @@
<a-button key="back" @click="formatSheetVisible = false"> 关闭 </a-button>
</template>
<div style="display: flex;">
<div :style="{width:formatSheet.total>0 ? '55%' : '25%'}">
<div v-if="formatSheet.total>0">
<p class="TaskShippingOrderCompareP">
{{ formatSheet.compareTime }}
<span v-if="formatSheet.isExistsDiff">
比对异常 合计
<span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
条
</span>
</p>
<div class="TaskShippingOrderCompareMainBox" style="height: 600px;">
<div style="width:55%">
<div >
<div v-if="formatSheet.total>0" style="display: flex;justify-content: space-between;" class="TaskShippingOrderCompareP">
<div>
{{ formatSheet.compareTime }}
<span v-if="formatSheet.isExistsDiff">
比对异常 合计
<span class="TaskShippingOrderCompareSpan">{{ formatSheet.total }}</span>
条
</span>
</div>
<div>显示全部
<a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
</div>
<div style="display: flex;align-items: flex-start;" v-else >
<a-icon style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;" type="check-circle" theme="filled" />
<div style="margin-left: 20px;">
<div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
<div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
<div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
</div>
<div style="margin:5px 0px 0px 40px">显示全部
<a-switch :checked="formatFlag" @change="formatFlag=!formatFlag" /></div>
</div>
<div v-if="!formatFlag && formatSheet.total>0" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
<div class="TaskShippingOrderCompareMain">
<div class="TaskShippingOrderCompareMainHeader">
<div>
@ -645,16 +676,16 @@
<div>
<p>箱信息</p>
<div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
<div>箱号:{{ formatSheet.primaryKey }}</div>
</div>
</div>
<div
v-for="(item, index) in formatSheet.showDetailList"
:key="index"
v-show="item.pCode == 'ContaList' && item.isDiff"
v-show="(item.pCode == 'ContaList' && item.isDiff) || item.fieldName=='箱号'"
style="display: flex;margin-top: 15px;align-items: flex-start;"
>
<p style="padding-top: 4px;" v-if="item.msg">
<div v-if="item.fieldName=='箱号' && formatSheet.isShowCntall">箱号:{{ item.primaryKey }}</div>
<p style="padding-top: 4px;" v-if="item.msg && item.isDiff">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
</p>
<p v-if="item.isDiff" style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
@ -673,15 +704,86 @@
</div>
</div>
</div>
</div>
<div v-else style="display: flex;align-items: flex-start;">
<a-icon style="color: rgb(82,196,26);font-size: 50px;margin-top: 5px;" type="check-circle" theme="filled" />
<div style="margin-left: 20px;">
<div style="font-weight: bold;font-size: 22px;">格式单比对(正常)</div>
<div style="font-weight: bold;">提单号:{{ formatSheet.mBlNo }}</div>
<div style="font-weight: bold;">{{ formatSheet.compareTime }}</div>
<div v-if="!formatFlag && formatSheet.total==0"></div>
<div v-if="formatFlag" class="TaskShippingOrderCompareMainBox" style="height: 600px;">
<div class="TaskShippingOrderCompareMain">
<div class="TaskShippingOrderCompareMainHeader">
<div>
<p>提单号</p>
<div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
<p>{{ formatSheet.mBlNo }}</p>
</div>
</div>
<div
v-for="(item, index) in formatSheet.showDetailList"
:key="index"
style="display: flex;margin-top: 15px;"
v-show="item.pCode != 'ContaList'">
<p style="padding-top: 4px;" v-if="item.msg">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
</p>
<p style="padding-top: 4px;" v-else>
<a-icon style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;" type="check-circle" theme="filled" />
</p>
<p style="width: 90px;margin-right: 20px;">{{ item.fieldName }}:</p>
<div style="width:60%">
<div style="display: flex;">
<a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
<span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
<div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
</div>
<div style="display: flex;">
<a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
<span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
<div v-if="item.isDiff" v-html="item.mergeHtml"></div>
<div v-else v-html="item.targetVal"></div>
</div>
</div>
</div>
</div>
<div class="TaskShippingOrderCompareMain">
<div>
<div>
<p>箱信息</p>
<div style="width: 100%;height: 1px;border-bottom: 1px dashed;margin: 5px 0;"></div>
<!-- <div>箱号:{{ formatSheet.primaryKey }}</div> -->
</div>
</div>
<div
v-for="(item, index) in formatSheet.showDetailList"
:key="index"
v-show="item.pCode == 'ContaList'"
style="display: flex;margin-top: 15px;align-items: flex-start;"
>
<div v-if="item.fieldName=='箱号'">箱号:{{ item.primaryKey }}</div>
<div style="display: flex;align-items: flex-start;" v-else>
<p style="padding-top: 4px;" v-if="item.msg">
<a-icon style="color: rgb(194,5,5);font-size: 18px;margin-right: 35px;" type="close-circle" theme="filled" />
</p>
<p style="padding-top: 4px;" v-else>
<a-icon style="color: rgb(0,153,68);font-size: 18px;margin-right: 35px;" type="check-circle" theme="filled" />
</p>
<p style="width: 90px;margin-right: 20px;flex-shrink:0">{{ item.fieldName }}:</p>
<div style="width:60%">
<div style="display: flex;">
<a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(0,153,204);" type="right-circle" />
<span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">本地</span>
<div style="margin-bottom: 15px;">{{ item.reqVal }}</div>
</div>
<div style="display: flex;">
<a-icon style="margin-top: 4px;margin-right: 5px;color: rgb(100,163,90);" type="right-circle" />
<span style="margin-right: 10px;font-weight: bold;width: 42px;flex-shrink:0;">格式单</span>
<div v-if="item.isDiff" v-html="item.mergeHtml"></div>
<div v-else v-html="item.targetVal"></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<a-spin class="padUrl" style="width: 100%;min-height: 600px;" :spinning="pdfLoading">
<iframe style="width: 100%;height: 100%;" :src="formatPdf" frameborder="0"></iframe>
@ -1016,6 +1118,7 @@ import { XCard, setFormModel } from '@/components'
import columnSetting from '@/components/tableColumnSetting'
import formLabel from './modules/formLabel'
import importBc from './modules/importBc'
import bookCard from './components/bookCard'
import importBcMore from './modules/importBcMore'
import {
PageDataByBooking,
@ -1071,13 +1174,15 @@ export default {
setFormModel,
formLabel,
importBc,
importBcMore
importBcMore,
bookCard
},
data() {
return {
spinning: false,
isUpload: false,
markFlag: false,
showCard: false,
pdfLoading: false,
marktitle: '',
refshYZloading: false,
@ -1178,7 +1283,8 @@ export default {
bcObj: {},
txxpLoading: false,
txxpFlag: false,
formatPdf: ''
formatPdf: '',
formatFlag: false
}
},
computed: {
@ -1292,6 +1398,9 @@ export default {
item.rowCustno = false
item.rowDzMark = false
item.atdLoading = false
if (!item.shenQingXiangShi) {
item.shenQingXiangShi = ''
}
let hasGoods = 0
item.goodsStatusList.map((gitem, gindex) => {
if (gitem.finishTime || gitem.remark) {
@ -2214,7 +2323,7 @@ export default {
document.body.removeChild(cInput);
},
editColumns(row) {
this.$router.push({ name: 'BookingDetailTest', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
this.$router.push({ name: 'BookingDetail', query: { id: row.id, type: row.carrierid, mblno: row.mblno } })
},
getList(queryParam = {}, isInit = false, isAdd = 'normal') {
this.$set(this.gridOptions, 'loading', true)
@ -2300,6 +2409,9 @@ export default {
item.dzmarkLoading = false
item.sqxsLoading = false
item.ponoLoading = false
if (!item.shenQingXiangShi) {
item.shenQingXiangShi = ''
}
let hasGoods = 0
if (item.goodsStatusList) {
item.goodsStatusList.map((gitem, gindex) => {
@ -2355,7 +2467,7 @@ export default {
this.$message.error('请至少选择一条数据')
return false
}
this.$router.push({ name: 'BookingDetailTest', query: { id: pkIdArr[0], isCopy: true } })
this.$router.push({ name: 'BookingDetail', query: { id: pkIdArr[0], isCopy: true } })
},
copyBookingMore() {
const select = this.$refs.xGrid.getCheckboxRecords()
@ -2389,7 +2501,7 @@ export default {
this.getCarrier()
this.addVisible = false
this.addNum = Math.round(Math.random() * 1000)
this.$router.push({ name: 'BookingDetailTest', query: { type: this.carrierRadio, addNum: this.addNum } })
this.$router.push({ name: 'BookingDetail', query: { type: this.carrierRadio, addNum: this.addNum } })
})
},
addCancel() {
@ -2473,13 +2585,19 @@ export default {
} else {
if (res.data.extra) {
this.formatSheet = res.data.extra
this.formatSheet.total = res.data.total
this.formatSheetVisible = true
const arr = []
this.formatSheet.showDetailList.forEach(item => {
if (item.pCode === 'ContaList') {
this.formatSheet.primaryKey = item.primaryKey
if (item.pCode === 'ContaList' && item.isDiff) {
arr.push(1)
}
})
this.formatSheet.total = res.data.total
this.formatSheetVisible = true
if (arr.length == 0) {
this.formatSheet.isShowCntall = false
} else {
this.formatSheet.isShowCntall = true
}
} else {
this.$message.success(res.data.msg)
}
@ -3782,7 +3900,6 @@ export default {
border-bottom: 1px solid #000;
padding: 5px;
background: #0000000e;
.TaskShippingOrderCompareSpan {
font-weight: bolder;
color: red;

Write Preview
Loading…
Cancel
Save