订舱详情多品名处修改

dev
liuxiaoxue 2 years ago
parent 3b84df1635
commit e9b09087f5

@ -95,7 +95,7 @@
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
<link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" /> <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
<% } %> <% } %>
<link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_sqw8em8u0p.css" /> <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3756681_5nvf0rgprqc.css" />
<!-- 1.8K仔百度收录 --> <!-- 1.8K仔百度收录 -->
<meta name="baidu-site-verification" content="code-QVfBYJ5laQ" /> <meta name="baidu-site-verification" content="code-QVfBYJ5laQ" />
</head> </head>

@ -628,7 +628,7 @@ export default {
.base-tit { .base-tit {
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
color: #666; color: #333;
position: relative; position: relative;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;

@ -3,11 +3,11 @@
<a-card :bordered="false"> <a-card :bordered="false">
<div class="from-line"> <div class="from-line">
<div class="left"> <div class="left">
<a-button class="btn" type="primary" @click="addboxLine"></a-button> <a-button class="btn btn-add" type="primary" @click="addboxLine"></a-button>
<a-button class="btn" @click="removeLine"></a-button> <a-button class="btn btn-delete" @click="removeLine" :style="{marginRight:'50px'}">删除</a-button>
<a-button class="btn" type="primary" @click="openDialog" :disabled="tableData.length === 0">多品名</a-button> <a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0"><a-icon type="appstore" />多品名</a-button>
<a-button class="btn" type="primary" @click="importYarn" :loading="YarnLoading">引入场站数据</a-button> <a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading"><a-icon type="import" />引入场站数据</a-button>
<a-button class="btn" type="primary" @click="importWeight" :loading="WeightLoading">引入箱皮重</a-button> <a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading"><a-icon type="import" />引入箱皮重</a-button>
</div> </div>
<div class="table-right"> <div class="table-right">
<!-- <span>合计: {{ totalCtnall }}</span> --> <!-- <span>合计: {{ totalCtnall }}</span> -->
@ -49,7 +49,7 @@
/> />
<div class="model-botton-box"> <div class="model-botton-box">
<a-button class="btn" type="primary" @click="addChildData"></a-button> <a-button class="btn" type="primary" @click="addChildData"></a-button>
<a-button class="btn" @click="removeChildData"></a-button> <a-button class="btn btn-delete" @click="removeChildData"></a-button>
<a-button class="btn" type="primary" @click="saveChildData"></a-button> <a-button class="btn" type="primary" @click="saveChildData"></a-button>
</div> </div>
<div class="model-child-table"> <div class="model-child-table">
@ -1028,6 +1028,22 @@ export default {
.btn { .btn {
margin-right: 10px; margin-right: 10px;
} }
.btn-delete{
border: 1px solid #ff6646;
background: #fdf2f0;
color: #ff6646;
&:hover{
border: 1px solid #ff6646 !important;
background: #fdf2f0 !important;
color: #ff6646 !important;
opacity:.7;
}
}
.btn-more-name,.btn-import-station,.btn-weight{
border: 1px solid @primary-color;
color: @primary-color;
background-color: #f5f9fe;
}
} }
.table-right { .table-right {
line-height: 28px; line-height: 28px;
@ -1042,10 +1058,21 @@ export default {
.model-content { .model-content {
.model-botton-box { .model-botton-box {
margin: 40px 0; margin: 40px 0 20px;
.btn { .btn {
margin-right: 10px; margin-right: 10px;
} }
.btn-delete{
border: 1px solid #ff6646;
background: #fdf2f0;
color: #ff6646;
&:hover{
border: 1px solid #ff6646 !important;
background: #fdf2f0 !important;
color: #ff6646 !important;
opacity:.7;
}
}
} }
} }
.table-no-data { .table-no-data {

@ -72,6 +72,9 @@
@cell-dblclick="handledbclick" @cell-dblclick="handledbclick"
style="margin-top:15px;" style="margin-top:15px;"
> >
<template #mblno="{ row }">
<div class="mblno">{{ row.mblno }}</div>
</template>
<template #vessel="{ row }"> <template #vessel="{ row }">
<div class="vessel">{{ row.vessel }}</div> <div class="vessel">{{ row.vessel }}</div>
</template> </template>
@ -554,9 +557,13 @@ export default {
} }
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
.vessel { /*订舱表格内字体颜色 */
color: #ffa93e; .mblno{
color: #3277ff;
} }
/*.vessel {
color: #77c950;
}*/
.nav-box { .nav-box {
margin-bottom: 10px; margin-bottom: 10px;
padding: 0 10px; padding: 0 10px;

@ -3,7 +3,7 @@ export default {
{ type: 'checkbox', width: 60, noDraggable: true }, { type: 'checkbox', width: 60, noDraggable: true },
{ field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true }, { field: 'carrier', title: '船公司', showHeaderOverflow: true, sortable: true },
{ field: 'yard', title: '场站', showHeaderOverflow: true, sortable: true }, { field: 'yard', title: '场站', showHeaderOverflow: true, sortable: true },
{ field: 'mblno', title: '提单号', showHeaderOverflow: true, sortable: true }, { title: '提单号', showHeaderOverflow: true, sortable: true, slots: { default: 'mblno' } },
{ title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } }, { title: '船名航次', showHeaderOverflow: true, sortable: true, slots: { default: 'vessel' } },
{ field: 'etd', title: '开船日期', showHeaderOverflow: true, sortable: true }, { field: 'etd', title: '开船日期', showHeaderOverflow: true, sortable: true },
{ field: 'voyno', title: '海关航次', showHeaderOverflow: true }, { field: 'voyno', title: '海关航次', showHeaderOverflow: true },

Loading…
Cancel
Save