修改前端问题 添加若依官方上传组件

src/components/FileUpload/index.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="upload-file">
+    <el-upload
+      :action="uploadFileUrl"
+      :before-upload="handleBeforeUpload"
+      :file-list="fileList"
+      :limit="1"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      :on-success="handleUploadSuccess"
+      :show-file-list="false"
+      :headers="headers"
+      class="upload-file-uploader"
+      ref="upload"
+    >
+      <!-- 上传按钮 -->
+      <el-button size="mini" type="primary">选取文件</el-button>
+      <!-- 上传提示 -->
+      <div class="el-upload__tip" slot="tip" v-if="showTip">
+        请上传
+        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        的文件
+      </div>
+    </el-upload>
+
+    <!-- 文件列表 -->
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+      <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list">
+        <el-link :href="file.url" :underline="false" target="_blank">
+          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+        </el-link>
+        <div class="ele-upload-list__item-content-action">
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+        </div>
+      </li>
+    </transition-group>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+
+export default {
+  props: {
+    // 值
+    value: [String, Object, Array],
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+    };
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+    // 列表
+    list() {
+      let temp = 1;
+      if (this.value) {
+        // 首先将值转为数组
+        const list = Array.isArray(this.value) ? this.value : [this.value];
+        // 然后将数组转为对象数组
+        return list.map((item) => {
+          if (typeof item === "string") {
+            item = { name: item, url: item };
+          }
+          item.uid = item.uid || new Date().getTime() + temp++;
+          return item;
+        });
+      } else {
+        this.fileList = [];
+        return [];
+      }
+    },
+  },
+  methods: {
+    // 上传前校检格式和大小
+    handleBeforeUpload(file) {
+      // 校检文件类型
+      if (this.fileType) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        const isTypeOk = this.fileType.some((type) => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+        if (!isTypeOk) {
+          this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          return false;
+        }
+      }
+      // 校检文件大小
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      return true;
+    },
+    // 文件个数超出
+    handleExceed() {
+      this.$message.error(`只允许上传单个文件`);
+    },
+    // 上传失败
+    handleUploadError(err) {
+      this.$message.error("上传失败, 请重试");
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      this.$message.success("上传成功");
+      this.$emit("input", res.url);
+    },
+    // 删除文件
+    handleDelete(index) {
+      this.fileList.splice(index, 1);
+      this.$emit("input", '');
+    },
+    // 获取文件名称
+    getFileName(name) {
+      if (name.lastIndexOf("/") > -1) {
+        return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+      } else {
+        return "";
+      }
+    }
+  },
+  created() {
+    this.fileList = this.list;
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
+</style>

src/views/fleet/plans/index.vue

@@ -868,7 +868,7 @@ export default {
           });
         }
         this.disabled = true;
-        this.title = "查看订单主";
+        this.title = "查看订单";
         // this.$refs.addOrUpdateRef.showSure();
         this.form = response.data.tmsorder;
         this.planList = response.data.scntrs;

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -661,6 +661,22 @@
                     />
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="状态"
+                  align="center"
+                  prop="billStatus"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.billStatus == 1">新建</span>
+                    <span v-if="scope.row.billStatus == 2">暂存</span>
+                    <span v-if="scope.row.billStatus == 3">撤销</span>
+                    <span v-if="scope.row.billStatus == 5">变更中</span>
+                    <span v-if="scope.row.billStatus == 6">提交</span>
+                    <span v-if="scope.row.billStatus == 20">派车暂存</span>
+                    <span v-if="scope.row.billStatus == 30">派车撤销</span>
+                    <span v-if="scope.row.billStatus == 60">派车提交</span>
+                  </template>
+                </el-table-column>
                 <el-table-column label="备注" align="center" prop="remarks">
                   <template slot-scope="scope">
                     <el-input

src/views/fleet/scheduling/index.vue

