2024-06-11提交

src/views/ecw/box/batchMarkup.vue

@@ -143,7 +143,8 @@ import {getChannelList} from "@/api/ecw/channel";
 import {getCabinetPage} from "@/api/ecw/cabinet";
 import {getWarehouseList} from "@/api/ecw/warehouse";
 import {getSupplierPage} from "@/api/ecw/supplier";
-import {approvalCancel, boxGoodsDetail, createApproval, getSectionList, loadSecGoodsList} from "@/api/ecw/boxSea";
+import {approvalCancel, boxGoodsDetail, createApproval, 
+  getSectionList, loadSecGoodsList} from "@/api/ecw/boxSea";
 import {getAbnormalList, getbox, getLogList} from "@/api/ecw/box";
 import {getTotlContent} from "@/views/ecw/box/shippingSea/utils";
 import WorkFlow from "@/components/WorkFlow";

src/views/ecw/box/indexSea.vue

 <template>
   <div class="app-container shipping-sea">
-
     <!-- 搜索工作栏 -->
-    <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="transportType">
-        <el-select v-model="queryParams.transportType" :placeholder="$t('请选择运输方式')" clearable size="small">
-          <el-option v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
+        <el-select
+          v-model="queryParams.transportType"
+          :placeholder="$t('请选择运输方式')"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="dict in transportTypes"
+            :key="dict.value"
+            :label="$l(dict, 'label')"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
       <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="$l(item, 'name')" :value="item.id" :key="item.id"></el-option>
+        <el-select
+          v-model="queryParams.cabinetId"
+          :placeholder="$t('请选择柜型')"
+          clearable
+        >
+          <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="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
+          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="" 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">
-        <el-select v-model="queryParams.boxStatus" :placeholder="$t('请选择状态')" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)" :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_ORDER_SHIPMENT_STATE
+            )"
+            :key="dict.value"
+            :label="$l(dict, 'label')"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('国家')" prop="countryId">
-        <el-select v-model="queryParams.countryId" :placeholder="$t('请选择国家')" clearable size="small">
-          <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id">
+        <el-select
+          v-model="queryParams.countryId"
+          :placeholder="$t('请选择国家')"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="item in countryList"
+            :key="item.id"
+            :label="$l(item, 'title')"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('提单制作')" prop="ladingBillStatus">
-        <el-select v-model="queryParams.ladingBillStatus" :placeholder="$t('请选择提单制作状态')" clearable size="small">
-          <el-option v-for="(item,index) in ladingBillStatusData" :key="index" :label="item" :value="index">
+        <el-select
+          v-model="queryParams.ladingBillStatus"
+          :placeholder="$t('请选择提单制作状态')"
+          clearable
+          size="small"
+        >
+          <el-option
+            v-for="(item, index) in ladingBillStatusData"
+            :key="index"
+            :label="item"
+            :value="index"
+          >
           </el-option>
         </el-select>
       </el-form-item>
 
-
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
+          $t("搜索")
+        }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{
+          $t("重置")
+        }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 操作工具栏 -->
     <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>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('自编号')" align="center" prop="selfNo">
         <template slot-scope="scope">
-          <a href="javascript:void(0)" @click="handleCommand(scope.row, 'detail')">{{ scope.row.selfNo }}</a>
+          <a
+            href="javascript:void(0)"
+            @click="handleCommand(scope.row, 'detail')"
+            >{{ scope.row.selfNo }}</a
+          >
         </template>
       </el-table-column>
       <el-table-column :label="$t('柜号')" align="center" prop="cubNo" />
