wzg vor 2 Jahren
Ursprung
Commit
2abee271f3
2 geänderte Dateien mit 27 neuen und 9 gelöschten Zeilen
  1. 1 1
      src/views/shipOwnerManage/shipOwnerList.vue
  2. 26 8
      src/views/voyage/voyageList.vue

+ 1 - 1
src/views/shipOwnerManage/shipOwnerList.vue

@@ -155,7 +155,7 @@ async function resetForm() {
 }
 
 const checkShipOwnerPhone = async (rule, value, callback) => {
-  if (value.length != 11) {
+  if (!value && value.length != 11) {
     return callback(new Error("请正确输入手机号"));
   }
   if (ruleForm.value.userId) return;

+ 26 - 8
src/views/voyage/voyageList.vue

@@ -264,13 +264,24 @@
             prop="dischargePorts"
             :label="'第 ' + (index + 1) + ' 卸货港'"
           >
-            <RemoteSelect
-              api="getCol"
-              v-model="dischargePorts[index].dischargePort"
-              placeholder="选择卸货港"
-              @selectItem="selectDischargeProt($event, index)"
-              class="mb10"
-            ></RemoteSelect>
+            <div class="df aic mb10">
+              <RemoteSelect
+                class="mr10"
+                api="getCol"
+                v-model="dischargePorts[index].dischargePort"
+                placeholder="选择卸货港"
+                @selectItem="selectDischargeProt($event, index)"
+              ></RemoteSelect>
+              <el-button
+                v-if="dischargePorts.length > 1"
+                style="padding: 0 8px"
+                type="danger"
+                size="mini"
+                @click="removeDischargePort(index)"
+              >
+                删除
+              </el-button>
+            </div>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="addDiscPort">
@@ -581,12 +592,15 @@ async function addVoyage() {
   voyageFormRef.value.validate(async (valid) => {
     if (valid) {
       console.log("提交", voyageForm.value);
-
+      dischargePorts.value = dischargePorts.value.filter((e) => {
+        return e.id;
+      });
       if (!dischargePorts.value.length) {
         ElNotification({
           title: "请选择至少一个装货港",
           type: "error",
         });
+        dischargePorts.value = [{}];
         return;
       }
       let res = await api.addVoyage({
@@ -850,6 +864,10 @@ async function downloadFYDI() {
   }
 }
 
+function removeDischargePort(index) {
+  dischargePorts.value.splice(index, 1);
+}
+
 onMounted(() => {
   getVoyageList();
 });