@@ -186,17 +186,6 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['fleet:plans:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
           type="warning"
           icon="el-icon-download"
           size="mini"
@@ -337,14 +326,6 @@
             v-hasPermi="['fleet:plans:edit']"
             >修改</el-button
           > -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['fleet:plans:remove']"
-            >删除</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -515,6 +496,13 @@ export default {
           width: 100,
         },
         {
+          surface: "12",
+          label: "qtyDisPatch",
+          name: "已安排箱量",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "13",
           label: "billStatus",
           name: "状态",
@@ -615,6 +603,13 @@ export default {
           width: 100,
         },
         {
+          surface: "12",
+          label: "qtyDisPatch",
+          name: "已安排箱量",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "13",
           label: "billStatus",
           name: "状态",
@@ -863,7 +858,7 @@ export default {
           });
         }
         this.disabled = true;
-        this.title = "查看订单主";
+        this.title = "查看订单";
         if (row.billStatus == 80) {
           this.disabled2 = true;
         }
@@ -914,22 +909,6 @@ export default {
       }
       this.schedulingList = data.data.plans;
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除订单主编号为"' + ids + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return delFtmsorderbills(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
-    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -411,7 +411,7 @@
           >
         </div> -->
         <el-collapse v-model="collapses">
-          <el-collapse-item v-if="userType == '00'">
+          <el-collapse-item v-if="userType == '00'" name="1">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -511,7 +511,7 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item v-if="userType == '00'">
+          <el-collapse-item v-if="userType == '00'" name="2">
             <template slot="title">
               <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
                 ><span
@@ -1307,7 +1307,7 @@ export default {
       priceTypeList: [],
       userType: null,
       username: null,
-      collapses: [],
+      collapses: ['1', '2'],
       fMblnoOptions: [],
       cntrId2List: [],
       goodsOptions: [],

src/views/fleet/sendcar/index.vue

@@ -512,6 +512,13 @@ export default {
           width: 100,
         },
         {
+          surface: "12",
+          label: "carcorPid",
+          name: "车队名称",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "13",
           label: "billStatus",
           name: "状态",
@@ -612,6 +619,13 @@ export default {
           width: 100,
         },
         {
+          surface: "12",
+          label: "carcorPid",
+          name: "车队名称",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "13",
           label: "billStatus",
           name: "状态",
@@ -847,7 +861,7 @@ export default {
           });
         }
         this.disabled = true;
-        this.title = "查看订单主";
+        this.title = "查看订单";
         this.form = response.data.tmsorder;
         if (response.data.fees.length) {
           this.DList = response.data.fees.filter((e) => e.fdc == "D");

src/views/track/cabinet/index.vue

@@ -421,160 +421,230 @@ export default {
       setRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",

src/views/track/goods/index.vue

@@ -421,160 +421,230 @@ export default {
       setRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",

src/views/track/meetSingle/index.vue

@@ -421,160 +421,230 @@ export default {
       setRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",

src/views/track/receipt/index.vue

@@ -421,160 +421,230 @@ export default {
       setRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",

src/views/track/singleCost/index.vue

@@ -691,7 +691,7 @@ export default {
     handleUpdate(row) {
       let id = row.id;
       this.reset();
-      this.title = "查看订单主";
+      this.title = "查看订单";
       this.addOrUpdateVisible = true;
       this.form.id = id;
       this.$nextTick(() => {

src/views/track/suitcase/index.vue

@@ -421,160 +421,230 @@ export default {
       setRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       getRowList: [
         {
           surface: "1",
-          label: "mblno",
-          name: "提单号",
+          label: "mdLoadDate",
+          name: "装卸日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "2",
-          label: "carregNo",
-          name: "车号",
+          surface: "1",
+          label: "billType",
+          name: "贸易方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "3",
-          label: "orderStatus",
-          name: "订单状态",
+          surface: "1",
+          label: "transType",
+          name: "运输方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "4",
-          label: "acceptDate",
-          name: "接单时间",
+          surface: "1",
+          label: "corpId",
+          name: "托运人",
           checked: 0,
           width: 100,
         },
         {
-          surface: "5",
-          label: "loadDate",
-          name: "提箱时间",
+          surface: "1",
+          label: "ysl",
+          name: "船名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "6",
-          label: "loadAddr",
-          name: "提箱地点",
+          surface: "1",
+          label: "voy",
+          name: "航次",
           checked: 0,
           width: 100,
         },
         {
-          surface: "7",
-          label: "mdLoadDate",
-          name: "装卸货时间",
+          surface: "1",
+          label: "mblno",
+          name: "运单号",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "8",
-          label: "mdLoadAddr",
-          name: "装卸货地点",
+          surface: "1",
+          label: "cntrQty",
+          name: "柜量",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "9",
-          label: "unLoadDate",
-          name: "还卸柜时间",
+          surface: "1",
+          label: "cntrId",
+          name: "柜型",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "10",
-          label: "unLoadAddr",
-          name: "还卸柜地点",
+          surface: "1",
+          label: "goodsId",
+          name: "品名",
           checked: 0,
-          width: 110,
+          width: 100,
         },
         {
-          surface: "11",
-          label: "waybillDate",
-          name: "回单时间",
+          surface: "1",
+          label: "cntrWeight",
+          name: "重量",
           checked: 0,
           width: 100,
         },
+        {
+          surface: "1",
+          label: "polId",
+          name: "起运港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "podId",
+          name: "目的港",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "loadAddr",
+          name: "提箱场站",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "mdLoadAddr",
+          name: "装货地",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "1",
+          label: "unLoadAddr",
+          name: "卸货地",
+          checked: 0,
+          width: 100,
+        }
       ],
       allCheck: false,
       title: "",