修改港口

src/api/kaihe/basicdata/container.js

@@ -72,3 +72,11 @@ export function getyard(query) {
     params: query
   })
 }
+//查询港口名称
+export function getBasicInformation(query) {
+  return request({
+    url: '/shipping/address/getBasicInformation',
+    method: 'get',
+    params: query
+  })
+}

src/views/fleet/plans/AddOrUpdate.vue

@@ -178,9 +178,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -198,9 +198,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -1282,19 +1282,11 @@
         >提 交</el-button
       >
       <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
-      <el-button
-        type="success"
-        @click="submitAllowChanges"
-        >修 改</el-button
-      >
+      <el-button type="success" @click="submitAllowChanges">修 改</el-button>
       <el-button type="info" @click="submitSave" :disabled="disabled"
         >保 存</el-button
       >
-      <el-button
-        type="warning"
-        @click="submitRetreat"
-        >撤 回</el-button
-      >
+      <el-button type="warning" @click="submitRetreat">撤 回</el-button>
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
   </el-dialog>
@@ -1315,6 +1307,7 @@ import {
   changeFtmsorderbillsplans,
   planChangeFtmsorderbillsplans,
 } from "@/api/fleet/ftmsorderbillsplans";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { company } from "@/api/fleet/carManage";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
@@ -1469,12 +1462,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
-    });
+    // this.getDicts("port_start").then((response) => {
+    //   this.polList = response.data;
+    // });
+    // this.getDicts("port_end").then((response) => {
+    //   this.podList = response.data;
+    // });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
     });
@@ -1490,6 +1483,13 @@ export default {
     }).then((response) => {
       this.companyList = response.rows;
     });
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
+    });
     this.userType = Cookies.get("userType");
     this.username = Cookies.get("userName");
   },

src/views/fleet/plans/index.vue

