bug修复

-import service from "../utils/request";
 import request from '@/utils/request'
 
+//航班预审模板下载
+/**
+ * @param
+ */
 export function downLoadTemplate(template) {
   return request({
     url:'/caPreReviewImport/downLoadTemplate?template=' + template,
@@ -9,6 +12,11 @@ export function downLoadTemplate(template) {
   })
 }
 
+//预审回执导入
+/**
+ * @param file 文件 *
+ * @param type 状态 *
+ */
 export function importcaPreReview(file, type){
   let formData = new FormData();
   formData.append("file", file);

 import request from '@/utils/request'
 
-// 货物查询查询条件数据
+//货物查询查询条件数据
+/**
+ * @param
+ */
 export function findConditionData(data) {
   return request({
     url: '/cargo/findConditionData',
@@ -10,6 +13,9 @@ export function findConditionData(data) {
 }
 
 //货物查询
+/**
+ * @param
+ */
 export function findCargoData(data) {
   return request({
     url: '/cargo/findCargoData',
@@ -53,3 +59,12 @@ export function downloadExcel(data) {
     responseType: 'blob',
   })
 }
+
+//释放仓位
+export function releaseCargo(data) {
+  return request({
+    url: '/cargo/releaseCargo',
+    method: 'post',
+    data: data,
+  })
+}
\ No newline at end of file

@@ -31,7 +31,6 @@ export function delFlight(data) {
   return request({
     url: '/FlightPreserveController/delFlight/'+ data,
     method: 'post'
-   
   })
 }
 //新增修改
@@ -61,3 +60,12 @@ export function updateStatusBatch(data){
     data: data
   })
 }
+
+//自动推送开关
+export function updateAutoPushBatch(data){
+  return request({
+    url: '/FlightPreserveController/updateAutoPushBatch',
+    method: 'post',
+    data: data
+  })
+}

-import service from "../utils/request";
 import request from '@/utils/request'
 
 // 查询航班种类

@@ -93,6 +93,13 @@ import { praseStrEmpty } from "@/utils/FedEx";
 // }
 
 // 查询用户列表
+/**
+ * @param page 页码 *
+ * @param size 数据长度 *
+ * @param isValid 用户状态
+ * @param username 用户名
+ * @param phone 手机号码
+ */
 export function listUser(data) {
   return request({
     url: '/sysUser/getUserList',
@@ -102,6 +109,9 @@ export function listUser(data) {
 }
 
 // 查询用户详细
+/**
+ * @param id 用户id *
+ */
 export function detailUser(userId) {
   return request({
     url: '/sysUser/detailUser?id=' + praseStrEmpty(userId),
@@ -110,6 +120,15 @@ export function detailUser(userId) {
 }
 
 // 新增用户
+/**
+ * @param loginName 员工号 *
+ * @param username 用户姓名 *
+ * @param phone 手机号
+ * @param email 电子邮箱
+ * @param portName 所属口岸 *
+ * @param roleIds 所属角色 *
+ * @param remark 备注
+ */
 export function addOrUpdateUser(data) {
   return request({
     url: '/sysUser/addOrUpdateUser',
@@ -119,6 +138,16 @@ export function addOrUpdateUser(data) {
 }
 
 // 修改用户状态
+/**
+ * @param id 用户id *
+ * @param loginName 员工号 *
+ * @param username 用户姓名 *
+ * @param phone 手机号
+ * @param email 电子邮箱
+ * @param portName 所属口岸 *
+ * @param roleIds 所属角色 *
+ * @param remark 备注
+ */
 export function updateUserStatus(data) {
   return request({
     url: '/sysUser/updateUserStatus',
@@ -128,6 +157,9 @@ export function updateUserStatus(data) {
 }
 
 //菜单信息
+/**
+ * @param
+ */
 export function getAllAuth() {
   return request({
     url: '/sysMenu/getAllAuth',
@@ -136,6 +168,10 @@ export function getAllAuth() {
 }
 
 //菜单开启关闭
+/**
+ * @param id 菜单id *
+ * @param status 菜单状态 *
+ */
 export function updateStatus(data) {
   return request({
     url: '/sysMenu/updateStatus',
@@ -145,6 +181,14 @@ export function updateStatus(data) {
 }
 
 //角色列表
+/**
+ * @param name 角色名称
+ * @param size 数据长度 *
+ * @param page 页码 *
+ * @param createStart 创建开始时间
+ * @param createEnd 创建结束时间
+ * @param valid 角色状态
+ */
 export function getRoleList(data) {
   return request({
     url: '/role/getRoleList',
@@ -154,6 +198,9 @@ export function getRoleList(data) {
 }
 
 //角色详情
+/**
+ * @param id 角色id *
+ */
 export function detailRole(id) {
   return request({
     url: '/role/detailRole?id=' + id,
@@ -162,6 +209,13 @@ export function detailRole(id) {
 }
 
 //新增修改角色
+/**
+ * @param id 角色id *
+ * @param name 角色名 *
+ * @param remark 角色描述
+ * @param menuIds 角色权限
+ * @param valid 角色状态
+ */
 export function addOrUpdateRole(data) {
   return request({
     url: '/role/addOrUpdateRole',
@@ -171,6 +225,10 @@ export function addOrUpdateRole(data) {
 }
 
 //角色状态修改
+/**
+ * @param id 角色id *
+ * @param valid 角色状态 *
+ */
 export function updateRoleStatus(data) {
   return request({
     url: '/role/updateRoleStatus',
@@ -180,6 +238,9 @@ export function updateRoleStatus(data) {
 }
 
 //口岸列表
+/**
+ * @param
+ */
 export function portNameList() {
   return request({
     url: '/dictionary/port',
@@ -188,6 +249,9 @@ export function portNameList() {
 }
 
 //口岸变更
+/**
+ * @param
+ */
 export function changeCurrentPort(data) {
   return request({
     url: '/sysUser/changeCurrentPort',

 <template>
   <div class="w-table" :class="{ 'w-table_moving': dragState.dragging }">
-    <el-table
-      :ref="tableName"
-      :data="data"
-      :border="border"
-      :stripe="stripe"
-      :size="size"
-      :fit="fit"
-      :indent="indent"
-      :show-header="showHeader"
-      :height="height"
-      :highlight-current-row="highlightCurrentRow"
-      :lazy="lazy"
-      :downShiftKey="shiftKey"
-      :limitStart="limitStart"
-      :row-key="rowKey"
-      :default-expand-all="defaultExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      v-loading="loading"
-      :cell-class-name="cellClassName"
-      :header-cell-class-name="headerCellClassName"
-      @sort-change="sortChange"
-      @select="tableSelect"
-      @select-all="tableSelectAll"
-      @select-change="SelectChange"
-    >
+    <el-table :ref="tableName" :data="data" :border="border" :stripe="stripe" :size="size" :fit="fit" :indent="indent"
+      :show-header="showHeader" :height="height" :highlight-current-row="highlightCurrentRow" :lazy="lazy"
+      :downShiftKey="shiftKey" :limitStart="limitStart" :row-key="rowKey" :default-expand-all="defaultExpandAll"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading"
+      :cell-class-name="cellClassName" :header-cell-class-name="headerCellClassName" @sort-change="sortChange"
+      @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange">
       <!-- 复选框 -->
-      <el-table-column
-        v-if="selection"
-        type="selection"
-        :fixed="true"
-        width="50"
-        align="center"
-      ></el-table-column>
+      <el-table-column v-if="selection" type="selection" :fixed="true" width="50" align="center"></el-table-column>
       <!-- 序号 -->
       <el-table-column type="index" width="50" align="center"></el-table-column>
       <template v-for="(item, index) in newHeader">
         <!-- 自定义插槽 -->
-        <el-table-column
-          v-if="item.slot"
-          :prop="item.value"
-          :label="item.name"
-          :width="item.width"
-          :align="item.align"
-          :fixed="item.fixed"
-          :show-overflow-tooltip="showOverflowTooltip"
-          :sortable="item.sorTable"
-          :formatter="formatter"
-          header-align="center"
-          :sort-orders="['descending', 'ascending', null]"
-          :slotHeader="slotHeader"
-          :render-header="renderHeader"
-          :key="index"
-        >
+        <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
+          :fixed="item.fixed" :show-overflow-tooltip="showOverflowTooltip" :sortable="item.sorTable"
+          :formatter="formatter" header-align="center" :sort-orders="['descending', 'ascending', null]"
+          :slotHeader="slotHeader" :render-header="renderHeader" :key="index">
           <template slot-scope="scope">
             <slot :name="item.value" :row="scope.row"></slot>
           </template>
         </el-table-column>
         <!-- 默认数据 -->
-        <el-table-column
-          v-else
-          :prop="item.value"
-          :label="item.name"
-          :index="item.index"
-          :width="item.width"
-          :align="item.align"
-          :fixed="item.fixed"
-          :sortable="item.sorTable"
-          :column-key="index.toString()"
-          :show-overflow-tooltip="showOverflowTooltip"
-          header-align="center"
-          :sort-orders="['descending', 'ascending', null]"
-          :slotHeader="slotHeader"
-          :render-header="renderHeader"
-          :formatter="formatter"
-          :key="index"
-        >
+        <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
+          :align="item.align" :fixed="item.fixed" :sortable="item.sorTable" :column-key="index.toString()"
+          :show-overflow-tooltip="showOverflowTooltip" header-align="center"
+          :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
+          :formatter="formatter" :key="index">
         </el-table-column>
       </template>
+      <!-- 末端插槽 -->
       <slot name="optionColumn"></slot>
     </el-table>
     <!-- 分页 -->
-    <el-pagination
-      :total="totalCount"
-      :page-size.sync="limitSize"
-      :current-page.sync="pageNum"
-      :page-sizes="pageSizes"
-      background
-      layout="prev, pager, next, jumper, ->, sizes, total"
-      class="tablePagination"
-      @size-change="sizeChange"
-      @next-click="nextClick"
-      @prev-click="prevClick"
-      @current-change="currentChange"
-    >
+    <el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes"
+      background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
+      @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
     </el-pagination>
     <!-- 表头控制 -->
     <div class="tableInfo" v-if="infoShow">
       <ul class="tableList" v-show="show">
         <el-checkbox-group v-model="checkDisabled">
-          <li
-            class="flexList"
-            v-for="(item, index) in newHeader"
-            :key="index"
-            :title="item.name"
-          >
+          <li class="flexList" v-for="(item, index) in newHeader" :key="index" :title="item.name">
             <div>
-              <el-checkbox
-                :label="item.name"
-                @change="newHeader[index].disabled = !item.disabled"
-                >{{ item.name }}</el-checkbox
-              >
+              <el-checkbox :label="item.name" @change="newHeader[index].disabled = !item.disabled">{{ item.name }}
+              </el-checkbox>
             </div>
           </li>
         </el-checkbox-group>
       </ul>
-      <el-button
-        type="primary"
-        icon="el-icon-edit"
-        size="medium"
-        circle
-        @click="show = !show"
-      ></el-button>
+      <el-button type="primary" icon="el-icon-edit" size="medium" circle @click="show = !show"></el-button>
     </div>
   </div>
 </template>
@@ -302,6 +229,7 @@ export default {
     },
   },
   methods: {
+    //数据长度切换
     sizeChange(val) {
       this.$emit("sizeChange", val);
     },
@@ -526,13 +454,17 @@ export default {
   margin-top: 40px;
   text-align: right;
 }
+
 .w-table {
   height: 100%;
-  　.el-table .darg_start {
+
+  .el-table .darg_start {
     background-color: #f3f3f3;
   }
+
   .el-table th {
     padding: 0;
+
     .virtual {
       position: absolute;
       display: block;
@@ -543,12 +475,14 @@ export default {
       background: none;
       border: none;
     }
+
     &.darg_active_left {
       .virtual {
         border-left: 2px dotted #666;
         z-index: 99;
       }
     }
+
     &.darg_active_right {
       .virtual {
         border-right: 2px dotted #666;
@@ -556,6 +490,7 @@ export default {
       }
     }
   }
+
   .thead-cell {
     padding: 0;
     display: inline-flex;
@@ -563,6 +498,7 @@ export default {
     align-items: left;
     cursor: pointer;
     overflow: initial;
+
     &:before {
       content: "";
       position: absolute;
@@ -572,21 +508,25 @@ export default {
       right: 0;
     }
   }
+
   &.w-table_moving {
     .el-table th .thead-cell {
       cursor: move !important;
     }
+
     .el-table__fixed {
       cursor: not-allowed;
     }
   }
 }
+
 .tableInfo {
   position: fixed;
   right: 30px;
   bottom: 100px;
   z-index: 99999999;
 }
+
 .tableList {
   width: 200px;
   max-height: 500px;
@@ -600,20 +540,24 @@ export default {
   background: #fff;
   overflow-y: scroll;
 }
+
 .tableList::-webkit-scrollbar {
   width: 4px;
   height: 4px;
 }
+
 .tableList::-webkit-scrollbar-thumb {
   border-radius: 10px;
   -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   background: rgba(0, 0, 0, 0.2);
 }
+
 .tableList::-webkit-scrollbar-track {
   -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   border-radius: 0;
   background: rgba(0, 0, 0, 0.2);
 }
+
 .flexList {
   width: 100%;
   display: flex;

 <template>
   <div>
-    <el-dialog
-      title="货物配舱"
-      width="80%"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
+    <el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
+      :append-to-body="true">
       <el-divider content-position="left">已选货物信息</el-divider>
-      <el-table
-        :data="tableData"
-        size="mini"
-        height="200"
-        max-height="200"
-        border
-        stripe
-        highlight-current-row
-        style="width: 100%"
-      >
+      <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
+        style="width: 100%">
         <el-table-column type="index" label="序号" align="center">
         </el-table-column>
-        <el-table-column
-          v-for="(item, index) in cargoHeader"
-          header-align="center"
-          align="center"
-          :prop="item.value"
-          :label="item.name"
-          :key="index"
-          :show-overflow-tooltip="true"
-          :formatter="formatter"
-        >
+        <el-table-column v-for="(item, index) in cargoHeader" header-align="center" align="center" :prop="item.value"
+          :label="item.name" :key="index" :show-overflow-tooltip="true" :formatter="formatter">
         </el-table-column>
       </el-table>
-      <el-form
-        ref="form"
-        label-position="right"
-        label-width="auto"
-        style="width: 400px; margin: 30px auto"
-        v-model="formData"
-      >
+      <el-form ref="form" label-position="right" label-width="auto" style="width: 400px; margin: 30px auto"
+        :model="formData" :rules="rules">
         <el-form-item label="航班号" prop="fltNo">
-          <el-input
-            v-model="fltNo"
-            size="medium"
-            placeholder="请输入航班号"
-            maxlength="10"
-            style="width: 350px"
-          ></el-input>
+          <el-input v-model="fltNo" size="medium" placeholder="请输入航班号" maxlength="10" style="width: 350px"></el-input>
         </el-form-item>
         <el-form-item label="航班日期:" prop="fltDate">
-          <el-date-picker
-            v-model="formData.fltDate"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-            size="medium"
-            style="width: 350px"
-          >
+          <el-date-picker v-model="formData.fltDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+            size="medium" style="width: 350px">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -118,11 +80,11 @@ export default {
           {
             required: true,
             message: "航班日期不能为空",
-            trigger: "change",
+            trigger: "blur",
           },
         ],
       },
-      loading:false,
+      loading: false,
     };
   },
   methods: {
@@ -136,7 +98,7 @@ export default {
     },
     //确定配舱
     submit() {
-      this.loading =true;
+      this.loading = true;
       let arr = [];
       this.tableData.forEach((item) => {
         arr.push(item.id);
@@ -196,7 +158,7 @@ export default {
               type: "warning",
             });
           }
-        }).catch(()=>{
+        }).catch(() => {
           this.loading = false;
         });
       } else {
@@ -212,11 +174,11 @@ export default {
       this.$refs['form'].clearValidate();
       this.$emit("dialogBeforeClose", { close: false, reload: true });
     },
-    formatter(row, column, cellValue, index){
-      if(column.property == "cargoRulesStatus"){
-        if(cellValue == 1){
+    formatter(row, column, cellValue, index) {
+      if (column.property == "cargoRulesStatus") {
+        if (cellValue == 1) {
           return "手动"
-        }else{
+        } else {
           return "自动"
         }
       }