wengyuwen 4 éve
szülő
commit
13210ade33

+ 22 - 33
src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -110,6 +110,28 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="船名" prop="vslidName">
+                <el-input
+                  v-model="form.vslidName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="航次" prop="voyidName">
+                <el-input
+                  v-model="form.voyidName"
+                  :disabled="doNot"
+                  size="small"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
             <el-col :span="14">
               <el-form-item label="备注" prop="remarks">
                 <el-input
@@ -200,39 +222,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="提单号" prop="fEtd">
-                <el-input
-                  v-model="estimatedTime.fEtd"
-                  :disabled="doNot"
-                  size="small"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="船名" prop="fEtd">
-                <el-input
-                  v-model="estimatedTime.fEtd"
-                  :disabled="doNot"
-                  size="small"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="航次" prop="fEtd">
-                <el-input
-                  v-model="estimatedTime.fEtd"
-                  :disabled="doNot"
-                  size="small"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-
           </el-row>
         </el-form>
       </el-collapse-item>

+ 15 - 2
src/views/kaihe/shipDynamics/vesselDetail/index.vue

@@ -430,6 +430,7 @@
               <el-select
                 v-model="form.fPid"
                 style="width: 80%"
+                clearable
                 placeholder="请输入船名"
                 :disabled="doNot"
                 :remote-method="vesselRemoteMethod"
@@ -450,6 +451,7 @@
               <el-select
                 v-model="form.fPortofloadid"
                 style="width: 80%"
+                clearable
                 placeholder="请输入装货港名称"
                 :disabled="doNot"
                 :remote-method="portRemoteMethod"
@@ -468,6 +470,7 @@
               <el-select
                 v-model="form.fPortofdischargeid"
                 style="width: 80%"
+                clearable
                 placeholder="请输入卸货港"
                 :disabled="doNot"
                 :remote-method="portRemoteMethod"
@@ -488,6 +491,7 @@
               <el-select
                 v-model="form.fDistinationid"
                 style="width: 80%"
+                clearable
                 placeholder="请输入目的地"
                 :disabled="doNot"
                 :remote-method="portRemoteMethod"
@@ -506,6 +510,7 @@
               <el-select
                 v-model="form.fPortoftransshipment"
                 style="width: 80%"
+                clearable
                 placeholder="请输入中转港"
                 :disabled="doNot"
                 :remote-method="portRemoteMethod"
@@ -576,6 +581,7 @@
               <el-select
                 v-model="form.fManageid"
                 style="width: 80%"
+                clearable
                 placeholder="请输入船管人"
                 :disabled="doNot"
                 :remote-method="manageRemoteMethod"
@@ -975,8 +981,6 @@
           fNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
           fPortofloadid:[{ required: true, message: "装货港不能为空", trigger: "blur" }],
           fPortofdischargeid:[{ required: true, message: "卸货港不能为空", trigger: "blur" }],
-          fDistinationid:[{ required: true, message: "目的港不能为空", trigger: "blur" }],
-          fPortoftransshipment:[{ required: true, message: "中转港不能为空", trigger: "blur" }],
           fEtd:[{ required: true, message: "预计开船日期不能为空", trigger: "blur" }],
           fEta:[{ required: true, message: "预计到达时间不能为空", trigger: "blur" }],
           fTel:[{ required: true, message: "手机号不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
@@ -984,6 +988,15 @@
         }
       };
     },
+    activated() {
+      this.getDicts("f_types").then(response => {
+        this.fTypesOptions = response.data;
+      });
+      this.vesselRemoteMethod()
+      this.portRemoteMethod()
+      this.manageRemoteMethod()
+      this.getList()
+    },
     created() {
       this.setRowList = this.tableDate;
       this.getRowList = this.tableDate;