修改问题

master
sunzehua 1 year ago
parent 7333e7275f
commit 4357b1398e

@ -355,7 +355,7 @@
prop="voynoinner"
>
<!-- 内部航次暂无接口 暂时改为输入框 -->
<inputView :ishd="BookingLockOrder['voynoinner'] && isLockBooking" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
<inputView :ishd="true" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -370,7 +370,7 @@
prop="voynoinner"
>
<!-- 内部航次暂无接口 暂时改为输入框 -->
<inputView :ishd="BookingLockOrder['voynoinner'] && isLockBooking" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
<inputView :ishd="true" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -384,7 +384,7 @@
has-feedback
prop="voyno"
>
<inputView :ishd="BookingLockOrder['voyno'] && isLockBooking" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
<inputView :ishd="true" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -398,7 +398,7 @@
has-feedback
prop="voyno"
>
<inputView :ishd="BookingLockOrder['voyno'] && isLockBooking" ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
<inputView :ishd="true" ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -1159,6 +1159,14 @@ export default {
if (type === 'voynoinner' && this.details.voyno == '') {
this.details.voyno = this.details[type]
}
if (type === 'voynoinner' && value == '') {
this.details.voyno = ''
this.details.vessel = ''
}
if (type === 'voyno' && value == '') {
this.details.voynoinner = ''
this.details.vessel = ''
}
if (type === 'epCode' && this.details.carrierid === 'ESL') {
this.details.tmblno = this.details[type]
}
@ -1221,7 +1229,12 @@ export default {
this.details.vessel = res.vessel || ''
this.details.atd = res.atd || ''
this.details.etd = res.etd || ''
if (res.voyno.includes('1MA')) {
if (Object.keys(res).length == 0) {
this.details.voyno = ''
this.details.voynoinner = ''
}
if (res.voyno) {
if (res.voyno.includes('1MA')) {
this.details.voyno = res.voyno.replace('1MA', '') || ''
} else {
if (res.voyno.includes('1NC')) {
@ -1230,6 +1243,7 @@ export default {
this.details.voyno = res.voyno || ''
}
}
}
this.details.voynoinner = res.voynoInside || ''
} else if (type === 'shipagency') {
this.details.shipagency = res.name || ''

@ -149,29 +149,20 @@
{{ serive.showName }}
<div class="edit" @click.stop="FnOpenEdit(serive)"><a-icon type="edit" /></div>
</div>
<!-- <div
class="box-line"
style="margin: 0 5px 0 0;"
v-if="changeGoods && !serive.isEnd && !serive.isBr"
:class="{ active: serive.isYield }"></div> -->
</div>
<div v-if="changeGoods && !serive.isBr" class="goods-box">
<div class="goods-content" :class="{ active: serive.isYield }" @click="saveGoodsStatus(serive)">
<!-- <div class="round" :class="{ active: serive.isYield }">
<a-icon v-if="serive.isYield" style="color:rgb(48,172,214);font-size: 10px;" type="check" />
</div> -->
<a-icon v-if="serive.isYield" class="serve-icon" type="check-circle" />
<!-- <a-icon type="check-circle" /> -->
<a-icon v-if="serive.isYield" class="serve-icon" type="check-circle" theme="filled" />
<div v-else class="round">
</div>
<div class="showName">{{ serive.showName }}</div>
</div>
<!-- <a-icon type="right" style="color: rgb(179, 175, 175);" /> -->
<div class="box-line" v-if="changeGoods && !serive.isEnd" :class="{ active: serive.isYield }"></div>
<div class="box-edit" @click.stop="FnOpenEdit(serive)"><a-icon type="edit" /></div>
</div>
</a-tooltip>
</div>
<br />
</div>
</div>
</a-spin>
@ -1280,7 +1271,9 @@ export default {
display: flex;
flex-wrap: wrap;
}
.box-list :last-child{
border: none !important;
}
.goods-box {
display: flex;
align-items: center;
@ -1313,15 +1306,15 @@ export default {
}
.serve-icon {
font-size: 22px;
font-size: 19px;
display: block;
margin: 0 auto;
margin-bottom: 5px;
}
.round {
width: 22px;
height: 22px;
width: 19px;
height: 19px;
line-height: 15px;
border-radius: 50%;
// margin-right: 3px;
@ -1370,5 +1363,9 @@ export default {
.isBr {
width: 100%;
margin: 3px 0;
height: 1px;
border: 1px dashed #d5cbcb;
}
</style>

@ -32,106 +32,183 @@
</a-form-model>
</div>
<div class="content">
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
MSK
</div>
<!-- <div class="card-bottom">
<div class="card-item">
<div style="width: 85px;margin-right: 20px;"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div> <span style="margin-right: 7px;">箱量:</span><span>1</span></div>
</div>
<div class="card-item">
<div style="width: 85px;margin-right: 20px;"> <span style="margin-right: 7px;">已用箱:</span><span>5</span></div>
<div><span style="margin-right: 7px;">已截单:</span><span>1</span></div>
</div>
<div class="card-item">
<div style="width: 85px;margin-right: 20px;"> <span style="margin-right: 7px;">海放数:</span><span>5</span></div>
<div> <span style="margin-right: 7px;">码放数:</span><span>1</span></div>
</div>
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top" style="background: red;">
<div class="card-top-title">XXXX</div>
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top" style="background: rgb(104,208,32);">
<div class="card-top-title">XXXX</div>
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</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 class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item" style="justify-content: space-between;"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
PIL
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
PIL
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
PIL
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
PIL
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
<div class="card">
<div class="card" @click="handleInto">
<div class="card-top">
<div class="card-top-title">XXXX</div>
MSK
<div class="card-top-title">
<div><span style="margin-right: 7px;">船名/航次:</span><span>CSCL INDIAN OCEAN/058W</span></div>
<div><span style="margin-right: 7px;">开船日期:</span><span>2023-10-23</span></div>
<div><span style="margin-right: 7px;">截单时间:</span><span>2023-10-24 12:30</span></div>
</div>
PIL
</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 class="card-item"><span style="margin-right: 7px;">订舱票数:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">箱量:</span><span>1</span></div>
<div class="card-item"><span style="margin-right: 7px;">已用箱:</span><span>10</span></div>
<div class="card-item"><span style="margin-right: 7px;">已截单:</span><span>5</span></div>
<div class="card-item"><span style="margin-right: 7px;">海放数:</span><span>7</span></div>
<div class="card-item"><span style="margin-right: 7px;">码放数:</span><span>4</span></div>
</div>
</div>
</div>
@ -154,6 +231,9 @@ export default {
methods: {
handleBack() {
this.$emit('back')
},
handleInto() {
this.$emit('back')
}
}
}
@ -167,7 +247,7 @@ export default {
.content {
margin-top: 50px;
padding: 0 100px;
padding: 0 10px;
display: flex;
flex-wrap: wrap;
}
@ -175,8 +255,9 @@ export default {
.card {
border: 1px #ebebeb solid;
border-radius: 15px;
margin-right: 70px;
width: 200px;
margin-right: 1%;
width: 19%;
background-color: #f9f9f9;
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);
@ -207,6 +288,9 @@ export default {
&:hover::after {
opacity: 1;
}
&:nth-child(5){
margin-right: 0px !important;
}
.card-top {
border-top-left-radius: 15px;
@ -214,14 +298,14 @@ export default {
background-color: rgb(126, 206, 243);
padding: 5px;
color: white;
font-size: 35px;
font-size: 25px;
font-weight: bold;
text-align: center;
position: relative;
.card-top-title {
color: black;
font-size: 12px;
font-size: 15px;
text-align: left;
padding-left: 5px;
}
@ -249,7 +333,7 @@ export default {
font-size: 13px;
color: #67aaef;
display: flex;
justify-content: flex-start;
justify-content: space-between;
}
}
}

@ -132,7 +132,7 @@
<template #tools>
<div class="right BookTopButton">
<span class="tab-btn" @click="showCard=true">
<a-icon type="credit-card" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />
<a-icon type="appstore" theme="filled" :style="{ fontSize: '14px' }" />
</span>
<span class="tab-btn" @click="tableRefreshFirst">
<a-icon type="redo" :style="{ fontSize: '14px', transform: 'rotate(278deg)' }" />

@ -35,7 +35,6 @@
}
},
created () {
if (this.hasPerm('sysUser:updatePwd')) {
const updPwdMenu = {
title: '账户密码',
description: '当前密码强度',
@ -47,15 +46,14 @@
}
}
this.data.push(updPwdMenu)
}
const encryptedPhone = { title: '密保手机', description: '已绑定手机', value: '138****8293', actions: { title: '修改', callback: () => { this.$message.success('This is a message of success') } } }
const encryptedProblem = { title: '密保问题', description: '未设置密保问题,密保问题可有效保护账户安全', value: '', actions: { title: '设置', callback: () => { this.$message.error('This is a message of error') } } }
const encryptedEmail = { title: '备用邮箱', description: '已绑定邮箱', value: 'ant***sign.com', actions: { title: '修改', callback: () => { this.$message.warning('This is message of warning') } } }
const encryptedMfa = { title: 'MFA 设备', description: '未绑定 MFA 设备,绑定后,可以进行二次确认', value: '', actions: { title: '绑定', callback: () => { this.$message.info('This is a normal message') } } }
this.data.push(encryptedPhone)
this.data.push(encryptedProblem)
this.data.push(encryptedEmail)
this.data.push(encryptedMfa)
// this.data.push(encryptedPhone)
// this.data.push(encryptedProblem)
// this.data.push(encryptedEmail)
// this.data.push(encryptedMfa)
},
computed: {
...mapGetters(['userInfo'])

Loading…
Cancel
Save