|
|
@@ -10,14 +10,15 @@
|
|
|
:on-success="onSuccess" :on-error="onError" :on-change="onChange" style="float: right">
|
|
|
<el-button type="success" size="mini" icon="el-icon-upload">解析文件</el-button>
|
|
|
</el-upload>
|
|
|
+ <el-button type="primary" @click="importData" size="mini" style="margin-left: 6px;">导 入</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="9">
|
|
|
<el-row>
|
|
|
<el-card class="box-card" shadow="never" :body-style="bodyStyle"
|
|
|
style="margin: 0 4px 4px 0;">
|
|
|
- <el-divider content-position="left">ConsolDetail</el-divider>
|
|
|
+ <el-divider content-position="left">Consol Detail</el-divider>
|
|
|
<avue-crud v-if="excelBox" :data="data" :option="option" :table-loading="loading"
|
|
|
@row-click="handleRowClick">
|
|
|
</avue-crud>
|
|
|
@@ -30,7 +31,7 @@
|
|
|
<el-date-picker v-model="form.etd" type="date" format="yyyy-MM-dd"
|
|
|
value-format="yyyy-MM-dd" placeholder="请选择 ETD">
|
|
|
</el-date-picker>
|
|
|
- <el-tooltip class="item" effect="dark" content="刷新ETD" placement="top">
|
|
|
+ <el-tooltip class="item" effect="dark" content="更新" placement="top">
|
|
|
<el-button size="mini" icon="el-icon-refresh" @click="etdClick"></el-button>
|
|
|
</el-tooltip>
|
|
|
</tempalte>
|
|
|
@@ -38,7 +39,7 @@
|
|
|
</el-card>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
- <el-col :span="16">
|
|
|
+ <el-col :span="15">
|
|
|
<el-row>
|
|
|
<el-card class="box-card" shadow="never" :body-style="bodyStyle" style="margin: 0 0 4px 0;">
|
|
|
<el-divider content-position="left">Containers</el-divider>
|
|
|
@@ -95,7 +96,7 @@ export default {
|
|
|
disabled: false,
|
|
|
column: [
|
|
|
{
|
|
|
- label: 'BOOK NO',
|
|
|
+ label: 'Booking No',
|
|
|
prop: "bookingNo",
|
|
|
disabled: true,
|
|
|
},
|
|
|
@@ -142,15 +143,16 @@ export default {
|
|
|
valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
|
},
|
|
|
{
|
|
|
- label: 'PayMode',
|
|
|
- prop: "hpaymode",
|
|
|
+ label: 'M PayMode',
|
|
|
+ prop: "mpaymode",
|
|
|
span: 12,
|
|
|
disabled: true,
|
|
|
},
|
|
|
{
|
|
|
- label: 'PayAtLocation',
|
|
|
+ label: 'Pay at Location',
|
|
|
prop: "hpayplace",
|
|
|
span: 12,
|
|
|
+ labelWidth: 120,
|
|
|
disabled: true,
|
|
|
},
|
|
|
{
|
|
|
@@ -160,20 +162,20 @@ export default {
|
|
|
disabled: true,
|
|
|
},
|
|
|
{
|
|
|
- label: 'ServiceContract',
|
|
|
+ label: 'Service Contract',
|
|
|
prop: "corpArgreementNo",
|
|
|
span: 12,
|
|
|
- labelWidth: 100,
|
|
|
+ labelWidth: 120,
|
|
|
disabled: true,
|
|
|
},
|
|
|
{
|
|
|
- label: 'ServiceCode',
|
|
|
+ label: 'Service Code',
|
|
|
prop: "serviceCode",
|
|
|
span: 12,
|
|
|
disabled: true,
|
|
|
},
|
|
|
{
|
|
|
- label: 'IsAMS',
|
|
|
+ label: 'Is AMS',
|
|
|
prop: "isAMS",
|
|
|
span: 12,
|
|
|
disabled: true,
|
|
|
@@ -253,6 +255,7 @@ export default {
|
|
|
header: false,
|
|
|
stripe: true,
|
|
|
highlightCurrentRow: true,
|
|
|
+ index: true,
|
|
|
column: [
|
|
|
{
|
|
|
label: 'Booking No',
|
|
|
@@ -269,6 +272,7 @@ export default {
|
|
|
header: false,
|
|
|
stripe: true,
|
|
|
highlightCurrentRow: true,
|
|
|
+ index: true,
|
|
|
column: [
|
|
|
{
|
|
|
label: 'ContainerNumber',
|
|
|
@@ -294,6 +298,7 @@ export default {
|
|
|
menu: false,
|
|
|
header: false,
|
|
|
stripe: true,
|
|
|
+ index: true,
|
|
|
column: [
|
|
|
{
|
|
|
label: 'Commodity',
|
|
|
@@ -405,7 +410,12 @@ export default {
|
|
|
|
|
|
// },
|
|
|
openDialog(type) {
|
|
|
+ this.form = {
|
|
|
+ detail: {}
|
|
|
+ }
|
|
|
this.data = []
|
|
|
+ this.data2 = []
|
|
|
+ this.data3 = []
|
|
|
this.excelBox = true
|
|
|
},
|
|
|
importData() {
|
|
|
@@ -444,4 +454,4 @@ export default {
|
|
|
::v-deep .el-table th {
|
|
|
padding: 0px !important;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
