修改车队

src/App.vue

@@ -10,17 +10,7 @@ export default {
 };
 </script>
 <style>
-.navbar[data-v-d16d6306] {
-  background: #014da1 !important;
-}
-.el-breadcrumb__inner.is-link,
-.el-breadcrumb__inner a {
-  color: #fff !important;
-}
-.app-breadcrumb.el-breadcrumb .no-redirect[data-v-b50ef614] {
-  color: #fff !important;
-}
-.app-breadcrumb.el-breadcrumb[data-v-b50ef614] {
+.app-breadcrumb.el-breadcrumb{
   line-height: 60px !important;
 }
 .el-scrollbar__thumb {

src/components/Breadcrumb/index.vue

@@ -1,8 +1,12 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+        <span
+          v-if="item.redirect === 'noRedirect' || index == levelList.length - 1"
+          class="no-redirect"
+          >{{ item.meta.title }}</span
+        >
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -10,60 +14,64 @@
 </template>
 
 <script>
-import pathToRegexp from 'path-to-regexp'
+import pathToRegexp from "path-to-regexp";
 
 export default {
   data() {
     return {
-      levelList: null
-    }
+      levelList: null,
+    };
   },
   watch: {
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
-      if (route.path.startsWith('/redirect/')) {
-        return
+      if (route.path.startsWith("/redirect/")) {
+        return;
       }
-      this.getBreadcrumb()
-    }
+      this.getBreadcrumb();
+    },
   },
   created() {
-    this.getBreadcrumb()
+    this.getBreadcrumb();
   },
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
+      let matched = this.$route.matched.filter(
+        (item) => item.meta && item.meta.title
+      );
+      const first = matched[0];
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched);
       }
 
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      this.levelList = matched.filter(
+        (item) => item.meta && item.meta.title && item.meta.breadcrumb !== false
+      );
     },
     isDashboard(route) {
-      const name = route && route.name
+      const name = route && route.name;
       if (!name) {
-        return false
+        return false;
       }
-      return name.trim() === '首页'
+      return name.trim() === "首页";
     },
     pathCompile(path) {
-      const { params } = this.$route
-      var toPath = pathToRegexp.compile(path)
-      return toPath(params)
+      const { params } = this.$route;
+      var toPath = pathToRegexp.compile(path);
+      return toPath(params);
     },
     handleLink(item) {
-      const { redirect, path } = item
+      const { redirect, path } = item;
       if (redirect) {
-        this.$router.push(redirect)
-        return
+        this.$router.push(redirect);
+        return;
       }
-      this.$router.push(this.pathCompile(path))
-    }
-  }
-}
+      this.$router.push(this.pathCompile(path));
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -72,9 +80,12 @@ export default {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
-
+  .el-breadcrumb__inner.is-link,
+  .el-breadcrumb__inner a {
+    color: #fff;
+  }
   .no-redirect {
-    color: #97a8be;
+    color: #fff;
     cursor: text;
   }
 }

src/components/Hamburger/index.vue

@@ -8,7 +8,7 @@
       width="64"
       height="64"
     >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
+      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z"  fill="#FFFFFF"/>
     </svg>
   </div>
 </template>

src/layout/components/Navbar.vue

