doctor-admin-components 1.0.14-beta.76 → 1.0.14-beta.78
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -36,6 +36,18 @@
|
|
|
36
36
|
</el-select>
|
|
37
37
|
</el-form-item>
|
|
38
38
|
</el-col>
|
|
39
|
+
<el-col :span="6">
|
|
40
|
+
<el-form-item label="起运港" prop="originPort">
|
|
41
|
+
<el-select v-model="form.originPort" style="width: 100%" placeholder="请选择起运港" clearable filterable size="small">
|
|
42
|
+
<el-option v-for="(item, i) in portOptions" :key="i" :value="item.dictValue" :label="item.dictValue" />
|
|
43
|
+
</el-select>
|
|
44
|
+
</el-form-item>
|
|
45
|
+
</el-col>
|
|
46
|
+
<el-col :span="6">
|
|
47
|
+
<el-form-item label="海运距离(KM)" prop="portDistance">
|
|
48
|
+
<el-input v-decimal="2" v-model="form.portDistance" placeholder="请输入海运距离" size="small" />
|
|
49
|
+
</el-form-item>
|
|
50
|
+
</el-col>
|
|
39
51
|
</el-row>
|
|
40
52
|
<el-row>
|
|
41
53
|
<el-col :span="6">
|
|
@@ -471,7 +483,7 @@ import { updateBizContractDetail } from '../../../api/biz/bizContractDetail'
|
|
|
471
483
|
import { queryPurchaseContracts } from '../../../api/biz/bizContract'
|
|
472
484
|
|
|
473
485
|
import { Loading } from 'element-ui'
|
|
474
|
-
import { listDictData } from '../../../api/biz/dictData'
|
|
486
|
+
import { listDictData, portDictList } from '../../../api/biz/dictData'
|
|
475
487
|
import selectBooking from './selectBooking.vue'
|
|
476
488
|
import { listBizBooking } from '../../../api/biz/bizBooking'
|
|
477
489
|
import ReferenceAlert from './referenceAlert.vue'
|
|
@@ -490,6 +502,7 @@ export default {
|
|
|
490
502
|
voidInvoiceList: null,
|
|
491
503
|
//目的地港口列表
|
|
492
504
|
destinationPortList: [],
|
|
505
|
+
portOptions:[],
|
|
493
506
|
//折叠面板
|
|
494
507
|
activeName: ['1'],
|
|
495
508
|
//折叠面板
|
|
@@ -585,6 +598,9 @@ export default {
|
|
|
585
598
|
}).then((res) => {
|
|
586
599
|
this.destinationPortList = res.rows
|
|
587
600
|
})
|
|
601
|
+
portDictList().then((res) => {
|
|
602
|
+
this.portOptions = res.rows
|
|
603
|
+
})
|
|
588
604
|
},
|
|
589
605
|
mounted() {
|
|
590
606
|
const channel = new BroadcastChannel('ocrInfo-channnel');
|
|
@@ -1299,6 +1315,14 @@ export default {
|
|
|
1299
1315
|
this.form.destinationPort = billInfoSummary.destinationPort
|
|
1300
1316
|
}
|
|
1301
1317
|
|
|
1318
|
+
if (billInfoSummary.originPort) {
|
|
1319
|
+
this.form.originPort = billInfoSummary.originPort
|
|
1320
|
+
}
|
|
1321
|
+
|
|
1322
|
+
if (billInfoSummary.portDistance) {
|
|
1323
|
+
this.form.portDistance = billInfoSummary.portDistance
|
|
1324
|
+
}
|
|
1325
|
+
|
|
1302
1326
|
// if (billInfoSummary.actualArrivalDate) {
|
|
1303
1327
|
// this.form.actualArrivalDate = billInfoSummary.actualArrivalDate;
|
|
1304
1328
|
// }
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
|
|
103
103
|
<el-descriptions-item label="Origin Country/Region">{{ form.originCountry }}</el-descriptions-item>
|
|
104
104
|
<el-descriptions-item label="Loading Country/Region">{{ form.loadingCountry }}</el-descriptions-item>
|
|
105
|
-
<el-descriptions-item label="Loading Port">{{ form.originPort }}</el-descriptions-item>
|
|
105
|
+
<el-descriptions-item label="Loading Port" v-if="form.freightTerms != 'EXW'">{{ form.originPort }}</el-descriptions-item>
|
|
106
106
|
<el-descriptions-item v-if="form.freightTerms != 'EXW'" label="Destination">{{ form.destination }}</el-descriptions-item>
|
|
107
107
|
<el-descriptions-item v-else label="EXW Address">{{ form.exw }}</el-descriptions-item>
|
|
108
108
|
<el-descriptions-item label="Containers">
|