Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/indexSea.vue

@@ -40,7 +40,7 @@
       </el-form-item>
 
       <el-form-item label="" prop="dateRangeCreateTime">
-        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" clearable/>
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" clearable />
       </el-form-item>
 
       <el-form-item :label="$t('状态')" prop="boxStatus">

src/views/ecw/box/indexSeaAir.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('自编号')" prop="selfNo">
-        <el-input
-          v-model="queryParams.selfNo"
-          :placeholder="$t('请输入自编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.selfNo" :placeholder="$t('请输入自编号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('柜号')" prop="cubNo">
-        <el-input
-          v-model="queryParams.cubNo"
-          :placeholder="$t('请输入柜号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.cubNo" :placeholder="$t('请输入柜号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('柜型')" prop="cabinetId">
         <el-select v-model="queryParams.cabinetId" :placeholder="$t('请选择柜型')" clearable>
-          <el-option
-            v-for="item in cabinetList"
-            :label="item.name"
-            :value="item.name"
-            :key="item.id"
-          ></el-option>
+          <el-option v-for="item in cabinetList" :label="$l(item, 'name')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('始发地')" prop="startWarehouseId">
-        <el-select
-          v-model="queryParams.startWarehouseId"
-          :placeholder="$t('请选择始发地')"
-          clearable
-        >
-          <el-option
-            v-for="item in exportWarehouseList"
-            :label="$l(item, 'title')"
-            :value="item.id"
-            :key="item.id"
-          ></el-option>
+        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')" clearable>
+          <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('目的地')" prop="destWarehouseId">
-        <el-select
-          v-model="queryParams.destWarehouseId"
-          :placeholder="$t('请选择目的地')"
-          clearable
-        >
-          <el-option
-            v-for="item in importWarehouseList"
-            :label="$l(item, 'title')"
-            :value="item.id"
-            :key="item.id"
-          ></el-option>
+        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')" clearable>
+          <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item label="" prop="date">
-        <el-select
-          v-model="queryParams.dateType"
-          :placeholder="$t('请选择时间类型')"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="item in dateTypes"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+      <el-form-item label="" prop="dateType">
+        <el-select v-model="queryParams.dateType" :placeholder="$t('请选择时间类型')" clearable size="small">
+          <el-option v-for="item in dateTypes" :key="item.value" :label="$l(item, 'label')" :value="item.value" />
         </el-select>
       </el-form-item>
 
-      <el-form-item label="">
-        <el-date-picker
-          v-model="queryParams.dateRangeCreateTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
-          range-separator="-"
-          start-:placeholder="$t('开始日期')"
-          end-:placeholder="$t('结束日期')"
-          clearable
-        />
+      <el-form-item label="" prop="dateRangeCreateTime">
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" clearable />
       </el-form-item>
 
       <el-form-item :label="$t('状态')" prop="boxStatus">
-        <el-select
-          v-model="queryParams.boxStatus"
-          :placeholder="$t('请选择状态')"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR_SHIPMENT_STATUS)"
-            :key="dict.value"
-            :label="$l(dict, 'label')"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR_SHIPMENT_STATUS)" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
 
@@ -120,32 +51,14 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['shipment:box:create']"
-          >{{$t('出货安排')}}
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['shipment:box:create']">{{$t('出货安排')}}
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['shipment:box:export']"
-          >{{$t('导出')}}
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['shipment:box:export']">{{$t('导出')}}
         </el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -163,10 +76,7 @@
       </el-table-column>
       <el-table-column :label="$t('运输方式')" align="center" prop="transportType">
         <template slot-scope="scope">
-          <dict-tag
-            :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
-            :value="scope.row.transportType"
-          />
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportType" />
         </template>
       </el-table-column>
 
@@ -176,11 +86,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('方数') + '（' + $t('预装') + '/' + $t('已装') + '）'"
-        align="center"
-        prop="squareNumber"
-      >
+      <el-table-column :label="$t('方数') + '（' + $t('预装') + '/' + $t('已装') + '）'" align="center" prop="squareNumber">
         <template slot-scope="{ row }">
           {{ row.boxStatistics.volume }}/{{ row.boxStatistics.loadVolume }}
         </template>
