|
@@ -205,7 +205,7 @@
|
|
|
<el-form-item prop="shipName" label="船舶">
|
|
<el-form-item prop="shipName" label="船舶">
|
|
|
<RemoteSelect
|
|
<RemoteSelect
|
|
|
api="getShipSelect"
|
|
api="getShipSelect"
|
|
|
- v-model="voyageForm.shipStr"
|
|
|
|
|
|
|
+ v-model="shipStr"
|
|
|
@selectItem="selectShip($event)"
|
|
@selectItem="selectShip($event)"
|
|
|
class="mb10"
|
|
class="mb10"
|
|
|
></RemoteSelect>
|
|
></RemoteSelect>
|
|
@@ -213,7 +213,7 @@
|
|
|
<el-form-item prop="cargoOwnerName" label="货主">
|
|
<el-form-item prop="cargoOwnerName" label="货主">
|
|
|
<RemoteSelect
|
|
<RemoteSelect
|
|
|
api="getCargoOwnerSelect"
|
|
api="getCargoOwnerSelect"
|
|
|
- v-model="voyageForm.cargoOwnerStr"
|
|
|
|
|
|
|
+ v-model="cargoOwnerStr"
|
|
|
placeholder="选择货主"
|
|
placeholder="选择货主"
|
|
|
@selectItem="selectCargoOwner($event)"
|
|
@selectItem="selectCargoOwner($event)"
|
|
|
class="mb10"
|
|
class="mb10"
|
|
@@ -241,7 +241,7 @@
|
|
|
<el-form-item prop="loadPort" label="装货港">
|
|
<el-form-item prop="loadPort" label="装货港">
|
|
|
<RemoteSelect
|
|
<RemoteSelect
|
|
|
api="getCol"
|
|
api="getCol"
|
|
|
- v-model="voyageForm.loadPortStr"
|
|
|
|
|
|
|
+ v-model="loadPortStr"
|
|
|
placeholder="选择装货港"
|
|
placeholder="选择装货港"
|
|
|
@selectItem="selectLoadPort"
|
|
@selectItem="selectLoadPort"
|
|
|
class="mb10"
|
|
class="mb10"
|
|
@@ -256,7 +256,7 @@
|
|
|
>
|
|
>
|
|
|
<RemoteSelect
|
|
<RemoteSelect
|
|
|
api="getCol"
|
|
api="getCol"
|
|
|
- v-model="dischargePorts[index].id"
|
|
|
|
|
|
|
+ v-model="dischargePorts[index].dischargePort"
|
|
|
placeholder="选择卸货港"
|
|
placeholder="选择卸货港"
|
|
|
@selectItem="selectDischargeProt($event, index)"
|
|
@selectItem="selectDischargeProt($event, index)"
|
|
|
class="mb10"
|
|
class="mb10"
|
|
@@ -553,7 +553,6 @@ let voyageForm = ref({
|
|
|
cargo: "",
|
|
cargo: "",
|
|
|
tons: 0,
|
|
tons: 0,
|
|
|
loadPortId: "",
|
|
loadPortId: "",
|
|
|
- dischargeProtId: "",
|
|
|
|
|
shipId: "",
|
|
shipId: "",
|
|
|
shipName: "",
|
|
shipName: "",
|
|
|
pieces: 0,
|
|
pieces: 0,
|
|
@@ -587,10 +586,6 @@ async function addVoyage() {
|
|
|
getVoyageList();
|
|
getVoyageList();
|
|
|
} else {
|
|
} else {
|
|
|
console.log(res);
|
|
console.log(res);
|
|
|
- ElNotification({
|
|
|
|
|
- title: res.data.msg,
|
|
|
|
|
- type: "error",
|
|
|
|
|
- });
|
|
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
console.log("未提交", voyageForm.value);
|
|
console.log("未提交", voyageForm.value);
|
|
@@ -626,13 +621,13 @@ let cargoOwnerStr = ref("");
|
|
|
let loadPortStr = ref("");
|
|
let loadPortStr = ref("");
|
|
|
let discPortStr = ref("");
|
|
let discPortStr = ref("");
|
|
|
let selectShip = (item) => {
|
|
let selectShip = (item) => {
|
|
|
- voyageForm.value.shipId = item.value;
|
|
|
|
|
- voyageForm.value.shipName = item.key;
|
|
|
|
|
|
|
+ voyageForm.value.shipId = item.key;
|
|
|
|
|
+ voyageForm.value.shipName = item.value;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
let selectCargoOwner = (item) => {
|
|
let selectCargoOwner = (item) => {
|
|
|
- voyageForm.value.cargoOwnerName = item.key;
|
|
|
|
|
- voyageForm.value.cargoOwnerId = item.value;
|
|
|
|
|
|
|
+ voyageForm.value.cargoOwnerName = item.value;
|
|
|
|
|
+ voyageForm.value.cargoOwnerId = item.key;
|
|
|
voyageForm.value.cargo = "";
|
|
voyageForm.value.cargo = "";
|
|
|
voyageForm.value.cargoId = "";
|
|
voyageForm.value.cargoId = "";
|
|
|
};
|
|
};
|
|
@@ -655,26 +650,29 @@ let getCol = _.debounce(
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
let selectLoadPort = (item) => {
|
|
let selectLoadPort = (item) => {
|
|
|
- voyageForm.value.loadPortId = item.value;
|
|
|
|
|
- voyageForm.value.loadPort = item.key;
|
|
|
|
|
|
|
+ voyageForm.value.loadPortId = item.key;
|
|
|
|
|
+ voyageForm.value.loadPort = item.value;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
let selectDischargeProt = (item, index) => {
|
|
let selectDischargeProt = (item, index) => {
|
|
|
dischargePorts.value[index] = {
|
|
dischargePorts.value[index] = {
|
|
|
- dischargePort: item.key,
|
|
|
|
|
- id: item.value,
|
|
|
|
|
|
|
+ dischargePort: item.value,
|
|
|
|
|
+ id: item.key,
|
|
|
reasonableUnloadingDays: 0,
|
|
reasonableUnloadingDays: 0,
|
|
|
};
|
|
};
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
let selectCargo = (item) => {
|
|
let selectCargo = (item) => {
|
|
|
- voyageForm.value.cargo = item.key;
|
|
|
|
|
- voyageForm.value.cargoId = item.value;
|
|
|
|
|
|
|
+ voyageForm.value.cargo = item.value;
|
|
|
|
|
+ voyageForm.value.cargoId = item.key;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
function resetAddVoyageForm() {
|
|
function resetAddVoyageForm() {
|
|
|
voyageAddDialogVisible.value = false;
|
|
voyageAddDialogVisible.value = false;
|
|
|
voyageFormRef.value.resetFields();
|
|
voyageFormRef.value.resetFields();
|
|
|
|
|
+ shipStr.value = "";
|
|
|
|
|
+ cargoOwnerStr.value = "";
|
|
|
|
|
+ loadPortStr.value = "";
|
|
|
voyageForm.value = {
|
|
voyageForm.value = {
|
|
|
tons: 0,
|
|
tons: 0,
|
|
|
pieces: 0,
|
|
pieces: 0,
|
|
@@ -715,7 +713,7 @@ let FYDIParams = ref({
|
|
|
});
|
|
});
|
|
|
let cargoOwnerCompanyStr = ref("");
|
|
let cargoOwnerCompanyStr = ref("");
|
|
|
function selectCargoOwnerUpload(item) {
|
|
function selectCargoOwnerUpload(item) {
|
|
|
- FYDIParams.value.cargoOwnerId = item.value;
|
|
|
|
|
|
|
+ FYDIParams.value.cargoOwnerId = item.key;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function FYDIModalClose() {
|
|
function FYDIModalClose() {
|