wzh 3 лет назад
Родитель
Сommit
b7fd1b66e5
2 измененных файлов с 19 добавлено и 21 удалено
  1. 1 1
      src/components/RemoteSelect.vue
  2. 18 20
      src/views/voyage/voyageList.vue

+ 1 - 1
src/components/RemoteSelect.vue

@@ -15,7 +15,7 @@
       v-for="item in options"
       :key="item.key"
       :label="item.value"
-      :value="{ value: item.key, key: item.value }"
+      :value="{ value: item.value, key: item.key }"
     />
   </el-select>
 </template>

+ 18 - 20
src/views/voyage/voyageList.vue

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