@@ -96,113 +225,276 @@
           <span>{{ getCabinetName(scope.row.cabinetId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('运输方式')" align="center" prop="transportType">
+      <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>
 
       <el-table-column :label="$t('方数（预装/已装）')" align="center" prop="">
-        <template slot-scope="{row}">
-          {{row.boxStatistics.volume}}/{{row.boxStatistics.loadVolume}}
+        <template slot-scope="{ row }">
+          {{ row.boxStatistics.volume }}/{{ row.boxStatistics.loadVolume }}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('重量（预装/已装）')" align="center" prop="weight">
-        <template slot-scope="{row}">
-          {{row.boxStatistics.weight}}/{{row.boxStatistics.loadWeight}}
+      <el-table-column
+        :label="$t('重量（预装/已装）')"
+        align="center"
+        prop="weight"
+      >
+        <template slot-scope="{ row }">
+          {{ row.boxStatistics.weight }}/{{ row.boxStatistics.loadWeight }}
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('状态')" align="center" prop="shipmentStatusText" />
-
-      <el-table-column :label="$t('提单状态')" align="center" prop="ladingBillStatus" width="180">
+      <el-table-column
+        :label="$t('状态')"
+        align="center"
+        prop="shipmentStatusText"
+      />
+
+      <el-table-column
+        :label="$t('提单状态')"
+        align="center"
+        prop="ladingBillStatus"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ ladingBillStatusData[scope.row.ladingBillStatus] }}</span>
         </template>
       </el-table-column>
 
-
-      <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">
+      <el-table-column
+        :label="$t('操作')"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200px"
+      >
         <template slot-scope="scope">
-          <el-dropdown trigger="click" v-hasPermi="['shipment:box:action:sea','shipment:box:action:error','shipment:box:action:cost','shipment:box:action:editLadingBill']" @command="(command)=>handleCommand(scope.row, command)" style="marginRight:10px;">
+          <el-dropdown
+            trigger="click"
+            v-hasPermi="[
+              'shipment:box:action:sea',
+              'shipment:box:action:error',
+              'shipment:box:action:cost',
+              'shipment:box:action:editLadingBill',
+            ]"
+            @command="(command) => handleCommand(scope.row, command)"
+            style="marginright: 10px"
+          >
             <el-button type="primary">