@@ -193,39 +99,20 @@
 
       <el-table-column :label="$t('状态')" align="center" prop="shipmentStatusText" />
 
-      <el-table-column
-        :label="$t('日期')"
-        align="center"
-        prop="createTime"
-        width="180"
-      >
+      <el-table-column :label="$t('日期')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{
-            new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss')
-          }}</span>
+          <span>{{ new Date(scope.row.createTime).format('yyyy-MM-dd hh:mm:ss') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
-          <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-                     v-hasPermi="['shipment:box:query']">{{$t('查看')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['shipment:box:update']">{{$t('修改')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['shipment:box:delete']">{{$t('删除')}}</el-button> -->
-          <el-dropdown
-            trigger="click"
-            @command="(command) => handleCommand(scope.row, command)"
-            style="marginRight:10px;"
-          >
+          <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)" style="marginRight:10px;">
             <el-button type="primary">
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="edit">{{$t('编辑')}}</el-dropdown-item>
-              <el-dropdown-item command="seaAir"
-                >{{$t('操作')}}-{{$t('海空联运')}}</el-dropdown-item
-              >
+              <el-dropdown-item command="seaAir">{{$t('操作')}}-{{$t('海空联运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
@@ -250,55 +137,49 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" @pagination="getList" @current-change="pageChange" />
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog
-      :title="dialogCfg.title"
-      :visible.sync="dialogCfg.open"
-      :width="dialogCfg.width"
-      :fullscreen="dialogCfg.fullscreen"
-      append-to-body
-      class="shippingSea-dialog"
-    >
-      <template
-        v-if="
-          dialogCfg.dialogType === 'edit' || dialogCfg.dialogType === 'add'
-        "
-      >
-        <editForm
-          v-if="dialogCfg.open"
-          @closeDialog="closeDialog"
-          :shipmentObj="currRow"
-          :warehouseList="warehouseList"
-          :transportTypes="transportTypes"
-          :cabinetList="cabinetList"
-        />
+    <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.open" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
+      <template v-if="dialogCfg.dialogType === 'edit' || dialogCfg.dialogType === 'add'">
+        <editForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :warehouseList="warehouseList" :transportTypes="transportTypes" :cabinetList="cabinetList" />
       </template>
       <template v-if="dialogCfg.dialogType === 'cost'">
-        <costForm
-          v-if="dialogCfg.open"
-          @closeDialog="closeDialog"
-          :shipmentObj="currRow"
-        />
+        <costForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
       </template>
       <template v-if="dialogCfg.dialogType === 'error'">
-        <regError
-          v-if="dialogCfg.open"
-          @closeDialog="closeDialog"
-          :shipmentObj="currRow"
-          :allUsers="allUsers"
-        />
+        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers" />
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
         <ladingBill v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :getCabinetName="getCabinetName" />
       </template>
+      <template v-if="dialogCfg.dialogType === 'notice'">
+        <div class="notice-dialog">
+          <div class="notice-title">{{$t('您有{cnt}个待处理出货操作，请尽快前往处理', {cnt: noticeList.length})}}：</div>
+          <el-table :data="noticeList" height="500px" border>
+            <el-table-column :label="$t('自编号')" align="center" prop="selfNo" />
+            <el-table-column :label="$t('类型')" align="center">
+              <template slot-scope="scope">
+                <dict-tag :type="DICT_TYPE.BOX_SHIPPING_NOTICE_TYPE" :value="String(scope.row.noticeType)" />
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('预计时间')" align="center">
+              <template slot-scope="scope">
+                {{formatDate(scope.row.createTime)}}
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('操作')" align="center" width="80">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleCommand(scope.row, 'handle')">{{$t('处理')}}</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row class="operate-button">
+            <el-button type="primary" @click="closeDialog">{{$t('关闭窗口')}}</el-button>
+          </el-row>
+        </div>
+
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -308,24 +189,25 @@ import {
   deletebox,
   getbox,
   getboxPage,
-  exportboxExcel
-} from '@/api/ecw/box'
+  exportboxExcel,
+  getNoticeList,
+} from "@/api/ecw/box";
 import {
   downloadFile,
   downloadFileByUrl,
   formatDate,
 } from "./shippingSea/utils";
-import { getCabinetPage } from '@/api/ecw/cabinet'
-import { getChannelList } from '@/api/ecw/channel'
-import { getWarehouseList } from '@/api/ecw/warehouse'
-import costForm from './costForm.vue'
-import regError from './regError.vue'
-import editForm from './editSeaAirForm.vue'
+import { getCabinetPage } from "@/api/ecw/cabinet";
+import { getChannelList } from "@/api/ecw/channel";
+import { getWarehouseList } from "@/api/ecw/warehouse";
+import costForm from "./costForm.vue";
+import regError from "./regError.vue";
+import editForm from "./editSeaAirForm.vue";
 import ladingBill from "./ladingBill/index.vue";
 import { listUser } from "@/api/system/user";
 
 export default {
-  name: 'EcwBoxIndexseaair',
+  name: "EcwBoxIndexseaair",
   components: {
     costForm,
     regError,
@@ -335,14 +217,13 @@ export default {
   data() {
     return {
       dateTypes: [
-        { value: '1', label: this.$t('预装时间') },
-        { value: '2', label: this.$t('装柜时间') },
-        { value: '3', label: this.$t('起运时间') },
-        { value: '4', label: this.$t('到港时间') },
-        { value: '5', label: this.$t('清关时间') },
-        { value: '6', label: this.$t('提货时间') }
+        { value: "1", label: this.$t("预装时间") },
+        { value: "2", label: this.$t("装柜时间") },
+        { value: "3", label: this.$t("起运时间") },
+        { value: "4", label: this.$t("到港时间") },
+        { value: "5", label: this.$t("清关时间") },
+        { value: "6", label: this.$t("提货时间") },
       ],
-
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -354,9 +235,7 @@ export default {
       // 出货列表
       list: [],
       // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
+      // 弹出类型
       dialogCfg: {
         title: "",
         dialogType: "",
@@ -370,120 +249,117 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
+        page: 1,
         pageSize: 10,
-        id: null,
-        selfNo: null,
-        cubNo: null,
-        cabinetId: null,
-        boxStatus: null,
-        startWarehouseId: null,
-        destWarehouseId: null,
-        transportType: null
       },
       cabinetList: [],
       channelList: [],
       warehouseList: [],
-      allUsers: []
-    }
+      transportTypes: [],
+      // 通知列表
+      noticeList: [],
+      allUsers: [],
+    };
   },
   computed: {
     exportWarehouseList() {
       return this.warehouseList.filter(
-        (item) => item.tradeType == '2' || item.type == '3'
-      )
+        (item) => item.tradeType == "2" || item.type == "3"
+      );
     },
     importWarehouseList() {
       return this.warehouseList.filter(
-        (item) => item.tradeType == '1' || item.type == '3'
-      )
+        (item) => item.tradeType == "1" || item.type == "3"
+      );
     },
-
     getCabinetName() {
       return (cabinetId) => {
         for (let index in this.cabinetList) {
-          let cabinetItem = this.cabinetList[index]
+          let cabinetItem = this.cabinetList[index];
           if (cabinetItem.id == cabinetId) {
-            return cabinetItem.name
-          }
+            return cabinetItem.name;
           }
-        return '/'
         }
+        return "/";
+      };
     },
 
     getShipChannelName() {
       return (shippingChannelId) => {
         for (let index in this.channelList) {
-          let channelItem = this.channelList[index]
+          let channelItem = this.channelList[index];
           if (channelItem.channelId == shippingChannelId) {
-            return this.$l(channelItem, 'name')
-          }
-        }
-        return '/'
+            return this.$l(channelItem, "name");
           }
         }
+        return "/";
+      };
+    },
   },
   created() {
+    this.transportTypes = this.getDictDatas(
+      this.DICT_TYPE.ECW_TRANSPORT_TYPE
+    ).filter((item) => item.value == "4");
+    getWarehouseList().then((res) => (this.warehouseList = res.data));
+    getCabinetPage(null).then((response) => {
+      this.cabinetList = response.data.list;
+    });
+    this.getList();
+    this.getChannelList();
+    this.queryNotice();
     // 用户
     listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
       const { data } = res;
       this.allUsers = data.list ?? [];
     });
-    this.transportTypes = this.getDictDatas(
-      this.DICT_TYPE.ECW_TRANSPORT_TYPE
-    ).filter((item) => item.value == '4')
-    getWarehouseList().then((res) => (this.warehouseList = res.data))
-    getCabinetPage(null).then((response) => {
-      this.cabinetList = response.data.list
-    })
-    this.getList()
-    this.getChannelList()
   },
   methods: {
+    formatDate,
     getChannelList() {
-      getChannelList().then((res) => (this.channelList = res.data))
+      getChannelList().then((res) => (this.channelList = res.data));
+    },
+    queryNotice() {
+      getNoticeList({
+        transportTypeList: this.transportTypes.map((item) => item.value),
+      }).then((res) => {
+        const { data } = res;
+        this.noticeList = data ?? [];
+        if (data.length) {
+          this.$set(this.dialogCfg, "title", this.$t("出货操作提醒"));
+          this.$set(this.dialogCfg, "dialogType", "notice");
+          this.$set(this.dialogCfg, "width", "650px");
+          this.$set(this.dialogCfg, "open", true);
+        }
+      });
     },
-
     /** 查询列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       // 处理查询参数
-      let params = { ...this.queryParams }
-      params.transportType = 4
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
+      let params = { ...this.queryParams };
+      params.transportType = 4;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行查询
       getboxPage(params).then((response) => {
-        this.list = response.data.list
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 取消按钮 */
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    /** 表单重置 */
-    reset() {
-      this.form = {
-        id: undefined,
-        cabinetId: undefined,
-        startWarehouseId: undefined,
-        destWarehouseId: undefined,
-        transportType: '4'
-      }
-      this.resetForm('form')
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1
-      this.getList()
+      this.queryParams.page = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeCreateTime = []
-      this.resetForm('queryForm')
-      this.handleQuery()
+      this.queryParams = {};
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    resetForm() {
+      this.$refs["queryForm"].resetFields();
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -507,96 +383,94 @@ export default {
         this.$set(this.dialogCfg, "open", true);
       });
     },
-    /* 关闭弹窗 */
-    closeDialog(type) {
-      this.$set(this.dialogCfg, "open", false);
-      if (type === "add" || type === "edit") {
-        this.getList();
-      }
-    },
-
     /** 删除按钮操作 */
     handleDelete(row) {
-      const id = row.id
+      const id = row.id;
       this.$modal
-        .confirm(this.$t('是否确认删除出货编号为{id}的数据项?', {id}))
+        .confirm(this.$t("是否确认删除出货编号为{id}的数据项?", { id }))
         .then(function () {
-          return deletebox(id)
+          return deletebox(id);
         })
         .then(() => {
-          this.getList()
-          this.$modal.msgSuccess(this.$t('删除成功'))
+          this.getList();
+          this.$modal.msgSuccess(this.$t("删除成功"));
         })
-        .catch(() => {})
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
-      let params = { ...this.queryParams }
-      params.pageNo = undefined
-      params.pageSize = undefined
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
+      let params = { ...this.queryParams };
+      params.page = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
       // 执行导出
       this.$modal
-        .confirm(this.$t('是否确认导出所有出货数据项?'))
+        .confirm(this.$t("是否确认导出所有出货数据项?"))
         .then(() => {
-          this.exportLoading = true
-          return exportboxExcel(params)
+          this.exportLoading = true;
+          return exportboxExcel(params);
         })
         .then((response) => {
-          this.$download.excel(response, '${table.classComment}.xls')
-          this.exportLoading = false
+          this.$download.excel(response, "${table.classComment}.xls");
+          this.exportLoading = false;
         })
-        .catch(() => {})
+        .catch(() => {});
+    },
+    /* 关闭弹窗 */
+    closeDialog(type) {
+      this.$set(this.dialogCfg, "open", false);
+      if (type === "add" || type === "edit") {
+        this.getList();
+      }
     },
     /** 查看按钮操作 */
     handleCommand(row, command) {
       this.$set(this.dialogCfg, "fullscreen", false);
       switch (command) {
-        case 'seaAir':
-          this.$router.push('/boxSeaAir/shippingSeaAir/' + row.id)
-          break
+        case "seaAir":
+          this.$router.push("/boxSeaAir/shippingSeaAir/" + row.id);
+          break;
 
         case "detail":
           this.$router.push("/boxSeaAir/query/" + row.id);
           break;
 
-        case 'edit':
-          this.handleUpdate(row)
-          break
+        case "edit":
+          this.handleUpdate(row);
+          break;
 
-        case 'delete':
-          this.handleDelete(row)
-          break
+        case "delete":
+          this.handleDelete(row);
+          break;
 
         case "editLadingBill":
           const cabinetLabel = this.getCabinetName(row.cabinetId);
-            /* const title =
-
-            `查看提单 ${row.selfNo ?? ""} 柜号：${
-                row.cubNo ?? ""
-            } 柜型：${cabinetLabel}`; */
-            const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}`', {
+          const title = this.$t(
+            "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+            {
               selfNo: row.selfNo,
               cubNo: row.cubNo,
-              cabinetLabel: cabinetLabel
-            })
+              cabinetLabel: cabinetLabel,
+            }
+          );
           this.$set(this.dialogCfg, "title", title);
           this.$set(this.dialogCfg, "fullscreen", true);
           break;
 
-        case 'cost':
-          this.$set(this.dialogCfg, 'title', this.$t('费用登记'))
-          break
+        case "cost":
+          this.$set(this.dialogCfg, "title", this.$t("费用登记"));
+          break;
+
+        case "error":
+          this.$set(this.dialogCfg, "title", this.$t("异常登记"));
+          break;
 
-        case 'error':
-          this.$set(this.dialogCfg, 'title', this.$t('异常登记'))
-          break
         case "downloadPreloadGoodsList":
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('预装单') + `(${row.selfNo}).xlsx`,
+            this.$t("预装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -604,7 +478,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('已装单') + `(${row.selfNo}).xlsx`,
+            this.$t("已装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -612,7 +486,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('应收汇总表') + `(${row.selfNo}).xlsx`,
+            this.$t("应收汇总表") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -620,7 +494,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('提货单') + `(${row.selfNo}).zip`,
+            this.$t("提货单") + `(${row.selfNo}).zip`,
             "zip"
           );
           break;
@@ -629,15 +503,45 @@ export default {
         case "downloadLadingCopy":
           downloadFileByUrl(command, { shipmentId: row.id });
           break;
+        case "handle":
+          const { noticeType } = row;
+          if ([1, 2, 3, 4, 8].includes(noticeType)) {
+            this.$router.push("/boxSeaAir/shippingSeaAir/" + row.id);
+          }
+          if ([5, 6, 7].includes(noticeType)) {
+            this.$router.push("/boxSeaAir/query/" + row.id);
+          }
+          this.closeDialog();
+          break;
       }
+
       if (["editLadingBill", "cost", "error"].includes(command)) {
         this.currRow = row;
-        this.currRow.bosType = 'seaAir'
+        this.currRow.bosType = "seaAir";
         this.$set(this.dialogCfg, "dialogType", command);
         this.$set(this.dialogCfg, "width", "600px");
         this.$set(this.dialogCfg, "open", true);
       }
+    },
+    /* 分页 */
+    pageChange(page) {
+      this.pageParam.page = page;
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.notice-dialog {
+  ::v-deep .notice-title {
+    font-size: 24px;
+    font-weight: bold;
+    margin-bottom: 10px;
   }
+  ::v-deep .operate-button {
+    margin-top: 10px;
+    text-align: center;
   }
 }
-</script>
+</style>