@@ -108,7 +108,7 @@ export default {
   height:60px;
   overflow: hidden;
   position: relative;
-  background: #fff;
+  background: #014da1;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .hamburger-container {

src/views/chiCard.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="card">
     <div class="title">
-      <i :class="iconName"></i> 
-      <div style="margin-left:5px">{{title}}</div>
+      <div class="title-left">
+        <i :class="iconName"></i>
+        <div style="margin-left: 5px">{{ title }}</div>
+      </div>
+      <div v-if="More" class="more">more</div>
     </div>
     <div class="content">
       <slot name="content"></slot>
@@ -13,7 +16,7 @@
 <script>
 export default {
   name: "chiCard",
-  props:{
+  props: {
     title: {
       type: String,
       required: "",
@@ -22,6 +25,10 @@ export default {
       type: String,
       required: "",
     },
+    More: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {};
@@ -47,16 +54,24 @@ export default {
     border-bottom: 1px solid #e6ebf5;
     padding: 14px 15px 7px 10px;
     min-height: 40px;
-    i {
-      align-self: center;
-      font-size: 24px;
+    justify-content: space-between;
+    .title-left {
+      display: flex;
+      i {
+        align-self: center;
+        font-size: 24px;
+      }
+      div {
+        align-self: center;
+        font-size: 16px;
+      }
     }
-    div {
-      align-self: center;
-      font-size: 16px;
+    .more{
+       color: #409eff;
+       align-self: flex-end;
     }
   }
-  .content{
+  .content {
     min-height: 50px;
   }
 }

src/views/fleet/plans/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,37 +71,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -440,7 +444,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed:"left"
         },
         {
           surface: "2",
@@ -483,6 +486,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -541,7 +545,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed:"left"
         },
         {
           surface: "2",
@@ -584,6 +587,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -893,7 +897,12 @@ export default {
     },
     //获取到保存并复制
     getSave(data) {
-      console.log(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) {
         data.data.tmsorder.billType = data.data.tmsorder.billType.toString();
       }

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -542,7 +542,7 @@
                     <el-input
                       v-model="scope.row.cntrPlanQty"
                       placeholder="已调度货量"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>
@@ -555,7 +555,7 @@
                     <el-input
                       v-model="scope.row.planQty"
                       placeholder="已派车货量"
-                      :disabled="disabled"
+                      :disabled="true"
                     />
                   </template>
                 </el-table-column>

src/views/fleet/scheduling/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,39 +71,32 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
+
             <el-col :span="6">
               <el-form-item label-width="100px" label="货品名称" prop="goodsId">
                 <el-select
@@ -418,7 +423,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed:"left"
         },
         {
           surface: "2",
@@ -461,6 +465,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -526,7 +531,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed:"left"
         },
         {
           surface: "2",
@@ -569,6 +573,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -868,7 +873,7 @@ export default {
         }
         this.disabled = true;
         this.title = "查看订单";
-        if (response.data.tmsorder.billStatus >6) {
+        if (response.data.tmsorder.billStatus > 6) {
           this.disabled2 = true;
         }
         // this.$refs.addOrUpdateRef.showSure();

src/views/fleet/sendcar/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-col :span="6">
+            <el-form-item label-width="100px" label="提单号" prop="mblno">
+              <el-input
+                v-model="queryParams.mblno"
+                placeholder="请输入提单号"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+                style="max-width: 187px"
+              />
+            </el-form-item>
+          </el-col>
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,37 +71,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -435,7 +439,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed: "left",
         },
         {
           surface: "2",
@@ -478,6 +481,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -564,7 +568,6 @@ export default {
           name: "客户名称",
           checked: 0,
           width: 100,
-          fixed: "left",
         },
         {
           surface: "2",
@@ -607,6 +610,7 @@ export default {
           name: "提单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -802,16 +806,16 @@ export default {
             e.billStatus = "撤销";
           }
           if (e.billStatus == 6) {
-            e.billStatus = "提交";
+            e.billStatus = "待派车";
           }
           if (e.billStatus == 20) {
-            e.billStatus = "派车暂存";
+            e.billStatus = "派车中";
           }
           if (e.billStatus == 30) {
             e.billStatus = "派车撤回";
           }
           if (e.billStatus == 60) {
-            e.billStatus = "派车提交";
+            e.billStatus = "派车完成";
           }
         });
         this.ftmsorderbillsList = response.rows;

src/views/index.vue

@@ -111,7 +111,7 @@
                     align-self: center;
                     font-size: 16px;
                     margin: 2px 0 0 5px;
-                    width:110px
+                    width: 110px;
                   "
                 >
                   今日派车数
@@ -150,7 +150,7 @@
                     align-self: center;
                     font-size: 16px;
                     margin: 2px 0 0 5px;
-                    width:110px
+                    width: 110px;
                   "
                 >
                   可用车辆数
@@ -165,7 +165,11 @@
             </div>
           </div>
         </chi-card>
-        <chi-card title="新闻公告" iconName="el-icon-s-cooperation">
+        <chi-card
+          title="新闻公告"
+          iconName="el-icon-s-cooperation"
+          :More="true"
+        >
           <div slot="content" style="min-height: 250px">
             <div style="padding: 5px 5px 0 5px; font-size: 16px">
               【新闻】新闻
@@ -174,7 +178,7 @@
         </chi-card>
       </div>
       <div class="home-right">
-        <chi-card title="运输中业务" iconName="el-icon-s-order">
+        <chi-card title="运行车辆" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
             <div
               style="display: flex; padding: 2px; font-size: 16px"
@@ -183,7 +187,7 @@
             >
               <div style="width: 30%">{{ item.mblno }}</div>
               <div style="width: 20%">{{ item.carregNo }}</div>
-              <div style="width: 15%">{{ item.orderStatus }}</div>
+              <div style="width: 15%">{{ item.orderStatus|statusType }}</div>
               <div
                 style="
                   width: 35%;
@@ -197,7 +201,7 @@
             </div>
           </div>
         </chi-card>
-        <chi-card title="业务代办" iconName="el-icon-s-order">
+        <chi-card title="业务待办" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
             <div style="font-size: 16px; display: flex">
               <div style="width: 30%">FK221516485645</div>
@@ -208,7 +212,7 @@
             </div>
           </div>
         </chi-card>
-        <chi-card title="审核列表" iconName="el-icon-s-order">
+        <chi-card title="审核列表" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
             <div style="font-size: 16px; display: flex">
               <div style="width: 30%">FK221516485645</div>
@@ -473,6 +477,35 @@ export default {
       sysType: "",
     };
   },
+  filters: {
+    statusType(val) {
+      switch (val) {
+        case 10:
+          return "车队安排";
+          break;
+        case 20:
+          return "司机受理";
+          break;
+        case 30:
+          return "司机出车";
+          break;
+        case 40:
+          return "提箱";
+          break;
+        case 50:
+          return "装卸货";
+          break;
+        case 60:
+          return "还卸柜子";
+          break;
+            case 70:
+          return "费用确认";
+          break;
+        default:
+          return "回单";
+      }
+    },
+  },
   components: {
     chiCard,
   },

src/views/track/cabinet/AddOrUpdate.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="客户名称" prop="fCorpId">
+            <el-form-item label="客户名称" prop="fCorpId" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <el-select
                 v-model="form.polId"
                 placeholder="请输入起运港"
@@ -287,7 +287,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="目的港" prop="podId">
+            <el-form-item label="目的港" prop="podId" label-width="90px">
               <el-select
                 v-model="form.podId"
                 placeholder="请输入目的港"
@@ -309,7 +309,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="车号" prop="carregNo">
+            <el-form-item label="车号" prop="carregNo" label-width="90px">
               <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" label-width="90px">
               <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" label-width="90px">
               <el-input
                 v-model="form.driverTel"
                 placeholder="请输入司机电话"
@@ -344,7 +344,7 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
+            <el-form-item label="起始里程" prop="odometerFrom" label-width="90px">
               <el-input
                 v-model="form.odometerFrom"
                 placeholder="请输入起始里程表读数"
@@ -356,7 +356,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
+            <el-form-item label="结束里程" prop="odometerEnd" label-width="90px">
               <el-input
                 v-model="form.odometerEnd"
                 placeholder="请输入结束里程表读数"
@@ -368,7 +368,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜时间" prop="unLoadDate">
+            <el-form-item label="还卸柜时间" prop="unLoadDate" label-width="90px">
               <el-date-picker
                 clearable
                 size="mini"
@@ -383,7 +383,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
+            <el-form-item label="还卸柜备注" prop="unLoadRemarks" label-width="90px">
               <el-input
                 v-model="form.unLoadRemarks"
                 placeholder="请输入还卸柜备注"
@@ -1101,6 +1101,7 @@ export default {
         fcorpid: this.form.fCorpId,
         fcurrency: "RMB",
         fPid: this.form.id,
+        fExrate: "1",
       };
       tableData.push(obj);
     },

src/views/track/cabinet/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,37 +71,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -469,6 +473,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -597,6 +602,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+          fixed: "left",
         },
         {
           surface: "8",
@@ -883,6 +889,7 @@ export default {
         updateTime: null,
         remarks: null,
       };
+      this.disabled = false;
       this.resetForm("form");
     },
     // 多选框选中数据

src/views/track/goods/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+              <el-form-item label-width="100px" label="提单号" prop="mblno">
+                <el-input
+                  v-model="queryParams.mblno"
+                  placeholder="请输入提单号"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery"
+                  style="max-width: 187px"
+                />
+              </el-form-item>
+            </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,7 +71,12 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        
+      </el-row>
+      <el-collapse-transition>
+        <div v-show="show">
+          <el-row>
+            <el-col :span="6">
           <el-form-item label-width="100px" label="运输性质" prop="transProp">
             <el-select
               v-model="queryParams.transProp"
@@ -76,22 +93,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-collapse-transition>
-        <div v-show="show">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <el-form-item label-width="100px" label="货品名称" prop="goodsId">
                 <el-select
@@ -469,6 +470,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -597,6 +599,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -883,6 +886,7 @@ export default {
         updateTime: null,
         remarks: null,
       };
+      this.disabled = false;
       this.resetForm("form");
     },
     // 多选框选中数据

src/views/track/meetSingle/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+              <el-form-item label-width="100px" label="提单号" prop="mblno">
+                <el-input
+                  v-model="queryParams.mblno"
+                  placeholder="请输入提单号"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery"
+                  style="max-width: 187px"
+                />
+              </el-form-item>
+            </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,7 +71,12 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+      
+      </el-row>
+      <el-collapse-transition>
+        <div v-show="show">
+          <el-row>
+              <el-col :span="6">
           <el-form-item label-width="100px" label="运输性质" prop="transProp">
             <el-select
               v-model="queryParams.transProp"
@@ -76,22 +93,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-collapse-transition>
-        <div v-show="show">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
-                  clearable
-                  size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
-              </el-form-item>
-            </el-col>
+            
             <el-col :span="6">
               <el-form-item label-width="100px" label="货品名称" prop="goodsId">
                 <el-select
@@ -469,6 +471,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -597,6 +600,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -883,6 +887,7 @@ export default {
         updateTime: null,
         remarks: null,
       };
+      this.disabled = false;
       this.resetForm("form");
     },
     // 多选框选中数据

src/views/track/receipt/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,37 +71,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -469,6 +473,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -597,6 +602,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -883,6 +889,7 @@ export default {
         updateTime: null,
         remarks: null,
       };
+      this.disabled = false;
       this.resetForm("form");
     },
     // 多选框选中数据

src/views/track/suitcase/index.vue

@@ -9,6 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"
@@ -59,37 +71,29 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="运输性质" prop="transProp">
-            <el-select
-              v-model="queryParams.transProp"
-              placeholder="请选择运输性质"
-              clearable
-              size="small"
-            >
-              <el-option
-                v-for="(dict, index) in transPropList"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="提单号" prop="mblno">
-                <el-input
-                  v-model="queryParams.mblno"
-                  placeholder="请输入提单号"
+              <el-form-item
+                label-width="100px"
+                label="运输性质"
+                prop="transProp"
+              >
+                <el-select
+                  v-model="queryParams.transProp"
+                  placeholder="请选择运输性质"
                   clearable
                   size="small"
-                  @keyup.enter.native="handleQuery"
-                  style="max-width: 187px"
-                />
+                >
+                  <el-option
+                    v-for="(dict, index) in transPropList"
+                    :key="index.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -206,31 +210,31 @@
         >
       </el-col>
       <div class="tabSetting">
-         <div style="margin-right: 20px">
-           <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-        <el-button
-          v-show="show"
-          @click="show = !show"
-          icon="el-icon-arrow-up"
-          size="mini"
-          >展开</el-button
-        >
-        <el-button
-          v-show="!show"
-          @click="show = !show"
-          icon="el-icon-arrow-down"
-          size="mini"
-          >展开</el-button
-        >
+        <div style="margin-right: 20px">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+          <el-button
+            v-show="show"
+            @click="show = !show"
+            icon="el-icon-arrow-up"
+            size="mini"
+            >展开</el-button
+          >
+          <el-button
+            v-show="!show"
+            @click="show = !show"
+            icon="el-icon-arrow-down"
+            size="mini"
+            >展开</el-button
+          >
         </div>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -469,6 +473,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -548,7 +553,7 @@ export default {
           width: 100,
         },
       ],
-      getRowList:[
+      getRowList: [
         {
           surface: "1",
           label: "mdLoadDate",
@@ -597,6 +602,7 @@ export default {
           name: "运单号",
           checked: 0,
           width: 100,
+           fixed: "left",
         },
         {
           surface: "8",
@@ -883,6 +889,7 @@ export default {
         updateTime: null,
         remarks: null,
       };
+      this.disabled = false;
       this.resetForm("form");
     },
     // 多选框选中数据