-              {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
+              {{ $t("操作") }}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.prStatus>21" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
-              <el-dropdown-item  command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
-              <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
-              <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>
+              <el-dropdown-item
+                :disabled="scope.row.prStatus > 21"
+                command="edit"
+                v-hasPermi="['shipment:box:update']"
+                >{{ $t("编辑") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="sea"
+                v-hasPermi="['shipment:box:action:sea']"
+                >{{ $t("操作-海运") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="error"
+                v-hasPermi="['shipment:box:action:error']"
+                >{{ $t("异常登记") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="cost"
+                v-hasPermi="['shipment:box:action:cost']"
+                >{{ $t("费用登记") }}</el-dropdown-item
+              >
               <!-- <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item> -->
-              <el-dropdown-item :disabled="scope.row.ldStatus<46" command="editLadingBill" v-hasPermi="['shipment:box:action:editLadingBill']">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item
+                :disabled="scope.row.ldStatus < 46"
+                command="editLadingBill"
+                v-hasPermi="['shipment:box:action:editLadingBill']"
+                >{{ $t("编辑提货单") }}</el-dropdown-item
+              >
+              <!--lanbm 2024-06-11 添加海运批量加价功能-->
+              <el-dropdown-item
+                command="batchMarkup"
+                v-has-permi="['shipment:air:batchMarkup']"
+                >{{ $t("批量加价") }}</el-dropdown-item
+              >
             </el-dropdown-menu>
           </el-dropdown>
-          <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)" v-hasPermi="['shipment:box:download:downloadPreloadGoodsList','shipment:box:download:downloadLoadGoodsList','shipment:box:download:downloadReceivableList','shipment:box:download:downloadAgentListFiles','shipment:box:download:downloadSoncapFiles','shipment:box:download:zipDownload','shipment:box:download:downloadLadingCopy']">
+          <el-dropdown
+            trigger="click"
+            @command="(command) => handleCommand(scope.row, command)"
+            v-hasPermi="[
+              'shipment:box:download:downloadPreloadGoodsList',
+              'shipment:box:download:downloadLoadGoodsList',
+              'shipment:box:download:downloadReceivableList',
+              'shipment:box:download:downloadAgentListFiles',
+              'shipment:box:download:downloadSoncapFiles',
+              'shipment:box:download:zipDownload',
+              'shipment:box:download:downloadLadingCopy',
+            ]"
+          >
             <el-button type="primary">
-              {{$t('下载')}}<i class="el-icon-arrow-down el-icon--right"></i>
+              {{ $t("下载") }}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="downloadPreloadGoodsList" v-hasPermi="['shipment:box:download:downloadPreloadGoodsList']">{{$t('预装单')}}</el-dropdown-item>
-              <el-dropdown-item command="downloadLoadGoodsList" v-hasPermi="['shipment:box:download:downloadLoadGoodsList']">{{$t('已装单')}}</el-dropdown-item>
+              <el-dropdown-item
+                command="downloadPreloadGoodsList"
+                v-hasPermi="['shipment:box:download:downloadPreloadGoodsList']"
+                >{{ $t("预装单") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="downloadLoadGoodsList"
+                v-hasPermi="['shipment:box:download:downloadLoadGoodsList']"
+                >{{ $t("已装单") }}</el-dropdown-item
+              >
               <!--应收汇总表，Manifest样式修改 lanbm 2024-05-24 -->
-              <el-dropdown-item command="downloadReceivableList" v-hasPermi="['shipment:box:download:downloadReceivableList']">{{$t('应收汇总表')}}</el-dropdown-item>
-              <el-dropdown-item command="downloadAgentListFiles" v-hasPermi="['shipment:box:download:downloadAgentListFiles']">agent list</el-dropdown-item>
-              <el-dropdown-item command="downloadSoncapFiles" v-hasPermi="['shipment:box:download:downloadSoncapFiles']">soncap</el-dropdown-item>
-              <el-dropdown-item command="zipDownload" v-hasPermi="['shipment:box:download:zipDownload']">{{$t('提货单')}}</el-dropdown-item>
-              <el-dropdown-item command="downloadLadingCopy" v-hasPermi="['shipment:box:download:downloadLadingCopy']">{{$t('提单Copy')}}</el-dropdown-item>
+              <el-dropdown-item
+                command="downloadReceivableList"
+                v-hasPermi="['shipment:box:download:downloadReceivableList']"
+                >{{ $t("应收汇总表") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="downloadAgentListFiles"
+                v-hasPermi="['shipment:box:download:downloadAgentListFiles']"
+                >agent list</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="downloadSoncapFiles"
+                v-hasPermi="['shipment:box:download:downloadSoncapFiles']"
+                >soncap</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="zipDownload"
+                v-hasPermi="['shipment:box:download:zipDownload']"
+                >{{ $t("提货单") }}</el-dropdown-item
+              >
+              <el-dropdown-item
+                command="downloadLadingCopy"
+                v-hasPermi="['shipment:box:download:downloadLadingCopy']"
+                >{{ $t("提单Copy") }}</el-dropdown-item
+              >
             </el-dropdown-menu>
           </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
+      @pagination="getList"
+    />
 
     <!-- 对话框(添加 / 修改) -->
-    <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" />
+        <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>
+          <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"
+              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)" />
+                <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)}}
+                {{ 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>
+                <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-button type="primary" @click="closeDialog">{{
+              $t("关闭窗口")
+            }}</el-button>
           </el-row>
         </div>
-
       </template>
     </el-dialog>
   </div>
@@ -214,7 +506,11 @@ import {
   getbox,
   getboxPage,
   exportboxExcel,
-    getNoticeList, dealCustomsSplitNotify, exportSeaPreloadGoodsList, zipDownload, downloadLoadGoodsList,
+  getNoticeList,
+  dealCustomsSplitNotify,
+  exportSeaPreloadGoodsList,
+  zipDownload,
+  downloadLoadGoodsList,
 } from "@/api/ecw/box";
 import {
   downloadFile,
@@ -289,7 +585,7 @@ export default {
       countryList: [],
       // 通知列表
       noticeList: [],
-      allUsers: []
+      allUsers: [],
     };
   },
   computed: {
@@ -319,7 +615,7 @@ export default {
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == "1" || item.value == "2");
     getWarehouseList().then((res) => (this.warehouseList = res.data));
-    getCabinetPage({status:0}).then((response) => {
+    getCabinetPage({ status: 0 }).then((response) => {
       this.cabinetList = response.data.list;
     });
     this.getList();
@@ -452,6 +748,10 @@ export default {
       this.$set(this.dialogCfg, "fullscreen", false);
 
       switch (command) {
+        //lanbm 2024-06-11 添加批量海运批量加价功能
+        case "batchMarkup":
+          this.$router.push("/boxAir/batch_markup?shipmentId=" + row.id);
+          break;
         case "sea":
           this.$router.push("/boxSea/shippingSea/" + row.id);
           break;
@@ -497,12 +797,18 @@ export default {
           //   this.$t("预装单") + `(${row.selfNo}).xlsx`,
           //   "xlsx"
           // );
-          this.exportExcel(exportSeaPreloadGoodsList, { shipmentId: row.id }, this.$t("预装单") + `(${row.selfNo}).xlsx`)
+          this.exportExcel(
+            exportSeaPreloadGoodsList,
+            { shipmentId: row.id },
+            this.$t("预装单") + `(${row.selfNo}).xlsx`
+          );
           break;
         case "downloadLoadGoodsList":
-            downloadLoadGoodsList({ shipmentId: row.id }).then(res => {
-                this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
-            })
+          downloadLoadGoodsList({ shipmentId: row.id }).then((res) => {
+            this.$message.success(
+              this.$t("已加入导出队列，请稍后在下载日志中下载")
+            );
+          });
           break;
         case "downloadReceivableList":
           downloadFile(
@@ -519,7 +825,11 @@ export default {
             this.$t("提货单") + `(${row.selfNo}).zip`,
             "zip"
           );*/
-          this.exportExcel(zipDownload, { shipmentId: row.id }, this.$t("提货单") + `(${row.selfNo}).zip`)
+          this.exportExcel(
+            zipDownload,
+            { shipmentId: row.id },
+            this.$t("提货单") + `(${row.selfNo}).zip`
+          );
           break;
         case "downloadAgentListFiles":
         case "downloadSoncapFiles":
@@ -534,8 +844,8 @@ export default {
           if ([5, 6, 7].includes(noticeType)) {
             this.$router.push("/boxSea/query/" + row.id);
           }
-          if([9].includes(noticeType)){
-            await dealCustomsSplitNotify(row.notifyId)
+          if ([9].includes(noticeType)) {
+            await dealCustomsSplitNotify(row.notifyId);
           }
           this.closeDialog();
           break;
@@ -549,18 +859,22 @@ export default {
       }
     },
     // 通用导出函数
-    exportExcel(func, params, fileName = null){
+    exportExcel(func, params, fileName = null) {
       this.exportLoading = true;
-      func(params).then(res => {
-        console.log({res})
-        if(!fileName){
-          fileName = this.$t('订单')
+      func(params)
+        .then((res) => {
+          console.log({ res });
+          if (!fileName) {
+            fileName = this.$t("订单");
           }
-        this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
+          this.$message.success(
+            this.$t("已加入导出队列，请稍后在下载日志中下载")
+          );
           // this.$download.excel(res, fileName + '.xls');
-      }).finally(() => {
-        this.exportLoading = false
         })
+        .finally(() => {
+          this.exportLoading = false;
+        });
     },
     /* 分页 */
     pageChange(page) {

src/views/ecw/box/query.vue

@@ -392,7 +392,8 @@
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
                   <el-button
-                    type="primary" :disabled="scope.row.paymentId!='-1'"
+                    type="primary"
+                    :disabled="scope.row.paymentId != '-1'"
                     size="small"
                     @click="editCostClick(scope.row)"
                     style="marginright: 10px"
@@ -404,7 +405,8 @@
                     @confirm="deleteCostClick(scope.row)"
                   >
                     <el-button
-                      type="danger" :disabled="scope.row.paymentId!='-1'"
+                      type="danger"
+                      :disabled="scope.row.paymentId != '-1'"
                       size="small"
                       slot="reference"
                       v-hasPermi="['ecw:box-cost:delete']"
@@ -539,7 +541,6 @@
         />
       </template>
     </el-dialog>
-
     <!-- 对话框 lanbm 2024-05-23 add异常登记对话框 -->
     <el-dialog
       custom-class="shipping-dialog"

src/views/ecw/financial/receiptDetail.vue

@@ -722,14 +722,49 @@
               </div>
             </div>
           </el-form-item>
-          <el-form-item :label="$t('水单号')" prop="billNo">
+          <!--lanbm 2024-06-12 add
+          <el-form-item :label="$t('创建人')" prop="billNo">
             <el-input
               v-if="!isView"
               v-model="addForm.billNo"
               style="width: 220px"
             ></el-input>
-            <span v-else>{{ addForm.billNo }}</span>
           </el-form-item>
+          <el-form-item :label="$t('创建时间')" prop="createTime">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.createTime"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('最后更新人')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('最后更新时间')" prop="updateTime">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.updateTime"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('提交审批人')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('审批通过时间')" prop="billNo">
+            <el-input
+              v-if="!isView"
+              v-model="addForm.billNo"
+              style="width: 220px"
+            ></el-input>
+          </el-form-item>-->
         </el-form>
         <div slot="footer" v-if="!isView">
           <el-button type="primary" @click="saveFrom">{{

src/views/ecw/order/components/PrintLadingBill.vue

@@ -7,8 +7,8 @@
         <!-- <div v-if="detail" class="billcontent" v-html="detail.billContent"></div> -->
         <p class="subs" style="text-align:center">
             <!--lanbm 2024-06-04 添加审批状态控制逻辑-->
-            <el-button type="primary" @click="download" :disabled="detail.bpmStatus!='2'">{{$t('下载')}}</el-button>
-            <el-button type="primary" @click="print" :disabled="detail.bpmStatus!='2'">{{$t('打印')}}</el-button>
+            <el-button type="primary" @click="download" :disabled="detail.status!='2'">{{$t('下载')}}</el-button>
+            <el-button type="primary" @click="print" :disabled="detail.status!='2'">{{$t('打印')}}</el-button>
         </p>
     </el-dialog>
 </template>

src/views/ecw/order/detail.vue

@@ -451,6 +451,7 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
         <el-tab-pane :label="$t('订单动态')" name="second">
           <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
             <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="parseTime(activity.businessTime)">

src/views/ecw/warehouse/index.vue

@@ -1098,7 +1098,6 @@ export default {
         ],
       },
       nodeId: this.$route.query.nodeId,
-
       // 枚举
       CommonStatusEnum: CommonStatusEnum,
       // 数据字典

src/views/report/BankReceiptDetails/index.vue

@@ -108,6 +108,23 @@
           placeholder="请输截止月"
         />
       </el-form-item>
+      <el-form-item :label="$t('收款账户')" prop="accountNo">
+        <el-select
+          filterable
+          clear
+          v-model="queryParams.accountNo"
+          :placeholder="$t('请选择收款账户')"
+          style="width: 220px"
+          v-el-select-loadmore="loadmore"
+        >
+          <el-option
+            v-for="item in bankData"
+            :key="item.id"
+            :label="item.baAccountName"
+            :value="item.baAccountName"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery"
           >搜索</el-button
@@ -209,6 +226,11 @@
         align="center"
         prop="createTime"
       />
+      <el-table-column
+        :label="$t('提价审批人')"
+        align="center"
+        prop="createBpm"
+      />
       <el-table-column
         :label="$t('提交审批时间')"
         align="center"
@@ -229,7 +251,6 @@
             >{{ $t("删除") }}</el-button
           >
           <el-button
-            v-if="scope.row.status == 0"
             type="text"
             @click="detailClick(scope.row)"
             v-hasPermi="['ecw:payment:detail:detail']"
@@ -351,9 +372,7 @@
         </el-form-item>
 
         <el-form-item :label="$t('剩余应收金额')">
-          <span>
-            {{ form.syValue }}</span
-          >
+          <span> {{ form.syValue }}</span>
         </el-form-item>
         <el-form-item :label="$t('收款账户')" prop="accountNo">
           <el-select
@@ -469,9 +488,46 @@
             style="width: 220px"
           ></el-input>
         </el-form-item>
+        <!--lanbm 2024-06-12 add-->
+        <el-form-item :label="$t('创建人')" v-show="isEdit" prop="creator">
+          <el-input
+            v-model="form.creator"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('创建时间')" v-show="isEdit" prop="createTime">
+          <el-input
+            v-model="form.createTime"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('最后更新人')" v-show="isEdit" prop="updater">
+          <el-input         
+            v-model="form.updater"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('最后更新时间')" v-show="isEdit" prop="updateTime">
+          <el-input
+            v-model="form.updateTime"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('提交审批人')" v-show="isEdit" prop="createBpm">
+          <el-input
+            v-model="form.createBpm"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('审批通过时间')" v-show="isEdit" prop="updateTimeBpm">
+          <el-input
+            v-model="form.updateTimeBpm"
+            style="width: 220px"
+          ></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer">
-        <el-button type="primary" @click="saveFrom">{{
+        <el-button type="primary" v-show="!isEdit" @click="saveFrom">{{
           saveBtnText
         }}</el-button>
         <el-button @click="hiddenDialog">{{ $t("取消") }}</el-button>
@@ -561,6 +617,7 @@ export default {
         sDate4: undefined,
         eDate4: undefined, //实收日期
         creator: undefined, //创建人
+        accountNo: undefined, //收款账号 lanbm 2024-06-12 add
       },
       params: {
         page: 1,