@@ -855,21 +855,25 @@ export default {
         if (response.data.tmsorder.billType) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
-        if (response.data.tmsorder.polId) {
-          response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
-        }
-        if (response.data.tmsorder.podId) {
-          response.data.tmsorder.podId = response.data.tmsorder.podId.toString();
-        }
+        // if (response.data.tmsorder.polId) {
+        //   response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
+        // }
+        // if (response.data.tmsorder.podId) {
+        //   response.data.tmsorder.podId = response.data.tmsorder.podId.toString();
+        // }
         if (response.data.scntrs.length != 0) {
           response.data.scntrs.map((e) => {
-            e.cntrId = e.cntrId.toString();
-            e.priceType = e.priceType.toString();
+            if (e.cntrId) {
+              e.cntrId = e.cntrId.toString();
+            }
+            if (e.priceType) {
+              e.priceType = e.priceType.toString();
+            }
           });
         }
         if (response.data.plans.length != 0) {
           response.data.plans.cntrId = response.data.plans.map((e) => {
-            if (e.cntrId != null) {
+            if (e.cntrId) {
               return (e.cntrId = e.cntrId.toString());
             }
           });
@@ -897,24 +901,24 @@ export default {
     },
     //获取到保存并复制
     getSave(data) {
-      if (data.data.tmsorder.polId) {
-        data.data.tmsorder.polId = data.data.tmsorder.polId.toString();
-      }
-      if (data.data.tmsorder.podId) {
-        data.data.tmsorder.podId = data.data.tmsorder.podId.toString();
-      }
-      if (data.data.tmsorder.billType != null) {
+      if (data.data.tmsorder.billType) {
         data.data.tmsorder.billType = data.data.tmsorder.billType.toString();
       }
       if (data.data.scntrs.length != 0) {
         data.data.scntrs.map((e) => {
-          e.cntrId = e.cntrId.toString();
-          e.priceType = e.priceType.toString();
+          if (e.cntrId) {
+            e.cntrId = e.cntrId.toString();
+          }
+          if (e.priceType) {
+            e.priceType = e.priceType.toString();
+          }
         });
       }
       if (data.data.plans.length != 0) {
         data.data.plans.cntrId = data.data.plans.map((e) => {
-          return (e.cntrId = e.cntrId.toString());
+          if (e.cntrId) {
+            e.cntrId = e.cntrId.toString();
+          }
         });
       }
       if (data.data.fees.length != 0) {

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -339,9 +339,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -359,9 +359,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -724,7 +724,9 @@
                       @click.native.prevent="
                         delplansRow(scope.$index, schedulingList, scope.row)
                       "
-                      :disabled="scope.row.billStatus==5||scope.row.billStatus==6"
+                      :disabled="
+                        scope.row.billStatus == 5 || scope.row.billStatus == 6
+                      "
                       >删除</el-button
                     >
                     <el-button
@@ -732,7 +734,9 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addplansRow(scope.row)"
-                      :disabled="scope.row.billStatus==3||scope.row.billStatus==6"
+                      :disabled="
+                        scope.row.billStatus == 3 || scope.row.billStatus == 6
+                      "
                       >提交</el-button
                     >
                     <el-button
@@ -1287,7 +1291,10 @@
 </template>
 
 <script>
-import { RetreatFtmsorderbills,allowChangesFtmsorderbills } from "@/api/fleet/ftmsorderbills";
+import {
+  RetreatFtmsorderbills,
+  allowChangesFtmsorderbills,
+} from "@/api/fleet/ftmsorderbills";
 import {
   singleaddFtmsorderbillsplans,
   revokeFtmsorderbillsplans,
@@ -1298,6 +1305,7 @@ import {
   planChangeFtmsorderbillsplans,
   saveFtmsorderbillsplans,
 } from "@/api/fleet/ftmsorderbillsplans";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { company } from "@/api/fleet/carManage";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
@@ -1452,11 +1460,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
@@ -1636,12 +1645,12 @@ export default {
     },
     //撤回
     submitRetreat() {
-      const id = { id: this.form.id,actId: 1010  };
+      const id = { id: this.form.id, actId: 1010 };
       RetreatFtmsorderbills(id).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("撤回成功");
           this.$parent.getList();
-          this.$emit("fixDisabled", "false");
+          // this.$emit("fixDisabled", "false");
           this.$emit("fixDisabled2", "false");
         }
       });
@@ -1653,13 +1662,13 @@ export default {
         this.$emit("fixDisabled2", "false");
         this.msgSuccess("允许修改");
       } else {
-         this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
+        this.$confirm("该单据已经提交，是否进行变更操作?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         })
           .then(() => {
-            console.log("111")
+            console.log("111");
             const data = { id: this.form.id, actId: 1010 };
             allowChangesFtmsorderbills(data).then((response) => {
               if (response.code == 200) {
@@ -1673,7 +1682,7 @@ export default {
             });
           })
           .catch(() => {
-            console.log("111")
+            console.log("111");
             this.$message({
               type: "info",
               message: "已取消",
@@ -1721,6 +1730,9 @@ export default {
           if (response.code == 200) {
             this.$set(row, "billStatus", 6);
             this.$set(row, "disabled", true);
+            this.$set(row, "id", response.data.plan.id);
+            this.$set(row, "orgId", response.data.plan.orgId);
+            this.$parent.getSave2(responsed.data.cntrs);
           }
         });
       } else if (row.billStatus != 6) {
@@ -1730,9 +1742,11 @@ export default {
         singleaddFtmsorderbillsplans(formData).then((response) => {
           this.msgSuccess("成功提交");
           if (response.code == 200) {
-            this.$set(row, "id", response.data.id);
             this.$set(row, "billStatus", 6);
             this.$set(row, "disabled", true);
+            this.$set(row, "id", response.data.plan.id);
+            this.$set(row, "orgId", response.data.plan.orgId);
+            this.$parent.getSave2(response.data.cntrs);
           }
         });
       } else {
@@ -1757,6 +1771,7 @@ export default {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
             this.$set(row, "billStatus", 3);
+            this.$parent.getSave2(response.data.cntrs);
           }
         });
       } else {

src/views/fleet/scheduling/index.vue

@@ -850,16 +850,20 @@ export default {
         if (response.data.tmsorder.billType) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
-        if (response.data.tmsorder.polId) {
-          response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
-        }
-        if (response.data.tmsorder.podId) {
-          response.data.tmsorder.podId = response.data.tmsorder.podId.toString();
-        }
+        // if (response.data.tmsorder.polId) {
+        //   response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
+        // }
+        // if (response.data.tmsorder.podId) {
+        //   response.data.tmsorder.podId = response.data.tmsorder.podId.toString();
+        // }
         if (response.data.scntrs.length != 0) {
           response.data.scntrs.map((e) => {
-            e.cntrId = e.cntrId.toString();
-            e.priceType = e.priceType.toString();
+            if (e.cntrId) {
+              e.cntrId = e.cntrId.toString();
+            }
+            if (e.priceType) {
+              e.priceType = e.priceType.toString();
+            }
           });
         }
         if (response.data.plans.length != 0) {
@@ -867,7 +871,7 @@ export default {
             if (e.cntrId) {
               e.cntrId = e.cntrId.toString();
             }
-            if (e.billStatus == 6||e.billStatus == 3) {
+            if (e.billStatus == 6 || e.billStatus == 3) {
               e.disabled = true;
             }
           });
@@ -882,7 +886,7 @@ export default {
         this.planList = response.data.scntrs;
         if (response.data.fees.length) {
           response.data.fees.map((e) => {
-            if (e.fFeeunitid != null) {
+            if (e.fFeeunitid) {
               return (e.fFeeunitid = e.fFeeunitid.toString());
             }
           });
@@ -903,13 +907,38 @@ export default {
           if (e.cntrId) {
             e.cntrId = e.cntrId.toString();
           }
-          if (e.billStatus == 6||e.billStatus == 3) {
+          if (e.billStatus == 6 || e.billStatus == 3) {
             e.disabled = true;
           }
         });
       }
       this.schedulingList = data.data;
     },
+    getSave2(data) {
+      console.log(data);
+      // if (data.data.length != 0) {
+      //   data.data.cntrId = data.data.map((e) => {
+      //     if (e.cntrId) {
+      //       e.cntrId = e.cntrId.toString();
+      //     }
+      //     if (e.billStatus == 6 || e.billStatus == 3) {
+      //       e.disabled = true;
+      //     }
+      //   });
+      // }
+      if (data.length != 0) {
+        data.map((e) => {
+          if (e.cntrId) {
+            e.cntrId = e.cntrId.toString();
+          }
+          if (e.priceType) {
+            e.priceType = e.priceType.toString();
+          }
+        });
+      }
+      this.planList = data;
+      console.log(this.planList)
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -177,9 +177,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -197,9 +197,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -572,7 +572,11 @@
                     <el-select
                       v-model="scope.row.cntrId"
                       placeholder="请选择箱型"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 ||
+                        scope.row.billStatus == 3 ||
+                        scope.row.billStatus == 3
+                      "
                       @change="checkPid(scope.row)"
                     >
                       <el-option
@@ -595,7 +599,9 @@
                     <el-input
                       v-model="scope.row.cntrQty"
                       placeholder="货量"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                      "
                     />
                   </template>
                 </el-table-column>
@@ -610,7 +616,9 @@
                     <el-input
                       v-model="scope.row.cntrNo"
                       placeholder="箱号"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                      "
                     />
                   </template>
                 </el-table-column>
@@ -629,7 +637,9 @@
                     <el-select
                       v-model="scope.row.carregNo"
                       placeholder="车号"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                      "
                       :clearable="true"
                       filterable
                       @change="carChange(scope.row)"
@@ -676,7 +686,9 @@
                     <el-input
                       v-model="scope.row.remarks"
                       placeholder="备注"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                      "
                     />
                   </template>
                 </el-table-column>
@@ -712,7 +724,9 @@
                       @click.native.prevent="
                         delscarsRow(scope.$index, vehicleList, scope.row)
                       "
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 5"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 5
+                      "
                       >删除</el-button
                     >
                     <el-button
@@ -720,7 +734,9 @@
                       type="text"
                       icon="el-icon-document-checked"
                       @click.native.prevent="addscarsRow(scope.row)"
-                      :disabled="scope.row.billStatus == 6||scope.row.billStatus == 3"
+                      :disabled="
+                        scope.row.billStatus == 6 || scope.row.billStatus == 3
+                      "
                       >提交</el-button
                     >
                     <el-button
@@ -1281,6 +1297,7 @@ import {
   addFtmsorderbillscars,
   singleChangeFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { company } from "@/api/fleet/carManage";
 import { listFtmsorderbillss } from "@/api/fleet/carManage";
 import { driverList } from "@/api/fleet/driverMsg";
@@ -1436,11 +1453,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
@@ -1743,7 +1761,11 @@ export default {
             if (response.code == 200) {
               this.msgSuccess("成功提交");
               this.$set(row, "billStatus", 6);
-              this.$set(this.schedulingList[0], "carQty", response.data.plan.carQty);
+              this.$set(
+                this.schedulingList[0],
+                "carQty",
+                response.data.plan.carQty
+              );
             }
           });
         } else if (row.billStatus != 6) {
@@ -1751,7 +1773,11 @@ export default {
             this.msgSuccess("成功提交");
             if (response.code == 200) {
               this.$set(row, "billStatus", 6);
-              this.$set(this.schedulingList[0], "carQty", response.data.plan.carQty);
+              this.$set(
+                this.schedulingList[0],
+                "carQty",
+                response.data.plan.carQty
+              );
             }
           });
         } else {
@@ -1765,7 +1791,11 @@ export default {
           if (response.code == 200) {
             rows.splice(index, 1);
             this.msgSuccess("成功删除");
-            this.$set(this.schedulingList[0], "carQty", response.data.plan.carQty);
+            this.$set(
+              this.schedulingList[0],
+              "carQty",
+              response.data.plan.carQty
+            );
           }
         });
       } else {
@@ -1778,7 +1808,11 @@ export default {
           if (response.code == 200) {
             this.msgSuccess("成功撤回");
             this.$set(row, "billStatus", 3);
-            this.$set(this.schedulingList[0], "carQty", response.data.plan.carQty);
+            this.$set(
+              this.schedulingList[0],
+              "carQty",
+              response.data.plan.carQty
+            );
           }
         });
       } else {

src/views/fleet/sendcar/index.vue

@@ -908,12 +908,6 @@ export default {
         if (response.data.tmsorder.billType) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
-        if (response.data.tmsorder.polId) {
-          response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
-        }
-        if (response.data.tmsorder.podId) {
-          response.data.tmsorder.podId = response.data.tmsorder.podId.toString();
-        }
         if (response.data.plans.billStatus == 60) {
           this.disabled2 = true;
         }

src/views/index.vue

@@ -184,11 +184,15 @@
               style="display: flex; padding: 2px; font-size: 16px"
               v-for="(item, index) in fleetData.upperRight"
               :key="index"
-               :style="{ backgroundColor:index%2==0 ? '#e6ebf5' : '#FFFFFF' }"
+              :style="{
+                backgroundColor: index % 2 == 0 ? '#e6ebf5' : '#FFFFFF',
+              }"
             >
               <div style="width: 30%">{{ item.mblno }}</div>
               <div style="width: 20%">{{ item.carregNo }}</div>
-              <div style="width: 15%;color:#67c23a">{{ item.orderStatus|statusType }}</div>
+              <div style="width: 15%; color: #67c23a">
+                {{ item.orderStatus | statusType }}
+              </div>
               <div
                 style="
                   width: 35%;
@@ -204,37 +208,51 @@
         </chi-card>
         <chi-card title="业务待办" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
-            <div style="font-size: 16px; display: flex;margin: 4px 0;border-bottom:1px dashed #e6ebf5">
-              <div style="width: 30%">FK221516485645</div>
-              <div style="width: 20%">运费运费运费</div>
-              <div style="width: 15%">李刚</div>
-              <div style="width: 15%;color:#67c23a">待审批</div>
-              <div style="width: 20%">2020/10/10</div>
+            <div
+              style="
+                font-size: 16px;
+                display: flex;
+                margin: 4px 0;
+                border-bottom: 1px dashed #e6ebf5;
+              "
+            >
+              <div style="width: 30%" class="single_line">FK221516485645</div>
+              <div style="width: 20%" class="single_line">运费运费运费</div>
+              <div style="width: 15%" class="single_line">李刚</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 16px; display: flex;margin: 4px 0;">
-              <div style="width: 30%">FK221516485645</div>
-              <div style="width: 20%">运费运费运费</div>
-              <div style="width: 15%">李刚</div>
-              <div style="width: 15%;color:#67c23a">待审批</div>
-              <div style="width: 20%">2020/10/10</div>
+            <div style="font-size: 16px; display: flex; margin: 4px 0">
+              <div style="width: 30%" class="single_line">FK221516485645</div>
+              <div style="width: 20%" class="single_line">运费运费运费</div>
+              <div style="width: 15%" class="single_line">李刚</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
         </chi-card>
         <chi-card title="审核列表" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
-            <div style="font-size: 16px; display: flex;margin: 4px 0;border-bottom:1px dashed #e6ebf5">
-              <div style="width: 30%">FK221516485645</div>
-              <div style="width: 20%">运费运费运费</div>
-              <div style="width: 15%">李刚</div>
-              <div style="width: 15%;color:#67c23a">待审批</div>
-              <div style="width: 20%">2020/10/10</div>
+            <div
+              style="
+                font-size: 16px;
+                display: flex;
+                margin: 4px 0;
+                border-bottom: 1px dashed #e6ebf5;
+              "
+            >
+              <div style="width: 30%" class="single_line">FK221516485645</div>
+              <div style="width: 20%" class="single_line">运费运费运费</div>
+              <div style="width: 15%" class="single_line">李刚</div>
+              <div style="width: 15%; color: #67c23a">待审批</div>
+              <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 16px; display: flex;;margin: 4px 0;">
-              <div style="width: 30%">FK221516485645</div>
-              <div style="width: 20%">运费运费运费</div>
-              <div style="width: 15%">李刚</div>
-              <div style="width: 15%;color:#67c23a">待审批</div>
-              <div style="width: 20%">2020/10/10</div>
+            <div style="font-size: 16px; display: flex; margin: 4px 0">
+              <div style="width: 30%" class="single_line">FK221516485645</div>
+              <div style="width: 20%" class="single_line">运费运费运费</div>
+              <div style="width: 15%" class="single_line">李刚</div>
+              <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
+              <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
           </div>
         </chi-card>
@@ -513,7 +531,7 @@ export default {
         case 60:
           return "还卸柜子";
           break;
-            case 70:
+        case 70:
           return "费用确认";
           break;
         default:
@@ -1125,7 +1143,11 @@ export default {
     min-height: 144px;
   }
 }
-
+.single_line {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 @media screen and (max-width: 920px) {
   .home-fleet {
     display: flex;

src/views/track/cabinet/AddOrUpdate.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="客户名称" prop="fCorpId" >
+            <el-form-item label="客户名称" prop="fCorpId">
               <el-select
                 v-model="form.fCorpId"
                 placeholder="请输入客户名称"
@@ -30,7 +30,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="业务类型" prop="billType" >
+            <el-form-item label="业务类型" prop="billType">
               <el-select
                 v-model="form.billType"
                 placeholder="请选择业务类型"
@@ -48,7 +48,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="运输方式" prop="transType" >
+            <el-form-item label="运输方式" prop="transType">
               <el-select
                 v-model="form.transType"
                 placeholder="请选择运输方式"
@@ -66,7 +66,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="运输性质" prop="transProp" >
+            <el-form-item label="运输性质" prop="transProp">
               <el-select
                 v-model="form.transProp"
                 placeholder="请选择运输方式"
@@ -86,7 +86,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="装车地点" prop="tLoadAddr" >
+            <el-form-item label="装车地点" prop="tLoadAddr">
               <el-input
                 v-model="form.tLoadAddr"
                 placeholder="请输入装车地点"
@@ -97,7 +97,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划时间" prop="tLoadDate" >
+            <el-form-item label="计划时间" prop="tLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -112,7 +112,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系人" prop="loadAttn" >
+            <el-form-item label="联系人" prop="loadAttn">
               <el-input
                 v-model="form.loadAttn"
                 placeholder="请输入装车联系人"
@@ -123,7 +123,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系电话" prop="loadAttntel" >
+            <el-form-item label="联系电话" prop="loadAttntel">
               <el-input
                 v-model="form.loadAttntel"
                 placeholder="请输入装车联系电话"
@@ -137,7 +137,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="卸车地点" prop="unLoadAddr" >
+            <el-form-item label="卸车地点" prop="unLoadAddr">
               <el-input
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸车地点"
@@ -148,7 +148,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划时间" prop="tUnLoadDate" >
+            <el-form-item label="计划时间" prop="tUnLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -163,7 +163,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系人" prop="unLoadAttn" >
+            <el-form-item label="联系人" prop="unLoadAttn">
               <el-input
                 v-model="form.unLoadAttn"
                 placeholder="请输入卸车联系人"
@@ -174,7 +174,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系电话" prop="unLoadAttnTel" >
+            <el-form-item label="联系电话" prop="unLoadAttnTel">
               <el-input
                 v-model="form.unLoadAttnTel"
                 placeholder="请输入卸车联系电话"
@@ -188,7 +188,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="提单号" prop="mblno" >
+            <el-form-item label="提单号" prop="mblno">
               <el-input
                 v-model="form.mblno"
                 placeholder="请输入提单号"
@@ -199,7 +199,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="货品名称" prop="goodsId" >
+            <el-form-item label="货品名称" prop="goodsId">
               <el-select
                 v-model="form.goodsId"
                 placeholder="请输入货品名称"
@@ -219,7 +219,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划件数" prop="qtyPlan" >
+            <el-form-item label="计划件数" prop="qtyPlan">
               <el-input
                 v-model="form.qtyPlan"
                 placeholder="请输入计划件数"
@@ -231,7 +231,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="重量(吨)" prop="weightPlan" >
+            <el-form-item label="重量(吨)" prop="weightPlan">
               <el-input
                 v-model="form.weightPlan"
                 placeholder="请输入计划重量"
@@ -245,7 +245,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="船名" prop="ysl" >
+            <el-form-item label="船名" prop="ysl">
               <el-input
                 v-model="form.ysl"
                 placeholder="请输入船名"
@@ -256,7 +256,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="航次" prop="voy" >
+            <el-form-item label="航次" prop="voy">
               <el-input
                 v-model="form.voy"
                 placeholder="请输入航次"
@@ -267,7 +267,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="起运港" prop="polId" >
+            <el-form-item label="起运港" prop="polId">
               <el-select
                 v-model="form.polId"
                 placeholder="请输入起运港"
@@ -279,15 +279,15 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目的港" prop="podId" >
+            <el-form-item label="目的港" prop="podId">
               <el-select
                 v-model="form.podId"
                 placeholder="请输入目的港"
@@ -299,9 +299,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -309,7 +309,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="车号" prop="carregNo" >
+            <el-form-item label="车号" prop="carregNo">
               <el-input
                 v-model="form.carregNo"
                 placeholder="请输入车号"
@@ -320,7 +320,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="司机" prop="driverName" >
+            <el-form-item label="司机" prop="driverName">
               <el-input
                 v-model="form.driverName"
                 placeholder="请输入司机"
@@ -331,7 +331,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="司机电话" prop="driverTel" >
+            <el-form-item label="司机电话" prop="driverTel">
               <el-input
                 v-model="form.driverTel"
                 placeholder="请输入司机电话"
@@ -342,9 +342,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="6">
-            <el-form-item label="接单时间" prop="acceptDate" >
+            <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -359,7 +359,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提箱时间" prop="loadDate" >
+            <el-form-item label="提箱时间" prop="loadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -374,7 +374,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="装卸货时间" prop="mdLoadDate" >
+            <el-form-item label="装卸货时间" prop="mdLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -403,8 +403,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col> -->
-           <el-col :span="6">
-            <el-form-item label="回单时间" prop="waybillDate" >
+          <el-col :span="6">
+            <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -421,7 +421,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom" >
+            <el-form-item label="起始里程" prop="odometerFrom">
               <el-input
                 v-model="form.odometerFrom"
                 placeholder="请输入起始里程表读数"
@@ -433,7 +433,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd" >
+            <el-form-item label="结束里程" prop="odometerEnd">
               <el-input
                 v-model="form.odometerEnd"
                 placeholder="请输入结束里程表读数"
@@ -445,7 +445,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜时间" prop="unLoadDate" >
+            <el-form-item label="还卸柜时间" prop="unLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -460,7 +460,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜备注" prop="unLoadRemarks" >
+            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
               <el-input
                 v-model="form.unLoadRemarks"
                 placeholder="请输入还卸柜备注"
@@ -473,7 +473,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="油气费" prop="oilAmt" >
+            <el-form-item label="油气费" prop="oilAmt">
               <el-input
                 v-model="form.oilAmt"
                 placeholder="请输入油气费"
@@ -485,7 +485,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="单趟提成" prop="driverbonus" >
+            <el-form-item label="单趟提成" prop="driverbonus">
               <el-input
                 v-model="form.driverbonus"
                 placeholder="请输入单趟提成"
@@ -497,8 +497,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="其他费用" prop="costOth" >
-               <el-input
+            <el-form-item label="其他费用" prop="costOth">
+              <el-input
                 v-model="form.costOth"
                 placeholder="请输入其他费用"
                 size="mini"
@@ -509,7 +509,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="备注" prop="costRemarks" >
+            <el-form-item label="备注" prop="costRemarks">
               <el-input
                 v-model="form.costRemarks"
                 placeholder="请输入备注"
@@ -520,9 +520,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.billType==1">
+        <el-row v-if="form.billType == 1">
           <el-col :span="6">
-            <el-form-item label="修洗费" prop="costomAmt03" >
+            <el-form-item label="修洗费" prop="costomAmt03">
               <el-input
                 v-model="form.costomAmt03"
                 placeholder="请输入修洗费"
@@ -534,7 +534,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="吊装费" prop="costomAmt04" >
+            <el-form-item label="吊装费" prop="costomAmt04">
               <el-input
                 v-model="form.costomAmt04"
                 placeholder="请输入吊装费"
@@ -546,8 +546,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="其他费用" prop="costomAmt02" >
-               <el-input
+            <el-form-item label="其他费用" prop="costomAmt02">
+              <el-input
                 v-model="form.costomAmt02"
                 placeholder="请输入其他费用"
                 size="mini"
@@ -558,7 +558,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="费用备注" prop="costomStr02" >
+            <el-form-item label="费用备注" prop="costomStr02">
               <el-input
                 v-model="form.costomStr02"
                 placeholder="请输入备注"
@@ -569,9 +569,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.billType==2">
+        <el-row v-if="form.billType == 2">
           <el-col :span="6">
-            <el-form-item label="港杂费" prop="costomAmt03" >
+            <el-form-item label="港杂费" prop="costomAmt03">
               <el-input
                 v-model="form.costomAmt03"
                 placeholder="请输入港杂费"
@@ -583,7 +583,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提箱费" prop="costomAmt04" >
+            <el-form-item label="提箱费" prop="costomAmt04">
               <el-input
                 v-model="form.costomAmt04"
                 placeholder="请输入提箱费"
@@ -595,8 +595,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="其他费用" prop="costomAmt01" >
-               <el-input
+            <el-form-item label="其他费用" prop="costomAmt01">
+              <el-input
                 v-model="form.costomAmt01"
                 placeholder="请输入其他费用"
                 size="mini"
@@ -607,7 +607,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="费用备注" prop="costomStr01" >
+            <el-form-item label="费用备注" prop="costomStr01">
               <el-input
                 v-model="form.costomStr01"
                 placeholder="请输入备注"
@@ -1142,6 +1142,7 @@ import {
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1259,11 +1260,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;

src/views/track/cabinet/index.vue

@@ -906,12 +906,6 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.cars.polId) {
-          response.data.cars.polId = response.data.cars.polId.toString();
-        }
-        if (response.data.cars.podId) {
-          response.data.cars.podId = response.data.cars.podId.toString();
-        }
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fDc == "D");
           this.CList = response.data.fees.filter((e) => e.fDc == "C");

src/views/track/goods/AddOrUpdate.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="客户名称" prop="fCorpId" >
+            <el-form-item label="客户名称" prop="fCorpId">
               <el-select
                 v-model="form.fCorpId"
                 placeholder="请输入客户名称"
@@ -30,7 +30,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="业务类型" prop="billType" >
+            <el-form-item label="业务类型" prop="billType">
               <el-select
                 v-model="form.billType"
                 placeholder="请选择业务类型"
@@ -48,7 +48,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="运输方式" prop="transType" >
+            <el-form-item label="运输方式" prop="transType">
               <el-select
                 v-model="form.transType"
                 placeholder="请选择运输方式"
@@ -66,7 +66,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="运输性质" prop="transProp" >
+            <el-form-item label="运输性质" prop="transProp">
               <el-select
                 v-model="form.transProp"
                 placeholder="请选择运输方式"
@@ -86,7 +86,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="装车地点" prop="tLoadAddr" >
+            <el-form-item label="装车地点" prop="tLoadAddr">
               <el-input
                 v-model="form.tLoadAddr"
                 placeholder="请输入装车地点"
@@ -97,7 +97,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划时间" prop="tLoadDate" >
+            <el-form-item label="计划时间" prop="tLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -112,7 +112,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系人" prop="loadAttn" >
+            <el-form-item label="联系人" prop="loadAttn">
               <el-input
                 v-model="form.loadAttn"
                 placeholder="请输入装车联系人"
@@ -123,7 +123,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系电话" prop="loadAttntel" >
+            <el-form-item label="联系电话" prop="loadAttntel">
               <el-input
                 v-model="form.loadAttntel"
                 placeholder="请输入装车联系电话"
@@ -137,7 +137,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="卸车地点" prop="unLoadAddr" >
+            <el-form-item label="卸车地点" prop="unLoadAddr">
               <el-input
                 v-model="form.unLoadAddr"
                 placeholder="请输入卸车地点"
@@ -148,7 +148,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划时间" prop="tUnLoadDate" >
+            <el-form-item label="计划时间" prop="tUnLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -163,7 +163,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系人" prop="unLoadAttn" >
+            <el-form-item label="联系人" prop="unLoadAttn">
               <el-input
                 v-model="form.unLoadAttn"
                 placeholder="请输入卸车联系人"
@@ -174,7 +174,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="联系电话" prop="unLoadAttnTel" >
+            <el-form-item label="联系电话" prop="unLoadAttnTel">
               <el-input
                 v-model="form.unLoadAttnTel"
                 placeholder="请输入卸车联系电话"
@@ -188,7 +188,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="提单号" prop="mblno" >
+            <el-form-item label="提单号" prop="mblno">
               <el-input
                 v-model="form.mblno"
                 placeholder="请输入提单号"
@@ -199,7 +199,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="货品名称" prop="goodsId" >
+            <el-form-item label="货品名称" prop="goodsId">
               <el-select
                 v-model="form.goodsId"
                 placeholder="请输入货品名称"
@@ -219,7 +219,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="计划件数" prop="qtyPlan" >
+            <el-form-item label="计划件数" prop="qtyPlan">
               <el-input
                 v-model="form.qtyPlan"
                 placeholder="请输入计划件数"
@@ -231,7 +231,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="重量(吨)" prop="weightPlan" >
+            <el-form-item label="重量(吨)" prop="weightPlan">
               <el-input
                 v-model="form.weightPlan"
                 placeholder="请输入计划重量"
@@ -245,7 +245,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="船名" prop="ysl" >
+            <el-form-item label="船名" prop="ysl">
               <el-input
                 v-model="form.ysl"
                 placeholder="请输入船名"
@@ -256,7 +256,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="航次" prop="voy" >
+            <el-form-item label="航次" prop="voy">
               <el-input
                 v-model="form.voy"
                 placeholder="请输入航次"
@@ -267,7 +267,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="起运港" prop="polId" >
+            <el-form-item label="起运港" prop="polId">
               <el-select
                 v-model="form.polId"
                 placeholder="请输入起运港"
@@ -279,15 +279,15 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目的港" prop="podId" >
+            <el-form-item label="目的港" prop="podId">
               <el-select
                 v-model="form.podId"
                 placeholder="请输入目的港"
@@ -299,9 +299,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -309,7 +309,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="车号" prop="carregNo" >
+            <el-form-item label="车号" prop="carregNo">
               <el-input
                 v-model="form.carregNo"
                 placeholder="请输入车号"
@@ -320,7 +320,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="司机" prop="driverName" >
+            <el-form-item label="司机" prop="driverName">
               <el-input
                 v-model="form.driverName"
                 placeholder="请输入司机"
@@ -331,7 +331,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="司机电话" prop="driverTel" >
+            <el-form-item label="司机电话" prop="driverTel">
               <el-input
                 v-model="form.driverTel"
                 placeholder="请输入司机电话"
@@ -344,7 +344,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="接单时间" prop="acceptDate" >
+            <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -359,7 +359,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提箱时间" prop="loadDate" >
+            <el-form-item label="提箱时间" prop="loadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -389,7 +389,7 @@
             </el-form-item>
           </el-col> -->
           <el-col :span="6">
-            <el-form-item label="还柜时间" prop="unLoadDate" >
+            <el-form-item label="还柜时间" prop="unLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -403,8 +403,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-           <el-col :span="6">
-            <el-form-item label="回单时间" prop="waybillDate" >
+          <el-col :span="6">
+            <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -421,7 +421,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom" >
+            <el-form-item label="起始里程" prop="odometerFrom">
               <el-input
                 v-model="form.odometerFrom"
                 placeholder="请输入起始里程表读数"
@@ -433,7 +433,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd" >
+            <el-form-item label="结束里程" prop="odometerEnd">
               <el-input
                 v-model="form.odometerEnd"
                 placeholder="请输入结束里程表读数"
@@ -445,7 +445,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="装卸货时间" prop="mdLoadDate" >
+            <el-form-item label="装卸货时间" prop="mdLoadDate">
               <el-date-picker
                 clearable
                 size="mini"
@@ -460,7 +460,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="装卸货备注" prop="mdLoadRemarks" >
+            <el-form-item label="装卸货备注" prop="mdLoadRemarks">
               <el-input
                 v-model="form.mdLoadRemarks"
                 placeholder="请输入装卸货备注"
@@ -995,6 +995,7 @@ import {
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1112,11 +1113,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;

src/views/track/goods/index.vue

@@ -903,12 +903,6 @@ export default {
             if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.cars.polId) {
-          response.data.cars.polId = response.data.cars.polId.toString();
-        }
-        if (response.data.cars.podId) {
-          response.data.cars.podId = response.data.cars.podId.toString();
-        }
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fDc == "D");
           this.CList = response.data.fees.filter((e) => e.fDc == "C");

src/views/track/meetSingle/AddOrUpdate.vue

@@ -279,9 +279,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -299,15 +299,15 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="车号" prop="carregNo">
               <el-input
@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <!-- <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -403,7 +403,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-           <el-col :span="6">
+          <el-col :span="6">
             <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
@@ -995,6 +995,7 @@ import {
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1112,11 +1113,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-        this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
@@ -1260,10 +1262,10 @@ export default {
     submitRetreat() {},
     //修改
     submitAllowChanges() {
-      if(this.form.orderStatus<=20){
+      if (this.form.orderStatus <= 20) {
         this.$emit("fixDisabled", "false");
         this.msgSuccess("允许修改");
-      }else{
+      } else {
         this.msgSuccess("不允许修改");
       }
     },

src/views/track/meetSingle/index.vue

@@ -904,12 +904,6 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.cars.polId) {
-          response.data.cars.polId = response.data.cars.polId.toString();
-        }
-        if (response.data.cars.podId) {
-          response.data.cars.podId = response.data.cars.podId.toString();
-        }
         if (response.data.fees.length) {
           response.data.fees.map((e) => {
             if (e.fFeeunitid) {

src/views/track/receipt/AddOrUpdate.vue

@@ -279,9 +279,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -299,15 +299,15 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="车号" prop="carregNo">
               <el-input
@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -403,7 +403,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-           <!-- <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
@@ -995,6 +995,7 @@ import {
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1112,11 +1113,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;
@@ -1259,11 +1261,11 @@ export default {
     //撤回
     submitRetreat() {},
     //修改
-        submitAllowChanges() {
-      if(this.form.orderStatus<=80){
+    submitAllowChanges() {
+      if (this.form.orderStatus <= 80) {
         this.$emit("fixDisabled", "false");
         this.msgSuccess("允许修改");
-      }else{
+      } else {
         this.msgSuccess("不允许修改");
       }
     },

src/views/track/receipt/index.vue

@@ -906,12 +906,6 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.cars.polId) {
-          response.data.cars.polId = response.data.cars.polId.toString();
-        }
-        if (response.data.cars.podId) {
-          response.data.cars.podId = response.data.cars.podId.toString();
-        }
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fDc == "D");
           this.CList = response.data.fees.filter((e) => e.fDc == "C");

src/views/track/suitcase/AddOrUpdate.vue

@@ -279,9 +279,9 @@
               >
                 <el-option
                   v-for="(dict, index) in polList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -299,9 +299,9 @@
               >
                 <el-option
                   v-for="(dict, index) in podList"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
                 />
               </el-select>
             </el-form-item>
@@ -342,7 +342,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -403,7 +403,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-           <el-col :span="6">
+          <el-col :span="6">
             <el-form-item label="回单时间" prop="waybillDate">
               <el-date-picker
                 clearable
@@ -995,6 +995,7 @@ import {
   driverSaveFtmsorderbillscars,
   insertDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
+import { getBasicInformation } from "@/api/kaihe/basicdata/container";
 import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
@@ -1112,11 +1113,12 @@ export default {
     this.getDicts("data_ffeeunitid").then((response) => {
       this.ffeeunitidList = response.data;
     });
-    this.getDicts("port_start").then((response) => {
-      this.polList = response.data;
-    });
-    this.getDicts("port_end").then((response) => {
-      this.podList = response.data;
+    getBasicInformation({
+      fTypes: 1,
+      fStatus: "T",
+    }).then((response) => {
+      this.polList = response;
+      this.podList = response;
     });
     listCorps().then((response) => {
       this.fMblnoOptions = response.rows;

src/views/track/suitcase/index.vue

@@ -906,12 +906,6 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
-        if (response.data.cars.polId) {
-          response.data.cars.polId = response.data.cars.polId.toString();
-        }
-        if (response.data.cars.podId) {
-          response.data.cars.podId = response.data.cars.podId.toString();
-        }
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fDc == "D");
           this.CList = response.data.fees.filter((e) => e.fDc == "C");